[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.06.09-2-34-g606569c

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit 1c5fb24e928b1d59e3c277eeb1a78b77fd8271dd
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Aug 24 15:34:31 2011 +0200

    Use GOVERSION as generate by src/version.bash on hg archive time

diff --git a/debian/patches/010-getgoversion_from_debian_changelog.patch b/debian/patches/010-getgoversion_from_debian_changelog.patch
deleted file mode 100644
index 1729f0b..0000000
--- a/debian/patches/010-getgoversion_from_debian_changelog.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/version.bash
-+++ b/src/version.bash
-@@ -3,36 +3,25 @@
- # Use of this source code is governed by a BSD-style
- # license that can be found in the LICENSE file.
- 
--# Check that we can use 'hg'
--if ! hg version > /dev/null 2>&1; then
--	echo 'hg not installed' 1>&2
--	exit 2
--fi
-+cd $(dirname $0)/..
- 
- # Get numerical revision
--VERSION=$(hg identify -n 2>/dev/null)
--if [ $? != 0 ]; then
--	OLD=$(hg identify | sed 1q)
--	VERSION=$(echo $OLD | awk '{print $1}')
--fi
-+# DEBIAN: We don't have a numerical revision
-+VERSION=
- 
- # Get branch type
-+# DEBIAN: Get release/weekly from source package name
- BRANCH=release
--if [ "$(hg identify -b 2>/dev/null)" == "default" ]; then
-+if [ "$(dpkg-parsechangelog | sed -n 's/Source: golang-//p;')" == "" ]; then
- 	BRANCH=weekly
- fi
- 
- # Find most recent known release or weekly tag.
--TAG=$(hg tags |
--	grep $BRANCH |
--	sed 's/:.*//' |
--	sort -rn -k2 |
--	awk -v ver=$VERSION '$2 <= ver && $1~/^(release|weekly)\./ {print $1}' |
--	sed -n 1p)
-+# DEBIAN: get tag from Debian changelog version
-+TAG=$BRANCH.$(dpkg-parsechangelog | sed -n 's/Version: \([^-]*\)-.*/\1/p;')
- 
- if [ "$TAG" != "" ]; then
- 	VERSION="$TAG $VERSION"
- fi
- 
- echo $VERSION
--
diff --git a/debian/patches/series b/debian/patches/series
index a35fdde..11d5416 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 007-use_native_dynamic_linker_on_kfreebsd.patch
 008-emacs-mode-key-literal-indent.patch
 009-goinstall_can_install_to_GOPATH.patch
-010-getgoversion_from_debian_changelog.patch

-- 
Packaging for Google Go