This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bindex.
commit 27e9aa18e4f34e6c66fbf9c0254635fd1b288d09 Author: Markus Koschany <[email protected]> Date: Fri Nov 20 19:24:47 2015 +0100 Imported Debian patch 2.2+svn101-3 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/libbindex-java.install | 2 +- debian/libbindex-java.links | 2 +- debian/rules | 15 ++++++++++----- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9faf5d..2efc958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bindex (2.2+svn101-3) unstable; urgency=medium + + * Team upload. + * Transition to bnd 2.1.0. + + -- Markus Koschany <[email protected]> Fri, 20 Nov 2015 19:24:47 +0100 + bindex (2.2+svn101-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 5a4ca27..3f01910 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: javahelper Build-Depends-Indep: ant, - bnd1.50, + bnd (>= 2.1.0), junit4, libfelix-osgi-obr-java, libkxml2-java, diff --git a/debian/libbindex-java.install b/debian/libbindex-java.install index 001f485..c0bdd10 100644 --- a/debian/libbindex-java.install +++ b/debian/libbindex-java.install @@ -1 +1 @@ -dist/bindex-2.2.jar usr/share/java/ +bindex-2.2.jar usr/share/java/ diff --git a/debian/libbindex-java.links b/debian/libbindex-java.links index 3bae878..cc9d279 100644 --- a/debian/libbindex-java.links +++ b/debian/libbindex-java.links @@ -1 +1 @@ -/usr/share/java/bindex-2.2.jar /usr/share/java/bindex.jar +/usr/share/java/bindex-2.2.jar /usr/share/java/bindex.jar diff --git a/debian/rules b/debian/rules index a6bc340..49e08e2 100755 --- a/debian/rules +++ b/debian/rules @@ -4,18 +4,23 @@ PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//' | sed -e 's/\+svn.*//') JAVA_HOME := /usr/lib/jvm/default-java/ JAR_BASE := /usr/share/java -CLASSPATH:=/usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation-1.50.0.jar +export JH_JAR_EXTRA := NOTICE.txt LICENSE.txt about.html README +export CLASSPATH :=/usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation.jar %: dh $@ --with javahelper override_dh_auto_build: - mkdir -p bin dist; \ - javac -classpath $(CLASSPATH) -d bin $(shell find src -name *.java); \ - bnd-1.50 buildx -output dist/bindex-$(VERSION).jar bnd.bnd; + mkdir -p dist + jh_build dist/bindex-$(VERSION).jar src + mv bnd.bnd bindex.bnd + bnd wrap --properties bindex.bnd --output bindex-$(VERSION).jar dist/bindex-$(VERSION).jar + mv bindex.bnd bnd.bnd override_dh_clean: - rm -rf bin dist + $(RM) -r dist + $(RM) bindex.bnd + $(RM) bindex-*.jar dh_clean svnURL := http://www.osgi.org/svn/public/trunk/org.osgi.impl.bundle.bindex/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bindex.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
