ooo-build r12270 - in branches/ooo-build-2-4: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Apr 22 08:15:45 2008
New Revision: 12270
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12270&view=rev

Log:
2008-04-22  Rene Engelhard  <rene debian org>

        * patches/src680/apply: move ubuntu-openoffice-java-common.diff to
          DebianBaseOnly; move ooo85931.inconsistent.getentrypos.diff to
          FedoraFixes


Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Tue Apr 22 08:15:45 2008
@@ -880,6 +880,7 @@
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 ubuntu-soffice-config.diff, mklose
+ubuntu-openoffice-java-common.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
@@ -1782,8 +1783,6 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-ooo85931.inconsistent.getentrypos.diff, ccheney
-ubuntu-openoffice-java-common.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
@@ -1797,6 +1796,7 @@
 #FIXME src680: ooo72129.vcl.fontglyphindex.diff
 ooo61812.svx.a11ycrash.diff
 
+ooo85931.inconsistent.getentrypos.diff, ccheney
 
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section