[jenkins-htmlunit] 06/07: Build with the DH sequencer instead of CDBS

Tue Dec 1 09:26:27 UTC 2015

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

ebourg-guest pushed a commit to branch master
in repository jenkins-htmlunit.

commit 643ab63f05c6d7e60d489a0c0d12cdbbc8daec0a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 1 10:19:20 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                     |  1 +
 debian/control                       |  1 -
 debian/libjenkins-htmlunit-java.poms | 16 +++++++++-------
 debian/patches/build.patch           | 15 ---------------
 debian/patches/series                |  1 -
 debian/rules                         | 23 ++++-------------------
 6 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 247b5d3..f68c502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jenkins-htmlunit (2.6-jenkins-6-3) UNRELEASED; urgency=medium
   * Team upload.
   * Removed the unnecessary dependency on maven-assembly-plugin
     (Closes: #805668)
+  * Build with the DH sequencer instead of CDBS
   * Removed the libjenkins-htmlunit-java-doc package
   * Fixed debian/watch
   * Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index 1663cd7..60dd04f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ 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 (>= 9),
  default-jdk,
  javahelper,
diff --git a/debian/libjenkins-htmlunit-java.poms b/debian/libjenkins-htmlunit-java.poms
index 9ec5af5..84745e9 100644
--- a/debian/libjenkins-htmlunit-java.poms
+++ b/debian/libjenkins-htmlunit-java.poms
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,16 +13,16 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
-pom.xml --has-package-version
+pom.xml --has-package-version --java-lib --usj-name=jenkins-htmlunit
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
deleted file mode 100644
index e583ad0..0000000
--- a/debian/patches/build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fixup trailing whitespace in pom.xml which causes
- maven-debian-helper to fail when transforming pom files.
-Author: James Page <james.page at canonical.com>
-Forwarded: not-needed
-
-Index: jenkins-htmlunit/pom.xml
-===================================================================
---- jenkins-htmlunit.orig/pom.xml	2011-03-15 11:57:06.840591733 +0000
-+++ jenkins-htmlunit/pom.xml	2011-03-15 12:09:37.793786267 +0000
-@@ -1,4 +1,4 @@
--<project xmlns="http://maven.apache.org/POM/4.0.0"
-+<project xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-     <modelVersion>4.0.0</modelVersion>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5879227..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build.patch
diff --git a/debian/rules b/debian/rules
index 5e9d2b7..fc598d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_INSTALL_TO_USJ := false 
-PACKAGE := jenkins-htmlunit
-JAR := htmlunit
-
-# Install branch specific named version in /usr/share/java
-# This works around the fact that maven-debian-helper does
-# not pass --usj-name from debian/*.poms
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java --usj-name=$(PACKAGE) -l pom.xml \
-        target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar
-	jh_classpath  -plib$(PACKAGE)-java
-
-clean::
-	-rm -Rf artifacts
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
 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-htmlunit.git

