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

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Aug 20 11:50:51 2008
New Revision: 13634
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13634&view=rev

Log:
2008-08-20  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/apply (LayoutDialogs): Also apply for ooo-mx.

	* bin/gob: Assimilate fpicker-common-scp2 into fpicker-kde branch.
	Fixes export of ooo-m3.


Modified:
   trunk/ChangeLog
   trunk/bin/gob
   trunk/patches/dev300/apply

Modified: trunk/bin/gob
==============================================================================
--- trunk/bin/gob	(original)
+++ trunk/bin/gob	Wed Aug 20 11:50:51 2008
@@ -216,6 +216,11 @@
             and assert_dir_group (m, 'unittesting')):
             return m.group (1)
 
+    # Some patches are declared in the middle of a branch [another
+    # series of patches that form a branch] which depends on that
+    # patch, but have derogatory naming.  These patches must be
+    # categorised explicitly.  The ASSIMILATE warning helps to detect
+    # these.
     if 'emf+' in options.dir_branch and re.search ('^(cairocanvas-alpha-pixmap-rewrite|vcl-grey-alpha-unix-sal-bitmap)', base):
         return 'emf+'
 
@@ -228,6 +233,9 @@
     if re.search ('^(fix-linkoo|linkoo-)', base):
         return 'linkoo'
 
+    if re.search ('^(fpicker-common-scp2)', base):
+        return 'fpicker-kde'
+
     # Remove workspace and milestone suffixes
     workspace = options.workspace
     milestone = options.milestone

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 20 11:50:51 2008
@@ -1967,7 +1967,7 @@
 wmf-pattern-brush.diff, n#232232, rodo
 
 
-[ LayoutDialogs < dev300-m29 ]
+[ LayoutDialogs < dev300-m29 >= ooo300-m0 ]
 SectionOwner => jannieuw
 
 cws-layoutdialogs-offapi.diff