This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-shared-jar.
commit 53b2157f4bf7e87c8352ca36ea56adb27b50055f Author: Emmanuel Bourg <[email protected]> Date: Sat Feb 27 00:32:07 2016 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 2 +- debian/libmaven-shared-jar-java.poms | 14 ++++++++------ debian/rules | 8 +++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70f568e..bc57e7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ maven-shared-jar (1.1-2) UNRELEASED; urgency=medium * Team upload. + * Build with the DH sequencer instead of CDBS * debian/control: - Standards-Version updated to 3.9.5 (no changes) * debian/orig-tar.sh: diff --git a/debian/control b/debian/control index d0c1004..9c88207 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: libmaven-javadoc-plugin-java, libplexus-maven-plugin-java, libbcel-java, libcommons-collections3-java, libmaven2-core-java, libplexus-digest-java, default-jdk-doc, libbcel-java-doc, libmaven2-core-java-doc diff --git a/debian/libmaven-shared-jar-java.poms b/debian/libmaven-shared-jar-java.poms index 31a0ccf..5ad70f2 100644 --- a/debian/libmaven-shared-jar-java.poms +++ b/debian/libmaven-shared-jar-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 --no-parent --has-package-version diff --git a/debian/rules b/debian/rules index b76c54a..d755df6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +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 +%: + dh $@ --buildsystem=maven 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/maven-shared-jar.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
