[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-36-gdb0aa69

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 6959c6d041e9141b24b5853e5bf55629e2ee041c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jun 7 10:26:36 2013 +0200

    Ensure that backwards compatible Java bytecode is built (Closes: #688138)

diff --git a/debian/rules b/debian/rules
index 9c99e31..ed30026 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ CONFIGURE_SWITCHES += --enable-posixmutexes
 endif
 
 ifeq (yes,$(ENABLE_JAVA))
-JAVAC_FLAGS=-source 1.5 -target 1.5
+JAVACFLAGS=-source 1.5 -target 1.5
 JAVA_HOME ?= /usr/lib/jvm/default-java
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 CONFIGURE_SWITCHES += --enable-java
@@ -94,10 +94,10 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 	dh $@ $(DH_PLUGINS)
 
 override_dh_auto_configure:
-	dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
+	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
 
 override_dh_auto_build:
-	JAVAC_FLAGS="$(JAVAC_FLAGS)" dh_auto_build
+	dh_auto_build -Ddist -Bbuild
 
 override_dh_auto_clean:
 	dh_auto_clean -Ddist -Bbuild

-- 
Berkeley DB Debian packaging