[pkg-java] r19115 - trunk/ecj/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-08-01 07:49:08 +0000 (Mon, 01 Aug 2016)
New Revision: 19115

Modified:
   trunk/ecj/debian/changelog
   trunk/ecj/debian/control
   trunk/ecj/debian/rules
Log:
Build with the DH sequencer instead of CDBS (Closes: #806020)



Modified: trunk/ecj/debian/changelog
===================================================================
--- trunk/ecj/debian/changelog	2016-07-31 22:57:29 UTC (rev 19114)
+++ trunk/ecj/debian/changelog	2016-08-01 07:49:08 UTC (rev 19115)
@@ -1,6 +1,7 @@
 ecj (3.11.0-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS (Closes: #806020)
   * Converted debian/copyright to the Copyright Format 1.0
   * Updated the version of the Maven pom
   * debian/rules: Let DH install the .lintian-overrides files

Modified: trunk/ecj/debian/control
===================================================================
--- trunk/ecj/debian/control	2016-07-31 22:57:29 UTC (rev 19114)
+++ trunk/ecj/debian/control	2016-08-01 07:49:08 UTC (rev 19115)
@@ -3,10 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
-Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 9),
- gcj-5-jdk,
- libgcj-bc,
- fastjar, ant, zip, dpkg (>= 1.13.19), python, time
+Build-Depends: debhelper (>= 9), gcj-5-jdk, libgcj-bc, fastjar, ant, zip, dpkg (>= 1.13.19), python, time
 Build-Depends-Indep: maven-repo-helper
 Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2)
 Standards-Version: 3.9.8

Modified: trunk/ecj/debian/rules
===================================================================
--- trunk/ecj/debian/rules	2016-07-31 22:57:29 UTC (rev 19114)
+++ trunk/ecj/debian/rules	2016-08-01 07:49:08 UTC (rev 19115)
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -43,12 +41,15 @@
 
 JAR = eclipse-ecj.jar
 
-default: build
-
 eclipse_root = $(CURDIR)/../eclipse
 
-build/ecj:: build/stamp-bytecode build/stamp-nativecode
+%:
+	dh $@
 
+override_dh_auto_build-indep: build/stamp-bytecode
+
+override_dh_auto_build-arch: build/stamp-nativecode
+
 build/stamp-bytecode:
 ifneq (,$(findstring $(DEB_HOST_ARCH),arm))
 	@echo 'Sorry ecj is no longer built on $(DEB_HOST_ARCH) due to a lack of porters'
@@ -179,19 +180,22 @@
 	touch build/stamp-nativecode
 
 
-install/libecj-java::
+override_dh_install-indep:
+	dh_install -i
+
 	mh_installpoms -plibecj-java
 	mh_installjar -plibecj-java -l debian/poms/ecj.pom build/dist/$(JAR) \
 		--usj-name=eclipse-ecj
 
-install/ecj::
+override_dh_install-arch:
+	# ecj
 	mkdir -p debian/tmp/usr/bin
 	sed 's/@ver@/$(GCC_VERSION)/g' debian/ecj.in \
 	  > debian/tmp/usr/bin/ecj
 	chmod 755 debian/tmp/usr/bin/ecj
 
-install/libecj-java-gcj::
 ifeq ($(with_native),yes)
+	# libecj-java-gcj
 	mkdir -p debian/tmp/usr/lib/gcj
 	install -m 644 build/dist/$(JAR).so debian/tmp/usr/lib/gcj
 
@@ -200,15 +204,15 @@
 		debian/tmp/usr/share/gcj/classmap.d/
 endif
 
-install/ecj1::
 ifeq ($(with_native),yes)
+	# ecj1::
 	mkdir -p debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc
 	install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc/
 	dh_link -p ecj1 \
 	  /usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ecj1 /usr/lib/gcc/ecj1
 endif
 
-install/ecj-gcj::
+	# ecj-gcj
 ifeq ($(with_native),yes)
 	mkdir -p debian/tmp/usr/bin
 	install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
@@ -219,13 +223,11 @@
 	ln -sf ecj.1.gz \
 	  debian/ecj-gcj/usr/share/man/man1/ecj-gcj.1.gz
 
-binary-predeb/ecj1::
-#	sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj1.substvars
+	dh_install -a
 
-binary-predeb/ecj-gcj::
-#	sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj-gcj.substvars
 
-clean::
+override_dh_clean:
+	dh_clean
 	rm -rf build
 	rm -f debian/*.pyc ecj1
 	rm -rf debian/.mh