[critterding] 09/24: Fix d/watch, remove +dfsg leftovers.

[Gabriele Giacone]

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

gg0-guest pushed a commit to branch master
in repository critterding.

commit fcdbe0268bd0892b63742a7b660a243945a173fe
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Aug 2 11:54:43 2014 +0200

    Fix d/watch, remove +dfsg leftovers.
---
 debian/README.source | 10 ----------
 debian/changelog     |  1 +
 debian/rules         |  2 +-
 debian/watch         |  2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ed44dd4..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-critterding for Debian
-----------------------
-
--- DFSG-compliant
-
-To be DFSG-compliant, some files have been removed from upstream 
-tarball:
-
-	- fonts/verdana.ttf		# non-free fonts
-
diff --git a/debian/changelog b/debian/changelog
index b4ead65..d66ce2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ critterding (1.0-beta14-1) UNRELEASED; urgency=low
   * Add parallel building support.
   * Fix d/copyright according to format specification 1.0.
   * Bump debhelper compatibility to 9.
+  * Fix d/watch, remove +dfsg leftovers.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 02 Aug 2014 11:41:51 +0200
 
diff --git a/debian/rules b/debian/rules
index b71b87b..528f871 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
+VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/p}')
 
 %:
 	dh $@ --parallel
diff --git a/debian/watch b/debian/watch
index 28d8ee1..5028cd6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//,uversionmangle=s/^/1.0-/" \
+opts="uversionmangle=s/^/1.0-/" \
 http://sf.net/critterding/critterding-(.*).tar.bz2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git