This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jericho-html.
commit 009707513e14b7731d6cbab3cfa1c4063713e731 Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 3 12:17:24 2018 +0100 Build with the DH sequencer instead of CDBS --- debian/build.xml | 8 +++++++- debian/changelog | 1 + debian/control | 1 - debian/rules | 17 ++++++++++------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index becc59a..9139441 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -6,7 +6,13 @@ <target name="build" description="build the jar file"> <mkdir dir="build"/> - <javac srcdir="src" destdir="build"/> + <javac srcdir="src" destdir="build"> + <classpath> + <pathelement location="/usr/share/java/commons-logging.jar"/> + <pathelement location="/usr/share/java/log4j-1.2.jar"/> + <pathelement location="/usr/share/java/slf4j-api.jar"/> + </classpath> + </javac> <jar destfile="${jarfile}" basedir="build" index="yes"/> </target> diff --git a/debian/changelog b/debian/changelog index 2670cff..d9f0a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ jericho-html (3.2-1) UNRELEASED; urgency=medium * New upstream release. * Removed Michael Koch from the uploaders (Closes: #654035) * Removed the -java-doc package + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Use XZ compression for the upstream tarball * Removed the .jar, .class and javadoc files from the upstream tarball diff --git a/debian/control b/debian/control index 50973ce..f7c873e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: Varun Hiremath <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 10), default-jdk, javahelper, diff --git a/debian/rules b/debian/rules index c079705..c9ed011 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,18 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +%: + dh $@ --buildsystem=ant -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := build -DEB_JARS := commons-logging log4j-1.2 slf4j-api +override_dh_auto_build: + dh_auto_build -- -f debian/build.xml build -install/libjericho-html-java:: +override_dh_auto_test: + +override_dh_auto_install: jh_installlibs -plibjericho-html-java jericho-html.jar +override_dh_auto_clean: + dh_auto_build -- -f debian/build.xml clean + get-orig-source: uscan --upstream-version 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jericho-html.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
