diff -Nru golang-defaults-1.10~4ubuntu1/debian/changelog golang-defaults-1.11~1/debian/changelog --- golang-defaults-1.10~4ubuntu1/debian/changelog 2018-02-28 09:12:34.000000000 +0000 +++ golang-defaults-1.11~1/debian/changelog 2018-12-29 13:55:11.000000000 +0000 @@ -1,9 +1,31 @@ -golang-defaults (2:1.10~4ubuntu1) bionic; urgency=medium +golang-defaults (2:1.11~1) unstable; urgency=medium - * Merge with Debian stable. Remaining change: - - Build and recommend golang-race-detector-runtime on amd64. + * Update to Go 1.11 (src:golang-1.11) - -- Michael Hudson-Doyle Wed, 28 Feb 2018 22:11:52 +1300 + -- Dr. Tobias Quathamer Sat, 29 Dec 2018 14:55:11 +0100 + +golang-defaults (2:1.10~6) unstable; urgency=medium + + [ Michael Hudson-Doyle ] + * d/control: Update Vcs-* to point at salsa. + * d/helpers/getver.pl: small improvements, thanks Guillem Jover. + (Closes: #909604) + + [ Dr. Tobias Quathamer ] + * Switch team address to tracker.d.o + * Add myself as uploader + * Update Standards-Version to 4.3.0 + - Use HTTPS URL for d/copyright + * Use debhelper v11 + + -- Dr. Tobias Quathamer Thu, 27 Dec 2018 00:20:37 +0100 + +golang-defaults (2:1.10~5) unstable; urgency=medium + + * Remove ppc64 from golang architectures as upstream's minimum ISA + requirement now exceeds Debian's. + + -- Michael Hudson-Doyle Thu, 01 Mar 2018 10:51:58 +1300 golang-defaults (2:1.10~4) unstable; urgency=medium @@ -23,14 +45,6 @@ -- Michael Stapelberg Wed, 28 Feb 2018 09:40:49 +0100 -golang-defaults (2:1.10~1ubuntu1) bionic; urgency=medium - - * Merge with Debian stable. Remaining changes: - - Build and recommend golang-race-detector-runtime on amd64. - - Build golang-go and related packages on s390x. - - -- Michael Hudson-Doyle Thu, 22 Feb 2018 10:43:50 +1300 - golang-defaults (2:1.10~1) unstable; urgency=medium [ Michael Hudson-Doyle ] @@ -41,15 +55,6 @@ -- Michael Stapelberg Sat, 17 Feb 2018 13:06:01 +0100 -golang-defaults (2:1.9~2ubuntu1) bionic; urgency=medium - - * Merge with Debian stable. Remaining changes: - - Build and recommend golang-race-detector-runtime on amd64. - - Build golang-go and related packages on s390x. - * Stop building shared library packages. - - -- Michael Hudson-Doyle Mon, 11 Dec 2017 20:20:55 +1300 - golang-defaults (2:1.9~2) unstable; urgency=medium * Add mips, mips64el and mipsel to golang-go Architectures. @@ -79,15 +84,6 @@ -- Michael Hudson-Doyle Mon, 15 May 2017 09:33:17 +1200 -golang-defaults (2:1.8~1ubuntu1) artful; urgency=medium - - * Merge with Debian experimental. Remaining changes: - - Build and recommend golang-race-detector-runtime on amd64. - - Add golang-go-shared-dev and golang-any-shared-dev. - - Build golang-go and related packages on s390x. - - -- Michael Hudson-Doyle Mon, 24 Apr 2017 10:59:33 +1200 - golang-defaults (2:1.8~1) experimental; urgency=medium * Update to Go 1.8 (src:golang-1.8) @@ -123,16 +119,6 @@ -- Tianon Gravi Fri, 18 Nov 2016 16:56:22 -0800 -golang-defaults (2:1.7~1ubuntu1) zesty; urgency=medium - - * Merge with Debian unstable. Remaining changes: - - Build golang-go everywhere, and have it depend on and symlink to gccgo on - platforms that do not have Go 1.6. - - Build and recommend golang-race-detector-runtime on amd64. - - Add golang-go-shared-dev and golang-any-shared-dev. - - -- Michael Hudson-Doyle Thu, 20 Oct 2016 10:31:35 +1300 - golang-defaults (2:1.7~1) unstable; urgency=medium [ Tianon Gravi ] @@ -146,35 +132,8 @@ -- Tianon Gravi Tue, 23 Aug 2016 14:15:24 -0700 -golang-defaults (2:1.6.1+1ubuntu2) yakkety; urgency=medium - - * Add golang-go-shared-dev and golang-any-shared-dev. (LP: #1508122) - - -- Michael Hudson-Doyle Wed, 25 May 2016 20:59:32 +1200 - -golang-defaults (2:1.6.1+1ubuntu1) yakkety; urgency=medium - - * Merge with Debian unstable. Remaining changes: - - Build golang-go everywhere, and have it depend on and symlink to gccgo on - platforms that do not have Go 1.6. - - Build and recommend golang-race-detector-runtime on amd64. - - -- Michael Hudson-Doyle Tue, 14 Jun 2016 14:48:08 +1200 - golang-defaults (2:1.6.1+1) unstable; urgency=medium * Initial release. (Closes: #818415, #822746) -- Michael Hudson-Doyle Wed, 01 Jun 2016 10:05:10 -0700 - -golang-defaults (2:1.6-1ubuntu4) xenial; urgency=medium - - * Add Breaks/Replaces of trusty golang packages. - - -- Michael Hudson-Doyle Tue, 29 Mar 2016 14:26:32 +1300 - -golang-defaults (2:1.6-1ubuntu3) xenial; urgency=medium - - * Initial release. (LP: #1555856) - - -- Michael Hudson-Doyle Thu, 03 Mar 2016 12:09:51 +1300 diff -Nru golang-defaults-1.10~4ubuntu1/debian/compat golang-defaults-1.11~1/debian/compat --- golang-defaults-1.10~4ubuntu1/debian/compat 2016-04-13 23:35:39.000000000 +0000 +++ golang-defaults-1.11~1/debian/compat 2018-12-29 13:48:57.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru golang-defaults-1.10~4ubuntu1/debian/control golang-defaults-1.11~1/debian/control --- golang-defaults-1.10~4ubuntu1/debian/control 2018-02-28 09:09:29.000000000 +0000 +++ golang-defaults-1.11~1/debian/control 2018-12-29 13:48:57.000000000 +0000 @@ -1,21 +1,21 @@ Source: golang-defaults Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Go Compiler Team +Maintainer: Go Compiler Team Uploaders: Michael Stapelberg , Paul Tagliamonte , Tianon Gravi , Michael Hudson-Doyle , Martín Ferrari , -Build-Depends: debhelper (>= 9), dh-exec -Standards-Version: 3.9.8 + Dr. Tobias Quathamer +Build-Depends: debhelper (>= 11), dh-exec +Standards-Version: 4.3.0 Homepage: https://golang.org -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang-defaults.git -Vcs-Git: https://anonscm.debian.org/git/pkg-golang/golang-defaults.git +Vcs-Browser: https://salsa.debian.org/go-team/compiler/golang-defaults +Vcs-Git: https://salsa.debian.org/go-team/compiler/golang-defaults.git Package: golang-go -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64 ppc64el s390x +Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x Conflicts: gccgo-go Depends: golang-${golang:GOVER}-go, golang-src (>= ${source:Version}), @@ -52,7 +52,6 @@ golang-go-windows-amd64, golang-go.tools (<< 1:0.0~git20151026.0.0f9d71c-1~), golang-golang-x-tools (<< 1:0.0~git20151026.0.0f9d71c-1~) -Recommends: golang-race-detector-runtime [amd64] 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 @@ -107,7 +106,7 @@ It conflicts with golang-go. Package: golang-src -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64 ppc64el s390x +Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x Depends: golang-${golang:GOVER}-src, ${misc:Depends} Description: Go programming language - source files The Go programming language is an open source project to make programmers more @@ -150,7 +149,7 @@ golang-go (>= ${source:Version}), golang-src (>= ${source:Version}), ${misc:Depends} -Architecture: amd64 arm64 armel armhf i386 mips mips64 mipsel ppc64 ppc64el s390x +Architecture: amd64 arm64 armel armhf i386 mips mips64 mipsel ppc64el s390x 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 @@ -164,16 +163,3 @@ . This package is a metapackage that, when installed, guarantees that (most of) a full Go development environment is installed. - -Package: golang-race-detector-runtime -Architecture: amd64 -Depends: golang-${golang:GOVER}-race-detector-runtime, ${misc:Depends} -Description: Runtime support for Go's race detector - The runtime support for the race detector is included as a binary - file in the go source distribution so this package exists to build it - from source on trusted infrastructure. - . - Installing this package will make the -race flag to the go tool functional. - . - This is a dependency package that depends on the race detector runtime for the - default version of Go. diff -Nru golang-defaults-1.10~4ubuntu1/debian/copyright golang-defaults-1.11~1/debian/copyright --- golang-defaults-1.10~4ubuntu1/debian/copyright 2017-12-10 20:10:16.000000000 +0000 +++ golang-defaults-1.11~1/debian/copyright 2018-12-29 13:48:57.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Comment: This package is entirely derived from the debian/* files in the golang packaging, so the copyright information has been copied from there. diff -Nru golang-defaults-1.10~4ubuntu1/debian/gitlab-ci.yml golang-defaults-1.11~1/debian/gitlab-ci.yml --- golang-defaults-1.10~4ubuntu1/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ golang-defaults-1.11~1/debian/gitlab-ci.yml 2018-12-29 13:48:57.000000000 +0000 @@ -0,0 +1,28 @@ + +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go + +# TODO: publish under debian-go-team/ci +image: stapelberg/ci2 + +test_the_archive: + artifacts: + paths: + - before-applying-commit.json + - after-applying-commit.json + script: + # Create an overlay to discard writes to /srv/gopath/src after the build: + - "rm -rf /cache/overlay/{upper,work}" + - "mkdir -p /cache/overlay/{upper,work}" + - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src" + - "export GOPATH=/srv/gopath" + - "export GOCACHE=/cache/go" + # Build the world as-is: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json" + # Copy this package into the overlay: + - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'" + - "pgt-gopath -dsc /tmp/export/*.dsc" + # Rebuild the world: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json" + - "ci-diff before-applying-commit.json after-applying-commit.json" diff -Nru golang-defaults-1.10~4ubuntu1/debian/helpers/getver.pl golang-defaults-1.11~1/debian/helpers/getver.pl --- golang-defaults-1.10~4ubuntu1/debian/helpers/getver.pl 2017-04-23 22:55:43.000000000 +0000 +++ golang-defaults-1.11~1/debian/helpers/getver.pl 2018-12-29 13:48:57.000000000 +0000 @@ -2,13 +2,13 @@ # Extract upstream version from version in changelog. -package main; - use warnings; use strict; -use Dpkg::Version; +use Dpkg::Changelog::Parse; -my $v = Dpkg::Version->new(`dpkg-parsechangelog -SVersion`)->version(); +my $fields = changelog_parse(); +my $v = $fields->{Version}->version(); $v =~ /^([0-9]+\.[0-9]+).*/ or die 'INVALID VERSION! (needs X.Y)'; + printf("%s\n", $1);