[maven-archiver] 09/13: Refreshed the 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 maven-archiver.

commit ea67d68a4251a9d083b175900e775411f2547be7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 14:57:08 2017 +0200

    Refreshed the patch
---
 debian/changelog                                   |  3 ++-
 ...hangelog-date-as-pom.properties-timestamp.patch | 26 ++++++++--------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0012136..5a2f2cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-maven-archiver (3.0.0-1) UNRELEASED; urgency=medium
+maven-archiver (3.1.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+    - Refreshed the patch
     - Depend on libmaven3-core-java instead of libmaven2-core-java
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
diff --git a/debian/patches/02-use-changelog-date-as-pom.properties-timestamp.patch b/debian/patches/02-use-changelog-date-as-pom.properties-timestamp.patch
index d0b7060..295c690 100644
--- a/debian/patches/02-use-changelog-date-as-pom.properties-timestamp.patch
+++ b/debian/patches/02-use-changelog-date-as-pom.properties-timestamp.patch
@@ -4,24 +4,16 @@ Forwarded: not-needed
 Bug-Debian: https://bugs.debian.org/775010
 --- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
 +++ b/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
-@@ -25,6 +25,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import java.util.Date;
- import java.util.Properties;
- 
- import org.apache.maven.project.MavenProject;
-@@ -105,7 +106,8 @@
-         final String artifactId = project.getArtifactId();
-         final String groupId = project.getGroupId();
- 
--        Properties p = new Properties();
-+        Date buildDate = DebianUtils.getDebianBuildDate();
-+        Properties p = buildDate == null ? new Properties() : new TimestampedProperties(buildDate);
- 
-         p.setProperty( "groupId", project.getGroupId() );
+@@ -155,7 +155,8 @@
+         }
+         else
+         {
+-            p = new Properties();
++            java.util.Date buildDate = DebianUtils.getDebianBuildDate();
++            p = buildDate == null ? new Properties() : new TimestampedProperties(buildDate);
+         }
  
+         p.setProperty( "groupId", groupId );
 --- /dev/null
 +++ b/src/main/java/org/apache/maven/archiver/TimestampedProperties.java
 @@ -0,0 +1,48 @@

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