[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - bin/package-ooo bin/piece

[Petr Mladek]

 bin/package-ooo                 |    7 ++++++-
 bin/piece/file-list-extras      |    3 +++
 bin/piece/file-list-postprocess |    3 ---
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 390af2c733a81f72b6d8976bd401ae432f012d76
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 41da475..393859e 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"
commit 26240ec61437ffe5b5bc9d94ce99863ef76de65f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 3 21:40:28 2010 +0100

    do not try to move intro.bmp; is not longer installed

diff --git a/bin/package-ooo b/bin/package-ooo
index ed4bcc8..41da475 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -372,7 +372,7 @@ if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
     mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program
     echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt
     echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME/program" >>$BUILDDIR/upstream_branding_list.txt
-    branding_stuff="about.png intro.png intro.bmp sofficerc"
+    branding_stuff="about.png intro.png sofficerc"
     for file in $branding_stuff ; do
 	mv $OOINSTDIR/program/$file $DATADIR/$OOOINSTALLDIRNAME/program/$file
 	ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/program/$file $OOINSTDIR/program/$file
diff --git a/bin/piece/file-list-postprocess b/bin/piece/file-list-postprocess
index b199bf9..29bbda3 100755
--- a/bin/piece/file-list-postprocess
+++ b/bin/piece/file-list-postprocess
@@ -37,12 +37,9 @@ if test "$OOO_BUILD_NOARCH" = 'YES' ; then
     # create only symlinks; the icons will be packaged separately
     ln -sf $OO_INSTDIR_SHARE/program/about.png $DESTDIR$OO_INSTDIR/program
     ln -sf $OO_INSTDIR_SHARE/program/intro.png $DESTDIR$OO_INSTDIR/program
-    ln -sf $OO_INSTDIR_SHARE/program/intro.bmp $DESTDIR$OO_INSTDIR/program
 else
     cp $OO_SOLVERDIR/default_images/introabout/about.png $DESTDIR$OO_INSTDIR/program || exit 1;
     cp $OO_SOLVERDIR/default_images/introabout/intro.png $DESTDIR$OO_INSTDIR/program || exit 1;
-    cp $OO_SOLVERDIR/default_images/introabout/intro.bmp $DESTDIR$OO_INSTDIR/program || exit 1;
 fi
 echo "$OO_INSTDIR/program/about.png" >>files-$piece.txt
 echo "$OO_INSTDIR/program/intro.png" >>files-$piece.txt
-echo "$OO_INSTDIR/program/intro.bmp" >>files-$piece.txt