[maven-bundle-plugin] 01/09: Use a simpler get-orig-source approach

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository maven-bundle-plugin.

commit 7066a9c4adfc1f60ab300391716ff12efd805dae
Author: 殷啟聰 | Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Mar 8 22:05:53 2018 +0800

    Use a simpler get-orig-source approach
---
 debian/copyright   |  1 +
 debian/orig-tar.sh | 16 ----------------
 debian/rules       |  2 +-
 debian/watch       |  6 ++----
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a806b6c..89ef7c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Felix Maven Bundle Plugin
 Upstream-Contact: http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
 Source: http://www.apache.org/dist/felix/
+Files-Excluded: *.jar *.class 
 
 Files: *
 Copyright: 2006-2015, The Apache Software Foundation
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 3ef1642..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-bundle-plugin_$VERSION.orig.tar.xz
-DIR=maven-bundle-plugin-$VERSION
-TAG=$(echo "maven-bundle-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export https://svn.apache.org/repos/asf/felix/releases/${TAG}/ $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# 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 8dea969..5a5dcd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-current-version --force-download --rename
+	uscan --download-current-version --force-download --repack --compression xz
diff --git a/debian/watch b/debian/watch
index b3d9862..ec708fc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  https://svn.apache.org/repos/asf/felix/releases/ \
-  maven-bundle-plugin-(\d.*)/ debian debian/orig-tar.sh
+version=4
+https://archive.apache.org/dist/felix maven-bundle-plugin at ANY_VERSION@-source-release at ARCHIVE_EXT@
\ No newline at end of file

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