Package: db
Version: 5.1.29-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Ensure that backwards compatible Java bytecode is built (LP: #1049765):
    - d/rules: Tweak naming of JAVACFLAGS, pass to dh_auto_configure and
      ensure that dh_auto_build operates on the correct directory.

This will ensure that the Java library built by this package is compatible
with Java 1.5+.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-15-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJQWgkZAAoJEL/srsug59jDd78P/1DTodwlpt2i94MMnhs6Ghx/
fmxw5nWI8SMxXX0qVP7tW9sIAbueB87Zxr4PtvM5W0SQGnjhNvBizl5o25xSO6gg
83nKSn9wcXxHY179JtDwZmupIEMVR8ELgg8AJLh1d4upJdsB24LEjPs0oDvZosOf
72Y8iQT76NMjOrQKsn5UtZiNxfmVRAho5cDSLKJpRgWYMvaIam/ZlFTe4PWtQBir
R1dwlE5rs+5xjrKX2Z6tdba5JOUTkyvAt7Bx6h3SF4z8k0ah0MBaQrn6ihzbiCIU
JZOrGeYOjXgBoO0gstTHfSHtbHOWn3s/lP9Jkk4zLLSPG/XSzI+6mqVtzlj8Tzo4
wW9B4PxjiukRoXBsu/qvtq6cdEkzjFMF1FSYcSiRogn+3flPFj/qn0ELlObotwfW
thsUy1QjRZyWqXhqD3lcA0pNePoRDA7YOj9SvIIW8UR2aSfzRST4om5DSjElpEt/
YBn8fOUxupu/BxQbNmvLQqePpX/LWLe8rB+cnTPrC8OFZ2moOQMaUXDB40Gxi0Fh
gfzXrg9ZXr2sLsAY3s9GOV/N/jFfF40D9wOJon2paIM/MEz1noiUiU3mYxWXk18U
rQpDln5BHoTzUEl7gYgT3Am2/EOQnphZi6LhUjFR7gr+abK07ByRPbgoHeVCJCVI
BkhpPiy5zVxPnY6c4eiv
=DQax
-----END PGP SIGNATURE-----
diff -Nru db-5.1.29/debian/changelog db-5.1.29/debian/changelog
diff -Nru db-5.1.29/debian/rules db-5.1.29/debian/rules
--- db-5.1.29/debian/rules	2012-06-28 13:03:31.000000000 +0100
+++ db-5.1.29/debian/rules	2012-09-19 18:04:00.000000000 +0100
@@ -62,7 +62,7 @@
 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 @@
 	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

Reply via email to