This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository knopflerfish-osgi.
commit d1e866cf04169b9f20339df8c836b816d716f6cd Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 3 16:09:33 2016 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 34 +++++++++------------------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0087553..e70b361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ knopflerfish-osgi (5.2.0-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches - Install the new 5.2.0 files/links + * Build with the DH sequencer instead of CDBS * Depend on libasm-java (>= 5.0) instead of libasm4-java * Standards-Version updated to 3.9.8 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index f4942d6..5a62f44 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Felix Natter <[email protected]> Build-Depends-Indep: libasm-java (>= 5.0), default-jdk -Build-Depends: cdbs, debhelper (>= 9), ant +Build-Depends: debhelper (>= 9), ant Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git diff --git a/debian/rules b/debian/rules index 8d70cb3..b00a9cb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,36 +1,20 @@ #!/usr/bin/make -f -# debian/rules for Commons Fileupload (uses CDBS) -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --buildsystem=ant -JAVA_HOME_DIRS := /usr/lib/jvm/default-java +override_dh_auto_build: + dh_auto_build -- -f osgi/framework/build.xml jar -ANT_HOME := /usr/share/ant -DEB_ANT_BUILD_TARGET := jar -DEB_BUILDDIR := osgi/framework -# DEB_INSTALL_DOCS_ALL = -Xlicense -# DEB_DH_INSTALL_ARGS := -XLICENSE.txt -DEB_COMPRESS_EXCLUDE := .java .html + javadoc -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi + cp docs/bundledoc/framework/index.html framework.html + cp docs/bundledoc/frameworkcommands/index.html frameworkcommands.html -clean:: - -$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET) +override_dh_auto_clean: -rm -f osgi/framework/resources/tstamp - -rm -fr api/ + -rm -fr api/ osgi/out -rm -f osgi/framework-*.jar -rm -f framework.html frameworkcommands.html -build/libknopflerfish-osgi-java-doc:: - javadoc -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi - cp docs/bundledoc/framework/index.html framework.html - cp docs/bundledoc/frameworkcommands/index.html frameworkcommands.html - -# Get original sources directly using uscan get-orig-source: uscan --force-download --download-current-version --rename --repack --compression xz - -# we don't need jh_manifest and it has a bug: -#JH_MANIFEST_ARGS := -V -#override_jh_manifest: -# -echo no jh_manifest -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/knopflerfish-osgi.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
