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) fixing the > missing targets required by Policy §4.9
Here are diffs for xfonts-cyrillic as requested. Because the reproducible builds NMU for xfonts-cyrillic was mistakenly versioned like a maintainer/QA upload, the changelog entry assumes that the NMU will be merged, since that seems like the easiest way to avoid reusing a version number. Please see the MR https://salsa.debian.org/xorg-team/font/xfonts-cyrillic/-/merge_requests/1 or fetch the qa branch from https://salsa.debian.org/smcv/xfonts-cyrillic-qa.git for the actual merge (since a merge as a proper git merge is not easily representable in diffs), or resolve the changelogs in whatever way you see fit. smcv
>From 41daa3f4c18e432827d67b771b8f9c5c1f9c624a Mon Sep 17 00:00:00 2001 From: Holger Levsen <hol...@debian.org> Date: Fri, 1 Jan 2021 17:23:03 +0100 Subject: [PATCH 1/6] Import Debian version 1.0.5 xfonts-cyrillic (1:1.0.5) unstable; urgency=medium . * Non maintainer upload by the Reproducible Builds team. * No source change upload to rebuild on buildd with .buildinfo files. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1f51b52..b8f7d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfonts-cyrillic (1:1.0.5) unstable; urgency=medium + + * Non maintainer upload by the Reproducible Builds team. + * No source change upload to rebuild on buildd with .buildinfo files. + + -- Holger Levsen <hol...@debian.org> Fri, 01 Jan 2021 17:23:03 +0100 + xfonts-cyrillic (1:1.0.4) unstable; urgency=medium * Get rid of debian/xsfbs/. -- 2.36.1
>From bd08f1035f774974d2005e1182be680155c2b4ea Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Thu, 21 Jul 2022 10:36:27 +0100 Subject: [PATCH 2/6] 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 6164ab6..62b7df3 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: xfonts-utils (>= 1:7.5), pkg-config, Standards-Version: 3.8.3 -Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-cyrillic.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-cyrillic.git +Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-cyrillic.git +Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-cyrillic Package: xfonts-cyrillic Architecture: all -- 2.36.1
>From 4b2f9a5f220307fe94177f563af7ae7bfdba81d7 Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Thu, 21 Jul 2022 10:34:58 +0100 Subject: [PATCH 3/6] =?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: #999227 --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index cbfa1f4..907896d 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 29cffc196b0dd0846c2186a38d512c45f70e18aa Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Thu, 21 Jul 2022 10:36:52 +0100 Subject: [PATCH 4/6] 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 62b7df3..0da8a6b 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: Standards-Version: 3.8.3 Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-cyrillic.git Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-cyrillic +Rules-Requires-Root: no Package: xfonts-cyrillic Architecture: all -- 2.36.1
>From 1b9d9460084ab69873a4dda5d5dc7d343b065232 Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Thu, 21 Jul 2022 10:38:10 +0100 Subject: [PATCH 5/6] 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. Fixes the equivalent of #856271, #976471, #976571 for this package. --- debian/control | 2 +- debian/rules | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0da8a6b..18deb4f 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 (>= 7), + debhelper (>= 10.8), xfonts-utils (>= 1:7.5), pkg-config, Standards-Version: 3.8.3 diff --git a/debian/rules b/debian/rules index 907896d..7f46f3c 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 65e8127dde3d46473ae21f373c3f67fb2c3d81c9 Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Thu, 21 Jul 2022 11:21:48 +0100 Subject: [PATCH 6/6] Update changelog --- debian/changelog | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a2803a6..28a4648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ xfonts-cyrillic (1:1.0.6) UNRELEASED; urgency=medium + [ Julien Cristau ] * Switch Vcs-* control fields to https. * Switch upstream URLs in packaging to https. - -- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 19:31:15 +0200 + [ Simon McVittie ] + * d/control: Update Vcs-* for migration to salsa.debian.org + * d/rules: Add missing build-arch, build-indep targets (Policy §4.9) + (Closes: #999227) + * d/control: Declare that the build does not require (fake)root + * d/rules: Use dh_update_autotools_config to update config.guess, + config.sub + + -- Simon McVittie <s...@debian.org> Thu, 21 Jul 2022 11:21:28 +0100 xfonts-cyrillic (1:1.0.5) unstable; urgency=medium -- 2.36.1
