[plexus-archiver] 06/44: 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 plexus-archiver.

commit c5d34e83b712de057d4ca8f57cbe6caf9f3c550f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 18 16:28:44 2017 +0200

    Refreshed the patch
---
 debian/changelog                                |  4 ++-
 debian/patches/01-plexus-io-compatibility.patch | 33 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bd15e7..5bc4cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-plexus-archiver (2.2-2) UNRELEASED; urgency=medium
+plexus-archiver (2.8-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patch
   * Build with maven-debian-helper instead of maven-ant-helper
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/01-plexus-io-compatibility.patch b/debian/patches/01-plexus-io-compatibility.patch
index caf03d4..3ccfdb7 100644
--- a/debian/patches/01-plexus-io-compatibility.patch
+++ b/debian/patches/01-plexus-io-compatibility.patch
@@ -4,26 +4,31 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
-@@ -163,7 +163,7 @@
+@@ -168,7 +168,7 @@
              throw new ArchiverException( "Failed to read filesystem attributes for: " + file, e );
          }
          
--        final PlexusIoFileResource res =  PlexusIoFileResource.existingFile( file, attrs );
-+        final PlexusIoFileResource res =  new PlexusIoFileResource( file, attrs);
+-        final PlexusIoFileResource res =  PlexusIoFileResource.justAFile( file, attrs );
++        final PlexusIoFileResource res =  new PlexusIoFileResource( file, attrs );
          return new ArchiveEntry( target, res, FILE, permissions );
      }
  
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -293,9 +293,9 @@
-                             : options.getUserName() );
-             te.setGroupName( ( attributes != null && attributes.getGroupName() != null ) ? attributes.getGroupName()
-                             : options.getGroup() );
--            te.setUserId( ( attributes != null && attributes.getUserId() != null) ? attributes.getUserId()
-+            te.setUserId( ( attributes != null && attributes.getUserId() != -1) ? attributes.getUserId()
-                             : options.getUid() );
--            te.setGroupId( ( attributes != null && attributes.getGroupId() != null) ? attributes.getGroupId()
-+            te.setGroupId( ( attributes != null && attributes.getGroupId() != -1) ? attributes.getGroupId()
-                             : options.getGid() );
+@@ -313,14 +313,14 @@
+ 					: options.getGroup());
  
-             tOut.putNextEntry( te );
+             final int userId =
+-                ( attributes != null && attributes.getUserId() != null ) ? attributes.getUserId() : options.getUid();
++                ( attributes != null && attributes.getUserId() != -1 ) ? attributes.getUserId() : options.getUid();
+             if ( userId >= 0 )
+             {
+                 te.setUserId( userId );
+             }
+ 
+             final int groupId =
+-                ( attributes != null && attributes.getGroupId() != null ) ? attributes.getGroupId() : options.getGid();
++                ( attributes != null && attributes.getGroupId() != -1 ) ? attributes.getGroupId() : options.getGid();
+             if ( groupId >= 0 )
+             {
+                 te.setGroupId( groupId );

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