[SCM] Packaging for Google Go branch, debian-sid, updated. debian/1%58.1-2-5-g90339ed

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 25416847a99c204e2ceb53113105309942ca02bf
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 8 09:51:43 2011 +0200

    Update version.bash to work with Debian packaging and not hg repository

diff --git a/debian/patches/010-getgoversion_from_debian_changelog.patch b/debian/patches/010-getgoversion_from_debian_changelog.patch
new file mode 100644
index 0000000..1729f0b
--- /dev/null
+++ b/debian/patches/010-getgoversion_from_debian_changelog.patch
@@ -0,0 +1,46 @@
+--- 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 11d5416..a35fdde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 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