Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv23995
Modified Files:
changelog rules
Log Message:
- fix and optimize db version check on Java builds
- fix libhpi search to not waste ressources on non-Java builds
- remove extraneous exit 0 in scripts/dbdevver
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- rules 25 Mar 2004 13:58:30 -0000 1.185
+++ rules 28 Mar 2004 14:24:19 -0000 1.186
@@ -586,7 +586,9 @@
test -r /usr/share/java/xalan.jar
test -r /usr/share/java/xml-apis.jar
test -r /usr/share/java/xalan2.jar
- if [ "`debian/scripts/dbdevver | cut -d'.' -f1`" = "3" ]; then \
+ if [ "`echo $(D) | cut -d'.' -f1`" = "3" ] \
+ || [ "`echo $(D) | cut -d'.' -f1`" = "4" -a \
+ "`echo $(D) | cut -d'.' -f2`" = "0" ]; then \
echo "You need at least libdb 4.1 for Java builds since only there"; \
echo "the db Java bindings are packaged."; \
echo "You then need the libdbX.Y-java pkg."; \
@@ -596,6 +598,7 @@
fi
endif
+ifeq "$(USE_JAVA)" "y"
ifeq "$(ARCH)" "powerpc"
# test for libhpi.so and warn ppc folks....
find /$(JDK_HOME) -type f -name "libhpi*" | grep usr | grep green \
@@ -610,6 +613,7 @@
echo ""; echo ""; \
fi; \
rm debian/libhpi.search
+endif
endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- changelog 25 Mar 2004 13:58:30 -0000 1.277
+++ changelog 28 Mar 2004 14:24:19 -0000 1.278
@@ -7,10 +7,13 @@
- Remove new binary bitmaps for Red Hat [CH]
- remove version infos from the remaining .desktop files to get
them synchron (closes: #224313) [RE]
+ - fix libdb version check to reject db4.0 on Java builds [RE]
+ - fix lihpi existence check to be only executed on Java builds; it
+ otherwise searches beginning from / which wastes much ressources... [RE]
* debian/shell-lib.sh:
- add message() taken from xfree86 (closes: #233424)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 25 Mar 2004 01:06:23 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 28 Mar 2004 04:59:26 +0200
openoffice.org (1.1.0+cvs20040317-1) unstable; urgency=low
