[maven-debian-helper] 07/11: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Mar 5 11:19:04 GMT 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.
commit 2e0f4ebe1e5c28012fc196bc57118b231f479b72
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Mar 5 12:08:00 2018 +0100
Build with the DH sequencer instead of CDBS
---
bin/mh_genrules | 0
bin/mh_lspoms | 0
bin/mh_resolve_dependencies | 0
debian/build.xml => build.xml | 2 +-
debian/changelog | 3 +-
debian/control | 1 -
debian/install | 2 +-
debian/manpages | 4 +++
debian/rules | 81 +++++++++++++++----------------------------
9 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/bin/mh_genrules b/bin/mh_genrules
old mode 100644
new mode 100755
diff --git a/bin/mh_lspoms b/bin/mh_lspoms
old mode 100644
new mode 100755
diff --git a/bin/mh_resolve_dependencies b/bin/mh_resolve_dependencies
old mode 100644
new mode 100755
diff --git a/debian/build.xml b/build.xml
similarity index 97%
rename from debian/build.xml
rename to build.xml
index 382e4f8..4767d84 100644
--- a/debian/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="pkg-java" default="package" basedir="..">
+<project name="pkg-java" default="package" basedir=".">
<property file="debian/build.properties"/>
<property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
diff --git a/debian/changelog b/debian/changelog
index c4ecdf7..01ee5f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,11 @@ maven-debian-helper (2.2.9) UNRELEASED; urgency=medium
* Team upload.
* Generate Vcs-* URLs for Salsa
- * Build with plexus-container-default.jar
- instead of plexus-container-default-1.5.jar
* Standards-Version updated to 4.1.3
* The generated control file now specifies Standards-Version: 4.1.3
* Switch to debhelper level 11
* Generate DH 11 compliant packages
+ * Build with the DH sequencer instead of CDBS
-- Emmanuel Bourg <ebourg at apache.org> Mon, 05 Mar 2018 09:41:56 +0100
diff --git a/debian/control b/debian/control
index 0f867e7..6f31419 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders:
Wolodja Wentland <debian at babilen5.org>
Build-Depends:
ant-optional,
- cdbs,
debhelper (>= 11),
default-jdk-headless | default-jdk,
help2man,
diff --git a/debian/install b/debian/install
index fdef7ca..e761eef 100644
--- a/debian/install
+++ b/debian/install
@@ -3,4 +3,4 @@ etc/*.conf /etc/maven/
etc/*.xml /etc/maven/
share/cdbs/1/class/*.mk /usr/share/cdbs/1/class
share/maven-debian-helper/*.sh /usr/share/maven-debian-helper
-usr/share/perl5
+share/perl/maven.pm /usr/share/perl5/Debian/Debhelper/Buildsystem/
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..5c8732c
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,4 @@
+debian/.mh/doc/mh_genrules.1
+debian/.mh/doc/mh_lspoms.1
+debian/.mh/doc/mh_make.1
+debian/.mh/doc/mh_resolve_dependencies.1
diff --git a/debian/rules b/debian/rules
index f3d3a6c..69453b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,60 +1,35 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(shell echo ${DEB_UPSTREAM_VERSION} | sed -r 's/([0-9\.]+).*/\1/')
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-junit junit commons-io plexus-classworlds maven-artifact-3.x maven-core-3.x maven-model-3.x maven-embedder-3.x \
- maven-plugin-api-3.x maven-plugin-annotations maven-scm-api velocity file-management plexus-utils maven-resolver-api maven-resolver-util \
- plexus-container-default maven-repo-helper
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
-API_DOCS := target/api
-
-debian/.mh:
- mkdir -p debian/.mh
-
-debian/.mh/bin: debian/.mh
- cp -R bin debian/.mh/
-
-debian/.mh/etc: debian/.mh
- cp -R etc debian/.mh/
-
-debian/.mh/share: debian/.mh
- cp -R share debian/.mh/
-
-makebuilddir/$(PACKAGE):: debian/.mh/bin debian/.mh/etc debian/.mh/share
-
-# Generation of man pages
-SCRIPTS := $(wildcard bin/mh_*)
-MAN_PAGES := $(addprefix debian/.mh/doc/,$(addsuffix .1, $(notdir $(SCRIPTS))))
-debian/.mh/mh_% : bin/mh_%
- mkdir -p debian/.mh
- cp $< $@
- chmod +x $@
-debian/.mh/doc/mh_%.1 : debian/.mh/mh_%
+include /usr/share/dpkg/pkg-info.mk
+
+export CLASSPATH=/usr/share/java/commons-io.jar\
+ :/usr/share/java/maven-artifact-3.x.jar\
+ :/usr/share/java/maven-core-3.x.jar\
+ :/usr/share/java/maven-embedder-3.x.jar\
+ :/usr/share/java/maven-model-3.x.jar\
+ :/usr/share/java/maven-plugin-api-3.x.jar\
+ :/usr/share/java/maven-resolver-api.jar\
+ :/usr/share/java/maven-resolver-util.jar\
+ :/usr/share/java/maven-repo-helper.jar\
+ :/usr/share/java/plexus-utils2.jar\
+ :/usr/share/java/velocity.jar
+
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper
+
+override_dh_auto_build:
+ # Generation of man pages
mkdir -p debian/.mh/doc
- help2man -N -o $@ $<
-man-pages: $(MAN_PAGES)
-build/$(PACKAGE):: man-pages
-
-install/$(PACKAGE)::
- mh_install -p$(PACKAGE)
- install -D share/perl/maven.pm debian/tmp/$$(perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper/Buildsystem/maven.pm
-
-cleanbuilddir::
- mh_unpatchpoms -p$(PACKAGE)
+ help2man -N -o debian/.mh/doc/mh_genrules.1 bin/mh_genrules
+ help2man -N -o debian/.mh/doc/mh_lspoms.1 bin/mh_lspoms
+ help2man -N -o debian/.mh/doc/mh_make.1 bin/mh_make
+ help2man -N -o debian/.mh/doc/mh_resolve_dependencies.1 bin/mh_resolve_dependencies
-clean::
- mh_clean
+ dh_auto_build -- package -Dpackage=$(DEB_SOURCE) -Dbin.package=$(DEB_SOURCE)
+ mh_unpatchpoms -pmaven-debian-helper
# Helper target, to use when updating the version of this package
update-package-version:
- perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" pom.xml
- perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" maven-debian-helper/pom.xml debian-maven-plugin/pom.xml
- perl -p -i -e "s/maven-debian-helper \(>= ([0-9\.]+)\)/maven-debian-helper \(>= ${VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
-
-
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${DEB_VERSION}</" pom.xml
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${DEB_VERSION}</" maven-debian-helper/pom.xml debian-maven-plugin/pom.xml
+ perl -p -i -e "s/maven-debian-helper \(>= ([0-9\.]+)\)/maven-debian-helper \(>= ${DEB_VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git
More information about the pkg-java-commits
mailing list