[jsch] 07/08: 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 jsch.

commit 8c5498fff2598b7fb58f0de7e1d38cd1304c1e41
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 2 00:05:15 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                |  1 +
 debian/control                  |  2 +-
 debian/libjsch-java-doc.install |  1 +
 debian/libjsch-java.links       |  1 +
 debian/libjsch-java.poms        |  2 +-
 debian/rules                    | 31 +++++++++++--------------------
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3eb1f6b..19f6086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ jsch (0.1.54-1) UNRELEASED; urgency=medium
       to write files outside the clients download basedir with effective
       permissions of the jsch sftp client process.
     - Updated the OSGi metadata
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 894a5a0..daa066f 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: Emmanuel Bourg <ebourg at apache.org>, Ludovic Claude <ludovic.claude at laposte.net>,
-Build-Depends: debhelper (>= 9), cdbs, default-jdk
+Build-Depends: debhelper (>= 9), default-jdk
 Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5), libjzlib-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jsch.git
diff --git a/debian/libjsch-java-doc.install b/debian/libjsch-java-doc.install
index 88a4ee4..f3000ca 100644
--- a/debian/libjsch-java-doc.install
+++ b/debian/libjsch-java-doc.install
@@ -1 +1,2 @@
 javadoc/* usr/share/doc/libjsch-java/api
+examples/*.java usr/share/doc/libjsch-java-doc/examples
diff --git a/debian/libjsch-java.links b/debian/libjsch-java.links
new file mode 100644
index 0000000..ea76edc
--- /dev/null
+++ b/debian/libjsch-java.links
@@ -0,0 +1 @@
+usr/share/java/jsch.jar /usr/share/ant/lib/jsch.jar
diff --git a/debian/libjsch-java.poms b/debian/libjsch-java.poms
index 9ac7e64..567b467 100644
--- a/debian/libjsch-java.poms
+++ b/debian/libjsch-java.poms
@@ -1 +1 @@
-pom.xml --no-parent --has-package-version --java-lib
+pom.xml --no-parent --has-package-version --java-lib --artifact=dist/lib/jsch-*.jar -e0.1.54
diff --git a/debian/rules b/debian/rules
index 300e8af..9ca3a6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,19 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_OPTS             := -Dant.build.javac.source=1.4
-DEB_JARS             := jzlib
-DEB_ANT_BUILD_TARGET := dist javadoc
-
-configure/lib$(PACKAGE)-java::
+override_dh_auto_build:
 	mkdir -p lib
+	ln -s /usr/share/java/jzlib.jar lib/jzlib.jar
+	dh_auto_build -- dist javadoc -Dant.build.javac.source=1.4
 
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/lib/jsch-$(DEB_UPSTREAM_VERSION).jar /usr/share/ant/lib/jsch.jar
-
-binary-post-install/lib$(PACKAGE)-java-doc::
-	install -d debian/libjsch-java-doc/usr/share/doc/libjsch-java-doc/examples
-	install -m 644 examples/*.java debian/libjsch-java-doc/usr/share/doc/libjsch-java-doc/examples
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -Rf lib
 
-clean::
-	mh_clean
+override_dh_compress:
+	dh_compress -X.java
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+	uscan --download-current-version --force-download --rename --repack --compression xz

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