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 -scalable attached. As with -encodings, the missing build-arch
and build-indep targets are a second RC bug, but I'm not going to spend
time reporting a second RC bug and getting a second bug number just so
I can propose a patch to close it.
smcv
>From d8ae598f46674b56152f2a9347bf7712359648aa Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:57:08 +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 553de3b..5ffb6d3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
xutils-dev (>= 1:7.5+1),
pkg-config,
Standards-Version: 3.8.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
+Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-scalable.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-scalable
Package: xfonts-scalable
Architecture: all
--
2.36.1
>From 020b14f4ce6c9add3e4a7d71578771c66547656e Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:05:23 +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: #965894
---
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 5ffb6d3..580c43a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: fonts
Priority: optional
Maintainer: Debian X Strike Force <debia...@lists.debian.org>
Build-Depends:
- debhelper (>= 5.0.31),
+ debhelper-compat (= 13),
xfonts-utils (>= 1:7.6~),
automake,
autoconf,
diff --git a/debian/rules b/debian/rules
index 478acb1..dc614d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ clean: xsfclean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
@@ -81,7 +81,8 @@ binary-indep: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing --exclude=fonts.dir --exclude=fonts.scale
+ dh_install --sourcedir=debian/tmp --exclude=fonts.dir --exclude=fonts.scale
+ dh_missing --fail-missing --exclude=fonts.dir --exclude=fonts.scale
dh_installxfonts
dh_installchangelogs
dh_compress
--
2.36.1
>From 1a905ea923b52829645dfa4244542b8723b88d20 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:08:00 +0100
Subject: [PATCH 3/5] =?UTF-8?q?d/rules:=20Add=20missing=20build-arch,=20bu?=
=?UTF-8?q?ild-indep=20targets=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 dc614d7..81005dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ endif
build: build-stamp
+build-indep: build-stamp
build-stamp: $(STAMP_DIR)/prepare
dh_testdir
autoreconf -vfi
@@ -45,6 +46,9 @@ build-stamp: $(STAMP_DIR)/prepare
cd build && $(MAKE)
>$@
+build-arch:
+# Nothing to do
+
clean: xsfclean
dh_testdir
dh_testroot
--
2.36.1
>From 8e6373344b0cf78e807c2fd52dba66e2524ce523 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:08:23 +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 580c43a..f5a92b9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
Standards-Version: 3.8.3
Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-scalable.git
Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-scalable
+Rules-Requires-Root: no
Package: xfonts-scalable
Architecture: all
--
2.36.1
>From 5410658a402f6825a93fcf82513ed47b0c433a7d Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:24:15 +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 44852f8..a50f1d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
xfonts-scalable (1:1.0.3-2) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Remove Cyril and David from Uploaders.
* Add Vcs-* control fields.
* Use https URL in debian/watch.
- -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 14:52:31 +0200
+ [ Simon McVittie ]
+ * d/control: Update Vcs-* for migration to salsa.debian.org
+ * Use recommended debhelper compat level 13 (Closes: #965894)
+ * d/rules: Add missing build-arch, build-indep targets (Policy ยง4.9)
+ * d/control: Declare that the build does not require (fake)root
+
+ -- Simon McVittie <s...@debian.org> Thu, 21 Jul 2022 11:23:59 +0100
xfonts-scalable (1:1.0.3-1.1) unstable; urgency=medium
--
2.36.1
