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

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8abc9bea65f1f982742ce38bffe2d371fccb8e14
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Mar 4 15:02:12 2013 +0100

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

diff --git a/debian/rules b/debian/rules
index 82a8b7e..60a2d49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,7 @@ CONFIGURE_SWITCHES += --enable-posixmutexes
 endif
 
 ifeq (yes,$(ENABLE_JAVA))
+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
@@ -96,9 +97,9 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
 override_dh_auto_configure:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
+	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
 endif
-	dh_auto_configure -Ddist -Bbuild-production -- $(CONFIGURE_SWITCHES) --disable-test
+	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild-production -- $(CONFIGURE_SWITCHES) --disable-test
 
 override_dh_auto_clean:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

-- 
Berkeley DB Debian packaging