diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/changelog golang-github-valyala-fasthttp-1.31.0/debian/changelog
--- golang-github-valyala-fasthttp-1.31.0/debian/changelog	2022-03-16 13:54:45.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/changelog	2022-05-07 07:35:07.000000000 +0000
@@ -1,10 +1,15 @@
-golang-github-valyala-fasthttp (1:1.31.0-3ubuntu1) jammy; urgency=medium
+golang-github-valyala-fasthttp (1:1.31.0-4) unstable; urgency=medium
 
-  * debian/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch:
+  [ Guillem Jover ]
+  * Update debian/watch file.
+
+  [ Nobuhiro Iwamatsu ]
+  * Add d/patches/0001-bytesconv-add-appropriate-build-tags-for-s390x.patch
     Add appropriate build tags for s390x. This fixes an autopkgtest regression
-    on this architecture (LP: #1965134).
+    on this architecture (Closes: #1008050, LP: #1965134).
+    Thanks to Nick Rosbrook <nick.rosbrook@canonical.com>.
 
- -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 16 Mar 2022 09:54:45 -0400
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sat, 07 May 2022 16:35:07 +0900
 
 golang-github-valyala-fasthttp (1:1.31.0-3) unstable; urgency=medium
 
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/control golang-github-valyala-fasthttp-1.31.0/debian/control
--- golang-github-valyala-fasthttp-1.31.0/debian/control	2022-03-16 13:54:45.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/control	2022-05-07 07:35:07.000000000 +0000
@@ -1,8 +1,7 @@
 Source: golang-github-valyala-fasthttp
 Section: golang
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders:
  Nobuhiro Iwamatsu <iwamatsu@debian.org>,
 Build-Depends:
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/gitlab-ci.yml golang-github-valyala-fasthttp-1.31.0/debian/gitlab-ci.yml
--- golang-github-valyala-fasthttp-1.31.0/debian/gitlab-ci.yml	2021-11-22 15:45:23.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/gitlab-ci.yml	2022-05-07 07:35:07.000000000 +0000
@@ -1,26 +1,6 @@
 # auto-generated, DO NOT MODIFY.
 # The authoritative copy of this file lives at:
-# https://salsa.debian.org/go-team/ci/blob/master/config/gitlabciyml.go
-
-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"
+# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
+---
+include:
+  - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml
diff -Nru golang-github-valyala-fasthttp-1.31.0/debian/watch golang-github-valyala-fasthttp-1.31.0/debian/watch
--- golang-github-valyala-fasthttp-1.31.0/debian/watch	2021-11-22 15:45:23.000000000 +0000
+++ golang-github-valyala-fasthttp-1.31.0/debian/watch	2022-05-07 07:35:07.000000000 +0000
@@ -1,4 +1,5 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%golang-github-valyala-fasthttp-$1.tar.gz%,\
-      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/" \
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\
+      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/,\
+      dversionmangle=s/\+ds\d*$//,repacksuffix=+ds1" \
   https://github.com/valyala/fasthttp/tags .*/v?(\d\S*)\.tar\.gz