[maven-bundle-plugin] 04/08: 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 73dda5295828624b9c766b714d8a41d7f991ad0e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 7 11:59:42 2015 +0100

    Refreshed the patches
---
 debian/changelog                                                  | 4 +++-
 debian/patches/backward-compatibility.patch                       | 2 +-
 debian/patches/remove_bndlib_spring_support.diff                  | 8 +++++---
 debian/patches/support_plexus_utils_1_5.diff                      | 4 ++--
 .../patches/use-changelog-date-as-pom.properties-timestamp.patch  | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf716f6..62115d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-bundle-plugin (2.4.0-3) UNRELEASED; urgency=medium
+maven-bundle-plugin (2.5.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Dec 2015 11:48:03 +0100
diff --git a/debian/patches/backward-compatibility.patch b/debian/patches/backward-compatibility.patch
index d5226e3..21f297f 100644
--- a/debian/patches/backward-compatibility.patch
+++ b/debian/patches/backward-compatibility.patch
@@ -20,7 +20,7 @@ Bug-Debian: http://bugs.debian.org/761548
             http://bugs.debian.org/761522
 --- a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
-@@ -66,7 +66,18 @@
+@@ -67,7 +67,18 @@
          Manifest manifest;
          try
          {
diff --git a/debian/patches/remove_bndlib_spring_support.diff b/debian/patches/remove_bndlib_spring_support.diff
index 7d8cb43..58d01f8 100644
--- a/debian/patches/remove_bndlib_spring_support.diff
+++ b/debian/patches/remove_bndlib_spring_support.diff
@@ -6,7 +6,7 @@ Last-Update: 2011-10-13
 
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -77,7 +77,6 @@ import aQute.bnd.osgi.FileResource;
+@@ -84,7 +84,6 @@
  import aQute.bnd.osgi.Jar;
  import aQute.bnd.osgi.Packages;
  import aQute.bnd.osgi.Processor;
@@ -14,12 +14,14 @@ Last-Update: 2011-10-13
  
  
  /**
-@@ -1260,9 +1259,6 @@ public class BundlePlugin extends AbstractMojo
+@@ -1304,11 +1303,6 @@
  
          properties.put( "classifier", classifier == null ? "" : classifier );
  
 -        // Add default plugins
--        header( properties, Analyzer.PLUGIN, BlueprintPlugin.class.getName() + "," + SpringXMLType.class.getName() );
+-        header( properties, Analyzer.PLUGIN, ScrPlugin.class.getName() + ","
+-                                           + BlueprintPlugin.class.getName() + ","
+-                                           + SpringXMLType.class.getName() );
 -
          return properties;
      }
diff --git a/debian/patches/support_plexus_utils_1_5.diff b/debian/patches/support_plexus_utils_1_5.diff
index 557e1c7..35248a2 100644
--- a/debian/patches/support_plexus_utils_1_5.diff
+++ b/debian/patches/support_plexus_utils_1_5.diff
@@ -5,7 +5,7 @@ Last-Update: 2011-10-23
 
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -518,7 +518,7 @@
+@@ -603,7 +603,7 @@
              {
                  getLog().info( "Writing BND instructions to " + dumpInstructions );
                  dumpInstructions.getParentFile().mkdirs();
@@ -14,7 +14,7 @@ Last-Update: 2011-10-23
              }
          }
  
-@@ -530,7 +530,7 @@
+@@ -615,7 +615,7 @@
              {
                  getLog().info( "Writing BND classpath to " + dumpClasspath );
                  dumpClasspath.getParentFile().mkdirs();
diff --git a/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch b/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
index 930c2c1..618ebc7 100644
--- a/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
+++ b/debian/patches/use-changelog-date-as-pom.properties-timestamp.patch
@@ -82,7 +82,7 @@ Forwarded: not-needed
 +}
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -1028,7 +1028,8 @@
+@@ -1072,7 +1072,8 @@
          File pomFile = new File( currentProject.getBasedir(), "pom.xml" );
          jar.putResource( path + "/pom.xml", new FileResource( pomFile ) );
  

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