[maven] 03/03: Fetch the sources from the new Git repository

[Emmanuel Bourg]

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

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

commit d18d2bd286a224d853716c7495bab78c70ce5649
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 21 16:45:57 2013 +0200

    Fetch the sources from the new Git repository
---
 debian/changelog   |    4 ++++
 debian/orig-tar.sh |   15 +++++++++++----
 debian/watch       |    5 ++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08edf77..69e2124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ maven (3.0.4-7) UNRELEASED; urgency=low
     (Closes: #725588)
   * Updated maven-clean-plugin version from 2.3 to 2.5
   * debian/rules: Improved the clean target
+  * debian/orig-tar.sh:
+    - Use XZ compression for the upstream tarball
+    - Reworked to pull the sources from the Apache Git repository
+  * debian/watch: Updated to watch the tags on the Github mirror
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Oct 2013 18:16:18 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 9f121b0..c189af9 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,10 +1,17 @@
 #!/bin/sh -e
 
 VERSION=$2
-TAR=../maven_$VERSION.orig.tar.gz
+TAR=../maven_$VERSION.orig.tar.xz
 DIR=maven-$VERSION
-TAG=$(echo maven-$2 | sed s/~RC/-RC/ )
+TAG=$(echo maven-$VERSION | sed s/~RC/-RC/ )
 
-svn export http://svn.apache.org/repos/asf/maven/maven-3/tags/$TAG $DIR
-GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+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 a05af54..1583175 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/-RC/~RC/ \
-  http://svn.apache.org/repos/asf/maven/maven-3/tags/ \
-  maven-(.*)/ debian debian/orig-tar.sh
+opts=uversionmangle=s/-(RC|alpha|beta)/~$1/ \
+https://github.com/apache/maven/releases .*/maven-(.*).tar.gz debian debian/orig-tar.sh

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