[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 4693969a3211eaf4c6f8b2b4d1662b7b5956490b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 21:59:10 2011 +0200

    Keep -Ddist -Bbuild to overriden dh_auto_ commands to fix javahelper breakage

diff --git a/debian/rules b/debian/rules
index 04665fc..e72faf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ GCJ_BROKEN_ARCHS = ia64 sparc mips
 -include /usr/share/gcj/debian_defaults
 -include /usr/share/javahelper/java-vars.mk
 
+GCJ_NATIVE_ARCHS = $(filter-out $(GCJ_BROKEN_ARCHS), $(gcj_native_archs))
+
 # Don't try to build this file if missing
 /usr/share/gcj/debian_defaults /usr/share/javahelper/java-vars.mk:
 	:
@@ -49,7 +51,7 @@ ifeq (zavr32-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --enable-posixmutexes
 endif
 
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+ifneq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHSs)))
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 else
 # don't build java-gcj package
@@ -70,11 +72,14 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
 %:
-	dh $@ -Ddist -Bbuild --with=javahelper
+	dh $@ --with=javahelper
 
 override_dh_auto_configure:
 	dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
 
+override_dh_auto_clean:
+	dh_auto_clean -Ddist -Bbuild
+
 override_dh_auto_test:
 ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -118,7 +123,7 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install -a -Xusr/doc --fail-missing
 	tcltk-depends
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHSs)))
 	dh_nativejava
 endif
 

-- 
UNNAMED PROJECT