This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 3ebb927d9d838282ebc080609eecf00a908c30d3 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 11:24:57 2015 +0100 Updated the linked jars in debian/rules --- debian/changelog | 1 + debian/rules | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8a24e6..47b0bde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ bnd (2.2.0-1) UNRELEASED; urgency=medium - Refreshed the patches - Updated the Maven poms - Added the missing resources to the bootstrap jar + - Updated the linked jars in debian/rules * Restored the Java 8 compatibility patch * Use XZ compression for the upstream tarball diff --git a/debian/rules b/debian/rules index b844d83..461af10 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,7 @@ debian/stamp-bootstrap: $(DEB_ANT_INVOKE) mkdir -p cnf/repo/biz.aQute.bnd/ \ cnf/repo/com.springsource.junit/ \ + cnf/repo/com.springsource.org.junit \ cnf/repo/org.eclipse.osgi \ cnf/repo/osgi.core \ cnf/repo/osgi.cmpn \ @@ -49,9 +50,10 @@ debian/stamp-bootstrap: cnf/repo/org.eclipse.ui.ide \ cnf/repo/org.eclipse.core.jobs \ cnf/repo/org.eclipse.text \ - cnf/repo/org.osgi.impl.bundle.bindex - ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar - ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar + cnf/repo/org.osgi.impl.bundle.bindex \ + cnf/plugins/biz.aQute.bnd + ln -s -r bootstrap/bnd.jar cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.2.0.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/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 @@ -59,7 +61,6 @@ debian/stamp-bootstrap: ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar # ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar - ln -s /usr/share/java/ant-contrib.jar cnf/ant-contrib/ant-contrib-1.0b3.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar @@ -114,15 +115,17 @@ binary-post-install/$(PACKAGE):: clean:: -rm -f debian/stamp-bootstrap - -rm -rf biz.aQute.repository - -rm -rf biz.aQute.resolve - -rm -rf biz.aQute.bndlib/bin - -rm -rf biz.aQute.bndlib/generated - -rm -rf biz.aQute.junit/generated - -rm -rf biz.aQute.launcher/bin - -rm -rf biz.aQute.launcher/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.junit/bin/ + -rm -rf biz.aQute.junit/generated/ + -rm -rf biz.aQute.launcher/bin/ + -rm -rf biz.aQute.launcher/generated/ -find . -type l -name '*.jar' -delete - -find . -type f \( -name '*.jar' -o -name '*.class' -o -name 'packageinfo' \) -delete jh_clean mh_clean -rm -rf install/ -- 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
