[Pkg-golang-commits] [golang] 02/03: Consolidate packages down to just "golang-go", "golang-src", and "golang-doc"
Tianon Gravi
tianon at debian.org
Tue Aug 18 21:22:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
tianon pushed a commit to branch debian-experimental
in repository golang.
commit b5eff64bf80412d332bc7a4c147dfbc56c6f82b9
Author: Tianon Gravi <admwiggin at gmail.com>
Date: Mon Aug 3 22:02:24 2015 -0700
Consolidate packages down to just "golang-go", "golang-src", and "golang-doc"
---
debian/control | 115 ++++++++++++++++------------------------------
debian/copyright | 2 +-
debian/golang-go.install | 2 +
debian/golang-go.links | 2 +-
debian/golang-pkg.install | 1 -
debian/rules | 6 +--
6 files changed, 45 insertions(+), 83 deletions(-)
diff --git a/debian/control b/debian/control
index 5b1df36..3edf514 100644
--- a/debian/control
+++ b/debian/control
@@ -16,56 +16,59 @@ Homepage: https://golang.org
Package: golang-go
Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
- golang-src (>= ${source:Version}),
- golang-pkg (= ${source:Version})
-Replaces: golang-weekly-go, golang-weekly-tools, golang-tools
-Conflicts: golang-weekly-go, golang-weekly-tools, golang-tools
-Provides: go-compiler, golang-weekly-go, golang-weekly-tools, golang-tools
+ golang-src (>= ${source:Version})
+Replaces: golang-go-darwin-386,
+ golang-go-darwin-amd64,
+ golang-go-freebsd-386,
+ golang-go-freebsd-amd64,
+ golang-go-freebsd-arm,
+ golang-go-linux-386,
+ golang-go-linux-amd64,
+ golang-go-linux-arm,
+ golang-go-netbsd-386,
+ golang-go-netbsd-amd64,
+ golang-go-windows-386,
+ golang-go-windows-amd64
Suggests: bzr, git, golang-go.tools, mercurial, subversion
-Description: Go programming language compiler
- 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.
+Description: Go programming language compiler, linker, compiled stdlib
+ 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.
+ .
+ This package provides an assembler, compiler, linker, and compiled libraries
+ for the Go programming language.
.
- This package provides an assembler, a compiler, and a linker for the
- Go programming language. This is Google's implementation of the Go
- tool chain.
+ Go supports cross-compilation, but as of Go 1.5, it is no longer necessary to
+ pre-compile the standard library inside GOROOT for cross-compilation to work.
Package: golang-src
-Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
-Conflicts: golang-weekly-src
-Provides: golang-weekly-src
+Replaces: golang-go (<< 2:1-3~)
Breaks: golang-go (<< 2:1-3~)
Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Go programming language compiler - source files
- 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.
+Description: Go programming language - source files
+ 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.
.
- This package provides the Go programming language source files needed
- for godoc and goinstall.
+ This package provides the Go programming language source files needed for
+ cross-compilation.
Package: golang-doc
-Replaces: golang-weekly-doc
-Conflicts: golang-weekly-doc
-Provides: golang-weekly-doc
Depends: ${misc:Depends}, golang-go
Architecture: all
Section: doc
-Description: Go programming language compiler - documentation
+Description: Go programming language - documentation
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
@@ -81,9 +84,6 @@ Description: Go programming language compiler - documentation
--http=:6060", and then visiting http://localhost:6060/doc/install.html.
Package: golang
-Replaces: golang-weekly
-Conflicts: golang-weekly
-Provides: golang-weekly
Depends: ${misc:Depends},
golang-go (>= ${source:Version}),
golang-src (>= ${source:Version}),
@@ -102,38 +102,3 @@ Description: Go programming language compiler - metapackage
.
This package is a metapackage that, when installed, guarantees
that (most of) a full Go development environment is installed.
-
-Package: golang-pkg
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2),
- golang-go-darwin-386,
- golang-go-darwin-amd64,
- golang-go-freebsd-386,
- golang-go-freebsd-amd64,
- golang-go-freebsd-arm,
- golang-go-linux-386,
- golang-go-linux-amd64,
- golang-go-linux-arm,
- golang-go-netbsd-386,
- golang-go-netbsd-amd64,
- golang-go-windows-386,
- golang-go-windows-amd64
-Replaces: golang-go (<< 2:1.1-2),
- golang-go-darwin-386,
- golang-go-darwin-amd64,
- golang-go-freebsd-386,
- golang-go-freebsd-amd64,
- golang-go-freebsd-arm,
- golang-go-linux-386,
- golang-go-linux-amd64,
- golang-go-linux-arm,
- golang-go-netbsd-386,
- golang-go-netbsd-amd64,
- golang-go-windows-386,
- golang-go-windows-amd64
-Description: Go standard library
- This package contains the Go standard library in compiled form.
- .
- Go supports cross-compilation, but as of Go 1.5, it is no longer necessary to
- pre-compile the standard library inside GOROOT for cross-compilation to work.
diff --git a/debian/copyright b/debian/copyright
index c9a86e4..96afe8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -162,7 +162,7 @@ Files: src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
src/debug/elf/testdata/go-relocation-test-gcc441-x86.o
src/debug/elf/testdata/gcc-386-freebsd-exec
src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.o
-Source: ?
+Source: src/debug/elf/testdata/hello.c
Copyright: © 2009, 2010, The Go Authors. All rights reserved.
License: Go
diff --git a/debian/golang-go.install b/debian/golang-go.install
index 33cb6d6..c79c8b1 100644
--- a/debian/golang-go.install
+++ b/debian/golang-go.install
@@ -1,5 +1,7 @@
VERSION /usr/lib/go/
bin/go /usr/lib/go/bin/
bin/gofmt /usr/lib/go/bin/
+pkg/*_* /usr/lib/go/pkg/
+pkg/include /usr/share/go/pkg/
pkg/obj /usr/lib/go/pkg/
pkg/tool /usr/lib/go/pkg/
diff --git a/debian/golang-go.links b/debian/golang-go.links
index 424fc79..8865815 100644
--- a/debian/golang-go.links
+++ b/debian/golang-go.links
@@ -1,3 +1,3 @@
-usr/share/go/include /usr/lib/go/include
+usr/share/go/pkg/include /usr/lib/go/pkg/include
usr/share/go/src /usr/lib/go/src
usr/share/go/test /usr/lib/go/test
diff --git a/debian/golang-pkg.install b/debian/golang-pkg.install
deleted file mode 100644
index 7546b66..0000000
--- a/debian/golang-pkg.install
+++ /dev/null
@@ -1 +0,0 @@
-pkg/*_* /usr/lib/go/pkg/
diff --git a/debian/rules b/debian/rules
index 957fcbb..f2af34b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
# This file is in the public domain.
# You may freely use, modify, distribute, and relicense it.
-PACKAGE = golang
-
libexecdir := /usr/lib/go
datadir := /usr/share/go
bindir := /bin
@@ -29,7 +27,7 @@ else
endif
override_dh_compress:
- dh_compress -Xusr/share/doc/$(PACKAGE)-doc/html -Xusr/share/doc/$(PACKAGE)-doc/godoc
+ dh_compress -Xusr/share/doc/golang-doc/html -Xusr/share/doc/golang-doc/godoc
override_dh_install:
# Install the native runtime/cgo.a to the golang-go package.
@@ -49,8 +47,6 @@ override_dh_install:
find $(CURDIR)/debian/golang-src/usr/share/go/src -type f -name "*.rc" -delete
# Remove empty /usr/share/go/src from golang-go, it is provided by golang-src
find $(CURDIR)/debian/golang-go/usr/share/go/src -type d -delete
- # Subsequently, /usr/share/go is empty, too, so remove
- find $(CURDIR)/debian/golang-go/usr/share/go -type d -delete
# Touch built and installed files and directories to have same timestamp
touch $(CURDIR)/debian/golang-go/usr/lib/go/pkg
find $(CURDIR)/debian/golang-go/usr/lib/go/pkg -exec touch -r $(CURDIR)/debian/golang-go/usr/lib/go/pkg {} \;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git
More information about the pkg-golang-commits
mailing list