[jalview] 01/03: replace new-upstream script with Files-Excluded

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository jalview.

commit fbf9e2ac0c1779a9faedf8fb00250e8b3eddf52b
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sun Feb 7 12:21:40 2016 -0800

    replace new-upstream script with Files-Excluded
---
 debian/copyright    | 10 +++-------
 debian/new-upstream | 45 ---------------------------------------------
 debian/watch        |  4 ++--
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f180b63..0742722 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jalview
 Upstream-Contact: jalview-discuss at jalview.org
-Source:
-  The original tarball was made downloading the jalview-*.tar.gz
-  tarball on http://www.jalview.org/versions.html, and stripping all
-  binary jars.
-  . 
-  For more details, see the debian/new-upstream script that takes care of 
-  the repackaging.
+Files-Excluded: */*.jar
+                utils
+                examples
 
 Files: *
 Copyright: Copyright 2007-2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
diff --git a/debian/new-upstream b/debian/new-upstream
deleted file mode 100755
index 20dfee2..0000000
--- a/debian/new-upstream
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# new-upstream: copyright 2008, 2009 by Vincent Fourmond.
-# See debian/copyright file for details.
-#
-# Called by uscan; from uscan(1):
-#
-# Finally,  if a third parameter (an action) is given in the watchfile
-# line, this is taken as the name of a command, and the command
-#  command --upstream-version version filename
-# 
-# is executed, using either the original file or the symlink name.
-#
-# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
-#
-
-version=$2
-filename=$3
-
-dir=`mktemp -d`
-
-# We repackage the upstream source zip file:
-tar xvz -C $dir -f "$filename"
-origname=jalview_$version.dfsg.orig.tar.bz2
-
-# We repackage excluding the lib/ subdir
-cd $dir
-# Removing the utils/ directory, not needed for build ?
-rm -rf jalview*/utils
-
-# Removing all binary jars...
-find -name '*.jar' | xargs rm 
-
-# Removing examples/ subdirectory, whose copyright status is unclear
-# to me for the time being
-rm -rf jalview*/examples
-
-
-echo "Creating archive"
-tar cvj -f $origname jalview*
-cd -
-# We remove any file already existing there: it might be a symlink.
-rm -f $orginame 
-mv $dir/$origname ..
-# rm -rf $dir
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index d935812..861159e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g;s/\.0(\d)/.0.$1/g" \
-http://www.jalview.org/source jalview_([\d_]+)\.tar\.gz debian debian/new-upstream
+opts="repacksuffix=+dfsg,dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g;s/\.0(\d)/.0.$1/g" \
+http://www.jalview.org/source jalview_([\d_]+)\.tar\.gz debian

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