diff -Nru db4.8-4.8.30/debian/changelog db4.8-4.8.30/debian/changelog --- db4.8-4.8.30/debian/changelog 2011-12-05 15:11:38.000000000 +0000 +++ db4.8-4.8.30/debian/changelog 2012-01-08 03:41:34.000000000 +0000 @@ -1,51 +1,40 @@ -db4.8 (4.8.30-11) unstable; urgency=low +db4.8 (4.8.30-10precise1) precise; urgency=low - * Remove generic -ldb linkability from the package - * Add debian/NEWS about -ldb removal + * Mark for precise. - -- Ondřej Surý Mon, 05 Dec 2011 16:11:33 +0100 + -- Matt Corallo Sat, 7 Jan 2011 22:41:00 -0500 -db4.8 (4.8.30-10) unstable; urgency=low +db4.8 (4.8.30-10oneiric3) oneiric; urgency=low - * Set CC appropriately when cross-compiling. + * Change depends so that install works. - -- Ondřej Surý Fri, 23 Sep 2011 11:05:32 +0200 + -- Matt Corallo Tue, 8 Nov 2011 14:49:00 -0500 -db4.8 (4.8.30-9) unstable; urgency=low +db4.8 (4.8.30-10oneiric2) oneiric; urgency=low - * Move all packages to extra/oldlibs - * Update Vcs-* links - * Apply MultiArch patch (Courtesy of Steve Langasek) (Closes: #631352) + * Remove all but libdb4.8++* packages. - -- Ondřej Surý Tue, 28 Jun 2011 10:24:20 +0200 + -- Matt Corallo Sun, 30 Oct 2011 16:34:00 -0400 -db4.8 (4.8.30-8) unstable; urgency=high +db4.8 (4.8.30-10oneiric1) oneiric; urgency=low - * Build with --enable-test because it breaks the env_sig function - (Closes: #625484) + * Bump version for no reason. - -- Ondřej Surý Tue, 03 May 2011 21:58:06 +0200 + -- Matt Corallo Fri, 28 Oct 2011 13:12:00 -0400 -db4.8 (4.8.30-7) unstable; urgency=low +db4.8 (4.8.30-5ubuntu2) natty; urgency=low - * Move to Priority: extra and Section: oldlibs - * Remove libdb4.8++* and libdb4.8-dbg binary packages + * Build for multiarch, adding Pre-Depends: multiarch-support to the shared + library packages. + * Use DESTDIR instead of prefix when installing. - -- Ondřej Surý Mon, 02 May 2011 12:32:59 +0200 + -- Steve Langasek Wed, 16 Mar 2011 18:10:53 -0700 -db4.8 (4.8.30-6) unstable; urgency=low +db4.8 (4.8.30-5ubuntu1) natty; urgency=low - * Adopt package under Debian Berkeley DB Group - * Remove Java and TCL packages - * Remove .la files from packages (ReleaseGoal) - * Debian packaging: - + Update VCS links - + Remove obsolete Conflicts - + Set Conflicts only with db4.6 and db4.7 - * Fix lintian errors and warnings: - + Fix errors in db4.8_load.1 manpage + * Build with -mno-vsx on ppc64, otherwise the tests fail. - -- Ondřej Surý Tue, 19 Apr 2011 21:08:31 +0200 + -- Colin Watson Fri, 04 Mar 2011 15:31:46 +0000 db4.8 (4.8.30-5) unstable; urgency=low @@ -69,6 +58,15 @@ -- Clint Adams Mon, 31 Jan 2011 22:00:04 -0500 +db4.8 (4.8.30-3ubuntu1) natty; urgency=low + + * Enable both native & cross building by using DEB_HOST variables, + rather than DEB_BUILD ones. + * Pass correct values to configure for cross building + * Use correct binutils for cross building + + -- Peter Pearse Mon, 31 Jan 2011 13:08:05 +0000 + db4.8 (4.8.30-3) unstable; urgency=low * Patch from Matthias Klose to work around newer binutils breakage on diff -Nru db4.8-4.8.30/debian/control db4.8-4.8.30/debian/control --- db4.8-4.8.30/debian/control 2011-12-05 15:11:38.000000000 +0000 +++ db4.8-4.8.30/debian/control 2011-11-08 19:48:21.000000000 +0000 @@ -1,48 +1,34 @@ Source: db4.8 -Section: oldlibs -Priority: extra -Maintainer: Debian Berkeley DB Group -Uploaders: Ondřej Surý -Standards-Version: 3.9.2 -Build-Depends: procps [!hurd-i386], tcl-dev, dpkg-dev (>= 1.16.0) +Section: libs +Priority: standard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group +Standards-Version: 3.9.1 +Build-Depends: tcl8.5-dev, procps [!hurd-i386], default-jdk-builddep [!arm !hppa !hurd-i386 !m32r !avr32], dpkg-dev (>= 1.16.0~ubuntu4) Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html -Vcs-Browser: http://git.debian.org/?p=pkg-db/db4.8.git -Vcs-Git: git://git.debian.org/pkg-db/db4.8/db.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/db.git;a=shortlog;h=refs/heads/db4.8 +Vcs-Git: git://git.debian.org/git/collab-maint/db.git -Package: libdb4.8-dev -Architecture: any -Depends: libdb4.8 (= ${binary:Version}) -Conflicts: libdb-dev, libdb4.6-dev, libdb4.7-dev -Description: Berkeley v4.8 Database Libraries [development] - This is the development package which contains headers and static - libraries for the Berkeley v4.8 database library. - -Package: libdb4.8 +Package: libdb4.8++ Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libdb2++ (<< 2:2.7.7-3) +Section: libs +Priority: optional Multi-Arch: same Pre-Depends: multiarch-support -Depends: ${shlibs:Depends} -Description: Berkeley v4.8 Database Libraries [runtime] - This is the runtime package for programs that use the v4.8 Berkeley - database library. +Description: Berkeley v4.8 Database Libraries for C++ [runtime] + This is the runtime package for programs that use the Berkeley v4.8 + database library. This is only for programs which use the C++ interface. -Package: db4.8-util +Package: libdb4.8++-dev Architecture: any -Multi-Arch: foreign -Depends: ${shlibs:Depends} -Description: Berkeley v4.8 Database Utilities - This package provides different tools for manipulating databases - in the Berkeley v4.8 database format, and includes: - - db4.8_archive: write the pathnames of the log files no longer in use. - - db4.8_checkpoint: daemon process to monitor the database log and - checkpoint it periodically. - - db4.8_deadlock: traverse the database environment lock region and - abort lock requests when a deadlock is detected. - - db4.8_load: loads (and creates) a database from standard input. - - db4.8_dump: read a database file and write it in a format understood - by db4.{2..8}_load. - - db4.8_printlog: dump log files in human readable format. - - db4.8_stat: display statistics for Berkeley DB environments. - - db4.8_upgrade: upgrades the version of files and the databases they - contain. - - db4.8_verify: check the structure of files and their databases. +Provides: libdb++-dev +Conflicts: libdb2++-dev, libdb++-dev, libdb3++-dev +Section: libdevel +Priority: extra +Depends: libdb4.8++ (= ${binary:Version}), libdb4.8-dev +Description: Berkeley v4.8 Database Libraries for C++ [development] + This is the development package which contains headers and static + libraries for the Berkeley v4.8 database library. This is only for + programs which will use the C++ interface. diff -Nru db4.8-4.8.30/debian/manpages/db4.8_load.1 db4.8-4.8.30/debian/manpages/db4.8_load.1 --- db4.8-4.8.30/debian/manpages/db4.8_load.1 2011-12-05 15:11:38.000000000 +0000 +++ db4.8-4.8.30/debian/manpages/db4.8_load.1 2011-03-17 00:54:00.000000000 +0000 @@ -145,38 +145,38 @@ expect value to be \fB1\fR (set) or \fB0\fR (unset). Items listed as (number) convert value to a number. Items listed as (string) use the string value without modification. -.IP "bt_minkey (number)" +.IP bt_minkey (number) The minimum number of keys per page. -.IP "chksum (boolean)" +.IP chksum (boolean) Enable page checksums. -.IP "database (string)" +.IP database (string) The database to load. -.IP "db_lorder (number)" +.IP db_lorder (number) The byte order for integers in the stored database metadata. -.IP "db_pagesize (number)" +.IP db_pagesize (number) The size of database pages, in bytes. -.IP "duplicates (boolean)" +.IP duplicates (boolean) The value of the DB_DUP flag. -.IP "dupsort (boolean)" +.IP dupsort (boolean) The value of the DB_DUPSORT flag. -.IP "extentsize (number)" +.IP extentsize (number) The size of database extents, in pages, for Queue databases configured to use extents. -.IP "h_ffactor (number)" +.IP h_ffactor (number) The density within the Hash database. -.IP "h_nelem (number)" +.IP h_nelem (number) The size of the Hash database. -.IP "keys (boolean)" +.IP keys (boolean) Specify whether keys are present for Queue or Recno databases. -.IP "re_len (number)" +.IP re_len (number) Specify fixed-length records of the specified length. -.IP "re_pad (string)" +.IP re_pad (string) Specify the fixed-length record pad character. -.IP "recnum (boolean)" +.IP recnum (boolean) The value of the DB_RECNUM flag. -.IP "renumber (boolean)" +.IP renumber (boolean) The value of the DB_RENUMBER flag. -.IP "subdatabase (string)" +.IP subdatabase (string) The subdatabase to load. .SH AUTHORS diff -Nru db4.8-4.8.30/debian/NEWS db4.8-4.8.30/debian/NEWS --- db4.8-4.8.30/debian/NEWS 2011-12-05 15:11:38.000000000 +0000 +++ db4.8-4.8.30/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -db4.8 (4.8.30-11) unstable; urgency=low - - The libdb.so symlink has been removed from libdb4.8-dev package. - If you really need to link with libdb4.8 then you need to explicitly - link with -ldb-4.8 and not with -ldb. - - -- Ondřej Surý Mon, 05 Dec 2011 16:10:48 +0100 diff -Nru db4.8-4.8.30/debian/rules db4.8-4.8.30/debian/rules --- db4.8-4.8.30/debian/rules 2011-12-05 15:11:38.000000000 +0000 +++ db4.8-4.8.30/debian/rules 2011-10-30 23:26:38.000000000 +0000 @@ -16,14 +16,30 @@ INSTALL_PROGRAM += -s endif +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +ifeq ($(DEB_HOST_ARCH),ppc64) +CFLAGS += -mno-vsx +endif + +JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z +JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz +-include /usr/share/gcj/debian_defaults + ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) - CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" + CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" + TCLDIR=/usr/lib/tcl8.5 else - CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CFLAGS="$(CFLAGS)" + CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5" + TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5 endif CONFIGURE_SWITCHES = --prefix=/usr \ @@ -31,14 +47,15 @@ --localstatedir=/var \ --sysconfdir=/etc \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --libexecdir=/usr/lib \ - --disable-cxx \ + --libexecdir=/usr/lib/ \ + --enable-cxx \ --enable-compat185 \ - --with-tcl=/usr/lib \ --enable-tcl \ + --with-tcl=$(TCLDIR) \ --enable-test -DB_BINARY_PKGS = libdb4.8 libdb4.8-dev db4.8-util +#DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev libdb4.8-tcl db4.8-util libdb4.8-dbg +DB_BINARY_PKGS = libdb4.8++ libdb4.8++-dev ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z) CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library @@ -53,10 +70,33 @@ CONFIGURE_SWITCHES += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) endif +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) +JAVA_HOME = /usr/lib/jvm/default-java +JAVA_BIN = $(JAVA_HOME)/bin +CFLAGS += -I$(JAVA_HOME)/include +JAVACFLAGS = -source 1.5 +CONFIGURE_VARS += GCJ="$(JAVA_BIN)/gcj" +CONFIGURE_VARS += JAVAC="$(JAVA_BIN)/javac" +CONFIGURE_VARS += JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar" +CONFIGURE_VARS += JAVACFLAGS="$(JAVACFLAGS)" +CONFIGURE_SWITCHES += --enable-java +#DB_BINARY_PKGS += libdb4.8-java libdb4.8-java-dev +ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs))) +#DB_BINARY_PKGS += libdb4.8-java-gcj +endif +endif +endif + ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) CONFIGURE_VARS += STRIP=":" endif +BROKEN_CPUS = zs390z +VERY_BROKEN_CPUS = zm68kz zhppaz +BROKEN_SYSTEMS = zgnuz +VERY_BROKEN_SYSTEMS = + package=db4.8 bdbversion=4.8 @@ -65,7 +105,7 @@ build: $(checkdir) - + mkdir -p obj cd obj && $(CONFIGURE_VARS) \ @@ -73,6 +113,24 @@ cd obj && $(MAKE) +ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS))) +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + chmod +x ./debian/runtests.tclsh + cd obj && ../debian/runtests.tclsh || true + +ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(BROKEN_SYSTEMS))) + ! grep ^FAIL obj/ALL.OUT +else + # Testsuite failures are marked as non-fatal on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU) + grep ^FAIL obj/ALL.OUT || true +endif +else + # Testsuite has been disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS) +endif +else + # Testsuite has been disabled on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU) +endif + touch build clean: @@ -93,44 +151,98 @@ touch install-stamp +binary-indep: checkroot build install-stamp + $(checkdir) + + rm -rf debian/$(package)-doc + $(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN + + cd debian/tmp/usr/docs && rm -rf `find . -type d -name ".arch-ids"` + cp -a debian/tmp/usr/docs debian/$(package)-doc/usr/share/doc/$(package)-doc + + $(INSTALL_FILE) debian/copyright debian/$(package)-doc/usr/share/doc/$(package)-doc/copyright + $(INSTALL_FILE) debian/changelog debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian + gzip -9frq debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian + + cd debian/$(package)-doc && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums + #dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc + chown -R root:root debian/$(package)-doc + chmod -R ugo=rX,u+w debian/$(package)-doc + #dpkg --build debian/$(package)-doc .. + binary-arch: checkroot build install-stamp $(checkdir) - rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) + rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \ + debian/lib$(package)++ debian/lib$(package)++-dev debian/lib$(package)-tcl \ + debian/lib$(package)-java debian/lib$(package)-java-dev $(INSTALL_DIR) debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ debian/$(package)-util/usr/share/man/man1 \ - debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH) + debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH) debian/lib$(package)++/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)++-dev/usr/include \ + debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-java/usr/share/java \ + debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH) + + $(OBJCOPY) --only-keep-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so \ + debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so.debug ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - strip --remove-section=.note --remove-section=.comment \ + $(STRIP) --remove-section=.note --remove-section=.comment \ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/bin/* - strip --strip-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a + $(STRIP) --strip-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a endif + $(OBJCOPY) --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so.debug \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so + chmod 644 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/include/*.h chmod 755 debian/tmp/usr/bin/* - rm -f debian/tmp/usr/include/db_cxx.h cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr cp -a debian/tmp/usr/bin debian/$(package)-util/usr cp -a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \ - debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + cp -a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/db.jar \ + debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar + ln -s lib$(package)-java-$(version).jar \ + debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) + mkdir debian/lib$(package)-java-gcj + (TMPFILE=$$(mktemp -t sourcelist.XXXXXXXXXX) && \ + find $(CURDIR) -type f ! -type l >$$TMPFILE && \ + aot-compile -L /usr/lib/gcj -c -fsource-filename=$$TMPFILE debian/lib$(package)-java debian/lib$(package)-java-gcj/usr/lib/gcj; \ + retval=$?; \ + rm -f $$TMPFILE; exit $$retval) + mkdir -p debian/lib$(package)-java-gcj/usr/share/gcj/classmap.d + mv debian/lib$(package)-java-gcj/usr/lib/gcj/*.db debian/lib$(package)-java-gcj/usr/share/gcj/classmap.d +endif +endif +endif + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*cxx* debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*tcl* debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH) +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*java* debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH) + + mv debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*.a \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*.la \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java.so \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java-4.so \ + debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ +endif +endif mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx-$(bdbversion).so debian/lib$(package)++/usr/lib/$(DEB_HOST_MULTIARCH) - # Remove extra TCL library - rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*tcl* - - # Remove -ldb from libdb*-dev packages - rm -f debian/lib$(package)-dev/usr/lib/libdb.a - rm -f debian/lib$(package)-dev/usr/lib/libdb.so - rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-4.so - rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx.a - rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx.so - rm -f debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx-4.so - rm -f debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java.so - rm -f debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java-4.so - rm -f debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_tcl.so - rm -f debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_tcl-4.so + rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a + ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a cd debian/$(package)-util/usr/bin && for i in * ; \ do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \ @@ -146,8 +258,23 @@ gzip -9fq debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \ done - echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs - $(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst + #echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs + echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs + #echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + #echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs + #$(INSTALL_SCRIPT) debian/libjava.postinst debian/lib$(package)-java/DEBIAN/postinst + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) + #$(INSTALL_SCRIPT) debian/java-gcj.postrm debian/lib$(package)-java-gcj/DEBIAN/postrm + #$(INSTALL_SCRIPT) debian/java-gcj.postinst debian/lib$(package)-java-gcj/DEBIAN/postinst +endif +endif +endif + #$(INSTALL_SCRIPT) debian/libtcl.postinst debian/lib$(package)-tcl/DEBIAN/postinst + $(INSTALL_SCRIPT) debian/lib++.postinst debian/lib$(package)++/DEBIAN/postinst + #$(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst for i in $(DB_BINARY_PKGS); \ do dpkg-shlibdeps -Tdebian/substvars.$${i} -dDepends `find debian/$${i}/usr/lib -name "*.so"` `find debian/$${i}/usr/bin -type f` ; \