[med-svn] r20813 - trunk/packages/cain/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-12-17 17:51:44 +0000 (Thu, 17 Dec 2015)
New Revision: 20813

Removed:
   trunk/packages/cain/trunk/debian/README.Debian-source
Modified:
   trunk/packages/cain/trunk/debian/copyright
   trunk/packages/cain/trunk/debian/rules
   trunk/packages/cain/trunk/debian/watch
Log:
Implement obtaining upstream source via Files-Excluded of uscan


Deleted: trunk/packages/cain/trunk/debian/README.Debian-source
===================================================================
--- trunk/packages/cain/trunk/debian/README.Debian-source	2015-12-17 17:36:32 UTC (rev 20812)
+++ trunk/packages/cain/trunk/debian/README.Debian-source	2015-12-17 17:51:44 UTC (rev 20813)
@@ -1,15 +0,0 @@
-the source package have only .zip file format and a invalid version number
-
-unzip Cain-1_9.zip
-cd Cain
-# remove superfluous files and directories
-rm -rf ../__MACOSX
-find . -iname .DS_Store -exec rm -f {} +
-find . -iname .scons* -exec rm -f {} +
-# clean the solvers directory
-rm -f solvers/*
-# remove third-party files
-rm -rf src/third-party/*
-tar cvzf ../cain_1.9.orig.tar.gz .
-cd ..
-rm -rf Cain/

Modified: trunk/packages/cain/trunk/debian/copyright
===================================================================
--- trunk/packages/cain/trunk/debian/copyright	2015-12-17 17:36:32 UTC (rev 20812)
+++ trunk/packages/cain/trunk/debian/copyright	2015-12-17 17:51:44 UTC (rev 20813)
@@ -2,6 +2,12 @@
 Upstream-Name: Cain
 Upstream-Contact: Sean Mauch <sean at caltech.edu>
 Source: http://sourceforge.net/projects/cain/files
+Files-Excluded: __MACOSX
+                */.DS_Store
+                */.sconsign.dblite
+                */solvers
+                */*/third-party
+                */*/*.pyc
 
 Files: *
 Copyright: 1999-2012, California Institute of Technology

Modified: trunk/packages/cain/trunk/debian/rules
===================================================================
--- trunk/packages/cain/trunk/debian/rules	2015-12-17 17:36:32 UTC (rev 20812)
+++ trunk/packages/cain/trunk/debian/rules	2015-12-17 17:51:44 UTC (rev 20813)
@@ -23,22 +23,7 @@
 override_dh_auto_test:
 	echo "no tests implemented"
 
-override_dh_builddeb:
-	dh_builddeb -- -Z xz
-
 get-orig-source:
-	rm -rf $(SRC_TMP) && mkdir $(SRC_TMP)
-	#[ -f ../cain_$(VERSION).zip ] || wget -O ../cain_$(VERSION).zip http://sf.net/cain/Cain-$(UVERSION).zip # URL did not work
-	[ -f ../cain_$(VERSION).zip ] ||  wget -O ../cain_$(VERSION).zip http://qa.debian.org/watch/sf.php/cain/Cain-$(UVERSION).zip
-	cd $(SRC_TMP) && unzip ../../cain_$(VERSION).zip
-	mv $(SRC_TMP)/Cain $(SRC_TMP)/cain-$(VERSION)
-	find $(SRC_TMP) -name __MACOSX -type d -exec rm -rf {} +
-	find $(SRC_TMP) -iname .DS_Store -delete
-	find $(SRC_TMP) -iname "*.pyc" -delete
-	find $(SRC_TMP) -iname ".scons*" -delete
-	find $(SRC_TMP) -type f -exec chmod 644 {} +
-	find $(SRC_TMP) -type d -exec chmod 755 {} +
-	rm -f $(SRC_TMP)/cain-$(VERSION)/solvers/*
-	rm -rf $(SRC_TMP)/cain-$(VERSION)/src/third-party/
-	cd $(SRC_TMP) && tar cvzf ../../cain_$(VERSION).orig.tar.gz cain-$(VERSION)
-	rm -rf $(SRC_TMP)
+	uscan --verbose --force-download --repack --compression xz
+#	find $(SRC_TMP) -type f -exec chmod 644 {} +
+#	find $(SRC_TMP) -type d -exec chmod 755 {} +

Modified: trunk/packages/cain/trunk/debian/watch
===================================================================
--- trunk/packages/cain/trunk/debian/watch	2015-12-17 17:36:32 UTC (rev 20812)
+++ trunk/packages/cain/trunk/debian/watch	2015-12-17 17:51:44 UTC (rev 20813)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_/./" \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,uversionmangle=s/_/./" \
   http://sf.net/cain/[cC]ain-(\d[\d\._]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)