[Pkg-db-devel] Bug#401555: please build a libdb4.x-java-gcj package

[Matthias Klose]

Package: db4.4, db4.5
Tags: patch

  - build libdb4.4-java-gcj package.


diff -u db4.4-4.4.20/debian/control db4.4-4.4.20/debian/control
--- db4.4-4.4.20/debian/control
+++ db4.4-4.4.20/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian Berkeley DB Maintainers <pkg-db-devel at lists.alioth.debian.org>
 Uploaders: Clint Adams <schizo at debian.org>, Matthew Wilcox <willy at debian.org>, Andreas Barth <aba at not.so.argh.org>, Adam Conrad <adconrad at 0c3.net>
 Standards-Version: 3.7.2
-Build-Depends: tcl8.4-dev, procps [!hurd-i386], java-gcj-compat-dev [!m68k !mips !mipsel !arm !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: tcl8.4-dev, procps [!hurd-i386], java-gcj-compat-dev (>= 1.0.65-6) [!m68k !mips !mipsel !arm !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 
 Package: db4.4-doc
 Architecture: all
@@ -96,11 +96,23 @@
 Priority: optional
 Provides: libdb-java
 Conflicts: libdb-java
+Recommends: libdb4.4-java-gcj
 Depends: ${shlibs:Depends}
 Description: Berkeley v4.4 Database Libraries for Java
  This package provides the Java interface for the Berkeley v4.4 database
  library.
 
+Package: libdb4.4-java-gcj
+Architecture: any
+Section: libs
+Priority: optional
+Depends: libdb4.4-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Berkeley v4.4 Database Libraries for Java (native code)
+ This package provides the Java interface for the Berkeley v4.4 database
+ library.
+ .
+ This package contains the natively compiled code for use by gij.
+
 Package: libdb4.4-java-dev
 Architecture: any
 Section: libs
diff -u db4.4-4.4.20/debian/rules db4.4-4.4.20/debian/rules
--- db4.4-4.4.20/debian/rules
+++ db4.4-4.4.20/debian/rules
@@ -16,6 +16,7 @@
 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)
@@ -25,6 +26,7 @@
 
 JAVA_UNSUPPORTED_CPUS = zm32rz zm68kz zarmz zmipsz zmipselz
 JAVA_UNSUPPORTED_SYSTEMS = zgnuz zkfreebsd-gnuz zknetbsd-gnuz
+-include /usr/share/gcj/debian_defaults
 
 NPTL_SUPPORTED_CPUS = zamd64z
 NPTL_SUPPORTED_SYSTEMS = zlinux-gnuz
@@ -50,6 +52,9 @@
 CONFIGURE_VARS += JAVAC="$(JAVA_BIN)/javac" JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar"
 CONFIGURE_SWITCHES += --enable-java
 DB_BINARY_PKGS += libdb4.4-java libdb4.4-java-dev
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+DB_BINARY_PKGS += libdb4.4-java-gcj
+endif
 endif
 endif
 
@@ -161,6 +166,9 @@
 		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_BUILD_ARCH), $(gcj_native_archs)))
+	dh_nativejava -plib$(package)-java-gcj
+endif
 endif
 endif
 	mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib