diff -Nru golang-defaults-1.10~4ubuntu1/debian/changelog golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/changelog --- golang-defaults-1.10~4ubuntu1/debian/changelog 2018-02-28 09:12:34.000000000 +0000 +++ golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/changelog 2020-08-31 10:44:21.000000000 +0000 @@ -1,3 +1,87 @@ +golang-defaults (2:1.13~1ubuntu2~ppa18.04+1) bionic; urgency=medium + + * Backport from Focal. + + -- Nicolas Derive Mon, 31 Aug 2020 12:44:21 +0200 + +golang-defaults (2:1.13~1ubuntu2) focal; urgency=medium + + * Make golang-go depend on golang-1.14-go on riscv64 (but stick to 1.13 on + other golang architectures). + + -- Michael Hudson-Doyle Thu, 16 Apr 2020 12:12:36 +1200 + +golang-defaults (2:1.13~1ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Build and recommend golang-race-detector-runtime on amd64. + + -- Didier Roche Wed, 27 Nov 2019 10:12:02 +0100 + +golang-defaults (2:1.13~1) unstable; urgency=medium + + * Update to Go 1.13 (src:golang-1.13) + + -- Dr. Tobias Quathamer Fri, 04 Oct 2019 13:23:03 +0200 + +golang-defaults (2:1.12~1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build and recommend golang-race-detector-runtime on amd64. + + -- Gianfranco Costamagna Sun, 04 Aug 2019 22:46:14 +0200 + +golang-defaults (2:1.12~1) unstable; urgency=medium + + [ Louis-Philippe Véronneau ] + * d/control: Suggest installing git (Closes: #933003) + + [ Anthony Fok ] + * Add myself to the list of Uploaders + * Apply "cme fix dpkg" fixes: + - Update debhelper dependency to "Build-Depends: debhelper-compat (= 12)" + - Bump Standards-Version to 4.4.0 (no change) + * Have gccgo-go depend on gccgo-9 + * Update to Go 1.12 (src:golang-1.12) (Closes: #924623) + + -- Anthony Fok Sat, 03 Aug 2019 04:27:09 -0600 + +golang-defaults (2:1.11~1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build and recommend golang-race-detector-runtime on amd64. + + -- Gianfranco Costamagna Tue, 30 Apr 2019 14:05:59 +0200 + +golang-defaults (2:1.11~1) unstable; urgency=medium + + * Update to Go 1.11 (src:golang-1.11) + + -- 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~4ubuntu1) bionic; urgency=medium * Merge with Debian stable. Remaining change: diff -Nru golang-defaults-1.10~4ubuntu1/debian/control golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/control --- golang-defaults-1.10~4ubuntu1/debian/control 2018-02-28 09:09:29.000000000 +0000 +++ golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/control 2020-08-31 10:44:21.000000000 +0000 @@ -1,25 +1,28 @@ Source: golang-defaults -Section: devel -Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Go Compiler Team +XSBC-Original-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 , + Anthony Fok +Section: devel +Priority: optional +Build-Depends: debhelper (>= 9), + dh-exec +Standards-Version: 4.4.0 +Vcs-Browser: https://salsa.debian.org/go-team/compiler/golang-defaults +Vcs-Git: https://salsa.debian.org/go-team/compiler/golang-defaults.git 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 Package: golang-go -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64 ppc64el s390x -Conflicts: gccgo-go +Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el riscv64 s390x Depends: golang-${golang:GOVER}-go, golang-src (>= ${source:Version}), ${misc:Depends} +Suggests: git Breaks: gccgo-5 (<< 5.3.1-12~), gccgo-6 (<< 6-20160319-1~), golang-doc (<< 2:1.6.1+1~), @@ -37,6 +40,7 @@ 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~) +Conflicts: gccgo-go Replaces: golang-doc (<< 2:1.6.1+1~), golang-go-darwin-386, golang-go-darwin-amd64, @@ -91,7 +95,8 @@ Package: gccgo-go Architecture: any -Depends: gccgo-8, ${misc:Depends} +Depends: gccgo-9, + ${misc:Depends} Conflicts: golang-go Description: Go programming language -- gccgo The Go programming language is an open source project to make programmers more @@ -107,8 +112,9 @@ It conflicts with golang-go. Package: golang-src -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64 ppc64el s390x -Depends: golang-${golang:GOVER}-src, ${misc:Depends} +Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el riscv64 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 productive. Go is expressive, concise, clean, and efficient. Its concurrency @@ -123,11 +129,11 @@ source code, which is needed for the go build process. Package: golang-doc +Architecture: all +Section: doc Depends: golang-${golang:GOVER}-doc, golang-go (>= ${source:Version}), ${misc:Depends} -Architecture: all -Section: doc 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 @@ -145,12 +151,12 @@ http://localhost:6060/doc/install.html. Package: golang +Architecture: amd64 arm64 armel armhf i386 mips mips64 mipsel ppc64el riscv64 s390x Depends: golang-${golang:GOVER}, golang-doc (>= ${source:Version}), golang-go (>= ${source:Version}), golang-src (>= ${source:Version}), ${misc:Depends} -Architecture: amd64 arm64 armel armhf i386 mips mips64 mipsel ppc64 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 diff -Nru golang-defaults-1.10~4ubuntu1/debian/copyright golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/copyright --- golang-defaults-1.10~4ubuntu1/debian/copyright 2017-12-10 20:10:16.000000000 +0000 +++ golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/copyright 2020-04-15 23:30:08.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/gccgo-go.links golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/gccgo-go.links --- golang-defaults-1.10~4ubuntu1/debian/gccgo-go.links 2018-02-28 09:09:14.000000000 +0000 +++ golang-defaults-1.13~1ubuntu2~ppa18.04+1/debian/gccgo-go.links 2020-04-15 23:30:08.000000000 +0000 @@ -1,2 +1,2 @@ -usr/bin/go-8 usr/bin/go -usr/bin/gofmt-8 usr/bin/gofmt +usr/bin/go-9 usr/bin/go +usr/bin/gofmt-9 usr/bin/gofmt diff -Nru golang-defaults-1.10~4ubuntu1/debian/gitlab-ci.yml golang-defaults-1.13~1ubuntu2~ppa18.04+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.13~1ubuntu2~ppa18.04+1/debian/gitlab-ci.yml 2019-08-16 02:00:39.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.13~1ubuntu2~ppa18.04+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.13~1ubuntu2~ppa18.04+1/debian/helpers/getver.pl 2020-04-16 00:12:36.000000000 +0000 @@ -2,13 +2,21 @@ # Extract upstream version from version in changelog. -package main; - use warnings; use strict; -use Dpkg::Version; +use Dpkg::Changelog::Parse; +use Dpkg::Arch qw(get_host_arch); + +my $v; + +if (get_host_arch() eq "riscv64") { + $v = '1.14'; +} else { + my $fields = changelog_parse(); + $v = $fields->{Version}->version(); + $v =~ /^([0-9]+\.[0-9]+).*/ or die 'INVALID VERSION! (needs X.Y)'; + $v = $1; +} -my $v = Dpkg::Version->new(`dpkg-parsechangelog -SVersion`)->version(); -$v =~ /^([0-9]+\.[0-9]+).*/ or die 'INVALID VERSION! (needs X.Y)'; -printf("%s\n", $1); +printf("%s\n", $v);