Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5586/debian
Modified Files:
changelog java-lib.sh rules
Log Message:
backport -java/LIBSUFFIX fix from OPENOFFICE_ORG_1_1_3
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- changelog 5 Oct 2004 23:36:10 -0000 1.367
+++ changelog 14 Oct 2004 23:48:22 -0000 1.368
@@ -1,3 +1,13 @@
+openoffice.org (1.1.2-5.6pre) unstable; urgency=low
+
+ * debian/rules:
+ - add LIBSUFFIX as defined in debian/scripts/vars.$(ARCH) to the
+ maintainer scripts
+ * debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
+ make it work on !i386
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 15 Oct 2004 01:25:39 +0200
+
openoffice.org (1.1.2-5) unstable; urgency=high
* Urgency because printing (more than before!) and formatting in impress
Index: java-lib.sh
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/java-lib.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- java-lib.sh 1 Jun 2004 22:15:27 -0000 1.1
+++ java-lib.sh 14 Oct 2004 23:48:22 -0000 1.2
@@ -1,3 +1,3 @@
-java_diversions="usr/lib/openoffice/program/libj645li_g.so \
+java_diversions="usr/lib/openoffice/program/libj645${LIBSUFFIX}_g.so \
usr/lib/openoffice/program/services.rdb \
usr/lib/openoffice/share/registry/data/org/openoffice/Office/TypeDetection.xcu"
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- rules 17 Sep 2004 07:40:21 -0000 1.234
+++ rules 14 Oct 2004 23:48:22 -0000 1.235
@@ -796,6 +796,7 @@
MAINTSCRIPT=debian/$$PKG.$$FILE ; \
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
+ grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
if [ $$PKG = openoffice.org-java ]; then \
cat debian/java-lib.sh >> $$MAINTSCRIPT ; \
fi ; \
