This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit 8ca436356b51ed3e10489d840a98c53aaf69a5f9 Author: Markus Koschany <[email protected]> Date: Mon May 18 15:28:48 2015 +0200 Readd no-osgi.r5.patch --- debian/patches/no-osgi.r5.patch | 51 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 52 insertions(+) diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch new file mode 100644 index 0000000..7a9fa4d --- /dev/null +++ b/debian/patches/no-osgi.r5.patch @@ -0,0 +1,51 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 18 May 2015 15:28:32 +0200 +Subject: no osgi.r5 + +--- + biz.aQute.bnd/bnd.bnd | 3 +-- + biz.aQute.bndlib/bnd.bnd | 3 +-- + dist/bnd.bnd | 2 +- + 3 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd +index 2c30f70..238231d 100644 +--- a/biz.aQute.bnd/bnd.bnd ++++ b/biz.aQute.bnd/bnd.bnd +@@ -11,8 +11,7 @@ Conditional-Package: aQute.libg.*,aQute.lib.*,aQute.configurable + osgi.cmpn;version=4.3,\ + osgi.core;version=4.1,\ + junit.osgi,\ +- org.osgi.impl.bundle.bindex,\ +- osgi.r5;version=1.0.1 ++ org.osgi.impl.bundle.bindex + + # About the aQute.library.bndrepo dep. Needed to add them here + # by hand even though they are in bndlib. However, they are added +diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd +index 49d247f..11c0104 100644 +--- a/biz.aQute.bndlib/bnd.bnd ++++ b/biz.aQute.bndlib/bnd.bnd +@@ -42,8 +42,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 + -buildpath: com.springsource.junit,\ + osgi.cmpn;version=4.3,\ + aQute.libg;version=project,\ +- osgi.core;version=4.1,\ +- osgi.r5;version=1.0.1,\ ++ osgi.core;version=4.1 + + Bundle-Version: 2.1.0.${tstamp;yyyyMMdd-HHmmss} + Import-Package: junit.framework;resolution:=optional,\ +diff --git a/dist/bnd.bnd b/dist/bnd.bnd +index 8cd392a..be23a6d 100644 +--- a/dist/bnd.bnd ++++ b/dist/bnd.bnd +@@ -2,7 +2,7 @@ + # This directory holds the distribution of the bnd project + # + +--dependson: biz.aQute.bnd, biz.aQute.jpm, osgi.r5 ++-dependson: biz.aQute.bnd, biz.aQute.jpm + -nobundles: true + + no.junit: true diff --git a/debian/patches/series b/debian/patches/series index 61805e8..2184749 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ embedded-repo.patch FTBFS.patch implement-missing-methods.patch build-without-biz.aQute.repository-and-resolve.patch +no-osgi.r5.patch -- 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
