[maven-bundle-plugin] 04/04: Refreshed the patches

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-bundle-plugin.

commit fcc6efa5aba8c7b0c19594a1d0731f28564e5d4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 3 13:54:13 2014 +0200

    Refreshed the patches
---
 debian/changelog                                 | 1 +
 debian/patches/remove_bndlib_spring_support.diff | 6 ++----
 debian/patches/support_plexus_utils_1_5.diff     | 6 ++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69df64b..63d836b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-bundle-plugin (2.3.7-2) unstable; urgency=medium
   * Team upload.
   * Added a switch to revert the ManifestPlugin class to the behaviour
     of the version 2.3.5 if necessary (see #761548 and #761522).
+  * Refreshed the patches
   * debian/control:
     - Tightened the dependency on bnd (>= 1.50.0)
     - Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/patches/remove_bndlib_spring_support.diff b/debian/patches/remove_bndlib_spring_support.diff
index 92ea31d..d4b30cb 100644
--- a/debian/patches/remove_bndlib_spring_support.diff
+++ b/debian/patches/remove_bndlib_spring_support.diff
@@ -4,11 +4,9 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 Last-Update: 2011-10-13
 
-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 @@
+@@ -74,7 +74,6 @@
  import aQute.lib.osgi.FileResource;
  import aQute.lib.osgi.Jar;
  import aQute.lib.osgi.Processor;
@@ -16,7 +14,7 @@ Index: b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
  
  
  /**
-@@ -1129,9 +1128,6 @@
+@@ -1213,9 +1212,6 @@
  
          properties.put( "classifier", classifier == null ? "" : classifier );
  
diff --git a/debian/patches/support_plexus_utils_1_5.diff b/debian/patches/support_plexus_utils_1_5.diff
index b092fcc..557e1c7 100644
--- a/debian/patches/support_plexus_utils_1_5.diff
+++ b/debian/patches/support_plexus_utils_1_5.diff
@@ -3,11 +3,9 @@ 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 @@
+@@ -518,7 +518,7 @@
              {
                  getLog().info( "Writing BND instructions to " + dumpInstructions );
                  dumpInstructions.getParentFile().mkdirs();
@@ -16,7 +14,7 @@ Index: b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
              }
          }
  
-@@ -463,7 +463,7 @@
+@@ -530,7 +530,7 @@
              {
                  getLog().info( "Writing BND classpath to " + dumpClasspath );
                  dumpClasspath.getParentFile().mkdirs();

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