Bug#1028967: xfonts-base: diff for NMU version 1:1.0.5+nmu1
Package: xfonts-base
Version: 1:1.0.5
Severity: normal
Tags: patch pending
I've prepared an NMU for xfonts-base (versioned as 1:1.0.5+nmu1). Because
all of the changes were already accepted into the maintainers' VCS,
I uploaded directly to unstable.
The attached diff is also available as
<https://salsa.debian.org/xorg-team/font/xfonts-base/-/merge_requests/3>
or from dgit, if you would prefer to receive it that way.
Thanks,
smcv
diffstat for xfonts-base-1.0.5 xfonts-base-1.0.5+nmu1
changelog | 19 +++++++++++++++++++
control | 7 ++++---
rules | 10 +++++++++-
3 files changed, 32 insertions(+), 4 deletions(-)
diff -Nru xfonts-base-1.0.5/debian/changelog xfonts-base-1.0.5+nmu1/debian/changelog
--- xfonts-base-1.0.5/debian/changelog 2019-02-21 13:50:43.000000000 +0000
+++ xfonts-base-1.0.5+nmu1/debian/changelog 2023-01-15 13:47:44.000000000 +0000
@@ -1,3 +1,22 @@
+xfonts-base (1:1.0.5+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload, incorporating changes from the maintainers'
+ packaging repository
+
+ [ Simon McVittie ]
+ * 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)
+
+ [ Debian Janitor ]
+ * Remove constraints unnecessary since buster (oldstable):
+ + Build-Depends-Indep: Drop versioned constraint on xfonts-utils and
+ xutils-dev.
+
+ -- Simon McVittie <smcv@debian.org> Sun, 15 Jan 2023 13:47:44 +0000
+
xfonts-base (1:1.0.5) unstable; urgency=medium
* Add Vcs-* control fields.
diff -Nru xfonts-base-1.0.5/debian/control xfonts-base-1.0.5+nmu1/debian/control
--- xfonts-base-1.0.5/debian/control 2019-02-21 13:49:21.000000000 +0000
+++ xfonts-base-1.0.5+nmu1/debian/control 2023-01-15 13:47:44.000000000 +0000
@@ -3,14 +3,15 @@
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),
- xutils-dev (>= 1:7.5+4),
+ xfonts-utils,
+ xutils-dev,
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
diff -Nru xfonts-base-1.0.5/debian/rules xfonts-base-1.0.5+nmu1/debian/rules
--- xfonts-base-1.0.5/debian/rules 2019-02-21 13:48:02.000000000 +0000
+++ xfonts-base-1.0.5+nmu1/debian/rules 2023-01-15 13:47:44.000000000 +0000
@@ -45,8 +45,12 @@
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 \
@@ -60,9 +64,13 @@
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
Reply to: