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 13e7bc21c9054da699c4151a47906cdc50517680 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 18 17:02:46 2017 +0200 Depend on libplexus-io-java (>= 2.4) and removed the plexus-io patch --- debian/changelog | 4 +-- debian/control | 2 +- debian/patches/01-plexus-io-compatibility.patch | 34 ------------------------- debian/patches/series | 1 - 4 files changed, 3 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c83c62..8c21a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -plexus-archiver (2.8.3-1) UNRELEASED; urgency=medium +plexus-archiver (2.9-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - - Refreshed the patch + - Depend on libplexus-io-java (>= 2.4) and removed the plexus-io patch - New dependency on libcommons-compress-java - New build dependency on libplexus-component-metadata-java and junit4 - Depend on libplexus-utils2-java instead of libplexus-utils-java diff --git a/debian/control b/debian/control index fea0777..9ee84c0 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: junit4, libcommons-compress-java (>= 1.9), libplexus-component-metadata-java, libplexus-containers-java, - libplexus-io-java, + libplexus-io-java (>= 2.4), libplexus-utils2-java, maven-debian-helper (>= 2.2) Standards-Version: 4.0.0 diff --git a/debian/patches/01-plexus-io-compatibility.patch b/debian/patches/01-plexus-io-compatibility.patch deleted file mode 100644 index e4b8695..0000000 --- a/debian/patches/01-plexus-io-compatibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Ensure the compatibility with plexus-io 1.x currently in Debian. - This patch can be removed after upgrading plexus-io to the version 2.0 or later. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java -+++ b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java -@@ -193,7 +193,7 @@ - type = FILE; // File flag was there already. This is a bit of a mess ! - } - -- final PlexusIoFileResource res = PlexusIoFileResource.justAFile( file, attrs ); -+ final PlexusIoFileResource res = new PlexusIoFileResource( file, attrs ); - return new ArchiveEntry( target, res, type, permissions, null, defaultDirectoryPermissions ); - } - ---- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java -+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java -@@ -313,14 +313,14 @@ - : options.getGroup()); - - 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 ); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e631fd7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-plexus-io-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
