CVS:oo-deb/debian changelog,1.262.4.9,1.262.4.10 control,1.147.4.8,1.147.4.9 control.in,1.114.4.5,1.114.4.6 rules,1.182.4.4,1.182.4.5 setperms,1.8,1.8.4.1

[Rene Engelhard <rene@gluck.debian.org>]

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

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_1
	changelog control control.in rules setperms 
Log Message:
- update Depends of openoffice.org
- detect db version, exit on Java builds with 3.2, point to 4.x
  build-depen on libdb3++-dev | libdb++-dev


Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.5
retrieving revision 1.114.4.6
diff -u -d -r1.114.4.5 -r1.114.4.6
--- control.in	21 Feb 2004 01:58:22 -0000	1.114.4.5
+++ control.in	1 Mar 2004 17:50:01 -0000	1.114.4.6
@@ -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], 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-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 | libdb++-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, g++-3.3 (= 1:3.3.3-0pre3)
 Standards-Version: 3.5.6
 

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.9
retrieving revision 1.262.4.10
diff -u -d -r1.262.4.9 -r1.262.4.10
--- changelog	1 Mar 2004 05:55:41 -0000	1.262.4.9
+++ changelog	1 Mar 2004 17:50:01 -0000	1.262.4.10
@@ -14,15 +14,16 @@
       gcc output and it fails now (at least with de_DE locale) with the new
       translated gcc.
   * 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]
+    - dynamically determine which db to use since we need to use db4.1 for
+      Java builds but want to use 3.2 for "normal" ones still; 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*:
-    - s/libdb3++dev/libdb4.1++-dev/ [RE]
+    - s/libdb3++dev/libdb3++-dev | libdb++-dev/ [RE]
     - add new ${java-additional-depends} substvar which adds a
-      dependency to libdb4.1-java on java builds [RE]
-    - depend on openoffice.org-debian-files (>> 1.1.0-1.1.1a) [RE]
+      dependency to libdbX.Y-java on java builds [RE]
+    - depend on openoffice.org-debian-files (>> 1.1.0+cvs20040229) [RE]
     - bump version of -l10n virtual package; openoffice.org depends on
       openoffice.org-10n-en (>> 1.1.0+1.1.a) | openoffice.org-l10n-1.1.1 
   * debian/local/openoffice-xlate-lang:
@@ -38,7 +39,7 @@
     - use ooo-icons_OOO_1_1-8 [RE]
   * merge 1.1.0-6 [RE]
 
- -- Rene Engelhard <rene@debian.org>  Sun, 29 Feb 2004 19:09:41 +0100
+ -- Rene Engelhard <rene@debian.org>  Mon,  1 Mar 2004 18:07:16 +0100
 
 openoffice.org (1.1.0+1.1.1a-1) experimental; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.4
retrieving revision 1.182.4.5
diff -u -d -r1.182.4.4 -r1.182.4.5
--- rules	21 Feb 2004 01:58:22 -0000	1.182.4.4
+++ rules	1 Mar 2004 17:50:01 -0000	1.182.4.5
@@ -44,7 +44,7 @@
 include debian/scripts/vars.$(ARCH)
 
 # Default flags to pass to configure
-D=$(shell dpkg -l libdb4.1++-dev | grep db | awk '{print $$3}' | cut -d"." -f1,2)
+D=$(shell debian/scripts/dbdevver)
 CONFIGURE_FLAGS= --enable-libart \
 	         --disable-rpath \
 	         --enable-crashdump \
@@ -574,6 +574,14 @@
 	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 \
+	  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."; \
+	  exit 1; \
+	else \
+	  test -r $(LIBDB_JAR); \
+	fi
 endif
 
 ifeq "$(ARCH)" "powerpc"

Index: setperms
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/setperms,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- setperms	5 Jan 2004 02:55:12 -0000	1.8
+++ setperms	1 Mar 2004 17:50:01 -0000	1.8.4.1
@@ -9,6 +9,7 @@
 	    scripts/xcftobmp \
 	    scripts/oo-xvfb-run \
 	    scripts/gen_lib_list \
+	    scripts/dbdevver \
             local/openoffice-*-lang 
 do
   chmod 755 $FILE

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.8
retrieving revision 1.147.4.9
diff -u -d -r1.147.4.8 -r1.147.4.9
--- control	29 Feb 2004 20:37:47 -0000	1.147.4.8
+++ control	1 Mar 2004 17:50:01 -0000	1.147.4.9
@@ -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], 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-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 | libdb++-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, g++-3.3 (= 1:3.3.3-0pre3)
 Standards-Version: 3.5.6