ooo-build r11737 - in trunk: . bin

[mrl svn gnome org]

Author: mrl
Date: Thu Feb 28 13:23:03 2008
New Revision: 11737
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11737&view=rev

Log:
2008-02-28  Marcelo Ricardo Leitner <mrl mandriva com>

	* bin/package-ooo: fixes regular expressions for moving files accross
	listings for Mandriva packaging.


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

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Feb 28 13:23:03 2008
@@ -699,7 +699,7 @@
 			program/pagein-impress \
 			program/pagein-writer
 		do
-			mv_file_between_flists core_list.txt common_list.txt $f
+			mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/$f
 		done
 		#mv_file_between_flists core_list.txt common_list.txt "\.so"
 		#mv_file_between_flists core_list.txt common_list.txt "\.so\..*"
@@ -718,7 +718,7 @@
 		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/uri-encode
 
 		# Move all libraries, binaries, *.rdb from -common to -core (from Debian code)
-		mv_file_between_flists core_list.txt common_list.txt '(placeholder\|.*\.so$\|.*\.so\..*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode)'
+		mv_file_between_flists core_list.txt common_list.txt '(.*/placeholder\|.*\.so$\|.*\.so\..*\|.*\.bin\|.*/pagein.*\|.*/nsplugin\|.*/kdefilepicker\|.*/msfontextract\|.*\.rdb\|.*javaldx.*\|.*uri-encode.*)'
 
 		# Put gtk/gnome stuff into gnome package
 		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/program/gnome-open-url.bin