[med-svn] [khmer] 01/01: Make sure the code copies will be really excluded from the orig.tar since lintian claims an error on some MS help file binary

[Andreas Tille]

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

tille pushed a commit to branch master
in repository khmer.

commit 81e6c99f2326136ac527794dab39058a4e8601cf
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 3 08:19:46 2015 +0100

    Make sure the code copies will be really excluded from the orig.tar since lintian claims an error on some MS help file binary
---
 debian/changelog |  2 +-
 debian/copyright |  3 ++-
 debian/rules     |  3 +++
 debian/watch     | 34 ++--------------------------------
 4 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14558fb..92e9676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-khmer (1.3-1) UNRELEASED; urgency=medium
+khmer (1.3+dfsg-1) UNRELEASED; urgency=medium
 
   * Update for new release 
 
diff --git a/debian/copyright b/debian/copyright
index 3630107..8b857a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: the khmer project
 Upstream-Contact: khmer-project at idyll.org
 Source: https://pypi.python.org/pypi/khmer#downloads
-Files-Excluded: third-party/bzip2, third-party/zlib
+Files-Excluded: third-party/bzip2
+                third-party/zlib
 
 Files: *
 Copyright: 2010-2015, Michigan State University
diff --git a/debian/rules b/debian/rules
index 0a9f786..b011547 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,3 +21,6 @@ override_dh_auto_clean:
 override_dh_install:
 	dh_install
 	find debian/khmer -name .gitignore -delete
+
+get-orig-source:
+	uscan --verbose --force-download --repack --compression xz
diff --git a/debian/watch b/debian/watch
index 403ac4b..d9435e3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,34 +1,4 @@
 version=3
 
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge
-# http://sf.net/#PACKAGE#/#PACKAGE#-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-
-# Uncomment to find new files on GooglePages
-# http://code.google.com/p/#PACKAGE#/downloads/list?can=1 \
-#  .*/#PACKAGE#-([-.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)
-
-# Uncomment to find new files on Github
-#  - when using releases:
-https://github.com/ged-lab/khmer/releases .*/archive/v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
-#  - when using tags
-# https://github.com/#GITHUBUSER#/#PACKAGE#/tags .*/#PREFIX#(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-# Remark: frequently you can do s/#PREFIX#/v?/ since 'v' or nothing is quite common but there are other prefixes possible
-
-# if tweaking of source is needed
-# \
-# debian debian/get-orig-source
-
-# if you need to repack and choose +dfsg prefix
-# opts=dversionmangle=s/[~\+]dfsg[0-9]*// \
-
-opts=repackage=+ds1
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
+  https://github.com/ged-lab/khmer/releases .*/archive/v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)

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