[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27

Ondřej Surý ondrej at sury.org
Fri Mar 9 08:43:30 UTC 2012


The following commit has been merged in the weekly-debian-sid branch:
commit d8158de998dd20fb3279b9c29e5f4971eea9ad83
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Feb 29 11:49:51 2012 +0100

    Merge golang-weekly-tools package into golang-weekly-go

diff --git a/debian/control b/debian/control
index cf61abf..9457da9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,11 @@ Standards-Version: 3.9.2
 Homepage: http://golang.org/
 
 Package: golang-weekly-go
-Conflicts: golang-go
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Recommends: golang-weekly-tools
-Provides: go-compiler, golang-go
+Replaces: golang-weekly-tools
+Conflicts: golang-go, golang-weekly-tools
+Provides: go-compiler, golang-go, golang-weekly-tools
 Description: Experimental Go programming language compiler
  This package provides assembler, compiler and linker for the Go
  programming language.  This is Google's Go implementation of the
@@ -42,7 +42,6 @@ Conflicts: golang-src
 Provides: golang-src
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}, golang-weekly-go
-Recommends: golang-weekly-tools
 Description: Go programming language compiler (.go source files)
  This package provides the source files for the Go programming
  language needed for godoc and goinstall.
@@ -68,7 +67,7 @@ Package: golang-weekly-doc
 Conflicts: golang-doc
 Provides: golang-doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, golang-weekly-go
 Section: doc
 Description: Documentation for Google's Go programming language
  This package provides the documentation for the Go programming
@@ -84,41 +83,8 @@ Description: Documentation for Google's Go programming language
  fast, statically typed, compiled language that feels like a
  dynamically typed, interpreted language.
  .
- After installing golang-weekly-tools package, you can view a nicely
- formatted documentation by running godoc --http=:6060 and then
- visiting http://localhost:6060/doc/install.html.
- .
- Go is an experiment. We hope adventurous users will give it a try and
- see if they enjoy it. Not every programmer will, but we hope enough
- will find satisfaction in the approach it offers to justify further
- development. The language can (and still does) change between weekly
- releases, check http://golang.org/doc/devel/weekly.html before
- upgrading this package.
-
-Package: golang-weekly-tools
-Conflicts: golang-tools
-Provides: golang-tools
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
-Depends: golang-weekly-go, ${shlibs:Depends}, ${misc:Depends}
-Recommends: golang-weekly-src, golang-weekly-doc
-Description: Tools for Google's Go programming language
- This package provides various tools for the Go programming language:
-  * godoc - extracts and generates documentation for Go programs
-  * gofix - upgrade Go programs to the most recent release
-  * gofmt - formats Go programs
-  * goinstall - automatic package installation
-  * gotry - evaluate expressions on the command line
-  * govet - simple checking of Go source code
- .
- The Go programming language is an open source project to make
- programmers more productive. Go is expressive, concise, clean, and
- efficient.  Its concurrency mechanisms make it easy to write programs
- that get the most out of multicore and networked machines, while its
- novel type system enables flexible and modular program construction.
- Go compiles quickly to machine code yet has the convenience of
- garbage collection and the power of run-time reflection.  It's a
- fast, statically typed, compiled language that feels like a
- dynamically typed, interpreted language.
+ You can view a nicely formatted documentation by running godoc
+ --http=:6060 and then visiting http://localhost:6060/doc/install.html.
  .
  Go is an experiment. We hope adventurous users will give it a try and
  see if they enjoy it. Not every programmer will, but we hope enough
@@ -147,7 +113,6 @@ Package: golang-weekly
 Depends: ${misc:Depends},
 	 golang-weekly-go (>= ${source:Version}),
 	 golang-weekly-src (>= ${source:Version}),
-	 golang-weekly-tools (>= ${source:Version}),
 	 golang-weekly-doc (>= ${source:Version})
 Architecture: all
 Description: Experimental Go programming language [meta package]
diff --git a/debian/golang-weekly-go.install b/debian/golang-weekly-go.install
index 131c58b..6028fa0 100644
--- a/debian/golang-weekly-go.install
+++ b/debian/golang-weekly-go.install
@@ -1,17 +1,7 @@
+bin/go /usr/bin
+bin/godoc /usr/bin
+bin/gofmt /usr/bin
 pkg /usr/lib/go/
-bin/gotest /usr/bin/
-bin/cgo /usr/bin/
-bin/goyacc /usr/bin/
-bin/ebnflint /usr/bin/
-bin/gopprof /usr/bin/
-bin/gomake /usr/bin/
-bin/?l /usr/bin/
-bin/?cov /usr/bin/
-bin/?prof /usr/bin/
-bin/?c /usr/bin/
-bin/?a /usr/bin/
-bin/?nm /usr/bin/
-bin/?g /usr/bin/
 src/Make.* /usr/share/go/src/
 src/pkg/runtime/cgocall.h /usr/share/go/src/pkg/runtime/
 src/pkg/runtime/runtime.h /usr/share/go/src/pkg/runtime/
diff --git a/debian/golang-weekly-tools.config b/debian/golang-weekly-tools.config
deleted file mode 100644
index 45c0b31..0000000
--- a/debian/golang-weekly-tools.config
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-conffile=/etc/golang/goinstall.conf
-
-. /usr/share/debconf/confmodule
-
-if [ -f $conffile ] ; then
-    if grep -q DASHBOARD $conffile; then
-        :;
-    fi
-    . $conffile
-    if [ yes = "$DASHBOARD" ] ; then
-        DASHBOARD=true
-    else
-        DASHBOARD=false
-    fi
-    db_set golang-weekly-tools/dashboard "$DASHBOARD"
-fi
-
-db_input high golang-weekly-tools/dashboard || [ $? -eq 30 ]
-db_go || true
diff --git a/debian/golang-weekly-tools.dirs b/debian/golang-weekly-tools.dirs
deleted file mode 100644
index 415f082..0000000
--- a/debian/golang-weekly-tools.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin
diff --git a/debian/golang-weekly-tools.install b/debian/golang-weekly-tools.install
deleted file mode 100644
index fe0e43f..0000000
--- a/debian/golang-weekly-tools.install
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/go /usr/bin
-bin/goapi /usr/bin
-bin/godoc /usr/bin
-bin/gofix /usr/bin
-bin/gofmt /usr/bin
-bin/goinstall /usr/bin
-bin/govet /usr/bin
-bin/gotype /usr/bin
diff --git a/debian/golang-weekly-tools.lintian-overrides b/debian/golang-weekly-tools.lintian-overrides
deleted file mode 100644
index d357b09..0000000
--- a/debian/golang-weekly-tools.lintian-overrides
+++ /dev/null
@@ -1,28 +0,0 @@
-golang-weekly-tools: statically-linked-binary usr/bin/godoc
-golang-weekly-tools: unstripped-binary-or-object usr/bin/godoc
-golang-weekly-tools: statically-linked-binary usr/bin/gofix
-golang-weekly-tools: unstripped-binary-or-object usr/bin/gofix
-golang-weekly-tools: statically-linked-binary usr/bin/gofmt
-golang-weekly-tools: unstripped-binary-or-object usr/bin/gofmt
-golang-weekly-tools: statically-linked-binary usr/bin/goinstall
-golang-weekly-tools: unstripped-binary-or-object usr/bin/goinstall
-golang-weekly-tools: statically-linked-binary usr/bin/govet
-golang-weekly-tools: unstripped-binary-or-object usr/bin/govet
-golang-weekly-tools: statically-linked-binary ./usr/bin/godoc
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/godoc
-golang-weekly-tools: statically-linked-binary ./usr/bin/gofix
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/gofix
-golang-weekly-tools: statically-linked-binary ./usr/bin/gofmt
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/gofmt
-golang-weekly-tools: statically-linked-binary ./usr/bin/goinstall
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/goinstall
-golang-weekly-tools: statically-linked-binary ./usr/bin/govet
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/govet
-golang-weekly-tools: unstripped-binary-or-object usr/bin/ebnflint
-golang-weekly-tools: statically-linked-binary usr/bin/ebnflint
-golang-weekly-tools: statically-linked-binary usr/bin/goapi
-golang-weekly-tools: statically-linked-binary usr/bin/gotype
-golang-weekly-tools: unstripped-binary-or-object ./usr/bin/ebnflint
-golang-weekly-tools: statically-linked-binary ./usr/bin/ebnflint
-golang-weekly-tools: statically-linked-binary ./usr/bin/goapi
-golang-weekly-tools: statically-linked-binary ./usr/bin/gotype
diff --git a/debian/golang-weekly-tools.postinst b/debian/golang-weekly-tools.postinst
deleted file mode 100644
index 330c7fb..0000000
--- a/debian/golang-weekly-tools.postinst
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# Load debconf variables
-. /usr/share/debconf/confmodule
-
-confdir=/etc/golang
-conffile=$confdir/goinstall.conf
-
-set -e
-
-if [ -e $conffile ] ; then
-    # Fetch current values.
-    . $conffile
-fi
-
-# Get this setting from debconf.  It was set based on the content of
-# /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
-if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
-    DASHBOARD="yes"
-else
-    DASHBOARD="no"
-fi
-
-generate_conffile() {
-	if [ ! -d $confdir ]; then
-		mkdir $confdir
-	fi
-	cat <<-EOF >$conffile
-		# Config file for goinstall tool.
-		#
-		# To change this file, use:
-		#        dpkg-reconfigure golang-weekly-tools
-		#
-		# You can also edit it by hand, if you so choose.
-		
-		DASHBOARD="$DASHBOARD"
-	EOF
-
-	# Make sure user nobody can read the file.
-	chmod a+r $conffile
-}
-
-case "$1" in
-    configure)
-	if [ ! -e $conffile ]; then
-	    generate_conffile
-	else
-	    # Replace only if the content changed, to avoid changing the
-	    # config file date when no change was done.
-	    sedopts=" \
-		s/^DASHBOARD=.*$/DASHBOARD=\"$DASHBOARD\"/;   \
-                "
-	    if sed "$sedopts" < $conffile > $conffile.new &&
-		! cmp $conffile $conffile.new > /dev/null; then
-		mv $conffile.new $conffile
-		# Make sure user nobody can read the file.
-		chmod a+r $conffile
-	    else
-		rm $conffile.new
-	    fi
-	fi
-	;;
-    *)
-	;;
-esac
-
-#DEBHELPER#
diff --git a/debian/golang-weekly-tools.postrm b/debian/golang-weekly-tools.postrm
deleted file mode 100644
index 2cf582e..0000000
--- a/debian/golang-weekly-tools.postrm
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# purge the config file which is created in the postinst script
-if [ "$1" = purge ] ; then
-        rm -f /etc/golang/goinstall.conf
-	rmdir /etc/golang || true
-fi
-
-if [ "$1" = "purge" ] && [ -e /usr/share/debconf/confmodule ]; then
-    # Source debconf library.
-    . /usr/share/debconf/confmodule
-    # Remove my changes to the db.
-    db_purge
-fi
-
-#DEBHELPER#
-
diff --git a/debian/golang-weekly-tools.templates b/debian/golang-weekly-tools.templates
deleted file mode 100644
index 2987e7e..0000000
--- a/debian/golang-weekly-tools.templates
+++ /dev/null
@@ -1,15 +0,0 @@
-Template: golang-weekly-tools/dashboard
-Type: boolean
-Default: true
-_Description: Report installation of public packages to Go Dashboard?
- goinstall reports the successful installation of the public packages to
- godashboard.appspot.com, which increments a count associated with the
- package and the time of its most recent installation.  This mechanism
- powers the package list at the Go Dashboard, allowing Go programmers to
- learn about popular packages that might be worth looking at.
- .
- If you choose to participate, the goinstall will report each successful
- installation to the Go Dashboard.
- .
- This choice can be later modified by running "dpkg-reconfigure
- golang-weekly-tools".

-- 
Packaging for Google Go



More information about the Pkg-google-commits mailing list