[SCM] Packaging for Google Go branch, debian-sid, updated. debian/1%60.2-1-32-ga228561

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit b7252247eeefea7637a10b03c3e76b01773bedb3
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Apr 10 11:12:56 2012 +0200

    Fix upstream version botched by my packaging scripts

diff --git a/debian/patches/000-fix_upstream_version.patch b/debian/patches/000-fix_upstream_version.patch
new file mode 100644
index 0000000..03b52ef
--- /dev/null
+++ b/debian/patches/000-fix_upstream_version.patch
@@ -0,0 +1,5 @@
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-release.r60 9481
++go1
diff --git a/debian/patches/series b/debian/patches/series
index df1559b..6b6a761 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+000-fix_upstream_version.patch
 001-allow_IPv4_on_IPv6_sockets.patch
 #003-set_correct_runpath.patch
 #006-fix_kfreebsd_build.patch
diff --git a/debian/rules b/debian/rules
index a32fe31..9610622 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,10 +131,8 @@ get-orig-source:
 	cd "$(GOLANG_ORIG_DIR)"; \
 	hg pull; \
 	hg update "$(REV)"; \
-	VERSION=$$(hg identify -t -r"$(REV)" | perl -e '<> =~ /go([\d.]+)/; print "$$1"'); \
+	VERSION=$$(cat VERSION | perl -e '<> =~ /go([\d.]+)/; print "$$1"'); \
 	hg archive -tfiles -r"$(REV)" -X'.hg*' -X'doc/talks/go_talk-20091030.pdf' "$(CURDIR)/../$(PACKAGE)-$$VERSION/"; \
-	src/version.bash -save; \
-	cp VERSION "$(CURDIR)/../$(PACKAGE)-$$VERSION/"; \
 	cd ..; \
 	tar -czf "$(CURDIR)/../$(PACKAGE)_$$VERSION.orig.tar.gz" "$(PACKAGE)-$$VERSION/"; \
 	rm -rf "$(CURDIR)/../$(PACKAGE)-$$VERSION/"; \

-- 
Packaging for Google Go