[pkg-db-commits] [SCM] UNNAMED PROJECT branch, debian-sid, updated. debian/5.1.25-5-6-g37006a6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit d2bb2a8d63a51434d4a3a1b7cfaaaef254170ccf
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 21:35:02 2011 +0200

    Enable Java support on every Debian architecture

diff --git a/debian/control b/debian/control
index b9058b8..fda6f2c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.0.50~),
 	       tcl-dev,
 	       procps [!hurd-i386],
-	       default-jdk [!hppa !hurd-i386 !m32r !avr32],
-	       gcj-native-helper [!hppa !hurd-i386 !m32r !avr32]	       
+	       javahelper,
+	       default-jdk,
+	       gcj-native-helper
 Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db.git;a=summary
 Vcs-Git: git://git.debian.org/git/pkg-db/db.git
diff --git a/debian/rules b/debian/rules
index 64b6753..04665fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,13 @@ 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)
 
-JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z
-JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz
+GCJ_BROKEN_ARCHS = ia64 sparc mips
 
 -include /usr/share/gcj/debian_defaults
+-include /usr/share/javahelper/java-vars.mk
 
 # Don't try to build this file if missing
-/usr/share/gcj/debian_defaults:
+/usr/share/gcj/debian_defaults /usr/share/javahelper/java-vars.mk:
 	:
 
 CONFIGURE_SWITCHES =    --prefix=/usr \
@@ -38,6 +38,7 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--enable-sql \
 			--enable-stl \
 			--enable-tcl \
+			--enable-java \
 			--with-tcl=/usr/lib \
 			--enable-test
 
@@ -48,27 +49,12 @@ ifeq (zavr32-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --enable-posixmutexes
 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
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-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)"
-# TODO: CONFIGURE_VARS???
-CONFIGURE_SWITCHES += --enable-java
-ifeq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+else
 # don't build java-gcj package
 DH_OPTIONS += -Nlibdb5.1-java-gcj
 endif
-else
-# don't build java packages
-DH_OPTIONS += -Nlibdb5.1-java -Nlibdb5.1-java-dev
-endif
-endif
 
 BROKEN_CPUS = zs390z
 VERY_BROKEN_CPUS = zm68kz zhppaz
@@ -84,7 +70,7 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
 %:
-	dh $@ -Ddist -Bbuild
+	dh $@ -Ddist -Bbuild --with=javahelper
 
 override_dh_auto_configure:
 	dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
@@ -110,15 +96,9 @@ endif
 
 override_dh_auto_install:
 	dh_auto_install -Ddist -Bbuild
-ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/java
 	mv $(CURDIR)/debian/tmp/usr/lib/db.jar \
 		$(CURDIR)/debian/tmp/usr/share/java/lib$(package)-java-$(version).jar
-	ln -s lib$(package)-java-$(version).jar \
-		$(CURDIR)/debian/tmp/usr/share/java/lib$(package)-java.jar
-endif
-endif
 # Remove .la files
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
 
@@ -135,17 +115,12 @@ endif
 	  mv $$i $$(echo $$i | sed -e 's{usr/bin/db_{usr/bin/$(package)_{'); \
 	done
 
-
 override_dh_install:
 	dh_install -a -Xusr/doc --fail-missing
 	tcltk-depends
-ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 	dh_nativejava
 endif
-endif
-endif
 
 override_dh_installdocs:
 	dh_installdocs -pdb5.1-doc

-- 
UNNAMED PROJECT