[Libreoffice-commits] .: bin/package-ooo bin/piece

[Petr Mladek]

 bin/package-ooo            |    5 +++++
 bin/piece/file-list-extras |    3 +++
 2 files changed, 8 insertions(+)

New commits:
commit b8ae45e8b2f08f8dc05ad88a8a31bf0537a19bb5
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Tue Jun 15 14:42:35 2010 +0200

    Do not pack presets/config/standard.soc.orig
    
    * bin/piece/file-list-extras:
    * bin/package-ooo: remove the non-wanted .orig file

diff --git a/bin/package-ooo b/bin/package-ooo
index ed4bcc8..8e32385 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -451,6 +451,11 @@ else
     GID_MODULE_ROOT_FILES_LISTS=""
 fi
 
+# remove .orig files created by patching l10n extras
+if test -f gid_Module_Root_Files_6 ; then
+	remove_file gid_Module_Root_Files_6 "$OOINSTBASE/basis$VERSION/presets/config/standard.soc.orig"
+fi
+
 if test "z$VENDORNAME" != "zDebian" ; then
 	echo "Moving package file lists..."
 
diff --git a/bin/piece/file-list-extras b/bin/piece/file-list-extras
index 9b75add..0286465 100755
--- a/bin/piece/file-list-extras
+++ b/bin/piece/file-list-extras
@@ -29,6 +29,9 @@ if test "$VENDORNAME" = "Novell" ; then
     fi
 fi
 
+# prune .orig files created by patch tool
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/presets/config/standard.soc.orig"
+
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"