[bnd] 12/17: Drop no-osgi.r5.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository bnd.

commit f114b5e419bf24ff1130ef9121970502b19163fb
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 18 15:16:00 2015 +0200

    Drop no-osgi.r5.patch
---
 debian/patches/no-osgi.r5.patch | 75 -----------------------------------------
 debian/patches/series           |  1 -
 2 files changed, 76 deletions(-)

diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch
deleted file mode 100644
index ab362e8..0000000
--- a/debian/patches/no-osgi.r5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Thu, 14 May 2015 15:20:15 +0200
-Subject: no osgi.r5
-
----
- biz.aQute.bnd/bnd.bnd        | 3 +--
- biz.aQute.bndlib/bnd.bnd     | 3 +--
- biz.aQute.repository/bnd.bnd | 1 -
- biz.aQute.resolve/bnd.bnd    | 1 -
- dist/bnd.bnd                 | 2 +-
- 5 files changed, 3 insertions(+), 7 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/biz.aQute.repository/bnd.bnd b/biz.aQute.repository/bnd.bnd
-index 0f39a37..1b9bf60 100644
---- a/biz.aQute.repository/bnd.bnd
-+++ b/biz.aQute.repository/bnd.bnd
-@@ -15,7 +15,6 @@ jetty.libs: lib/javax.servlet-2.5.0.jar;version=file,\
- 	org.osgi.impl.bundle.repoindex.lib;version=0.0.4,\
- 	junit.osgi,\
- 	osgi.cmpn;version=4.3.0,\
--	osgi.r5;version=1.0.1,\
- 	javax.xml.stream-1.0.1.jar;version=file,\
- 	org.mockito.mockito-all,\
- 	${jetty.libs}
-diff --git a/biz.aQute.resolve/bnd.bnd b/biz.aQute.resolve/bnd.bnd
-index 23be1c1..329439c 100644
---- a/biz.aQute.resolve/bnd.bnd
-+++ b/biz.aQute.resolve/bnd.bnd
-@@ -1,5 +1,4 @@
- -buildpath: osgi.core;version=4.2,\
--	osgi.r5;version=1.0.1,\
- 	junit.osgi,\
- 	biz.aQute.bndlib;version=snapshot,\
- 	biz.aQute.repository;version=snapshot,\
-diff --git a/dist/bnd.bnd b/dist/bnd.bnd
-index cba3e5d..d827250 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.resolve, biz.aQute.repository, biz.aQute.jpm, osgi.r5
-+-dependson: biz.aQute.bnd, biz.aQute.resolve, biz.aQute.repository, biz.aQute.jpm
- -nobundles: true
- 
- no.junit:	true
diff --git a/debian/patches/series b/debian/patches/series
index 359497b..1e6c8ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 no_ee_minimum.patch
 display_bsn_on_missing_bundle.patch
 no-ee.j2se.patch
-no-osgi.r5.patch
 findbugs.patch
 embedded-repo.patch
 FTBFS.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git