[SCM] Debian packaging for maven-bundle-plugin branch, master, updated. debian/2.3.4-4-8-gdf5deaf

Damien Raude-Morvan drazzib at debian.org
Tue Oct 25 23:13:39 UTC 2011


The following commit has been merged in the master branch:
commit 155a5442d93eb960bcb56100bcad113bb2f7deb4
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Oct 23 23:43:21 2011 +0200

    d/patches/support_bnd_144.diff: Support for bnd >= 1.44.

diff --git a/debian/changelog b/debian/changelog
index bddfda7..408d4c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ maven-bundle-plugin (2.3.5-1) unstable; urgency=low
 
   * New upstream release.
   * d/patches/remove_bndlib_spring_support.diff: Refresh.
+  * d/patches/support_bnd_144.diff: Support for bnd >= 1.44.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 13 Oct 2011 22:54:51 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 23 Oct 2011 23:43:03 +0200
 
 maven-bundle-plugin (2.3.4-4) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 335909a..0c57155 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_bndlib_spring_support.diff
 
+support_bnd_144.diff
diff --git a/debian/patches/support_bnd_144.diff b/debian/patches/support_bnd_144.diff
new file mode 100644
index 0000000..8dcb280
--- /dev/null
+++ b/debian/patches/support_bnd_144.diff
@@ -0,0 +1,19 @@
+Description: Support for bnd >= 1.44 API :
+ Add new boolean checkMultipleVersions parameter.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update: 2011-10-23
+
+Index: b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+===================================================================
+--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+@@ -698,7 +698,7 @@
+                         options.put( "resolution:", "optional" );
+                     }
+                 }
+-                String result = Processor.printClauses( values, "resolution:" );
++                String result = Processor.printClauses( values, true );
+                 bundleManifest.getMainAttributes().putValue( "Import-Package", result );
+             }
+ 

-- 
Debian packaging for maven-bundle-plugin



More information about the pkg-java-commits mailing list