[mysql-connector-java] 04/05: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository mysql-connector-java.

commit 4bd69b1219cf90ad7d5ad869614f4a5de382b234
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 30 22:22:27 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 38 ++++++++++++++++++++------------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bbb55a..0179ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mysql-connector-java (5.1.40-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Build with the DH sequencer instead of CDBS
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 30 Oct 2016 22:10:05 +0100
diff --git a/debian/control b/debian/control
index eaba894..456ff39 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus at better.se>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10), cdbs, ant, ant-optional
+Build-Depends: debhelper (>= 10), ant, ant-optional
 Build-Depends-Indep: default-jdk (>= 2:1.8), junit, ant-contrib, maven-repo-helper, libslf4j-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/mysql-connector-java.git
diff --git a/debian/rules b/debian/rules
index 88c0adb..c858ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,40 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
-DEB_ANT_ARGS := \
-    -Dcom.mysql.jdbc.jdk5.javac=$(JAVA_HOME)/bin/javac \
-    -Dcom.mysql.jdbc.jdk8.javac=$(JAVA_HOME)/bin/javac \
-    -Dsnapshot.version= \
-    -Dcom.mysql.jdbc.extra.libs=lib \
-    -Dant.java.version=1.5 \
-    -Dant.build.javac.source=1.6 \
-    -Dant.build.javac.target=1.7
-
-pre-build::
+%:
+	dh $@
+
+override_dh_auto_build:
 	mkdir -p lib
 	mkdir -p src/lib
 	ln -f -s /usr/share/java/ant-contrib.jar lib/ant-contrib.jar
-	ln -f -s /usr/share/java/slf4j-api.jar lib/slf4j-api.jar
+	ln -f -s /usr/share/java/slf4j-api.jar   lib/slf4j-api.jar
+
+	dh_auto_build -- \
+	    -Dcom.mysql.jdbc.jdk5.javac=$(JAVA_HOME)/bin/javac \
+	    -Dcom.mysql.jdbc.jdk8.javac=$(JAVA_HOME)/bin/javac \
+	    -Dsnapshot.version= \
+	    -Dcom.mysql.jdbc.extra.libs=lib \
+	    -Dant.java.version=1.5 \
+	    -Dant.build.javac.source=1.6 \
+	    -Dant.build.javac.target=1.7
+
+override_dh_install:
+	dh_install
 
-binary-post-install/libmysql-java::
 	mh_installpoms -plibmysql-java -e$(VERSION)
 	mh_installjar -plibmysql-java -e$(VERSION) -l src/doc/sources/pom.xml build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar
 	# compat link?
 	dh_link -plibmysql-java usr/share/java/mysql-connector-java.jar usr/share/java/mysql.jar
 
-clean::
+override_dh_clean:
+	dh_clean
 	rm -rf dist lib
 	rm -f build-stamp
 	mh_clean
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --no-symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git