This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository apache-log4j1.2.
commit 4754d8675a9923692af0ee5e6112e679031cab66 Author: Emmanuel Bourg <ebo...@apache.org> Date: Sun Oct 22 00:35:18 2017 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 2 ++ debian/control | 1 - debian/rules | 27 +++++++-------------------- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7939fa..e20aa14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apache-log4j1.2 (1.2.17-8) UNRELEASED; urgency=medium * No longer attempt to install the javadoc jar (Closes: #879251) + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.1 * Switch to debhelper level 10 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..0943fa3 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +docs/ +log4j-*.jar diff --git a/debian/control b/debian/control index 4d33d60..4254098 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Varun Hiremath <va...@debian.org>, Emmanuel Bourg <ebo...@apache.org> Build-Depends: ant, bnd (>= 2.1.0), - cdbs, debhelper (>= 10), default-jdk, default-jdk-doc, diff --git a/debian/rules b/debian/rules index 4336d44..df7e29c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,13 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +VERSION := 1.2.17 -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant -DEB_JARS := javax.mail -DEB_ANT_BUILD_TARGET := jar javadoc -DEB_ANT_ARGS := -Dversion=$(VERSION) +%: + dh $@ --with maven-repo-helper -clean:: - -$(RM) -r docs - -rm -rf debian/tmp - rm -Rf debian/liblog4j1.2-java-doc/* - rm -Rf debian/log4j-${VERSION}.bar - mh_clean +override_dh_auto_build: + dh_auto_build -- jar javadoc -Djavamail.jar=/usr/share/java/javax.mail.jar -common-build-indep:: cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd \ @@ -27,9 +16,7 @@ common-build-indep:: rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar mv log4j.jar dist/lib/log4j-$(VERSION).jar -install/liblog4j1.2-java:: - $(RM) dist/lib/log4j-*-sources.jar - mh_install + rm dist/lib/log4j-*-sources.jar get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download + -uscan --download-current-version --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j1.2.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits