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

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 0cc2e60071de460e69bbf2ddd938b8dacbc97a4d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Sep 13 13:56:15 2011 +0200

    Adapt templates and config to main golang package

diff --git a/debian/golang-weekly-tools.config b/debian/golang-tools.config
similarity index 72%
rename from debian/golang-weekly-tools.config
rename to debian/golang-tools.config
index 45c0b31..a952f62 100644
--- a/debian/golang-weekly-tools.config
+++ b/debian/golang-tools.config
@@ -16,8 +16,8 @@ if [ -f $conffile ] ; then
     else
         DASHBOARD=false
     fi
-    db_set golang-weekly-tools/dashboard "$DASHBOARD"
+    db_set golang-tools/dashboard "$DASHBOARD"
 fi
 
-db_input high golang-weekly-tools/dashboard || [ $? -eq 30 ]
+db_input high golang-tools/dashboard || [ $? -eq 30 ]
 db_go || true
diff --git a/debian/golang-weekly-tools.postinst b/debian/golang-tools.postinst
similarity index 94%
rename from debian/golang-weekly-tools.postinst
rename to debian/golang-tools.postinst
index 330c7fb..8050839 100644
--- a/debian/golang-weekly-tools.postinst
+++ b/debian/golang-tools.postinst
@@ -17,7 +17,7 @@ fi
 # /etc/golang/goinstall.conf in the 'config' script, so it should be
 # safe to ignore the value fetched by loading the file above.  This
 # should allow for using debconf to reconfigure the package.
-db_get golang-weekly-tools/dashboard || true
+db_get golang-tools/dashboard || true
 if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
     DASHBOARD="yes"
 else
@@ -32,7 +32,7 @@ generate_conffile() {
 		# Config file for goinstall tool.
 		#
 		# To change this file, use:
-		#        dpkg-reconfigure golang-weekly-tools
+		#        dpkg-reconfigure golang-tools
 		#
 		# You can also edit it by hand, if you so choose.
 		
diff --git a/debian/golang-weekly-tools.postrm b/debian/golang-tools.postrm
similarity index 100%
rename from debian/golang-weekly-tools.postrm
rename to debian/golang-tools.postrm
diff --git a/debian/golang-weekly-tools.templates b/debian/golang-tools.templates
similarity index 90%
rename from debian/golang-weekly-tools.templates
rename to debian/golang-tools.templates
index d1e3a4b..57284d3 100644
--- a/debian/golang-weekly-tools.templates
+++ b/debian/golang-tools.templates
@@ -1,4 +1,4 @@
-Template: golang-weekly-tools/dashboard
+Template: golang-tools/dashboard
 Type: boolean
 Default: true
 Description: Report installation of public packages to Go Dashboard?
@@ -13,4 +13,4 @@ Description: Report installation of public packages to Go Dashboard?
  successful installation to the Go Dashboard.
  .
  This choice can be later modified by running "dpkg-reconfigure
- popularity-contest".
+ golang-tools".

-- 
Packaging for Google Go