[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. debian/8.1.0-1-2-g4264733

[Niels Thykier]

The following commit has been merged in the master branch:
commit 06466ef38c025d7553eb9e7eee9b3b68da7268f4
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 24 10:33:56 2012 +0200

    Use build-arch target to shorten arch-specific builds
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 3f4c5bf..08dc668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+eclipse-cdt (8.1.0-2) UNRELEASED; urgency=low
+
+  * Bump versioned build dependency on debhelper to get better
+    handling of architecture specific override targets.
+  * Add versioned build dependency on dpkg-dev to get build-arch
+    support.
+  * Properly split build in architecture specific parts.  This
+    works around a FTBFS on sparc and reduces the build time for
+    doing architecture specific builds.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 24 Jun 2012 10:18:08 +0200
+
 eclipse-cdt (8.1.0-1) unstable; urgency=low
 
   [ Jakub Adam ]
diff --git a/debian/control b/debian/control
index c8f9609..e99b550 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,9 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>,
            Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper (>= 9.20120608~),
                default-jdk,
+               dpkg-dev (>= 1.16.2~),
                eclipse-pde (>= 3.8~),
                eclipse-rse,
                javahelper (>= 0.32~),
diff --git a/debian/rules b/debian/rules
index 2cd220f..5451efc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,17 +38,20 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	# Do not use the auto-build with ant.
 
-override_jh_compilefeatures:
+override_jh_compilefeatures-arch:
 	cd $(BUILD_DIR)/org.eclipse.cdt.core.linux/library && \
 		make JAVA_HOME="$(JAVA_HOME)" ARCH=$(ECLIPSE_BUILD_ARCH) CC='gcc -D_GNU_SOURCE' CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -fPIC"
+
+override_jh_compilefeatures-indep:
 	jh_compilefeatures --build-opts="-DjavacTarget=1.6 -DjavacSource=1.6 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
 
 jnidir := /usr/lib/$(DEB_HOST_MULTIARCH)/jni
-override_dh_install:
+
+override_dh_install-arch:
 	dh_install -peclipse-cdt-jni $(BUILD_DIR)/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so $(jnidir)
-	dh_install --remaining-packages
+	dh_install -a --remaining-packages
 
-override_jh_installeclipse:
+override_jh_installeclipse-indep:
 	jh_installeclipse
 	rm -f debian/eclipse-cdt/usr/share/eclipse/dropins/cdt/eclipse/plugins/org.eclipse.cdt.launch.remote.source*.jar
 

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.