[modello] 05/07: 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 modello.

commit 472faa7ea8d02d6255f45089a18b354194d3f769
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 15:49:33 2017 +0200

    Refreshed the patches
---
 debian/changelog                                   |  4 +++-
 debian/patches/01-plexus-utils-compatibility.patch | 12 ++++++------
 debian/patches/02-ignore-removed-modules.patch     |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f47d492..882aea0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-modello (1.8.3-4) UNRELEASED; urgency=medium
+modello (1.9.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Updated the URL of the project homepage
   * Switch to debhelper level 10
   * Removed debian/orig-tar.sh
diff --git a/debian/patches/01-plexus-utils-compatibility.patch b/debian/patches/01-plexus-utils-compatibility.patch
index a39ab08..37ff03d 100644
--- a/debian/patches/01-plexus-utils-compatibility.patch
+++ b/debian/patches/01-plexus-utils-compatibility.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
 +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
-@@ -253,7 +253,7 @@
+@@ -267,7 +267,7 @@
  
          sc = unmarshall.getSourceCode();
  
@@ -13,7 +13,7 @@ Forwarded: not-needed
  
          sc.add( "" );
  
-@@ -261,6 +261,8 @@
+@@ -275,6 +275,8 @@
  
          sc.add( "" );
  
@@ -22,7 +22,7 @@ Forwarded: not-needed
          sc.add( "" );
  
          sc.add( "return " + readerMethodName + "( parser, strict" + trackingArgs + " );" );
-@@ -341,7 +343,6 @@
+@@ -355,7 +357,6 @@
  
          jClass.addImport( "org.codehaus.plexus.util.ReaderFactory" );
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.MXParser" );
@@ -30,7 +30,7 @@ Forwarded: not-needed
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.XmlPullParser" );
          jClass.addImport( "org.codehaus.plexus.util.xml.pull.XmlPullParserException" );
          jClass.addImport( "java.io.InputStream" );
-@@ -1057,6 +1058,288 @@
+@@ -1097,6 +1098,288 @@
          }
      }
  
@@ -319,7 +319,7 @@ Forwarded: not-needed
      private void writeBuildDomMethod( JClass jClass )
      {
          if ( domAsXpp3 )
-@@ -1210,6 +1493,8 @@
+@@ -1250,6 +1533,8 @@
          jClass.addMethod( getCheckUnknonwElement2Method() );
          jClass.addMethod( getCheckUnknownAttributeMethod() );
          jClass.addMethod( getNextTagMethod() );
@@ -328,7 +328,7 @@ Forwarded: not-needed
      }
  
      private JMethod getCheckUnknonwElement2Method() {
-@@ -1557,6 +1842,20 @@
+@@ -1597,6 +1882,20 @@
  
          return method;
      }
diff --git a/debian/patches/02-ignore-removed-modules.patch b/debian/patches/02-ignore-removed-modules.patch
index 1b457d4..dadff57 100644
--- a/debian/patches/02-ignore-removed-modules.patch
+++ b/debian/patches/02-ignore-removed-modules.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -174,9 +174,7 @@
+@@ -175,9 +175,7 @@
    </mailingLists>
  
    <modules>

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