This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 52068b243add39d7c28efb41d3270acf0d11e5b7 Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 17 09:57:07 2015 +0100 Updated the linked jars and the ignored modules in debian/rules --- debian/changelog | 1 + debian/rules | 49 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2264c0a..475a27c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ bnd (2.4.0-1) UNRELEASED; urgency=medium - Require Java 6 or higher - Build the Gradle plugin during the bootstrap phase - Require libosgi-compendium-java >= 5.0.0-3 for the new OSGi types + - Updated the linked jars and the ignored modules in debian/rules -- Emmanuel Bourg <[email protected]> Wed, 16 Dec 2015 12:54:06 +0100 diff --git a/debian/rules b/debian/rules index dcb2439..c0b37e8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f MAVEN_REPO := http://repo1.maven.org/maven2/biz/aQute/ -MAVEN_VERSION := 2.3.0 +MAVEN_VERSION := 2.4.0 PACKAGE := bnd VERSION := $(MAVEN_VERSION) @@ -45,11 +45,13 @@ override_dh_auto_build: cnf/repo/org.eclipse.core.jobs \ cnf/repo/org.eclipse.text \ cnf/repo/org.osgi.impl.bundle.bindex \ + cnf/cache \ cnf/gradle/dependencies \ cnf/plugins/biz.aQute.bnd - ln -s -r bootstrap/bnd.jar cnf/gradle/dependencies/biz.aQute.bnd.jar + ln -s -r bootstrap/bnd.jar cnf/gradle/dependencies/biz.aQute.repository.jar + ln -s -r bootstrap/bnd.jar cnf/plugins/biz.aQute.repository.jar + ln -s -r bootstrap/bnd.jar cnf/cache/biz.aQute.bnd.gradle.jar ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar - ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.10.0.jar ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.11.0.jar ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar @@ -82,18 +84,26 @@ override_dh_auto_build: ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar dh_auto_build -- -x :biz.aQute.repository:compileJava \ - -x :biz.aQute.repository:bundle \ + -x :biz.aQute.repository:jar \ -x :biz.aQute.repository.aether:compileJava \ - -x :biz.aQute.repository.aether:bundle \ + -x :biz.aQute.repository.aether:jar \ -x :biz.aQute.resolve:compileJava \ - -x :biz.aQute.resolve:bundle \ + -x :biz.aQute.resolve:jar \ -x :demo:compileJava \ - -x :demo:bundle \ -x :biz.aQute.bndlib.tests:compileJava \ - -x :biz.aQute.bndoc:compileJava \ -x :biz.aQute.jpm:compileJava \ - -x :biz.aQute.jpm:bundle \ - -x :osgi.r5:bundle + -x :biz.aQute.jpm:jar \ + -x :org.osgi.impl.bundle.repoindex.lib:compileJava \ + -x :org.osgi.impl.bundle.repoindex.lib:jar \ + -x :org.osgi.impl.bundle.repoindex.ant:compileJava \ + -x :org.osgi.impl.bundle.repoindex.ant:jar \ + -x :org.osgi.impl.bundle.repoindex.cli:compileJava \ + -x :org.osgi.impl.bundle.repoindex.cli:jar \ + -x :org.osgi.impl.bundle.repoindex.test:compileJava \ + -x :org.osgi.impl.bundle.repoindex.test:jar \ + -x :osgi.r5:jar \ + -x :biz.aQute.launcher:test \ + -x check jar pod2man -c 'BND for Debian GNU/Linux' \ -r $(PACKAGE)-$(VERSION) \ @@ -108,7 +118,7 @@ override_dh_auto_install: mh_installpoms -p$(PACKAGE) -e$(VERSION) mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml --usj-name=bndlib biz.aQute.bndlib/generated/biz.aQute.bndlib.jar mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml --usj-name=bnd biz.aQute.bnd/generated/biz.aQute.bnd.jar - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd/generated/biz.aQute.bnd.annotation.jar + mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd.annotation/generated/biz.aQute.bnd.annotation.jar jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar jh_installlibs -p$(PACKAGE) install/bnd.junit.jar dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/ @@ -117,13 +127,22 @@ override_dh_auto_install: override_dh_auto_clean: dh_auto_clean - -rm -f debian/stamp-bootstrap + -rm -rf cnf/cache + -rm -rf demo/bin/ + -rm -rf demo/generated/ -rm -rf aQute.libg/bin/ -rm -rf aQute.libg/generated/ -rm -rf biz.aQute.bndlib/bin/ -rm -rf biz.aQute.bndlib/generated/ -rm -rf biz.aQute.bnd/bin/ -rm -rf biz.aQute.bnd/generated/ + -rm -rf biz.aQute.bnd.annotation/generated/ + -rm -rf biz.aQute.bnd.gradle/bin/ + -rm -rf biz.aQute.bnd.gradle/generated/ + -rm -rf biz.aQute.bnd.test/bin/ + -rm -rf biz.aQute.bnd.test/generated/ + -rm -rf biz.aQute.bnd.testextension/bin/ + -rm -rf biz.aQute.bnd.testextension/generated/ -rm -rf biz.aQute.junit/bin/ -rm -rf biz.aQute.junit/generated/ -rm -rf biz.aQute.launcher/bin/ @@ -132,9 +151,9 @@ override_dh_auto_clean: -rm -rf biz.aQute.bnd.doc/generated/ -rm -rf biz.aQute.bndlib.tests/bin/ -rm -rf biz.aQute.bndoc/bin/ - -rm -rf biz.aQute.jpm/bin/ - -rm -rf biz.aQute.repository/bin/ - -rm -rf biz.aQute.resolve/bin/ + -rm -rf biz.aQute.bndoc/generated/ + -rm -rf org.osgi.impl.bundle.repoindex.api/bin/ + -rm -rf org.osgi.impl.bundle.repoindex.api/generated/ -find . -type l -name '*.jar' -delete jh_clean mh_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
