ooo-build r13209 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jul 15 00:05:17 2008
New Revision: 13209
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13209&view=rev

Log:
fix some slight snafus and fix patch applying for beb300-mX

Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 00:05:17 2008
@@ -618,7 +618,7 @@
 # eg. print preview
 zoom-combobox-m22.diff, michael
 
-[ CalcFixes >= dev300-m23 ]
+[ CalcFixes >= dev300-m23 < beb300-m0 ]
 # Replace usability numb Zoom dialog with a Combo Box
 # FIXME: this conflicts with Sun's duplication of this work,
 # eg. print preview
@@ -1260,7 +1260,7 @@
 # use it by default under Win32
 tango-icons-default-w32-m23.diff, n#254855, pmladek
 
-[ TangoIcons >= dev300-m24 ]
+[ TangoIcons >= dev300-m24 < beb300-m0 ]
 # use it by default under Win32
 tango-icons-default-w32.diff, n#254855, pmladek
 
@@ -1324,6 +1324,10 @@
 # Mailmerge column mapping by default (n#73627)
 default-evo-column-mapping.diff, michael
 
+[ AddressBooks < dev300-m24]
+# NB. when this cws goes up-stream we need to enable this
+default-evo2-ab-m23.diff, michael
+[ AddressBooks >= dev300-m24 < beb300-m0 ]
 # NB. when this cws goes up-stream we need to enable this
 default-evo2-ab.diff, michael
 
@@ -1707,7 +1711,7 @@
 
 [ PostgreSQL < dev300-m23 ]
 sdbc-postgresql-config_office-m22.diff
-[ PostgreSQL >= dev300-m23 ]
+[ PostgreSQL >= dev300-m23 < beb300-m0 ]
 sdbc-postgresql-config_office.diff
 
 [ PostgreSQL ]
@@ -1797,7 +1801,7 @@
 static-libs-use-_pic.diff, rengelha
 # link dynamically with liblpsolve55.so
 
-[ DebianSidOnly >= dev300-m22 ]
+[ DebianSidOnly >= dev300-m22 < beb300-m0 ]
 system-lpsolve-rpath.diff, rengelha
 [ DebianSidOnly < dev300-m22 ]
 system-lpsolve-rpath-m21.diff, rengelha
@@ -2217,10 +2221,10 @@
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseOnly >= dev300-m22 ]
+[ DebianBaseOnly >= dev300-m22 < beb300-m0 ]
 debian-system-jfreereport.diff
 [ DebianBaseOnly < dev300-m22 ]
-debian-system-jfreereport.diff
+debian-system-jfreereport-m21.diff
 [ DebianBaseOnly ]
 debian-system-apache-commons.diff
 # FIXME: does this need more for DEV300s new external modules?