[maven] 04/24: No longer use debian/orig-tar.sh to download the upstream tarball

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch maven-3.5
in repository maven.

commit 92e7cbcb08adbece3e7a836148f9baf9f6649195
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 16 00:13:40 2017 +0200

    No longer use debian/orig-tar.sh to download the upstream tarball
---
 debian/changelog        |  1 +
 debian/copyright        |  1 +
 debian/orig-tar.exclude |  2 --
 debian/orig-tar.sh      | 17 -----------------
 debian/watch            |  3 +--
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 269c067..3f69f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven (3.3.9-5) UNRELEASED; urgency=medium
   * Build with the DH sequencer instead of CDBS
   * Build with maven-debian-helper instead of Ant
   * Switch to debhelper level 10
+  * No longer use debian/orig-tar.sh to download the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 May 2017 11:13:10 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 3fac4a3..e6386b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Maven
 Source: http://maven.apache.org
+Files-Excluded: *.jar
 
 Files: *
 Copyright: 2001-2015, The Apache Software Foundation
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index 3433fd6..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,2 +0,0 @@
-*.jar
-src/site/xdoc/maven-deps.odg
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index c189af9..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven_$VERSION.orig.tar.xz
-DIR=maven-$VERSION
-TAG=$(echo maven-$VERSION | sed s/~RC/-RC/ )
-
-rm $3
-
-git clone http://git.apache.org/maven.git $DIR
-cd $DIR
-git checkout tags/$TAG
-cd ..
-rm -Rf $DIR/.git
-
-XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR ../$TAG
diff --git a/debian/watch b/debian/watch
index 1583175..7ef30e0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/-(RC|alpha|beta)/~$1/ \
-https://github.com/apache/maven/releases .*/maven-(.*).tar.gz debian debian/orig-tar.sh
+https://github.com/apache/maven/releases .*/maven-([\d\.]+).tar.gz

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