[Pkg-cli-apps-commits] [SCM] ikvm branch, master, updated. debian/0.46.0.1+ds-5-1-g753c2d1

[Jo Shields]

The following commit has been merged in the master branch:
commit 753c2d16c8862401a18596309a9ef2045200d82e
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Feb 5 15:56:52 2012 +0100

    Tweak get-orig-source rule to handle new taball locations

diff --git a/debian/rules b/debian/rules
index 24ec1a9..efc7d6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+JAVATARBALL=http://downloads.sourceforge.net/project/ikvm/ikvm/7.0.4335.0/openjdk7-b147-stripped.zip
 DEB_CLI_API_VERSION = 0.46.0.1
 DEB_CLI_RUNTIME = cli
 UPVERSION = $(shell dpkg-parsechangelog | grep '^Version: ' | sed -n 's/^Version: \([.0-9]*\).*/\1/p')
@@ -73,17 +74,15 @@ override_dh_clideps:
 	dh_clideps --exclude-moduleref=fusion --exclude-moduleref=winspool.drv
 
 get-orig-source:
-	uscan \
-		--force-download \
-		--download-version $(UPVERSION) \
-		--destdir .
+#	uscan \
+#		--force-download \
+#		--download-version $(UPVERSION) \
+#		--destdir .
 	mkdir ikvm-$(UPVERSION)+ds
 	unzip ikvmsrc-$(UPVERSION).zip -d ikvm-$(UPVERSION)+ds
 	dos2unix ikvm-$(UPVERSION)+ds/ikvm-$(UPVERSION)/HOWTO
-	for I in `grep http ikvm-$(UPVERSION)+ds/ikvm-$(UPVERSION)/HOWTO | grep openjdk`; do \
-		wget $$I; \
-		unzip `basename $$I` -d ikvm-$(UPVERSION)+ds; \
-	done
+	wget $(JAVATARBALL);
+	unzip `basename $(JAVATARBALL)` -d ikvm-$(UPVERSION)+ds;
 	rm *.zip
 	rm -f ikvm-$(UPVERSION)+ds/ikvm-*/runtime/JniAssemblyInfo.cs \
 		ikvm-$(UPVERSION)+ds/ikvm-*/runtime/AssemblyInfo.cs \

-- 
ikvm