[neon/backports-jammy/debuerreotype/Neon/unstable] debian: 0.10-2 (patches unapplied)

[git-ubuntu importer]

Git commit 782117f1c1b317ea680df32e9ffd8b9751c1cdb9 by git-ubuntu importer, on behalf of Tianon Gravi.
Committed on 26/02/2021 at 05:28.
Pushed by carlosdem into branch 'Neon/unstable'.

0.10-2 (patches unapplied)

Imported using git-ubuntu import.

M  +18   -0    debian/changelog
D  +0    -1    debian/compat
M  +4    -4    debian/control
M  +2    -0    debian/tests/control
M  +26   -3    debian/tests/stretch
A  +4    -0    debian/upstream/metadata

https://invent.kde.org/neon/backports-jammy/debuerreotype/-/commit/782117f1c1b317ea680df32e9ffd8b9751c1cdb9

diff --git a/debian/changelog b/debian/changelog
index 93cf812..d6a707b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+debuerreotype (0.10-2) unstable; urgency=medium
+
+  [ Tianon Gravi ]
+  * Add "wget" to Recommends and move "debian-archive-keyring" to Recommends
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Update standards version to 4.5.0, no changes needed.
+
+  [ Tianon Gravi ]
+  * Adjust autopkgtest to include removed keyrings (Closes: #983512)
+  * Add "arm64" to autopkgtest, and be more forgiving (Closes: #983513)
+
+ -- Tianon Gravi <tianon at debian.org>  Thu, 25 Feb 2021 12:56:24 -0800
+
 debuerreotype (0.10-1) unstable; urgency=medium
 
   * Update to 0.10 upstream release (very focused on building EOL suites)
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 39b3c12..6516849 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: debuerreotype
 Maintainer: Tianon Gravi <tianon at debian.org>
 Section: admin
 Priority: optional
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 11~)
+Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 12)
 Homepage: https://github.com/debuerreotype/debuerreotype
 Vcs-Browser: https://github.com/debuerreotype/debian-debuerreotype
 Vcs-Git: https://github.com/debuerreotype/debian-debuerreotype.git
 
 Package: debuerreotype
 Architecture: all
-Depends: debian-archive-keyring, ${misc:Depends}
-Recommends: debootstrap
+Depends: ${misc:Depends}
+Recommends: debian-archive-keyring, debootstrap, wget
 Suggests: diffoscope
 Description: reproducible, snapshot-based Debian rootfs builder
  A set of scripts for building reproducible Debian rootfs tarballs based on
diff --git a/debian/tests/control b/debian/tests/control
index 4846b48..a5273a8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,6 +3,8 @@ Depends: ca-certificates,
          debootstrap,
          debuerreotype,
          diffoscope,
+         gnupg,
          wget,
          xz-utils
 Restrictions: allow-stderr, needs-root
+#Architecture: amd64, arm64
diff --git a/debian/tests/stretch b/debian/tests/stretch
index 3dc41ab..cbb25ca 100755
--- a/debian/tests/stretch
+++ b/debian/tests/stretch
@@ -5,7 +5,13 @@ suite='stretch'
 timestamp='2017-01-01T00:00:00Z'
 
 expectedEpoch='1483228800'
-expectedSha256='26490ed3400a5029b8b5939c6cebd38691e28ea5c616bb54f25f758125417c5f'
+
+declare -A expectedSha256s=(
+	['amd64']='26490ed3400a5029b8b5939c6cebd38691e28ea5c616bb54f25f758125417c5f'
+	['arm64']='45e5e0c6da27db14de19a600663140db1f85f7516a856bf00957436e93e1f684'
+)
+dpkgArch="$(dpkg --print-architecture)"
+expectedSha256="${expectedSha256s["$dpkgArch"]:-}"
 
 tempDir="$(mktemp -d)"
 trap "rm -rf '$tempDir'" EXIT
@@ -13,7 +19,14 @@ rootfs="$tempDir/rootfs"
 
 set -x
 
-debuerreotype-init "$rootfs" "$suite" "$timestamp"
+# make a new keyring that contains all archive keys so this still works in the future too
+# (see also "debian.sh" in the debuerreotype examples, which this is a hyper-simplified version of)
+keyring="$tempDir/keyring.gpg"
+gpg --batch --no-default-keyring --keyring "$keyring" --import \
+	/usr/share/keyrings/debian-archive-keyring.gpg \
+	/usr/share/keyrings/debian-archive-removed-keys.gpg
+
+debuerreotype-init --arch="$dpkgArch" --keyring="$keyring" "$rootfs" "$suite" "$timestamp"
 [ "$(< "$rootfs/debuerreotype-epoch")" = "$expectedEpoch" ]
 
 debuerreotype-chroot "$rootfs" true
@@ -28,6 +41,16 @@ sha256="$(sha256sum "$tempDir/actual.tar" | cut -d' ' -f1)"
 # see https://people.debian.org/~tianon/debuerreotype/
 
 if [ "$sha256" != "$expectedSha256" ]; then
+	if [ -z "$expectedSha256" ]; then
+		(
+			set +x
+			echo >&2
+			echo >&2 "WARNING: no expected SHA256 for '$dpkgArch' known -- please file a bug with this full build output against src:debuerreotype!"
+			echo >&2
+		)
+		exit 0
+	fi
+
 	(
 		set +x
 		echo >&2
@@ -35,7 +58,7 @@ if [ "$sha256" != "$expectedSha256" ]; then
 		echo >&2
 	)
 
-	toCompare="https://people.debian.org/~tianon/debuerreotype/$suite--$timestamp--$expectedSha256.txz"
+	toCompare="https://people.debian.org/~tianon/debuerreotype/$suite--$timestamp--$dpkgArch--$expectedSha256.txz"
 	wget -qO "$tempDir/expected.txz" "$toCompare"
 	xz -d < "$tempDir/expected.txz" > "$tempDir/expected.tar"
 	diffoscope >&2 "$tempDir/expected.tar" "$tempDir/actual.tar"
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..365dc39
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/debuerreotype/debuerreotype/issues
+Bug-Submit: https://github.com/debuerreotype/debuerreotype/issues/new
+Repository: https://github.com/debuerreotype/debuerreotype.git
+Repository-Browse: https://github.com/debuerreotype/debuerreotype