[mvel] 27/42: Use the Files-Excluded field of debian/copyright to clean up the upstream tarball

[Emmanuel Bourg]

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

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

commit 5bf9d2bb5685c09c368419212827fd49869011c3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 15:56:05 2016 +0100

    Use the Files-Excluded field of debian/copyright to clean up the upstream tarball
---
 debian/changelog        |  2 ++
 debian/copyright        |  4 +++-
 debian/orig-tar.exclude |  3 ---
 debian/orig-tar.sh      | 22 ----------------------
 debian/rules            |  2 +-
 5 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8fb0c4..b375639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mvel (2.0.18-5) UNRELEASED; urgency=medium
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
+  * Use the Files-Excluded field of debian/copyright to clean up
+    the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 18 Jan 2016 14:47:55 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 1d0834a..6f131de 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MVEL
 Upstream-Contact: Mike Brock <mbrock at codehaus.org>
 Source: http://mvel.codehaus.org
+Files-Excluded: lib/*
+                src/main/java/org/mvel2/asm/*
+                ASM-LICENSE.txt
 
 Files: *
 Copyright: 2007 The Codehaus, Mike Brock, Dhanji Prasanna, John Graham, Mark Proctor
@@ -17,4 +20,3 @@ License: Apache-2.0
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index a5d74c9..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,3 +0,0 @@
-ASM-LICENSE.txt
-src/main/java/org/mvel2/asm/*
-lib/*
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100644
index d393d07..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-# $1 version
-TAR=../mvel_$1.orig.tar.gz
-DIR=mvel-$1.orig
-VERSION=`echo $1 | sed -e 's/[+~].*//g'`
-TAG=mvel2-$VERSION
-SVN_ROOT=http://svn.codehaus.org/mvel/tags/
-
-svn export $SVN_ROOT/$TAG $DIR
-GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi
-
-exit 0
-
diff --git a/debian/rules b/debian/rules
index 4951da7..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:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+	uscan --download-current-version --force-download --repack --compression xz

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