[SCM] general-purpose neural simulator branch, master, updated. upstream/2.3-16-ga91a97a

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 92c95fd58d995537ca1b105ce25d578a69e74a60
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 10 17:13:55 2011 +0100

    Remove libcdf from upstream tarball.

diff --git a/debian/changelog b/debian/changelog
index 88949ab..82ba4fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-genesis (2.3-1) UNRELEASED; urgency=low
+genesis (2.3+dfsg-1) UNRELEASED; urgency=low
 
+  [ Sam Hocevar ]
   * New upstream release.
 
- -- Sam Hocevar <sho at debian.org>  Sun, 25 Jul 2010 14:45:08 +0000
+  [ Gabriele Giacone ]
+  * Remove libcdf from upstream tarball.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 10 Dec 2011 16:46:17 +0100
 
 genesis (2.2.1-12) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index dd6f50d..6c4f2ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,8 +108,9 @@ source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 NAME = genesis
-VER  = $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|cut -f1 -d'-')
-TARBALL = $(NAME)_$(VER).orig.tar.bz2
+VER  = $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|cut -f1 -d'+')
+TAR  = $(NAME)_$(VER).orig.tar.bz2
+DTAR = $(NAME)_$(VER)+dfsg.orig.tar.bz2
 MD5FILE = $(NAME)-$(VER)-*.md5
 TMPDIR = tmp-$(NAME)
 get-orig-source:
@@ -117,11 +118,11 @@ get-orig-source:
 	uscan --force-download --no-symlink --download-version $(VER)
 	sed -i 's/\\.md5//' debian/watch
 	uscan --force-download --rename --download-version $(VER)
-	sed -i 's/^\(.*\)genesis.*$$/\1'$(TARBALL)'/' ../$(MD5FILE)
+	sed -i 's/^\(.*\)genesis.*$$/\1'$(TAR)'/' ../$(MD5FILE)
 	@cd .. && if ! md5sum -c $(MD5FILE); then echo "Corrupted tarball. Download it again!";exit 1;fi
-	mkdir $(TMPDIR) && tar -C $(TMPDIR) -jxf ../$(TARBALL)
+	mkdir $(TMPDIR) && tar -C $(TMPDIR) -jxf ../$(TAR) && rm -f ../$(TAR)
 	@cd $(TMPDIR)/*/* && echo "Removing from orig tarball: " && find src/diskio/interface/netcdf/netcdf-*
-	tar -C $(TMPDIR)/*/* --exclude src/diskio/interface/netcdf/netcdf-* -jcf ../$(TARBALL) .
+	tar -C $(TMPDIR)/*/* --exclude src/diskio/interface/netcdf/netcdf-* -jcf ../$(DTAR) .
 	rm -rf $(TMPDIR)
 
 binary: binary-indep binary-arch
diff --git a/debian/watch b/debian/watch
index ce1ce9a..2de7d1e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://www.genesis-sim.org/GENESIS/genesis-ftp/genesis-([\d\.]*)-src.tar.bz2
+opts=dversionmangle=s/\+dfsg// \
+http://www.genesis-sim.org/GENESIS/genesis-ftp/genesis-([\d\.]*)-src\.tar\.bz2

-- 
general-purpose neural simulator