[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 f3870f4dc303739624cb29ef8023406e7c5f466b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 22:18:30 2011 +0200

    Fix typo and set GCJ CFLAGS out of the condition

diff --git a/debian/rules b/debian/rules
index e72faf7..39a6729 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,10 +51,11 @@ ifeq (zavr32-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --enable-posixmutexes
 endif
 
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHSs)))
+JAVA_HOME ?= /usr/lib/jvm/default-java
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-else
-# don't build java-gcj package
+
+# don't build java-gcj package on non-native or broken archs
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
 DH_OPTIONS += -Nlibdb5.1-java-gcj
 endif
 
@@ -123,9 +124,6 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install -a -Xusr/doc --fail-missing
 	tcltk-depends
-ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHSs)))
-	dh_nativejava
-endif
 
 override_dh_installdocs:
 	dh_installdocs -pdb5.1-doc
@@ -136,3 +134,9 @@ override_dh_strip:
 
 override_dh_clean:
 	DH_OPTIONS="" dh_clean
+
+override_jh_installlibs:
+	jh_installlibs
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
+	dh_nativejava
+endif

-- 
UNNAMED PROJECT