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

[Michael Meeks]

 bin/package-ooo |   22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 1e5f1082c98cc7a3e351e2a0d6a88366ddf7c63b
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue May 3 21:33:35 2011 +0100

    adapt to moving all the gnome pieces into the right place in the scp2

diff --git a/bin/package-ooo b/bin/package-ooo
index ae00338..d973b83 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -631,7 +631,7 @@ if test "z$VENDORNAME" != "zDebian" ; then
 	if test -f gid_Module_Root_SDK ; then
 	    cp gid_Module_Root_SDK $BUILDDIR/sdk_list.txt
 	fi
-	
+
 	cd $BUILDDIR
 
 	# kde subpackage
@@ -643,22 +643,13 @@ if test "z$VENDORNAME" != "zDebian" ; then
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libkabdrv1.so
 	add_used_directories kde_list.txt common_list.txt
 
-	# create kde4 subpackage 
+	# create kde4 subpackage
 	rm -f kde4_list.txt
 	mv_file_between_flists kde4_list.txt kde_list.txt    $OOINSTBASE/basis$VERSION/program/kde4be1.uno.so
 	mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde4l..so
 	mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde4.uno.so
 	add_used_directories kde4_list.txt common_list.txt
 
-	# gnome subpackage
-	rm -f gnome_list.txt
-	test -f $OODESTDIR/gid_Module_Optional_Gnome && cp $OODESTDIR/gid_Module_Optional_Gnome gnome_list.txt || :
-	mv_file_between_flists gnome_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libevoab2.so
-	mv_file_between_flists gnome_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_gnome.uno.so
-	mv_file_between_flists gnome_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_gtk[0-9]*l..so
-	mv_file_between_flists common_list.txt gnome_list.txt $OOINSTBASE/basis$VERSION/program/ucpgvfs1.uno.so
-	add_used_directories gnome_list.txt common_list.txt
-
 	# NLD subpackage
 	rm -f nld_list.txt
 	mv_file_between_flists nld_list.txt common_list.txt $OOINSTBASE/program/openintro_nld.bmp
@@ -788,15 +779,6 @@ if test "z$VENDORNAME" != "zDebian" ; then
 			mv_file_between_flists core_list.txt common_list.txt "$OOINSTBASE/basis$VERSION/$f"
 		done
 
-		# Put gtk/gnome stuff into gnome package
-		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/basis$VERSION/program/gnome-open-url.bin
-		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/basis$VERSION/program/fps_gnome.uno.so
-		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/basis$VERSION/program/ucpgvfs1.uno.so
-		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/basis$VERSION/program/libeggtray680li.so
-
-		# Ship ooqstart for gnome in gnome package
-		mv_file_between_flists gnome_list.txt core_list.txt "$OOINSTBASE/program/libqstart_gtk680.*"
-
 		# themes are included in other packages
 		# don't use remove_file as we don't want them removed from the buildroot.
 		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/basis$VERSION/share/config/images_crystal.zip