[mina2] 01/09: Removed orig-tar.sh and use uscan with debian/copyright File-Excluded

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository mina2.

commit be9663c04404ed16d6e3df48fc0af42f1e842787
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 3 22:20:14 2016 +0200

    Removed orig-tar.sh and use uscan with debian/copyright File-Excluded
---
 debian/changelog   |  7 +++++++
 debian/copyright   |  2 ++
 debian/orig-tar.sh | 21 ---------------------
 debian/rules       |  2 +-
 debian/watch       |  2 +-
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c832cc..10bc25d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mina2 (2.0.9-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed orig-tar.sh and use uscan with debian/copyright File-Excluded
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 May 2016 22:18:59 +0200
+
 mina2 (2.0.9-2) unstable; urgency=medium
 
   * Enabled the OSGi metadata
diff --git a/debian/copyright b/debian/copyright
index 49c59ec..e98ec74 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Mina
 Upstream-Contact: Apache Software Foundation, http://mina.apache.org/
 Source: http://www.apache.org/dist/mina/
+Files-Excluded: LICENSE.*.txt
+                docs/apidocs
 
 Files: *
 Copyright: 2007-2010, The Apache Software Foundation
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 8f849a6..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-DIR=mina2-$VERSION.orig
-TAR=../mina2_$VERSION.orig.tar.xz
-
-# clean up the upstream tarball
-tar zxf $3
-mv apache-mina-* $DIR
-XZ_OPT=--best tar cJvf $TAR \
-    --exclude 'LICENSE.*.txt' \
-    $DIR
-rm -rf $DIR
-rm $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi
diff --git a/debian/rules b/debian/rules
index 67ad8c2..081f75f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,4 +15,4 @@ override_dh_auto_install:
 	dh_auto_install -- -f src/pom.xml
 
 get-orig-source:
-	uscan --download-current-version --force-download --rename
+	uscan --download-current-version --force-download --rename --repack --compression xz
diff --git a/debian/watch b/debian/watch
index 18a4c6f..c6bea4b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts="dversionmangle=s/\+dfsg//" \
-  http://archive.apache.org/dist/mina/mina/2\.([\d.]+)/ apache-mina-(.+)-src\.tar\.gz debian debian/orig-tar.sh
+http://archive.apache.org/dist/mina/mina/(2\.[\d.]+)/ apache-mina-(.+)-src\.tar\.gz

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