[Pkg-golang-commits] [golang] 01/03: Update to 1.5rc1 upstream release
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 f335b0012b24b18e49b6c31aa1415f126569c1a6
Author: Tianon Gravi <admwiggin at gmail.com>
Date: Wed Jul 29 20:57:11 2015 -0700
Update to 1.5rc1 upstream release
---
debian/changelog | 15 +++
debian/control | 261 ++++++----------------------------------
debian/control.base | 103 ----------------
debian/control.cross | 18 ---
debian/copyright | 180 ++++++++++++++++++---------
debian/docs | 2 +-
debian/golang-doc.links | 2 +-
debian/golang-go.install | 2 +-
debian/golang-go.links | 2 +-
debian/golang-go.postinst | 11 +-
debian/golang-pkg.install | 1 +
debian/golang-src.install | 1 -
debian/rules | 60 +--------
debian/source/lintian-overrides | 20 +--
14 files changed, 208 insertions(+), 470 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fa10914..6364049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+golang (2:1.5~rc1-1) UNRELEASED; urgency=low
+
+ * Upload to experimental.
+ * Update to 1.5rc1 upstream release.
+ - Compiler and runtime written entirely in Go.
+ - Concurrent garbage collector.
+ - GOMAXPROCS=runtime.NumCPU() by default.
+ - "internal" packages for all, not just core.
+ - Experimental "vendoring" support.
+ - Cross-compilation no longer requires a complete rebuild of the stdlib in
+ GOROOT, and thus the golang-go-GOHOST-GOARCH packages are removed.
+ * Sync debian/copyright with the Ubuntu delta. (thanks doko!)
+
+ -- Tianon Gravi <admwiggin at gmail.com> Wed, 22 Jul 2015 21:55:56 -0700
+
golang (2:1.4.2-3) unstable; urgency=medium
* Add missing "prerm" for our new alternatives (thanks piuparts).
diff --git a/debian/control b/debian/control
index dfde545..5b1df36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,3 @@
-# DO NOT EDIT THIS FILE. EDIT debian/control.* instead!
Source: golang
Section: devel
Priority: optional
@@ -6,18 +5,19 @@ Maintainer: Go Compiler Team <pkg-golang-devel at lists.alioth.debian.org>
Uploaders: Michael Stapelberg <stapelberg at debian.org>,
Paul Tagliamonte <paultag at debian.org>,
Tianon Gravi <admwiggin at gmail.com>
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-golang/golang.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang.git
Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
-Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
+Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase,
+ golang (>= 1:1.4~) | gccgo-5
Build-Depends-Indep: po-debconf
Standards-Version: 3.9.6
-Homepage: http://golang.org/
+Homepage: https://golang.org
Package: golang-go
-Architecture: i386 amd64 armel armhf
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
golang-src (>= ${source:Version}),
- golang-go-linux-${go:Hostarch} (= ${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
@@ -42,7 +42,7 @@ Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
Conflicts: golang-weekly-src
Provides: golang-weekly-src
Breaks: golang-go (<< 2:1-3~)
-Architecture: i386 amd64 armel armhf
+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
@@ -103,218 +103,37 @@ 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-go-linux-amd64
-Architecture: i386 amd64 armel armhf
+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)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for linux_amd64
- This package contains the Go standard library,
- compiled for linux_amd64.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-linux-arm
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for linux_arm
- This package contains the Go standard library,
- compiled for linux_arm.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-linux-386
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for linux_386
- This package contains the Go standard library,
- compiled for linux_386.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-freebsd-amd64
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for freebsd_amd64
- This package contains the Go standard library,
- compiled for freebsd_amd64.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-freebsd-arm
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for freebsd_arm
- This package contains the Go standard library,
- compiled for freebsd_arm.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-freebsd-386
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for freebsd_386
- This package contains the Go standard library,
- compiled for freebsd_386.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-windows-amd64
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for windows_amd64
- This package contains the Go standard library,
- compiled for windows_amd64.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-windows-386
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for windows_386
- This package contains the Go standard library,
- compiled for windows_386.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-darwin-amd64
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for darwin_amd64
- This package contains the Go standard library,
- compiled for darwin_amd64.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-darwin-386
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for darwin_386
- This package contains the Go standard library,
- compiled for darwin_386.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-netbsd-amd64
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for netbsd_amd64
- This package contains the Go standard library,
- compiled for netbsd_amd64.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
-
-Package: golang-go-netbsd-386
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for netbsd_386
- This package contains the Go standard library,
- compiled for netbsd_386.
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
+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/control.base b/debian/control.base
deleted file mode 100644
index 94e2823..0000000
--- a/debian/control.base
+++ /dev/null
@@ -1,103 +0,0 @@
-Source: golang
-Section: devel
-Priority: optional
-Maintainer: Go Compiler Team <pkg-golang-devel at lists.alioth.debian.org>
-Uploaders: Michael Stapelberg <stapelberg at debian.org>,
- Paul Tagliamonte <paultag at debian.org>,
- Tianon Gravi <admwiggin at gmail.com>
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-golang/golang.git
-Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
-Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
-Build-Depends-Indep: po-debconf
-Standards-Version: 3.9.6
-Homepage: http://golang.org/
-
-Package: golang-go
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
- golang-src (>= ${source:Version}),
- golang-go-linux-${go:Hostarch} (= ${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
-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.
- .
- 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.
-
-Package: golang-src
-Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
-Conflicts: golang-weekly-src
-Provides: golang-weekly-src
-Breaks: golang-go (<< 2:1-3~)
-Architecture: i386 amd64 armel armhf
-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.
- .
- This package provides the Go programming language source files needed
- for godoc and goinstall.
-
-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
- 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 documentation for the Go programming
- language. You can view the formatted documentation by running "godoc
- --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}),
- golang-doc (>= ${source:Version})
-Architecture: all
-Description: Go programming language compiler - metapackage
- 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 is a metapackage that, when installed, guarantees
- that (most of) a full Go development environment is installed.
diff --git a/debian/control.cross b/debian/control.cross
deleted file mode 100644
index 592b4f9..0000000
--- a/debian/control.cross
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Package: golang-go- at OS@- at ARCH@
-Architecture: @BUILDARCHS@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Breaks: golang-go (<< 2:1.1-2)
-Replaces: golang-go (<< 2:1.1-2)
-Description: Go standard library compiled for @OS at _@ARCH@
- This package contains the Go standard library,
- compiled for @OS at _@ARCH at .
- .
- This package is just one of a number of packages, each providing the Go
- standard library for a specific operating system/architecture combination.
- Go supports cross-compilation, so each of these packages is useful on any
- architecture.
- .
- The files contained in this package are independent of the host architecture,
- that is, you can use golang-go-linux-amd64 to generate a binary for
- linux_amd64, even though you are executing the Go compiler on linux_386.
diff --git a/debian/copyright b/debian/copyright
index ae2e96f..c9a86e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,54 @@
-Source: https://go.googlecode.com/hg/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: golang
+Source: https://github.com/golang/go
Files: *
Copyright: © 2009, 2010, The Go Authors. All rights reserved.
License: Go
-Files: include/*, src/lib9/*, src/libbio/*, src/pkg/runtime/386/*,
- src/libmach/*, src/pkg/runtime/arm/vlop.s, src/pkg/runtime/arm/vlrt.c,
- src/pkg/runtime/arm/memset.s, src/pkg/runtime/arm/memmove.s,
- src/pkg/runtime/amd64/memmove.s, src/pkg/runtime/amd64/memmove.s,
- src/pkg/math/fltasm_amd64.s, src/cmd/6c/txt.c, src/cmd/gopack/ar.c,
- src/cmd/ld/lib.[ch], src/cmd/6a/a.[yh], src/cmd/6a/lex.c,
- src/cmd/5g/gobj.c, src/cmd/5g/list.c, src/cmd/5g/gsubr.c,
- src/cmd/5g/opt.h, src/cmd/8c/*, src/cmd/goyacc/goyacc.go,
- src/cmd/5l/*, src/cmd/6g/reg.c, src/cmd/6g/gobj.c,
- src/cmd/6g/peep.c, src/cmd/6g/list.c, src/cmd/6g/gsubr.c,
- src/cmd/6g/opt.c, src/cmd/8l/*, src/cmd/nm/nm.c,
- src/cmd/gc/bits.c, src/cmd/cc/*, src/cmd/5a/*, src/cmd/8g/reg.c,
- src/cmd/8g/gobj.c, src/cmd/8g/peep.c, src/cmd/8g/list.c,
- src/cmd/8g/gsubr.c, src/cmd/8g/opt.h, src/cmd/5c/*, src/cmd/6l/*,
+Files: include/*
+ src/lib9/*
+ src/libbio/*
+ src/runtime/386/*
+ src/libmach/*
+ src/runtime/arm/vlop.s
+ src/runtime/arm/vlrt.c
+ src/runtime/arm/memset.s
+ src/runtime/arm/memmove.s
+ src/runtime/amd64/memmove.s
+ src/runtime/amd64/memmove.s
+ src/math/fltasm_amd64.s
+ src/cmd/6c/txt.c
+ src/cmd/gopack/ar.c
+ src/cmd/ld/lib.[ch]
+ src/cmd/6a/a.[yh]
+ src/cmd/6a/lex.c
+ src/cmd/5g/gobj.c
+ src/cmd/5g/list.c
+ src/cmd/5g/gsubr.c
+ src/cmd/5g/opt.h
+ src/cmd/8c/*
+ src/cmd/goyacc/goyacc.go
+ src/cmd/5l/*
+ src/cmd/6g/reg.c
+ src/cmd/6g/gobj.c
+ src/cmd/6g/peep.c
+ src/cmd/6g/list.c
+ src/cmd/6g/gsubr.c
+ src/cmd/6g/opt.c
+ src/cmd/8l/*
+ src/cmd/nm/nm.c
+ src/cmd/gc/bits.c
+ src/cmd/cc/*
+ src/cmd/5a/*
+ src/cmd/8g/reg.c
+ src/cmd/8g/gobj.c
+ src/cmd/8g/peep.c
+ src/cmd/8g/list.c
+ src/cmd/8g/gsubr.c
+ src/cmd/8g/opt.h
+ src/cmd/5c/*
+ src/cmd/6l/*
src/cmd/8a/*
Origin: Plan 9 from User Space include/, src/lib9/, src/libmach/
Inferno utils/include/, utils/libmach/, utils/6c/, utils/iar/,
@@ -34,22 +65,42 @@ Copyright: © 1994-1999 Lucent Technologies Inc. All rights reserved.
Portions © 2009 The Go Authors. All rights reserved.
License: X11
-Files: src/lib9/goos.c, src/lib9/win32.c, src/lib9/Makefile,
- src/pkg/runtime/386/asm.s, src/pkg/runtime/386/closure.c,
- src/pkg/runtime/arm/asm.s, src/pkg/runtime/arm/closure.c,
- src/pkg/runtime/arm/cas5.s, src/libmach/fakeobj.c,
- src/libmach/macho.h, src/cmd/6c/doc.go, src/cmd/6c/Makefile,
- src/cmd/8c/doc.go, src/cmd/8c/Makefile, src/cmd/5l/doc.go,
- src/cmd/5l/softfloat.c, src/cmd/5l/Makefile, src/cmd/8l/doc.go,
- src/cmd/8l/Makefile, src/cmd/cc/doc.go, src/cmd/cc/Makefile,
- src/cmd/5a/doc.go, src/cmd/5a/Makefile, src/cmd/5c/doc.go,
- src/cmd/5c/Makefile, src/cmd/6l/doc.go, src/cmd/6l/Makefile,
- src/cmd/8a/doc.go, src/cmd/8a/Makefile
+Files: src/lib9/goos.c
+ src/lib9/win32.c
+ src/lib9/Makefile
+ src/runtime/386/asm.s
+ src/runtime/386/closure.c
+ src/runtime/arm/asm.s
+ src/runtime/arm/closure.c
+ src/runtime/arm/cas5.s
+ src/libmach/fakeobj.c
+ src/libmach/macho.h
+ src/cmd/6c/doc.go
+ src/cmd/6c/Makefile
+ src/cmd/8c/doc.go
+ src/cmd/8c/Makefile
+ src/cmd/5l/doc.go
+ src/cmd/5l/softfloat.c
+ src/cmd/5l/Makefile
+ src/cmd/8l/doc.go
+ src/cmd/8l/Makefile
+ src/cmd/cc/doc.go
+ src/cmd/cc/Makefile
+ src/cmd/5a/doc.go
+ src/cmd/5a/Makefile
+ src/cmd/5c/doc.go
+ src/cmd/5c/Makefile
+ src/cmd/6l/doc.go
+ src/cmd/6l/Makefile
+ src/cmd/8a/doc.go
+ src/cmd/8a/Makefile
Copyright: © 2009, 2010, The Go Authors. All rights reserved.
License: Go
-Files: include/fmt.h, src/lib9/utf/*, src/lib9/fmt/*,
- src/pkg/runtime/rune.c
+Files: include/fmt.h
+ src/lib9/utf/*
+ src/lib9/fmt/*
+ src/runtime/rune.c
Copyright: © 1998-2002 by Lucent Technologies.
Portions © 2004 Google Inc.
Portions © 2009 The Go Authors. All rights reserved.
@@ -91,36 +142,39 @@ Notes:
It's convenient to have a copy here because we need just the one
Perl script, not all the C++ libraries that surround it.
-Files: src/pkg/runtime/tiny/bootblock
+Files: src/runtime/tiny/bootblock
Origin: Xv6 rev3
Copyright: © 2006-2009 Frans Kaashoek, Robert Morris, Russ Cox,
Massachusetts Institute of Technology
License: X11
-Files: src/pkg/debug/dwarf/testdata/typedef.macho,
- src/pkg/debug/dwarf/testdata/typedef.elf
-Source: src/pkg/debug/dwarf/testdata/typedef.c
+Files: src/debug/dwarf/testdata/typedef.macho
+ src/debug/dwarf/testdata/typedef.elf
+Source: src/debug/dwarf/testdata/typedef.c
Copyright: © 2009, The Go Authors. All rights reserved.
License: Go
-Files: src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug,
- src/pkg/debug/macho/testdata/gcc-386-darwin-exec,
- src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec,
- src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.o,
- src/pkg/debug/elf/testdata/gcc-amd64-linux-exec,
- src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.o,
- src/pkg/debug/elf/testdata/gcc-386-freebsd-exec,
- src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.o
+Files: src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
+ src/debug/macho/testdata/gcc-386-darwin-exec
+ src/debug/macho/testdata/gcc-amd64-darwin-exec
+ src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.o
+ src/debug/elf/testdata/gcc-amd64-linux-exec
+ 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: ?
+Copyright: © 2009, 2010, The Go Authors. All rights reserved.
+License: Go
-Files: src/pkg/debug/elf/elf.go, src/cmd/ld/elf.h
+Files: src/debug/elf/elf.go
+ src/cmd/ld/elf.h
Origin: FreeBSD src/sys/sys/elf{32,64,_common}.h, src/sys/*/include/elf.h
Copyright: © 1996-1998 John D. Polstra. All rights reserved.
© 2001 David E. O'Brien
Portions © 2009 The Go Authors. All rights reserved.
License: FreeBSD
-Files: src/pkg/math/log1p.go
+Files: src/math/log1p.go
Origin: Translated and simplified from FreeBSD /usr/src/lib/msun/src/s_log1p.c
Copyright: © 2010 The Go Authors. All rights reserved.
Based on code © 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -138,20 +192,21 @@ License: Go
software is freely granted, provided that this notice
is preserved.
-Files: src/pkg/image/jpeg/idct.go
+Files: src/image/jpeg/idct.go
Origin: Translated from idct.c in the MPEG-2 (ISO/IEC 13818-4)
technical report video software verifier (mpeg2decode)
version 960109
Copyright: © 1996, MPEG Software Simulation Group. All Rights Reserved.
License: MPEG
-Files: src/pkg/exp/spacewar/pdp1.go, src/pkg/exp/spacewar/spacewar.go
+Files: src/exp/spacewar/pdp1.go
+ src/exp/spacewar/spacewar.go
Origin: Translated from the Java emulator pdp1.java in Spacewar!
Copyright: © 1996 Barry Silverman, Brian Silverman, Vadim Gerasimov.
Portions © 2009 The Go Authors.
License: Spacewar!
-Files: src/pkg/exp/spacewar/code.go
+Files: src/exp/spacewar/code.go
Origin: The original Spacewar!
Copyright: See license
License: PD
@@ -184,7 +239,8 @@ License: PD
Brian Silverman
Vadim Gerasimov
-Files: src/pkg/exp/4s/xs.go, src/pkg/exp/4s/data.go
+Files: src/exp/4s/xs.go
+ src/exp/4s/data.go
Origin: Derived from Plan 9's /sys/src/games/xs.c
Copyright: © 2003, Lucent Technologies Inc. and others. All Rights Reserved.
Portions © 2009 The Go Authors. All Rights Reserved.
@@ -201,12 +257,12 @@ Copyright: © 2003, Lucent Technologies Inc. and others. All Rights Reserved.
Portions © 2009 The Go Authors. All Rights Reserved.
License: Plan9
-Files: src/pkg/html/testdata/webkit/*
+Files: src/html/testdata/webkit/*
Origin: WebKit LayoutTests/html5lib/resources/
Copyright: © 2009, Apple Inc. All rights reserved.
License: WebKit
-Files: src/pkg/image/png/testdata/pngsuite/*
+Files: src/image/png/testdata/pngsuite/*
Origin: libpng 1.2.40, contrib/pngsuite/*
Copyright: © Willem van Schaik, 1999
License: noderivs
@@ -230,11 +286,13 @@ Authors: contributed by The Go Authors.
modified by Michael Mellor)
License: Shootout
-Files: test/garbage/tree.go, test/bench/*
+Files: test/garbage/tree.go
+ test/bench/*
Copyright: Brent Fulgham
License: Shootout
-Files: favicon.ico, doc/gopher/*
+Files: favicon.ico
+ doc/gopher/*
Author: Renée French
License: CC-BY-3.0
The mascot and logo were designed by
@@ -253,10 +311,18 @@ License: CC-BY-3.0
Except as noted, this content is licensed under Creative Commons
Attribution 3.0
-Files: doc/htmlgen.go, doc/makehtml, doc/popups.js, doc/style.css,
- doc/Makefile, doc/codelab/wiki/Makefile, doc/prog.sh, doc/progs/*,
- doc/codewalk/codewalk.css, doc/codewalk/codewalk.js,
- doc/codewalk/urlpoll.go, doc/talks/io2010/*.go
+Files: doc/htmlgen.go
+ doc/makehtml
+ doc/popups.js
+ doc/style.css
+ doc/Makefile
+ doc/codelab/wiki/Makefile
+ doc/prog.sh
+ doc/progs/*
+ doc/codewalk/codewalk.css
+ doc/codewalk/codewalk.js
+ doc/codewalk/urlpoll.go
+ doc/talks/io2010/*.go
Copyright: © 2009, 2010, The Go Authors. All rights reserved.
License: Go
@@ -272,8 +338,10 @@ License: W3C
Files: debian/*
Copyright: 2010 Ivan Wong <ivanwyc at gmail.com>
- 2010-2013 Ondřej Surý <ondrej at debian.org>
- 2013 Michael Stapelberg <stapelberg at debian.org>
+ 2010 Ondřej Surý <ondrej at debian.org>
+ 2012 Michael Stapelberg <stapelberg at debian.org>
+ 2014 Canonical Ltd
+ 2014 Tianon Gravi <admwiggin at gmail.com>
License: Go
License: Go
diff --git a/debian/docs b/debian/docs
index 9975f39..4ad6ffb 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-README
AUTHORS
CONTRIBUTORS
+README.md
diff --git a/debian/golang-doc.links b/debian/golang-doc.links
index 68cc210..fbd3d65 100644
--- a/debian/golang-doc.links
+++ b/debian/golang-doc.links
@@ -1,2 +1,2 @@
-usr/share/doc/golang-doc/html /usr/lib/go/doc
usr/share/doc/golang-doc/favicon.ico /usr/lib/go/favicon.ico
+usr/share/doc/golang-doc/html /usr/lib/go/doc
diff --git a/debian/golang-go.install b/debian/golang-go.install
index c819e34..33cb6d6 100644
--- a/debian/golang-go.install
+++ b/debian/golang-go.install
@@ -1,5 +1,5 @@
+VERSION /usr/lib/go/
bin/go /usr/lib/go/bin/
bin/gofmt /usr/lib/go/bin/
pkg/obj /usr/lib/go/pkg/
pkg/tool /usr/lib/go/pkg/
-VERSION /usr/lib/go/
diff --git a/debian/golang-go.links b/debian/golang-go.links
index 8a3bad6..424fc79 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/src /usr/lib/go/src
usr/share/go/test /usr/lib/go/test
-usr/share/go/include /usr/lib/go/include
diff --git a/debian/golang-go.postinst b/debian/golang-go.postinst
index 6a6081e..ca3f089 100644
--- a/debian/golang-go.postinst
+++ b/debian/golang-go.postinst
@@ -22,8 +22,15 @@ case "$1" in
# Very ugly hack to set timestamps same as /usr/lib/go/bin/go
find /usr/lib/go/pkg -exec touch -r /usr/lib/go/bin/go {} \;
# Setup alternatives
- # Priority: base of 100 + go version; 1.4.2 = 100 + 42)
- go=$(/usr/lib/go/bin/go version | awk '{ gsub(/^go1|[.]/, "", $3); print $3 }')
+ # Priority: base of 100 + go version; 1.4.2 = 100 + 42; 1.5 = 100 + 50
+ go=$(/usr/lib/go/bin/go version | awk '{
+ gsub(/^go1|[.]/, "", $3);
+ gsub(/([^0-9.]+.*)$/, "", $3);
+ if ($3 ~ /^[0-9]$/) {
+ $3 = $3 "0";
+ };
+ print $3;
+ }')
priority=$(( 100 + $go ))
update-alternatives \
--install /usr/bin/go go /usr/lib/go/bin/go $priority \
diff --git a/debian/golang-pkg.install b/debian/golang-pkg.install
new file mode 100644
index 0000000..7546b66
--- /dev/null
+++ b/debian/golang-pkg.install
@@ -0,0 +1 @@
+pkg/*_* /usr/lib/go/pkg/
diff --git a/debian/golang-src.install b/debian/golang-src.install
index f245da9..f034ba5 100644
--- a/debian/golang-src.install
+++ b/debian/golang-src.install
@@ -1,3 +1,2 @@
src /usr/share/go/
test /usr/share/go/
-include /usr/share/go/
diff --git a/debian/rules b/debian/rules
index b2545c2..957fcbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,22 +8,11 @@ libexecdir := /usr/lib/go
datadir := /usr/share/go
bindir := /bin
-# We loop over supported operating systems and architectures multiple times,
-# so these two variables contain a centralized version of that code.
-# The variables $$os and $$arch can be used inside such a loop.
-FOR_GO_ARCH := for os in $$(echo linux freebsd windows darwin netbsd); do \
- archs="amd64 386"; \
- [ "$$os" = "linux" ] || [ "$$os" = "freebsd" ] && archs="amd64 arm 386"; \
- for arch in $$(echo $$archs); do
-FOR_GO_ARCH_END := done; done
-
build-arch build-indep build clean install binary-arch binary-indep binary: debian/control
+dh --parallel $(opt_no_act) $@
override_dh_auto_clean:
rm -rf bin pkg
- # golang-go-$os-$arch.install files are auto-generated in override_dh_install
- rm -f debian/golang-go-*.install
rm -f debian/*+
rm -f debian/build.stamp
rm -f test/pass.out test/run.out test/times.out
@@ -42,34 +31,16 @@ endif
override_dh_compress:
dh_compress -Xusr/share/doc/$(PACKAGE)-doc/html -Xusr/share/doc/$(PACKAGE)-doc/godoc
-# Generates debian/control from debian/control.base and debian/control.cross.
-# In the latter, @OS@ and @ARCH@ are replaced with every supported combination
-# of operating system and architecture (e.g. linux_amd64, linux_386, …).
-gencontrol:
- echo "# DO NOT EDIT THIS FILE. EDIT debian/control.* instead!" > debian/control.tmp
- cat debian/control.base >> debian/control.tmp
- ${FOR_GO_ARCH} \
- BUILDARCHS=all; \
- [ "$$os" = "linux" ] && BUILDARCHS="i386 amd64 armel armhf"; \
- sed -e "s, at OS@,$$os,g; s, at ARCH@,$$arch,g; s, at BUILDARCHS@,$$BUILDARCHS,g" debian/control.cross >> debian/control.tmp; \
- ${FOR_GO_ARCH_END}
- mv debian/control.tmp debian/control
-
override_dh_install:
- -${FOR_GO_ARCH} \
- echo "pkg/$${os}_$${arch} /usr/lib/go/pkg/" > debian/golang-go-$$os-$$arch.install; \
- [ "$$arch" = "amd64" ] && [ "$$os" = "linux" ] && echo "pkg/linux_amd64_race /usr/lib/go/pkg" >> debian/golang-go-$$os-$$arch.install; \
- echo "golang-go-$$os-$$arch: arch-independent-package-contains-binary-or-object" > debian/golang-go-$$os-$$arch.lintian-overrides; \
- ${FOR_GO_ARCH_END}
# Install the native runtime/cgo.a to the golang-go package.
# runtime/cgo is only built for the native architecture, but the
# golang-go-OS-ARCH packages are built on one particular buildd, which
# might either be i386 or amd64.
echo "listing of $$(pwd):"; ls -hlR .
echo "listing of GOBIN: ($(GOBIN))"; ls -hlR $(GOBIN)
- for file in $$(cd pkg/ && ls */runtime/cgo.a); do \
- mkdir -p $(CURDIR)/debian/golang-go/usr/lib/go/pkg/$$(dirname $$file); \
- mv pkg/$$file $(CURDIR)/debian/golang-go/usr/lib/go/pkg/$$file; \
+ for file in pkg/*/runtime/cgo.a; do \
+ mkdir -p $(CURDIR)/debian/golang-go/usr/lib/go/$$(dirname $$file); \
+ mv $$file $(CURDIR)/debian/golang-go/usr/lib/go/$$file; \
done
dh_install --fail-missing
# Remove .syso files of the race detector; it is not used yet and the files are arch-dependent.
@@ -80,10 +51,6 @@ override_dh_install:
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
- # For some reason, Go cross-compiles a handful of tools: {yacc,fix,api,vet,cgo}.
- # Delete those, as they cannot be ran anyway.
- # This is tracked upstream at https://code.google.com/p/go/issues/detail?id=5667
- (cd $(CURDIR)/debian/golang-go/usr/lib/go/pkg/tool && find . -depth -path "./$(GOHOSTOS)_$(GOHOSTARCH)*" -prune -o -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 {} \;
@@ -92,10 +59,6 @@ override_dh_strip:
# strip disabled as golang upstream doesn't support it and it makes go
# crash. See http://bugs.debian.org/717172
-override_dh_prep:
- dh_prep
- echo 'go:Hostarch=$(GOHOSTARCH)' >> debian/golang-go.substvars
-
override_dh_builddeb:
dh_builddeb -- -Zxz
@@ -103,23 +66,10 @@ override_dh_shlibdeps:
dh_shlibdeps -Xtestdata -Xtest
debian/build.stamp:
+ [ -f VERSION ] || echo "debian snapshot +$$(dpkg-parsechangelog -SVersion)" > VERSION
rm -f debian/build.stamp
mkdir -p $(GOBIN)
- # Build native tools first, then bootstrap all other GOOS/GOARCH combinations.
- cd src && bash ./make.bash --no-banner
- # For the race detector to work (go test -race), we need to install the
- # std library with the race detector enabled. This will result in
- # having an additional “architecture” directory, e.g. linux_amd64_race.
- #
- # The race detector currently only works on linux/amd64. The check within
- # the following loop works precisely the same way src/race.bash does.
- -${FOR_GO_ARCH} \
- export GOARCH=$$arch; \
- export GOOS=$$os; \
- cd src && bash ./make.bash --no-clean; \
- [ "$$arch" = "amd64" ] && [ "$$os" = "linux" ] && $(GOBIN)/go install -race std; \
- cd ..; \
- ${FOR_GO_ARCH_END}
+ export GOROOT_BOOTSTRAP=$$(env -i go env GOROOT) && cd src && bash ./make.bash --no-banner
>debian/build.stamp
opt_no_act =
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index eaa4578..c078098 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,10 +1,10 @@
-golang source: source-contains-prebuilt-binary src/pkg/debug/dwarf/testdata/typedef.elf
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/gcc-amd64-linux-exec
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/gcc-386-freebsd-exec
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
-golang source: source-contains-prebuilt-windows-binary src/pkg/debug/pe/testdata/gcc-386-mingw-exec
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
-golang source: source-contains-prebuilt-binary src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
-golang source: source-contains-prebuilt-windows-binary src/pkg/debug/pe/testdata/gcc-386-mingw-obj
-golang source: source-contains-prebuilt-binary src/pkg/runtime/race/race_linux_amd64.syso
+golang source: source-contains-prebuilt-binary src/debug/dwarf/testdata/typedef.elf
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/gcc-amd64-linux-exec
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/gcc-386-freebsd-exec
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
+golang source: source-contains-prebuilt-windows-binary src/debug/pe/testdata/gcc-386-mingw-exec
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
+golang source: source-contains-prebuilt-binary src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
+golang source: source-contains-prebuilt-windows-binary src/debug/pe/testdata/gcc-386-mingw-obj
+golang source: source-contains-prebuilt-binary src/runtime/race/race_linux_amd64.syso
--
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