[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:40 UTC 2011


The following commit has been merged in the master branch:
commit 10063436b94986dd1b11382eedf58f808f392994
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Oct 23 23:54:15 2011 +0200

    d/patches/support_plexus_utils_1_5.diff: Support old plexus-utils-1.5 as currently in Debian.

diff --git a/debian/changelog b/debian/changelog
index 408d4c2..03a34b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ 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.
+  * d/patches/support_plexus_utils_1_5.diff: Support old plexus-utils-1.5
+    as currently in Debian.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 23 Oct 2011 23:43:03 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 23 Oct 2011 23:53:37 +0200
 
 maven-bundle-plugin (2.3.4-4) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 0c57155..44d6705 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_bndlib_spring_support.diff
 
 support_bnd_144.diff
+support_plexus_utils_1_5.diff
diff --git a/debian/patches/support_plexus_utils_1_5.diff b/debian/patches/support_plexus_utils_1_5.diff
new file mode 100644
index 0000000..b092fcc
--- /dev/null
+++ b/debian/patches/support_plexus_utils_1_5.diff
@@ -0,0 +1,27 @@
+Description: Support for olf plexus-utils 1.5.x (as currently in Debian).
+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
+@@ -451,7 +451,7 @@
+             {
+                 getLog().info( "Writing BND instructions to " + dumpInstructions );
+                 dumpInstructions.getParentFile().mkdirs();
+-                FileUtils.fileWrite( dumpInstructions, "# BND instructions" + NL + buf );
++                FileUtils.fileWrite( dumpInstructions.getAbsolutePath(), "# BND instructions" + NL + buf );
+             }
+         }
+ 
+@@ -463,7 +463,7 @@
+             {
+                 getLog().info( "Writing BND classpath to " + dumpClasspath );
+                 dumpClasspath.getParentFile().mkdirs();
+-                FileUtils.fileWrite( dumpClasspath, "# BND classpath" + NL + buf );
++                FileUtils.fileWrite( dumpClasspath.getAbsolutePath(), "# BND classpath" + NL + buf );
+             }
+         }
+     }

-- 
Debian packaging for maven-bundle-plugin



More information about the pkg-java-commits mailing list