Bug#856271: Bug#999177: xfonts-*: missing required debian/rules targets build-arch and/or build-indep
On Thu, 21 Jul 2022 at 16:35:31 +0000, Thorsten Glaser wrote:
> Simon McVittie dixit:
>
> >I've prepared merge requests for all the xfonts-* packages (except
>
> IMHO, things like this ought to be sent as diffs attached to
> the bugreport(s) in question.
If that's what you want, here are diffs (these are only the xfonts-base
subset, the remarkably similar diffs for the other packages will follow
when I get round to it).
Not all of the things I've fixed have bug reports on all the packages.
> Probably somewhat offtopic, but… Salsa isn’t an appropriate tool
> Or how would someone be able to review the diff like
> *that* (see attached screenshot)?
I had assumed that a team that has put repositories on Salsa is able to
receive commits from it. Each Gitlab MR can be fetched as a git branch,
if you prefer to use the CLI for review:
[remote "merge-requests"]
url = https://salsa.debian.org/xorg-team/font/xfonts-base.git
fetch = +refs/merge-requests/*/head:refs/remotes/merge-requests/*
Or if you want to try the web UI, closing the file list/search on the
left should give the content of the diff enough space to not wrap.
smcv
>From 0ecb409ab80272e5a8203ec93a4225b9e3a3d970 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 21 Jul 2022 09:47:34 +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: #999177
---
debian/rules | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index d73519e..99f313b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,9 +60,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 a9dfb137281b58e92298403ef7a07f392b7ba2ab Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 21 Jul 2022 09:52:36 +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 856a54b..b0a9ff5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends-Indep:
Standards-Version: 3.8.3
Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-base.git
Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-base
+Rules-Requires-Root: no
Package: xfonts-base
Architecture: all
--
2.36.1
>From 7b7691843c453886803a4a1fe1a5fa497a33e9d4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 21 Jul 2022 10:15:54 +0100
Subject: [PATCH 3/4] d/rules: 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: #856271
---
debian/control | 2 +-
debian/rules | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index b0a9ff5..2dcf9db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: fonts
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 10.8),
Build-Depends-Indep:
pkg-config,
xfonts-utils (>= 1:7.5),
diff --git a/debian/rules b/debian/rules
index 99f313b..4e548a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,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 3b12af51d153637bd0e45967e47f1d47a616e162 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 21 Jul 2022 11:16:44 +0100
Subject: [PATCH 4/4] Update changelog
---
debian/changelog | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7271df0..d8a5622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xfonts-base (1:1.0.6) UNRELEASED; urgency=medium
+
+ * d/rules: Add missing build-arch, build-indep targets (Policy §4.9)
+ (Closes: #999177)
+ * d/control: Declare that the build does not require (fake)root
+ * d/rules: Use dh_update_autotools_config to update config.guess,
+ config.sub (Closes: #856271)
+
+ -- Simon McVittie <smcv@debian.org> Thu, 21 Jul 2022 11:15:36 +0100
+
xfonts-base (1:1.0.5) unstable; urgency=medium
* Add Vcs-* control fields.
--
2.36.1
Reply to: