Merging debian version 2:1.21~1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 30 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 8c7c1fa..1541db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+golang-defaults (2:1.21~1) experimental; urgency=medium
+
+  * Team upload
+  * Make golang-any depends on determinate package (Closes: #1031351)
+  * Update to Go 1.21 (src:golang-1.21)
+
+ -- Shengjing Zhu <zhsj@debian.org>  Wed, 09 Aug 2023 16:45:21 +0800
+
 golang-defaults (2:1.20~2-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 938a690..d484e9a 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Homepage: https://golang.org
 Package: golang-go
 Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el riscv64 s390x
 Multi-Arch: same
-Depends: golang-${golang:GOVER}-go,
+Depends: golang-${golang:Version}-go,
          golang-src (>= ${source:Version}),
          ${misc:Depends}
 Suggests: git
@@ -74,7 +74,7 @@ Description: Go programming language compiler, linker, compiled stdlib
 Package: golang-any
 Architecture: any
 Multi-Arch: same
-Depends: golang-go (>= ${source:Version}) | gccgo-go (>= ${source:Version}),
+Depends: ${golang:Default} (>= ${source:Version}),
          ${misc:Depends}
 Description: Go programming language -- gccgo on "non-Go" platforms
  The Go programming language is an open source project to make programmers more
@@ -116,7 +116,7 @@ Description: Go programming language -- gccgo
 Package: golang-src
 Architecture: all
 Multi-Arch: foreign
-Depends: golang-${golang:GOVER}-src,
+Depends: golang-${golang:Version}-src,
          ${misc:Depends}
 Description: Go programming language - source files
  The Go programming language is an open source project to make programmers more
@@ -135,7 +135,7 @@ Package: golang-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
-Depends: golang-${golang:GOVER}-doc,
+Depends: golang-${golang:Version}-doc,
          golang-go (>= ${source:Version}),
          ${misc:Depends}
 Description: Go programming language - documentation
@@ -157,7 +157,7 @@ Description: Go programming language - documentation
 Package: golang
 Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el riscv64 s390x
 Multi-Arch: same
-Depends: golang-${golang:GOVER},
+Depends: golang-${golang:Version},
          golang-doc (>= ${source:Version}),
          golang-go (>= ${source:Version}),
          golang-src (>= ${source:Version}),
diff --git a/debian/helpers/getdefault.pl b/debian/helpers/getdefault.pl
new file mode 100755
index 0000000..0c12743
--- /dev/null
+++ b/debian/helpers/getdefault.pl
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+
+# Get default Go implementation.
+
+use warnings;
+use strict;
+
+use Debian::Debhelper::Dh_Lib;
+
+my %known_packages = map { $_ => 1 } getpackages('arch');
+if (exists($known_packages{'golang-go'})) {
+	printf("golang-go\n");
+} else {
+	printf("gccgo-go\n");
+}
diff --git a/debian/rules b/debian/rules
index 53e0bc5..cbb55fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,10 @@
 # -*- makefile -*-
 
 export GOVER := $(shell debian/helpers/getver.pl)
+export GODEFAULT := $(shell debian/helpers/getdefault.pl)
 
 %:
 	dh $@
 
 override_dh_gencontrol:
-	dh_gencontrol -- -Vgolang:GOVER=$(GOVER)
+	dh_gencontrol -- -Vgolang:Version=$(GOVER) -Vgolang:Default=$(GODEFAULT)