ooo-build r11798 - in trunk: . bin

[mrl svn gnome org]

Author: mrl
Date: Tue Mar  4 12:18:03 2008
New Revision: 11798
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11798&view=rev

Log:
2008-03-04  Marcelo Ricardo Leitner <mrl mandriva com>

	* bin/package-ooo: Update qstart handling for Mandriva packaging and
	avoid wrong dependencies.


Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Mar  4 12:18:03 2008
@@ -683,9 +683,6 @@
 		mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $OOINSTBASE/program/classes/pexcel.jar
 		mv_file_between_flists java_common_list.txt writer_list.txt $OOINSTBASE/program/classes/writer2latex.jar
 
-		# Ship ooqstart for gnome in gnome package
-		merge_flists ooqstart_list.txt gnome_list.txt
-
 		# Move arch-dependent/dup files from common to core
 		rm -f core_list.txt
 		for f in \
@@ -721,6 +718,9 @@
 		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/program/ucpgvfs1.uno.so
 		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/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/share/config/images_crystal.zip