[Libreoffice-commits] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                     |    8 ------
 patches/dev300/solenv-dummy-localize-sdf.diff            |   11 --------
 patches/dev300/solenv-installer-lang-filelist-names.diff |   19 ---------------
 3 files changed, 38 deletions(-)

New commits:
commit 62735b4703d73749c9f501697e839a5ca5502a1f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:31:31 2011 +0200

    pushed solenv-dummy-localize-sdf.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2e0a0e3..d549091 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -420,9 +420,6 @@ jvmfwk-disable-gcj.diff
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-# make the dummy localize.sdf realy working
-solenv-dummy-localize-sdf.diff, i#113389, pmladek
-
 # fix build with neon-0.24
 ucb-neon-0.24.diff, pmladek
 
diff --git a/patches/dev300/solenv-dummy-localize-sdf.diff b/patches/dev300/solenv-dummy-localize-sdf.diff
deleted file mode 100644
index 4c27060..0000000
--- a/patches/dev300/solenv-dummy-localize-sdf.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/target.mk.old	2010-07-23 16:06:29.000000000 +0200
-+++ solenv/inc/target.mk	2010-07-23 16:06:04.000000000 +0200
-@@ -1390,7 +1390,7 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
-     $(TOUCH) $@
- 
- .IF "$(LOCALIZATION_FOUND)"==""
--.IF "$(LOCALSDFFILE)"!=""
-+.IF "$(LOCALSDFFILE)"!="" && "$(LOCALSDFFILE)"=="$(LOCALIZESDF)"
- "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
-     @@-$(MKDIRHIER) $(@:d)
-     @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
commit 3755dad0306263e05224969504aa2bd4721faa65
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:25:08 2011 +0200

    pushed solenv-installer-lang-filelist-names.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 008e51d..2e0a0e3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -420,11 +420,6 @@ jvmfwk-disable-gcj.diff
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-# do not print twice the lang name in the filelist
-# for example, generate gid_Module_Langpack_Basis_es instead of
-# gid_Module_Langpack_Basis_es.es
-solenv-installer-lang-filelist-names.diff, pmladek
-
 # make the dummy localize.sdf realy working
 solenv-dummy-localize-sdf.diff, i#113389, pmladek
 
diff --git a/patches/dev300/solenv-installer-lang-filelist-names.diff b/patches/dev300/solenv-installer-lang-filelist-names.diff
deleted file mode 100644
index 2689059..0000000
--- a/patches/dev300/solenv-installer-lang-filelist-names.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- solenv/bin/modules/installer/worker.pm |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git solenv/bin/modules/installer/worker.pm solenv/bin/modules/installer/worker.pm
-index f2531b1..954b741 100644
---- solenv/bin/modules/installer/worker.pm
-+++ solenv/bin/modules/installer/worker.pm
-@@ -838,7 +838,6 @@ sub install_simple ($$$$$$)
-     {
-         my $filelist;
-         my $fname = $installer::globals::destdir . "/$packagename";
--        if ($installer::globals::languagepack || $installer::globals::helppack) { $fname .= ".$languagestring"; }
-         open ($filelist, ">$fname") || die "Can't open $fname: $!";
-         print $filelist @lines;
-         close ($filelist);
--- 
-1.7.0.1
-