This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libregexp-java.
commit 3e5dce569b8b17dffc864dad25752612e3e21466 Author: Emmanuel Bourg <[email protected]> Date: Fri Jan 12 12:12:39 2018 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 1 - debian/dirs | 1 - debian/libregexp-java.poms | 2 +- debian/rules | 29 +++++++---------------------- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index b239af6..12954d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libregexp-java (1.5-4) UNRELEASED; urgency=medium * Team upload. + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.3 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 62b330e..8e10e6a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Ludovic Claude <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 10), default-jdk, maven-repo-helper diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 13c9f03..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/debian/libregexp-java.poms b/debian/libregexp-java.poms index 623bd24..f7f92f8 100644 --- a/debian/libregexp-java.poms +++ b/debian/libregexp-java.poms @@ -1 +1 @@ -debian/pom.xml --no-parent +debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=regexp --artifact=build/jakarta-regexp-*.jar diff --git a/debian/rules b/debian/rules index 693f0e8..7717e3b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,14 @@ #!/usr/bin/make -f -# debian/rules file for libregexp-java (uses cdbs) -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --with maven-repo-helper -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_ARGS := -Dant.build.javac.source=1.4 -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar -DEB_ANT_BUILD_TARGET := jar javadocs +override_dh_auto_build: + dh_auto_build -- jar javadocs -clean:: - -rm -Rf docs - -rm -rf debian/tmp - -install/$(PACKAGE):: - mh_installpoms -p$(PACKAGE) - mh_installjar -p$(PACKAGE) -l --usj-name=regexp debian/pom.xml build/jakarta-regexp-$(VERSION).jar - -get-orig-pom: MVN_VERSION=1.4 get-orig-pom: - wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jakarta-regexp/jakarta-regexp/$(MVN_VERSION)/jakarta-regexp-$(MVN_VERSION).pom - sed -i -e 's/<version>1.4/<version>$(VERSION)/' debian/pom.xml + wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.pom + sed -i -e 's/<version>1.4/<version>1.5/' debian/pom.xml 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/libregexp-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
