[doxia] 24/35: 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 doxia.

commit 3daf1d2fb7fd32a1a3a95d4881a39ba1e9f10763
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 27 23:46:46 2017 +0200

    Refreshed the patches
---
 debian/changelog                             | 2 +-
 debian/patches/0001-modello.patch            | 4 ++--
 debian/patches/0008-fop2-compatibility.patch | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02ee301..920d542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-doxia (1.6-1) UNRELEASED; urgency=medium
+doxia (1.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch
index 92d3716..77899fc 100644
--- a/debian/patches/0001-modello.patch
+++ b/debian/patches/0001-modello.patch
@@ -83,7 +83,7 @@ Subject: modello
            </code>
 --- a/doxia-core/pom.xml
 +++ b/doxia-core/pom.xml
-@@ -132,6 +132,7 @@
+@@ -127,6 +127,7 @@
            <models>
              <model>src/main/mdo/document.mdo</model>
            </models>
@@ -93,7 +93,7 @@ Subject: modello
      </plugins>
 --- a/doxia-modules/doxia-module-fml/pom.xml
 +++ b/doxia-modules/doxia-module-fml/pom.xml
-@@ -74,6 +74,7 @@
+@@ -68,6 +68,7 @@
                  <model>src/main/mdo/fml.mdo</model>
                </models>
                <version>1.0.0</version>
diff --git a/debian/patches/0008-fop2-compatibility.patch b/debian/patches/0008-fop2-compatibility.patch
index 0cecb80..bad3329 100644
--- a/debian/patches/0008-fop2-compatibility.patch
+++ b/debian/patches/0008-fop2-compatibility.patch
@@ -2,7 +2,7 @@ Description: Port to fop-2.0
 Author: Michael Simacek <msimacek at redhat.com>
 --- a/doxia-modules/doxia-module-fo/pom.xml
 +++ b/doxia-modules/doxia-module-fo/pom.xml
-@@ -78,7 +78,7 @@
+@@ -85,7 +85,7 @@
      <dependency>
        <groupId>org.apache.xmlgraphics</groupId>
        <artifactId>fop</artifactId>

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