[doxia] 29/35: Removed 0001-modello.patch

[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 f04b2b87c3252fac3706e8af41443128c1d72edc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 09:41:27 2017 +0200

    Removed 0001-modello.patch
---
 debian/changelog                  |  1 +
 debian/patches/0001-modello.patch | 83 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14da953..542c7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ doxia (1.7-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Removed 0001-modello.patch
     - Build depend on maven-debian-helper (>= 2.2.2)
     - Build depend on junit4 instead of junit
     - No longer build the doxia-book module (removed upstream)
diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch
deleted file mode 100644
index 0060b5d..0000000
--- a/debian/patches/0001-modello.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Fri, 9 Sep 2011 21:14:55 +0200
-Subject: modello
-
----
- doxia-core/src/main/mdo/document.mdo               |   15 ++++++++++-----
- .../maven/doxia/module/fo/FoAggregateSink.java     |    2 +-
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
---- a/doxia-core/src/main/mdo/document.mdo
-+++ b/doxia-core/src/main/mdo/document.mdo
-@@ -500,7 +500,7 @@
-             return ISO_8601_FORMAT.format( getCreationDate() );
-         }
- 
--        return this.creationdate;
-+        return this.creationDate.toString();
-     }
- 
-     /**
-@@ -518,7 +518,7 @@
-             return ISO_8601_FORMAT.format( getDate() );
-         }
- 
--        return this.modifydate;
-+        return this.date.toString();
-     }
- 
-     /**
-@@ -536,7 +536,7 @@
-             return ISO_8601_FORMAT.format( getPrintDate() );
-         }
- 
--        return this.printdate;
-+        return this.printDate.toString();
-     }
-             ]]>
-           </code>
-@@ -701,10 +701,12 @@
-      */
-     public String getFullName()
-     {
-+        /*
-         if ( getName() != null && getName().trim().length() > 0 )
-         {
-             return getName().trim();
-         }
-+        */
- 
-         return ( getFirstName() != null ? getFirstName().trim() : "null" ) + " "
-             + ( getLastName() != null ? getLastName().trim() : "null" );
-@@ -783,7 +785,7 @@
-             return ISO_8601_FORMAT.format( getDate() );
-         }
- 
--        return this.modifydate;
-+        return this.date.toString();
-     }
-             ]]>
-           </code>
-@@ -1124,10 +1126,13 @@
-     public String getAllAuthorNames()
-     {
-         StringBuffer sb = new StringBuffer();
-+
-+        /*
-         if ( getAuthor() != null && getAuthor().trim().length() > 0 )
-         {
-             return getAuthor().trim();
-         }
-+        */
- 
-         if ( getAuthors() != null )
-         {
-@@ -1165,7 +1170,7 @@
-             return ISO_8601_FORMAT.format( getCoverDate() );
-         }
- 
--        return this.coverdate;
-+        return this.coverDate.toString();
-     }
-             ]]>
-           </code>
diff --git a/debian/patches/series b/debian/patches/series
index ceebdf3..e3f2370 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-modello.patch
 0002-add-version-to-plexus-container-default.patch
 0008-fop2-compatibility.patch

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