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)
-100dpi diffs attached.
smcv
>From bf4eb2eac34232a1ccf3ee994b48760a8f2c49ed Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:30:03 +0100
Subject: [PATCH 1/4] =?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
diffoscope confirms that this does not alter the contents of the
resulting binary package.
Closes: #999152
---
debian/rules | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index 6789d06..be92b35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,13 @@ $(STAMP_DIR)/build-%:
>$@
build: build-stamp
+build-indep: build-stamp
build-stamp: $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
>$@
+build-arch:
+# Nothing to do
+
clean:
dh_testdir
rm -f config.cache config.log config.status
--
2.36.1
>From eb1382d7797ab31de5846fdf258ff9d8d49b9ea7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:30:42 +0100
Subject: [PATCH 2/4] 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 fbce30a..2ca266d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 7), pkg-config, xfonts-utils (>= 1:7.5)
Standards-Version: 3.8.3
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-100dpi.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/font/xfonts-100dpi.git
+Rules-Requires-Root: no
Package: xfonts-100dpi
Architecture: all
--
2.36.1
>From 308ddf0a66269751ea07e5f92125af8182479c7f Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 10:31:23 +0100
Subject: [PATCH 3/4] Use dh_update_autotools_config to update config.guess,
config.sub
The originals will be put back automatically by dh_clean.
diffoscope confirms that this does not alter the contents of the
resulting binary package.
Closes: #976571
---
debian/control | 2 +-
debian/rules | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 2ca266d..8feb4de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-100dpi
Section: fonts
Priority: optional
Maintainer: Debian X Strike Force <debia...@lists.debian.org>
-Build-Depends: debhelper (>= 7), pkg-config, xfonts-utils (>= 1:7.5)
+Build-Depends: debhelper (>= 10.8), pkg-config, xfonts-utils (>= 1:7.5)
Standards-Version: 3.8.3
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-100dpi.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/font/xfonts-100dpi.git
diff --git a/debian/rules b/debian/rules
index be92b35..324aeac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,8 +35,12 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-$(STAMP_DIR)/build-%:
+$(STAMP_DIR)/prepare:
mkdir -p $(STAMP_DIR)
+ dh_update_autotools_config
+ >$@
+
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/prepare
mkdir -p $*-build
cd $*-build && \
../$*/configure \
--
2.36.1
>From 11e7a5f7bef7f5586c6ac6f389d32fed94bc04e2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Jul 2022 11:20:03 +0100
Subject: [PATCH 4/4] Update changelog
---
debian/changelog | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5b66d9e..372c2ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
xfonts-100dpi (1:1.0.5) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Add Vcs-* control fields.
* Use https for xorg.freedesktop.org URLs in packaging.
- -- Julien Cristau <jcris...@debian.org> Mon, 02 Feb 2015 21:07:25 +0100
+ [ Simon McVittie ]
+ * d/rules: Add missing build-arch, build-indep targets (Policy ยง4.9)
+ (Closes: #999152)
+ * d/control: Declare that the build does not require (fake)root
+ * Use dh_update_autotools_config to update config.guess, config.sub
+ (Closes: #976571)
+
+ -- Simon McVittie <s...@debian.org> Thu, 21 Jul 2022 11:19:37 +0100
xfonts-100dpi (1:1.0.4+nmu1) unstable; urgency=medium
--
2.36.1
