ooo-build r12287 - in trunk: . patches/dev300 patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Apr 22 16:09:12 2008
New Revision: 12287
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12287&view=rev

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

        * patches/dev300/apply,
          patches/src680/ooo85931.inconsistent.getentrypos.diff: remove,
          upstream

        merge from trunk:

        * patches/src680/apply,
          patches/src680/ubuntu-openoffice-java-common.diff: Add message to
          install openoffice.org-java-common package when attempting to use
          feature needing java.


Removed:
   trunk/patches/src680/ooo85931.inconsistent.getentrypos.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 22 16:09:12 2008
@@ -831,6 +831,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
@@ -1717,7 +1718,6 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-ooo85931.inconsistent.getentrypos.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff