ooo-build r13326 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jul 21 15:46:14 2008
New Revision: 13326
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13326&view=rev

Log:
2008-07-21  Petr Mladek  <pmladek suse cz>

	* patches/dev300/build-ant-1.6-swext.diff:
	* patches/dev300/build-ant-1.6.diff:
	* patches/dev300/apply: temporary disable; must be made Novell-specific
	  because of the conflict with debian-system-apache-commons.diff



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 15:46:14 2008
@@ -422,11 +422,14 @@
 build-java-target-swext.diff
 
 [ swextFixes ]
-build-ant-1.6-swext.diff
+# allow build with ant-1.6
+# IMPORTANT: the second part of the patch is build-ant-1.6.diff
+#FIXME: make NovellOnly build-ant-1.6-swext.diff, i#90830, pmladek
 
 [ NovellOnly ]
 # allow build with ant-1.6
-build-ant-1.6.diff, i#90830, pmladek
+# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
+#FIXME: make "build-ant-1.6-swext.diff" NovellOnly  build-ant-1.6.diff, i#90830, pmladek
 
 [ Fixes < dev300-m24 < beb300-m3 ]
 # let sd accept uri-list drop, n#183719