On Thu, 21 Jul 2022 at 13:30:19 +0100, Simon McVittie wrote:
> I've prepared merge requests for all the xfonts-* packages (except
> xfonts-utils which contains utilities rather than fonts)
Diffs for -encodings attached. There was no bug report for the missing
build-* targets, but they're also a RC bug.
smcv
>From 18a02f6b69f7b4b5ba9d86933f142ea9d58e3c38 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:52:34 +0100
Subject: [PATCH 1/5] d/control: Update Vcs-* for migration to salsa.debian.org
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 4244874..e7efb58 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends-Indep:
automake,
xutils-dev (>= 1:7.5+1),
Standards-Version: 3.8.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-encodings.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-encodings.git
+Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-encodings.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-encodings
Package: xfonts-encodings
Architecture: all
--
2.36.1
>From df31d46de9bfc95235ddf7eacffd18297df8e1e2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:54:21 +0100
Subject: [PATCH 2/5] Use recommended debhelper compat level 13
Compat levels 5 and 6 can no longer be built in bookworm.
- d/rules: Replace deprecated dh_clean -k with dh_prep
- d/rules: Replace deprecated dh_install --list-missing with
dh_missing --list-missing
According to diffoscope, the only change to the resulting binary package
is that this compat level adds the upstream changelog.
Closes: #965901
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
index e7efb58..8b96496 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debia...@lists.debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper-compat (= 13),
Build-Depends-Indep:
pkg-config,
xfonts-utils (>= 1:7.6~),
diff --git a/debian/rules b/debian/rules
index 8e65d61..6c5b69e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ clean: xsfclean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
@@ -77,7 +77,8 @@ binary-indep: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp
+ dh_missing --list-missing
dh_installchangelogs
dh_link
dh_strip
--
2.36.1
>From 08d314fe524135feadfd07112cc16128c358d16f Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:03:13 +0100
Subject: [PATCH 3/5] =?UTF-8?q?d/rules:=20Add=20missing=20targets=20build-?=
=?UTF-8?q?arch,=20build-indep=20(Policy=20=C2=A74.9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This resolves the equivalent of #999177 for this package.
diffoscope confirms that this does not alter the contents of the
resulting binary package.
---
debian/rules | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index 6c5b69e..c91421c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ endif
build: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
autoreconf -vfi
@@ -45,6 +46,9 @@ build-stamp:
cd build && $(MAKE)
>$@
+build-arch:
+# Nothing to do
+
clean: xsfclean
dh_testdir
dh_testroot
--
2.36.1
>From 85bea910a02802776ea51ef59b566a8c20b78cdc Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:04:08 +0100
Subject: [PATCH 4/5] d/control: Declare that the build does not require
(fake)root
diffoscope confirms that this does not alter the contents of the
resulting binary package.
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 8b96496..175e83c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends-Indep:
Standards-Version: 3.8.3
Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-encodings.git
Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-encodings
+Rules-Requires-Root: no
Package: xfonts-encodings
Architecture: all
--
2.36.1
>From 9f73254a4913ef561232802807903716463c9182 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:22:48 +0100
Subject: [PATCH 5/5] Update changelog
---
debian/changelog | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 136f8d6..df3999b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
xfonts-encodings (1:1.0.4-3) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Switch Vcs-* control fields to https.
* Switch xorg.freedesktop.org URLs in packaging to https.
- -- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 19:26:36 +0200
+ [ Simon McVittie ]
+ * d/control: Update Vcs-* for migration to salsa.debian.org
+ * Use recommended debhelper compat level 13 (Closes: #965901)
+ * d/rules: Add missing targets build-arch, build-indep (Policy ยง4.9)
+ * d/control: Declare that the build does not require (fake)root
+
+ -- Simon McVittie <s...@debian.org> Thu, 21 Jul 2022 11:22:28 +0100
xfonts-encodings (1:1.0.4-2) unstable; urgency=low
--
2.36.1
