[med-svn] [muscle] 02/04: Mark repackaged orig.tar properly with +dfsg

[Andreas Tille]

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

tille pushed a commit to branch master
in repository muscle.

commit 780738b27b98db78f0832dfa7088fa65a78d1ec4
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 18 17:10:59 2016 +0100

    Mark repackaged orig.tar properly with +dfsg
---
 debian/changelog |  3 ++-
 debian/copyright |  7 ++++---
 debian/rules     | 15 +--------------
 debian/watch     |  3 ++-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 249ea03..8e17858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-muscle (1:3.8.31-2) UNRELEASED; urgency=low
+muscle (1:3.8.31+dfsg-1) UNRELEASED; urgency=low
 
   [ Andreas Tille ]
   * debian/upstream: Added citations
@@ -7,6 +7,7 @@ muscle (1:3.8.31-2) UNRELEASED; urgency=low
      - debian/source/format: 3.0 (quilt)
   * Moved packaging from SVN to Git
   * cme fix dpkg-control
+  * Mark repackaged orig.tar properly with +dfsg
 
   [ Dylan Aïssi ]
   * debian/copyright: Fixed lintian dep5-copyright-license-name-not-unique
diff --git a/debian/copyright b/debian/copyright
index 20732d7..275a750 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: muscle
 Upstream-Contact: Robert C. Edgar "Bob" <muscle at drive5.com>
-Source: http://www.drive5.com/muscle/
+Source: http://www.drive5.com/muscle/downloads.htm
+Files-Excluded: */muscle21
+                *.vcproj
 Comment: This release contains a potentially sourceless binary file, muscle21, that was removed.
-Files-Excluded:
-    muscle3.8.31/src/muscle21
+         Once files will be removed anyway also unused visualc projects are removed
 
 Files: *
 Copyright: © Robert C. Edgar "Bob" <muscle at drive5.com>
diff --git a/debian/rules b/debian/rules
index 0f927d5..6bf28ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,18 +18,5 @@ build/muscle:: $(ObjNames)
 clean::
 	$(RM) *.o make.err make.out muscle
 
-SRC_TMP    := $(shell mktemp --tmpdir --directory muscle-build.XXXXXXXXXX)
-UP_TARBALL := $(SRC_TMP)/muscle$(DEB_UPSTREAM_VERSION)_src.tar.gz
-REPACKED   := muscle-$(DEB_UPSTREAM_VERSION).orig
-TARBALLS   := $(CURDIR)/../tarballs
-
 get-orig-source:
-	rm -rf $(SRC_TMP)/$(REPACKED)
-	[ -f $(UP_TARBALL) ] || wget -q -O $(UP_TARBALL) http://www.drive5.com/muscle/downloads3.8.31/muscle$(DEB_UPSTREAM_VERSION)_src.tar.gz
-	cd $(SRC_TMP) && \
-	  tar xvf $(UP_TARBALL) && \
-	  find . -name "muscle21" -delete && \
-	  mv $(SRC_TMP)/muscle$(DEB_UPSTREAM_VERSION)/src $(SRC_TMP)/$(REPACKED)
-	[ -d $(TARBALLS) ] || mkdir $(TARBALLS)
-	cd $(SRC_TMP) && GZIP="--best --no-name" tar -czf $(TARBALLS)/muscle_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(REPACKED)
-	rm -rf $(SRC_TMP)
+	uscan --verbose --force-download --repack --compression xz
diff --git a/debian/watch b/debian/watch
index 172441b..cac606c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://www.drive5.com/muscle/downloads.htm http://www.drive5.com/muscle/downloads.+?/muscle(.*)_src\.tar\.gz
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
+  http://www.drive5.com/muscle/downloads.htm http://www.drive5.com/muscle/downloads.+?/muscle(.*)_src\.tar\.gz

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