[pkg-db-devel] Bug#688138: Processing of db_5.1.29-5.1_amd64.changes

[Sylvestre Ledru]

On 06/06/2013 19:02, Ondřej Surý wrote:
> The thing is that I am preparing for db version transition, so I would prefer to have more time for possible to avoid duplicate work.
This is minor patch (basically, just fixing the upload 5.1.29-5).

> Do you hurry that much for OpenJDK transition or can it wait to the end of June?
I would like to have it sooner than later but you are the package
maintainer. So, you decide! :)

Sylvestre


-------------- next part --------------
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