[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian changelog,1.312,1.313



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv17149/debian

Modified Files:
	changelog 
Log Message:
mention system-db change; minor changelog entry fix

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- changelog	4 May 2004 22:21:54 -0000	1.312
+++ changelog	5 May 2004 12:32:22 -0000	1.313
@@ -12,6 +12,8 @@
     - Various other SuSE patches merged, see changelog.ooo-build.gz [MM]
   * Modified patches:
     - print-fontconfig: Fix broken afm metrics on Woody backport [CH]
+    - system-db: fix again for Java case. $(CC) -E apparently doesn't like
+      java.in anymore....
   * debian/control.in:
     - extend build-conflicts on libart, 2.3.16-4 too is broken.
       2.3.13 introduced new functions. build-conflict on 2.3.16-4... [RE]
@@ -23,7 +25,7 @@
         is a metapackage and we already have xlibs-static-pic there [RE]
       + do not require python-dev on woody [RE]
       + add libneon23-dev | g++-3.0 [!powerpc] [RE]
-      + add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [powerpc]
+      + add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc] [RE]
   * debian/rules:
     - add support for building using KDE icon set, use
       DEB_BUILD_OPTIONS=kdeicons [CH]



Reply to: