diff -u xbitmaps-1.1.1/debian/changelog xbitmaps-1.1.1/debian/changelog
--- xbitmaps-1.1.1/debian/changelog
+++ xbitmaps-1.1.1/debian/changelog
@@ -1,8 +1,18 @@
-xbitmaps (1.1.1-2.1ubuntu1) jammy; urgency=medium
+xbitmaps (1.1.1-2.2) unstable; urgency=medium
 
-  * Update to dh7 to fix the build
+  * Non-maintainer upload
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 25 Mar 2022 12:47:31 +0100
+  [ Julien Cristau ]
+  * Don't use dh_testroot in debian/rules clean.
+  * Update upstream URL in debian/watch to use https.
+  * Update Vcs-* control fields to use https.
+
+  [ Paul Gevers ]
+  * Bump debhelper compat level to 11 (highest one not requiring other
+    changes) (Closes: #965878)
+  * Update Vcs-* control fields to salsa
+
+ -- Paul Gevers <elbrus@debian.org>  Wed, 12 Oct 2022 21:10:53 +0200
 
 xbitmaps (1.1.1-2.1) unstable; urgency=medium
 
diff -u xbitmaps-1.1.1/debian/compat xbitmaps-1.1.1/debian/compat
--- xbitmaps-1.1.1/debian/compat
+++ xbitmaps-1.1.1/debian/compat
@@ -1 +1 @@
-7
+11
diff -u xbitmaps-1.1.1/debian/control xbitmaps-1.1.1/debian/control
--- xbitmaps-1.1.1/debian/control
+++ xbitmaps-1.1.1/debian/control
@@ -1,16 +1,15 @@
 Source: xbitmaps
 Section: x11
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 11),
  xutils-dev (>= 1:7.5~),
  automake,
 Standards-Version: 3.8.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xbitmaps
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xbitmaps.git
+Vcs-Git: https://salsa.debian.org/xorg-team/data/xbitmaps.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/data/xbitmaps
 
 Package: xbitmaps
 Architecture: all
diff -u xbitmaps-1.1.1/debian/rules xbitmaps-1.1.1/debian/rules
--- xbitmaps-1.1.1/debian/rules
+++ xbitmaps-1.1.1/debian/rules
@@ -44,9 +44,7 @@
 
 clean:
 	dh_testdir
-	dh_testroot
 	rm -f build-stamp
-
 	rm -f config.cache config.log config.status
 	rm -f */config.cache */config.log */config.status
 	rm -f conftest* */conftest*
@@ -55,7 +53,6 @@
 	rm -f aclocal.m4 config.h.in configure install-sh missing
 	rm -f config.guess config.sub
 	find -name Makefile.in -delete
-
 	dh_clean
 
 install: build
diff -u xbitmaps-1.1.1/debian/watch xbitmaps-1.1.1/debian/watch
--- xbitmaps-1.1.1/debian/watch
+++ xbitmaps-1.1.1/debian/watch
@@ -3 +3 @@
-http://xorg.freedesktop.org/releases/individual/data/ xbitmaps-(.*)\.tar\.gz
+https://xorg.freedesktop.orgreleases/individual/data/ xbitmaps-(.*)\.tar\.gz