[wagon2] 01/18: update d/watch and use Files-Excluded in d/copyright

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch experimental
in repository wagon2.

commit 62a4a74478da09105fff42b331b0a9c7b61febe7
Author: tony mancill <tmancill at debian.org>
Date:   Sat May 6 10:15:53 2017 -0700

    update d/watch and use Files-Excluded in d/copyright
    
    Drop the d/orig-tar.sh and d/orig-tar.exclude files in favor of
    documented excluded files in d/copyright.  Configure uscan in d/watch to
    repack using xz compression.
---
 debian/copyright        |  9 +++++++++
 debian/orig-tar.exclude |  8 --------
 debian/orig-tar.sh      | 11 -----------
 debian/watch            |  6 ++++--
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d5d27b8..8947121 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Wagon
 Upstream-Contact: http://maven.apache.org/wagon/
 Source: http://svn.apache.org/repos/asf/maven/wagon/
+Files-Excluded: */src/*/ssl/keystore
+ */src/*/ssh-keys/id_rsa
+ */src/*/ssh-keys/id_rsa-passphrase
+ */src/*/ssh-keys/id_rsa.pub
+ */src/*/ssh-keys/id_rsa-passphrase.pub
+ wagon-tcks/wagon-tck-http/Test Plan.oo3/*
+ wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/*
+ wagon-providers/wagon-scm/src/test/resources/test-repo-svn/*
 
 Files: *
 Copyright: 2002-2015, The Apache Software Foundation
@@ -9,6 +17,7 @@ License: Apache-2.0
 
 Files: debian/*
 Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
+           2017, tony mancill <tmancill at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index c639195..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,8 +0,0 @@
-*/src/*/ssl/keystore
-*/src/*/ssh-keys/id_rsa
-*/src/*/ssh-keys/id_rsa-passphrase
-*/src/*/ssh-keys/id_rsa.pub
-*/src/*/ssh-keys/id_rsa-passphrase.pub
-wagon-tcks/wagon-tck-http/Test Plan.oo3/*
-wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/*
-wagon-providers/wagon-scm/src/test/resources/test-repo-svn/*
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 6e257c5..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../wagon2_$VERSION.orig.tar.gz
-DIR=wagon-$VERSION
-
-tar -zxf $TAR
-rm $TAR
-TAR_XZ=../wagon2_$VERSION.orig.tar.xz
-tar -c -J -f $TAR_XZ -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
diff --git a/debian/watch b/debian/watch
index b6703ca..458f8cd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-http://archive.apache.org/dist/maven/wagon/wagon-([\d\.]+)-source-release.zip debian debian/orig-tar.sh
+version=4
+opts="compression=xz,\
+      repack" \
+      http://archive.apache.org/dist/maven/wagon/wagon-([\d\.]+)-source-release.zip

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