[maven-assembly-plugin] 18/28: New upstream release (2.2.1)

[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-assembly-plugin.

commit 3257b3af46ffdcfff7a9c36cff39cace16450bd6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 18 08:05:42 2013 +0000

    New upstream release (2.2.1)
---
 debian/changelog                 | 2 +-
 debian/patches/descriptors.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d663b6..c2fc2aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven-assembly-plugin (2.2-1) UNRELEASED; urgency=medium
+maven-assembly-plugin (2.2.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/descriptors.patch b/debian/patches/descriptors.patch
index 70925f4..9977ee2 100644
--- a/debian/patches/descriptors.patch
+++ b/debian/patches/descriptors.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
 +++ b/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
-@@ -207,7 +207,7 @@
+@@ -211,7 +211,7 @@
      /**
       * Maven ProjectHelper.
       * 
@@ -9,7 +9,7 @@
       */
      private MavenProjectHelper projectHelper;
  
-@@ -289,12 +289,12 @@
+@@ -293,12 +293,12 @@
      private boolean attach;
  
      /**

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