[jenkins-trilead-ssh2] 04/06: 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 jenkins-trilead-ssh2.

commit 6b60143e2a99921fc9607b9169a4f7988b5f8de1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 9 00:43:36 2017 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                         |  1 +
 debian/control                           |  2 +-
 debian/libjenkins-trilead-ssh2-java.poms |  2 +-
 debian/rules                             | 16 +++-------------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e3daa9..af58fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jenkins-trilead-ssh2 (217-jenkins-7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index bb639eb..96d9d02 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: James Page <james.page at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 10), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper
 Build-Depends-Indep: default-jdk-doc, junit4, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jenkins-trilead-ssh2.git
diff --git a/debian/libjenkins-trilead-ssh2-java.poms b/debian/libjenkins-trilead-ssh2-java.poms
index 4c16dce..61c49a5 100644
--- a/debian/libjenkins-trilead-ssh2-java.poms
+++ b/debian/libjenkins-trilead-ssh2-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml
+pom.xml --artifact=target/trilead-ssh2-build*.jar --java-lib --usj-name=jenkins-trilead-ssh2
diff --git a/debian/rules b/debian/rules
index 870a08f..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-PACKAGE   := jenkins-trilead-ssh2
-JAR       := trilead-ssh2
-DEB_MAVEN_INSTALL_TO_USJ := false
-JAR_VERSION := $(subst +dfsg,,$(DEB_UPSTREAM_VERSION))
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installjar -plib$(PACKAGE)-java pom.xml -l target/$(JAR)-build$(JAR_VERSION).jar \
-		--java-lib --usj-name=$(PACKAGE)	
+%:
+	dh $@
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

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