[med-svn] [figtree] 04/08: Use Files-Excluded to strip down tarball and add +dfsg suffix

[Andreas Tille]

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

tille pushed a commit to branch master
in repository figtree.

commit a2dcb327e14da45b486b53864b9795d0858d7a12
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 1 11:23:25 2015 +0100

    Use Files-Excluded to strip down tarball and add +dfsg suffix
---
 debian/changelog       |  3 ++-
 debian/copyright       |  4 ++++
 debian/get-orig-source | 62 --------------------------------------------------
 debian/rules           |  2 +-
 debian/watch           |  2 +-
 5 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d44eade..a9e41a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-figtree (1.4.2-2) UNRELEASED; urgency=medium
+figtree (1.4.2+dfsg-1) UNRELEASED; urgency=medium
 
   * Moved to Git
   * cme fix dpkg-control (removed versioned javahelper dependency)
   * debian/watch now points to Github
   * Fix source location in debian/copyright
+  * Use Files-Excluded to strip down tarball and add +dfsg suffix
 
  -- Andreas Tille <tille at debian.org>  Tue, 01 Dec 2015 09:25:51 +0100
 
diff --git a/debian/copyright b/debian/copyright
index a18d459..39743c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FigTree
 Upstream-Contact: Andrew Rambaut <a.rambaut at ed.ac.uk>
 Source: https://github.com/rambaut/figtree
+Files-Excluded: */*.jar
+                */*.jnilib
+                release/Windows
+		release/Mac
 
 Files: *
 Copyright: © 2005-2011 Andrew Rambaut <a.rambaut at ed.ac.uk>
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index f0794cd..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# Obtaining the source tarball of FigTree is a bit tricky because here is no
-# explicite link to a downloadable tarball on the web page and the source is
-# only in SVN
-
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-else
-    VERSION=`echo $@ | sed 's?^.*--upstream-version \([0-9.]\+\) .*download.html.*?\1?'`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-	echo "Unable to parse version number"
-        exit
-    fi
-fi
-
-cd ..
-rm -f  download.html
-mkdir -p tarballs
-cd tarballs
-
-svn export http://figtree.googlecode.com/svn/trunk/
-
-# FIXME: Replace this by mv once the script is sufficiently tested
-cp -a trunk ${PKG}-${VERSION}
-cd ${PKG}-${VERSION}
-
-# remove .svn dirs taht do not belong into upstream tarball
-find . -type d -name .svn -exec rm -rf \{\} \; 2>/dev/null
-
-# fix some broken permissions
-for ext in icns jar java jnilib pdf png psd pdf tif ; do
-    find . -type f -name "*.${ext}" -exec chmod 644 \{\} \;
-done
-
-# remove unneeded OSes
-rm -rf release/Mac release/Windows
-
-# remove jars which are provided as binaries but are not directly needed to build FigTree
-#for jar in \
-#	    jwt/ \
-#	    libquaqua.jnilib \
-#	    jdom.jar \
-#	    swing-layout.jar \
-#	    quaqua-filechooser-only.jar \
-#	    quaqua-colorchooser-only.jar \
-#	    quaqua.jar \
-#	    jam.jar \
-#	    jebl.jar \
-#	    freehep.jar \
-#	    itext.jar \
-#        ; do
-#    rm -rf lib/$jar
-#done
-# No particular JAR is needed any more
-rm -rf lib/*
-
-cd ..
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX --exclude-vcs -caf "$PKG"_"$VERSION".orig.tar.xz "$PKG"-"$VERSION"
-rm -rf "$PKG"-"$VERSION"
-rm -rf trunk
diff --git a/debian/rules b/debian/rules
index 64e0c5f..dd9357d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,4 +16,4 @@ override_dh_auto_clean:
 	ant clean
 
 get-orig-source:
-	. debian/get-orig-source
+	uscan --verbose --force-download --repack --compression xz
diff --git a/debian/watch b/debian/watch
index de3cb3d..749221b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/_/\./g \
+opts=uversionmangle=s/_/\./g,repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g \
    https://github.com/rambaut/figtree/releases .*/archive/[relas_]*(\d[\d._]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)

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