[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                         |    3 ---
 patches/dev300/installer-strip-optional.diff |   27 ---------------------------
 2 files changed, 30 deletions(-)

New commits:
commit 0c60dfb121b17485025a50309e579dd4502770f4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 18:03:51 2011 +0200

    bin installer-strip-optional.diff; already applied

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4226982..7a81f8d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -520,9 +520,6 @@ sensible-browser.diff
 [ BuildBits ]
 build-identification.diff, tml
 
-# add -dontstrip option to the installer
-installer-strip-optional.diff, i#48814, pmladek
-
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
diff --git a/patches/dev300/installer-strip-optional.diff b/patches/dev300/installer-strip-optional.diff
deleted file mode 100644
index 60bd9fe..0000000
--- a/patches/dev300/installer-strip-optional.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- solenv/bin/modules/installer/parameter.pm |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git solenv/bin/modules/installer/parameter.pm solenv/bin/modules/installer/parameter.pm
-index f14eec5..fe0eb3f 100644
---- solenv/bin/modules/installer/parameter.pm
-+++ solenv/bin/modules/installer/parameter.pm
-@@ -65,6 +65,7 @@ The following parameter are needed:
- -format: Package format
- -debian: Create Debian packages for Linux
- -dontunzip: do not unzip all files with flag ARCHIVE
-+-dontstrip : do not strip binaries, keep the debugging symbols
- -dontcallepm : do not call epm to create install sets (opt., non-Windows only)
- -ispatchedepm : Usage of a patched (non-standard) epm (opt., non-Windows only)
- -copyproject : is set for projects that are only used for copying (optional)
-@@ -146,6 +147,7 @@ sub getparameter
-         elsif ($param eq "-u") { $installer::globals::unpackpath = shift(@ARGV); }
-         elsif ($param eq "-i") { $installer::globals::rootpath = shift(@ARGV); }
-         elsif ($param eq "-dontcallepm") { $installer::globals::call_epm = 0; }
-+        elsif ($param eq "-dontstrip") { $installer::globals::strip = 0; }
-         elsif ($param eq "-msitemplate") { $installer::globals::idttemplatepath = shift(@ARGV); }
-         elsif ($param eq "-msilanguage") { $installer::globals::idtlanguagepath = shift(@ARGV); }
-         elsif ($param eq "-patchinc") { $installer::globals::patchincludepath = shift(@ARGV); }
--- 
-1.7.0.1
-