[bnd] 05/07: Require libosgi-compendium-java >= 5.0.0-3 for the new OSGi types

[Emmanuel Bourg]

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

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

commit 38d0c53639735c0f34d02baf1cf67b6eae9f9097
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 09:53:44 2015 +0100

    Require libosgi-compendium-java >= 5.0.0-3 for the new OSGi types
---
 debian/changelog                         |  1 +
 debian/control                           |  4 ++--
 debian/patches/no-osgi-annotations.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a2340f..2264c0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ bnd (2.4.0-1) UNRELEASED; urgency=medium
     - Refreshed debian/copyright
     - 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
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Dec 2015 12:54:06 +0100
 
diff --git a/debian/control b/debian/control
index 4090f52..ca6423e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  junit,
  junit4,
  libbindex-java (>= 2.2+svn101),
- libosgi-compendium-java (>= 5.0.0),
+ libosgi-compendium-java (>= 5.0.0-3~),
  libosgi-core-java (>= 6.0.0),
  libswt-gtk-3-java,
  maven-repo-helper
@@ -33,7 +33,7 @@ Architecture: all
 Depends:
  default-jre-headless | java6-runtime-headless,
  java-wrappers,
- libosgi-compendium-java (>= 5.0.0),
+ libosgi-compendium-java (>= 5.0.0-3~),
  libosgi-core-java (>= 6.0.0),
  ${misc:Depends}
 Recommends:
diff --git a/debian/patches/no-osgi-annotations.patch b/debian/patches/no-osgi-annotations.patch
new file mode 100644
index 0000000..70fda06
--- /dev/null
+++ b/debian/patches/no-osgi-annotations.patch
@@ -0,0 +1,25 @@
+Description: Do not look for the component and metatype annotations (included in the compendium jar)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/biz.aQute.bndlib/bnd.bnd
++++ b/biz.aQute.bndlib/bnd.bnd
+@@ -38,8 +38,6 @@
+ -includeresource: 				LICENSE, img/=img/, {readme.md}
+ 
+ -buildpath:  \
+-	org.osgi.service.component.annotations;version=6.0.0,\
+-	org.osgi.service.metatype.annotations;version=6.0.0,\
+ 	osgi.cmpn;version=4.3.1,\
+ 	aQute.libg;version=project,\
+ 	osgi.core;version=4.3.1
+--- a/biz.aQute.bnd/bnd.bnd
++++ b/biz.aQute.bnd/bnd.bnd
+@@ -45,8 +45,6 @@
+ -buildpath: aQute.libg;version=latest,\
+ 	biz.aQute.bndlib;version=project,\
+ 	org.apache.tools.ant,\
+-	org.osgi.service.component.annotations;version=6.0.0,\
+-	org.osgi.service.metatype.annotations;version=6.0.0,\
+ 	osgi.cmpn;version=4.3.1,\
+ 	osgi.core;version=4.3.1,\
+ 	org.osgi.impl.bundle.bindex
diff --git a/debian/patches/series b/debian/patches/series
index d9f84bf..c279fd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ embedded-repo.patch
 implement-missing-methods.patch
 no-osgi.r5.patch
 #java8-compatibility.patch
+no-osgi-annotations.patch

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