r755 - /scripts/download-seti /trunk/boinc-app-seti/debian/rules

[smoe-guest at users.alioth.debian.org]

Author: smoe-guest
Date: Thu Nov 22 12:42:27 2007
New Revision: 755

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=755
Log:
* Followed Frank's suggestions
	- destination directory of get-orig-dir is "."
	- no "bc" for yesterday's date
	- seti-download proposes using dch to bump the changelog entry

Modified:
    scripts/download-seti
    trunk/boinc-app-seti/debian/rules

Modified: scripts/download-seti
URL: http://svn.debian.org/wsvn/pkg-boinc/scripts/download-seti?rev=755&op=diff
==============================================================================
--- scripts/download-seti (original)
+++ scripts/download-seti Thu Nov 22 12:42:27 2007
@@ -45,4 +45,6 @@
 tar -czf "boinc-app-seti_$DEBIAN_VERSION.orig.tar.gz" seti_boinc
 rm -rf seti_boinc
 
+echo "Consider to update the changelog with dch --newversion ${DEBIAN_VERSION}-1" ; \
+
 exit 0

Modified: trunk/boinc-app-seti/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/rules?rev=755&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/rules (original)
+++ trunk/boinc-app-seti/debian/rules Thu Nov 22 12:42:27 2007
@@ -57,38 +57,27 @@
 	dh_clean client/setiathome-$(UPSTREAM_VERSION).*
 	dh_clean debian/extra/app_info.xml
 
+origDir="."
+
 get-orig-source:
+	if [ ! -d "$(origDir)" ]; then echo "Destination directory '$(origDir)' is not existing."; exit; fi
 	curl=`which curl`; if [ -z "$$curl" ]; then echo curl needs to be installed; exit -1; fi; \
 	wget=`which wget`; if [ -z "$$wget" ]; then echo wget needs to be installed; exit -1; fi; \
-	destdir=. ; \
-	if [ -r .svn/debLayout ]; then \
-		t=`grep origDir .svn/debLayout | cut -f2 -d=`; \
-		if [ -n "$$t" ]; then \
-			destdir=$$t; \
-			echo "Destination directory is $$destdir, as found set in .svn/debLayout"; \
-		elif [ -d "../tarballs" ]; then \
-			destdir="../tarballs"; \
-			echo "Destination directory is $$destdir, as presumed from existance of file .svn/debLayout"; \
-		fi; \
-	elif [ -d "../tarballs" ]; then \
-		destdir="../tarballs"; \
-		echo "Destination directory is $$destdir, as presumed from existance of file .svn/debLayout"; \
-	fi; \
 	(\
-	cd $$destdir; \
+	cd $(origDir); \
 	dls=/tmp/download-seti;\
 	url="http://svn.debian.org/wsvn/pkg-boinc/scripts/download-seti?op=file&rev=0&sc=0" ; \
 	wget "$$url" -O - | sed -e '1,/PRE/d' -e '/PRE/,$$d' -e 's/"/"/g' -e 's/ / /g' >  $$dls || exit -1; \
-	ddd=`date -d yesterday +%Y-%m-%d | tr -d '\n'`; \
-	echo "attempting retrieval of nightly release from $$ddd"; \
+	ddd=`date +%Y-%m-%d | tr -d '\n'`; \
+	echo "Attempting retrieval of today's nightly release version $$ddd"; \
 	sh $$dls $$ddd && echo "Download was successful to directory '$$destdir'." || ( \
-		echo "release dated $$ddd could not be downloaded"; \
-        	bc=`which bc`; if [ -z "$$bc" ]; then echo "bc needs to be installed for the retrieval of yesterday's release."; exit -1; fi; \
-         	dd=`date +%d` ; d=`echo $$dd-1|bc`; ddd=`date +%Y-%m|tr -d '\n'`-$$d; \
-         	echo "Now attemptin to rerieve nightly release from $$ddd"; \
+		echo "Release dated $$ddd could not be downloaded"; \
+		ddd=`date -d yesterday +%Y-%m-%d | tr -d '\n'`; \
+         	echo "Now attempting to rerieve yesterday's release from $$ddd"; \
 		sh $$dls $$ddd; \
 		) ; \
 	rm -f $$dls ; \
 	)
 
+
 .PHONY: get-orig-source