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

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit ee304a386daa7c7cc14ed7ea7dd8f2d692b743fb
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Oct 13 22:55:03 2011 +0200

    d/patches/remove_bndlib_spring_support.diff: Refresh.

diff --git a/debian/changelog b/debian/changelog
index 03b9442..bddfda7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 maven-bundle-plugin (2.3.5-1) unstable; urgency=low
 
   * New upstream release.
+  * d/patches/remove_bndlib_spring_support.diff: Refresh.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 13 Oct 2011 22:47:33 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 13 Oct 2011 22:54:51 +0200
 
 maven-bundle-plugin (2.3.4-4) unstable; urgency=low
 
diff --git a/debian/patches/remove_bndlib_spring_support.diff b/debian/patches/remove_bndlib_spring_support.diff
index 45ea5aa..92ea31d 100644
--- a/debian/patches/remove_bndlib_spring_support.diff
+++ b/debian/patches/remove_bndlib_spring_support.diff
@@ -2,27 +2,26 @@ Description: Drop support of bndlib Spring Framework support
  since this library is not build with this support enabled.
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
-Last-Update: 2011-04-29
+Last-Update: 2011-10-13
 
---- maven-bundle-plugin-2.3.4.orig/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-+++ maven-bundle-plugin-2.3.4/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -51,8 +51,6 @@ import org.codehaus.plexus.util.Director
- import org.codehaus.plexus.util.StringInputStream;
- import org.codehaus.plexus.util.StringUtils;
- 
+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
+@@ -72,7 +72,6 @@
+ import aQute.lib.osgi.FileResource;
+ import aQute.lib.osgi.Jar;
+ import aQute.lib.osgi.Processor;
 -import aQute.lib.spring.SpringXMLType;
--
+ 
  
  /**
-  * Create an OSGi bundle from Maven project
-@@ -961,11 +959,6 @@ public class BundlePlugin extends Abstra
+@@ -1129,9 +1128,6 @@
  
          properties.put( "classifier", classifier == null ? "" : classifier );
  
 -        // Add default plugins
--        header( properties, Analyzer.PLUGIN,
--                    BlueprintPlugin.class.getName() + ","
--                        + SpringXMLType.class.getName());
+-        header( properties, Analyzer.PLUGIN, BlueprintPlugin.class.getName() + "," + SpringXMLType.class.getName() );
 -
          return properties;
      }

-- 
Debian packaging for maven-bundle-plugin