ooo-build r14446 - in trunk: . bin patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Oct 31 15:44:45 2008
New Revision: 14446
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14446&view=rev

Log:
2008-10-31  Petr Mladek  <pmladek suse cz>

	* patches/dev300/apply: disabled sw-import-TOC.diff because it caused
	  a regression (bnc#438525, bnc#404254)

	* bin/package-ooo: put kdefilepicker into the kde subapackage
	  (bnc#439322)



Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Fri Oct 31 15:44:45 2008
@@ -677,7 +677,7 @@
 	# kde subpackage
 	rm -f kde_list.txt
 	test -f $OODESTDIR/gid_Module_Optional_Kde && cp $OODESTDIR/gid_Module_Optional_Kde kde_list.txt || :
-	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/kdefilepicker
+	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/program/kdefilepicker
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde.uno.so
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde[0-9]*l..so
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libkabdrv1.so

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 15:44:45 2008
@@ -2712,7 +2712,7 @@
 i92372.diff, i#92372, n#353143, tml
 
 [ Fixes ]
-sw-import-TOC.diff ,n#40425, Amelia Wang
+#sw-import-TOC.diff ,n#404254, Amelia Wang
 gnome-fpicker-transient-win.diff, i#92878, cmc
 gnome-fpicker-main-thread.diff, i#93366, cmc
 jurt-jnilib-deliver.diff, i#93516, thorsten