[med-svn] [treeview] 01/09: Create orig.tar.xz using Files-Excluded

[Andreas Tille]

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

tille pushed a commit to branch master
in repository treeview.

commit 38d68199798c533ca4ab2ca0915cc5050e1908d8
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jan 30 00:17:19 2016 +0100

    Create orig.tar.xz using Files-Excluded
---
 debian/changelog       |  3 ++-
 debian/copyright       |  8 ++++++++
 debian/get-orig-source | 47 -----------------------------------------------
 debian/rules           |  2 +-
 debian/watch           |  2 +-
 5 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00d2154..e6b7641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-treeview (1.1.6.4+dfsg-2) UNRELEASED; urgency=medium
+treeview (1.1.6.4+dfsg1-1) UNRELEASED; urgency=medium
 
   * Moved from contrib to main since all dependencies are in main now
+  * Tarball repackaged using Files-Excluded
   * Moved debian/upstream to debian/upstream/metadata
   * Packaging moved from SVN to Git
   * cme fix dpkg-control
diff --git a/debian/copyright b/debian/copyright
index d1b6a8d..7bcdeff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: treeview
 Source:  http://treeview.sourceforge.net/
+Files-Excluded: */windows-installer.tar.gz
+                */*.jar
+                compile_lib
+                lib
+                */.cvsignore
+                */install.osX
+                */*.bat
+                */*.icns
 
 Files: *
 Copyright: 2001-2003 Alok Saldanha <alok at caltech.edu>
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index d45b861..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# bail out upon error
-set -e
-
-PACKAGE=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-TARDIR=../tarballs
-
-VERSION=`uscan --rename --verbose --force-download |
-    grep "Newest version on remote site is .* local version is .*" |
-    head -n 1 |
-    sed "s/Newest version on remote site is \([a-z0-9.]\+\),.*/\1/"`
-
-echo "I: remote version $VERSION"
-RVERSION=`echo $VERSION|sed "s/\(.*\)\./\1r/"` 
-echo "I: file version $RVERSION"
-
-mkdir -p $TARDIR
-cd $TARDIR
-
-UTAR="${PACKAGE}_${VERSION}.orig.tar.gz"
-echo "I: $UTAR"
-mv ../${UTAR} .
-tar -xzf ${UTAR}
-
-mv TreeView-${RVERSION}-src ${PACKAGE}_${VERSION}+dfsg.orig # .orig is requested by Developers Reference 3.4.4 <C2><A7>6.7.8.2
-
-cd ${PACKAGE}_${VERSION}+dfsg.orig
-# do some magic here
-
-# we do not need windows stuff here
-rm windows-installer.tar.gz
-rm lib/nanoxml-2.2.2.jar
-# these jars are only needed for mac osx
-rm compile_lib/jarbundler-1.8.1.jar
-rm compile_lib/xercesImpl.jar
-rm compile_lib/xml-apis.jar
-# not needed?
-rm src/edu/stanford/genetics/treeview/plugin/dendroview/dendroview.jar
-
-cd ..
-rm $UTAR
-
-GZIP="--best --no-name" tar czf ${PACKAGE}_${VERSION}+dfsg.orig.tar.gz ${PACKAGE}_${VERSION}+dfsg.orig
-
-rm -rf ${PACKAGE}_${VERSION}+dfsg.orig
-
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 2cfe925..69502d7
--- a/debian/rules
+++ b/debian/rules
@@ -22,5 +22,5 @@ override_dh_auto_install:
 	dh_auto_install
 
 get-orig-source:
-	./debian/get-orig-source
+	uscan --verbose --force-download --repack --compression xz
 
diff --git a/debian/watch b/debian/watch
index e54cdb0..19a6a06 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/r/\./g,dversionmangle=s/\+dfsg// \
+opts=repacksuffix=+dfsg,uversionmangle=s/r/\./g,dversionmangle=s/\+dfsg[0-9]*// \
   http://sf.net/jtreeview/TreeView-([\d\.]+.*)-src\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/treeview.git