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

Gabriele Giacone 1o5g4r8o at gmail.com
Sat Dec 10 23:07:56 UTC 2011


The following commit has been merged in the master branch:
commit 11173da3e49042c4eb854341b91c1f61b4599df7
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 10 16:44:09 2011 +0100

    Add md5sum check to get-orig-target. Often broken download.

diff --git a/debian/rules b/debian/rules
index 385beaa..dd6f50d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,11 +110,19 @@ source diff:
 NAME = genesis
 VER  = $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|cut -f1 -d'-')
 TARBALL = $(NAME)_$(VER).orig.tar.bz2
+MD5FILE = $(NAME)-$(VER)-*.md5
+TMPDIR = tmp-$(NAME)
 get-orig-source:
-	uscan --verbose --force-download --rename --download-version $(VER)
-	mkdir tmp-$(NAME) && tar -C tmp-$(NAME) -jxf ../$(TARBALL) && \
-	tar -C tmp-$(NAME)/*/* -jcf ../$(TARBALL) .
-	rm -rf tmp-$(NAME)
+	sed -i '$$s/$$/\\.md5/' debian/watch
+	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)
+	@cd .. && if ! md5sum -c $(MD5FILE); then echo "Corrupted tarball. Download it again!";exit 1;fi
+	mkdir $(TMPDIR) && tar -C $(TMPDIR) -jxf ../$(TARBALL)
+	@cd $(TMPDIR)/*/* && echo "Removing from orig tarball: " && find src/diskio/interface/netcdf/netcdf-*
+	tar -C $(TMPDIR)/*/* --exclude src/diskio/interface/netcdf/netcdf-* -jcf ../$(TARBALL) .
+	rm -rf $(TMPDIR)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary

-- 
general-purpose neural simulator



More information about the debian-science-commits mailing list