CVS:oo-deb/debian changelog,1.262.4.1,1.262.4.2 control,1.147.4.1,1.147.4.2 control.in,1.114.4.1,1.114.4.2 rules,1.182.4.1,1.182.4.2
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv11338
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in rules
Log Message:
- mention changed system-db and config-switches patches
- use db4.1
- add --with-db-jar=/usr/share/java/libdb4.1-java.jar to CONFIGURE_FLAGS for
Java builds
- s/libdb3++dev/libdb4.1++-dev/ in Build-Depends
- add new ${java-additional-depends} substvar which adds a dependency to
libdb4.1-java on Java builds
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.1
retrieving revision 1.182.4.2
diff -u -d -r1.182.4.1 -r1.182.4.2
--- rules 20 Jan 2004 07:51:10 -0000 1.182.4.1
+++ rules 27 Jan 2004 00:04:06 -0000 1.182.4.2
@@ -44,7 +44,7 @@
include debian/scripts/vars.$(ARCH)
# Default flags to pass to configure
-D=$(shell dpkg -l libdb3++-dev | grep db | awk '{print $$3}' | cut -d"." -f1,2)
+D=$(shell dpkg -l libdb4.1++-dev | grep db | awk '{print $$3}' | cut -d"." -f1,2)
CONFIGURE_FLAGS= --enable-libart \
--disable-rpath \
--enable-crashdump \
@@ -65,7 +65,9 @@
else
USE_JAVA=y
JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*jdkhome=\([^,]*\),.*/\1/p')
- CONFIGURE_FLAGS+= --with-jdk-home=$(JDK_HOME)
+ LIBDB_JAR=/usr/share/java/libdb4.1-java.jar
+ CONFIGURE_FLAGS+= --with-jdk-home=$(JDK_HOME) --with-db-jar=$(LIBDB_JAR)
+ JAVA_ADDITIONAL_DEPENDS=, libdb$(D)-java
IGNORE_MANIFEST_CHANGES=1
export IGNORE_MANIFEST_CHANGES
endif
@@ -829,7 +831,7 @@
exit 1
endif
for i in javaldx javaloader.uno.so javavm.uno.so jvmsetup.bin \
- libdb_java-3.2.so libjava_uno.so libjdbc2.so libjpipe.so \
+ libjava_uno.so libjdbc2.so libjpipe.so \
libjuh.so libjuhx.so libjvm$(BUILDNUM)$(LIBSUFFIX).so \
libjvmaccessgcc3.so.3.1.0 libofficebean.so \
libxmlfa$(BUILDNUM)$(LIBSUFFIX).so \
@@ -1027,7 +1029,8 @@
# causes ldd crashes sometimes when used with fakeroot:
# -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
- -V'debianutils-depends=$(DEBIANUTILSDEPENDS)'
+ -V'debianutils-depends=$(DEBIANUTILSDEPENDS)' \
+ -V'java-additional-depends=$(JAVA_ADDITOONAL_DEPENDS)'
dh_md5sums
dh_builddeb
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.1
retrieving revision 1.114.4.2
diff -u -d -r1.114.4.1 -r1.114.4.2
--- control.in 20 Jan 2004 07:51:10 -0000 1.114.4.1
+++ control.in 27 Jan 2004 00:04:06 -0000 1.114.4.2
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb4.1++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
Build-Conflicts: libhnj-dev
Standards-Version: 3.5.6
@@ -41,7 +41,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)${java-additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.1
retrieving revision 1.262.4.2
diff -u -d -r1.262.4.1 -r1.262.4.2
--- changelog 20 Jan 2004 07:51:10 -0000 1.262.4.1
+++ changelog 27 Jan 2004 00:04:06 -0000 1.262.4.2
@@ -1,3 +1,23 @@
+openoffice.org (1.1.0+1.1.1a-1.2pre) experimental; urgency=low
+
+ * Modified patches:
+ - system-db.diff: fix to actually work in all circumstances [RE]
+ - config-switches.diff: ass -L$XINC -lXt to the extra libs for
+ the nas and curl check, fails on woody otherwise; do not check
+ for the libdb_cxx.so link when we specify a version with
+ --with-db-version [RE]
+ * debian/rules:
+ - use db4.1; add --with-db-jar=/usr/share/java/libdb4.1-java.jar
+ to CONFIGURE_FLAGS for Java builds. Thanks Martin for the
+ pointer again [RE]
+ - remove hardcoded installing of libdb_java-3.2.so for Java builds [RE]
+ * debian/control.in:
+ - s/libdb3++dev/libdb4.1++-dev/ [RE]
+ - add new ${java-additional-depends} substvar which adds a
+ dependency to libdb4.1-java on java builds [RE]
+
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Jan 2004 16:15:41 +0100
+
openoffice.org (1.1.0+1.1.1a-1) experimental; urgency=low
* New upstream (pre-)release. [RE, MK]; thanks Martin for the patch
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.1
retrieving revision 1.147.4.2
diff -u -d -r1.147.4.1 -r1.147.4.2
--- control 20 Jan 2004 07:51:10 -0000 1.147.4.1
+++ control 27 Jan 2004 00:04:06 -0000 1.147.4.2
@@ -41,7 +41,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)${java:additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Reply to: