This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository ognl.
commit 3164f2252589f778389a846f734cf7514e77dcac Author: Markus Koschany <[email protected]> Date: Wed Apr 18 21:45:06 2018 +0200 Switch from cdbs to dh sequencer. --- debian/control | 2 +- debian/rules | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/debian/control b/debian/control index caa1c35..a57fa6d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 11), default-jdk +Build-Depends: ant, debhelper (>= 11), default-jdk Build-Depends-Indep: ant-contrib, ant-optional, docbook-xml, diff --git a/debian/rules b/debian/rules index a4de1ba..78339ba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,18 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +export CLASSPATH := /usr/share/java/javassist.jar:/usr/share/java/junit4.jar:/usr/share/java/ant-trax.jar:/usr/share/java/xalan2.jar:/usr/share/java/xml-apis.jar:/usr/share/java/serializer.jar:/usr/share/java/javacc.jar:/usr/share/java/ant-contrib.jar -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ --with maven-repo-helper -DEB_JARS := javassist junit4 ant-trax xalan2 xml-apis serializer javacc ant-contrib +override_dh_auto_build: + dh_auto_build -- -Dversion=2.7.3 javacc-generate jar docs.impl javadocs -DEB_ANT_ARGS := -Dversion=$(DEB_UPSTREAM_VERSION) -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := javacc-generate jar docs.impl javadocs - -binary-post-install/libognl-java:: +override_mh_installpoms: mh_installpoms -plibognl-java - mh_installjar -plibognl-java -l pom.xml build/ognl-$(DEB_UPSTREAM_VERSION).jar -clean:: - mh_clean - -rm -rf debian/tmp +override_mh_installjar: + mh_installjar -plibognl-java -l pom.xml build/ognl-2.7.3.jar get-orig-source: - sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) + sh debian/orig-tar.sh 2.7.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
