Control: tags 999227 + pending Dear maintainer,
I've prepared an NMU for xfonts-cyrillic (versioned as 1:1.0.5+nmu1) and uploaded it to DELAYED/14. Please feel free to tell me if I should delay it longer. The diff is based on the changes in Git packaging repository. To view the difference between git packaging repo and NMU version, please check the gitdiff.patch file in the attachment. Regards. diff -Nru xfonts-cyrillic-1.0.5/debian/changelog xfonts-cyrillic-1.0.5+nmu1/debian/changelog --- xfonts-cyrillic-1.0.5/debian/changelog 2021-01-01 11:23:03.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/changelog 2023-08-29 13:36:25.000000000 -0400 @@ -1,3 +1,25 @@ +xfonts-cyrillic (1:1.0.5+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Julien Cristau ] + * Switch Vcs-* control fields to https. + * Switch upstream URLs in packaging to https. + + [ 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 + + [ Boyuan Yang ] + * debian/source/format: Explicitly use format "3.0 (native)". + + Current version corresponds to upstream release v1.0.4. + + -- Boyuan Yang <by...@debian.org> Tue, 29 Aug 2023 13:36:25 -0400 + xfonts-cyrillic (1:1.0.5) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -Nru xfonts-cyrillic-1.0.5/debian/control xfonts-cyrillic-1.0.5+nmu1/debian/control --- xfonts-cyrillic-1.0.5/debian/control 2015-02-02 15:28:36.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/control 2023-08-29 13:33:34.000000000 -0400 @@ -3,12 +3,13 @@ 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 -Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-cyrillic -Vcs-Browser: http://git.debian.org/?p=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 +Rules-Requires-Root: no Package: xfonts-cyrillic Architecture: all diff -Nru xfonts-cyrillic-1.0.5/debian/copyright xfonts-cyrillic-1.0.5+nmu1/debian/copyright --- xfonts-cyrillic-1.0.5/debian/copyright 2015-02-02 15:09:13.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/copyright 2023-08-29 13:33:34.000000000 -0400 @@ -1,7 +1,7 @@ This package contains the set of Russian fonts for X11 Release 6. The font-cronyx-cyrillic, font-misc-cyrillic, font-screen-cyrillic and font-winitzki-cyrillic tarballs were downloaded from: -http://xorg.freedesktop.org/releases/individual/font/ +https://xorg.freedesktop.org/releases/individual/font/ font-cronyx-cyrillic: Copyright (C) 1994-1995 Cronyx Ltd. diff -Nru xfonts-cyrillic-1.0.5/debian/rules xfonts-cyrillic-1.0.5+nmu1/debian/rules --- xfonts-cyrillic-1.0.5/debian/rules 2015-02-02 17:13:12.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/rules 2023-08-29 13:33:34.000000000 -0400 @@ -35,8 +35,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 \ @@ -48,9 +52,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 @@ -101,9 +109,10 @@ get-tarball-%: uscan --no-conf --download --no-symlink --destdir . --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure || echo 0) -- watchfile debian/watch.$* || test $$? = 1 -debian/watch.%: - echo version=3 > $@ - echo 'http://xorg.freedesktop.org/releases/individual/font/ $*-(.*)\.tar\.gz' >> $@ +debian/watch.font-%: + echo '#git=git://anongit.freedesktop.org/xorg/font/$*' > $@ + echo version=3 >> $@ + echo 'https://xorg.freedesktop.org/releases/individual/font/ font-$*-(.*)\.tar\.gz' >> $@ .PHONY: watchfiles watchfiles: $(addprefix debian/watch.,$(SUBDIRS)) diff -Nru xfonts-cyrillic-1.0.5/debian/source/format xfonts-cyrillic-1.0.5+nmu1/debian/source/format --- xfonts-cyrillic-1.0.5/debian/source/format 1969-12-31 19:00:00.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/source/format 2023-08-29 13:36:19.000000000 -0400 @@ -0,0 +1 @@ +3.0 (native) diff -Nru xfonts-cyrillic-1.0.5/debian/watch.font-cronyx-cyrillic xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-cronyx-cyrillic --- xfonts-cyrillic-1.0.5/debian/watch.font-cronyx-cyrillic 2015-02-02 15:09:13.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-cronyx-cyrillic 2023-08-29 13:33:34.000000000 -0400 @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/cronyx-cyrillic version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-cronyx-cyrillic-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-cronyx-cyrillic-(.*)\.tar\.gz diff -Nru xfonts-cyrillic-1.0.5/debian/watch.font-misc-cyrillic xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-misc-cyrillic --- xfonts-cyrillic-1.0.5/debian/watch.font-misc-cyrillic 2015-02-02 15:09:13.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-misc-cyrillic 2023-08-29 13:33:34.000000000 -0400 @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/misc-cyrillic version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-misc-cyrillic-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-misc-cyrillic-(.*)\.tar\.gz diff -Nru xfonts-cyrillic-1.0.5/debian/watch.font-screen-cyrillic xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-screen-cyrillic --- xfonts-cyrillic-1.0.5/debian/watch.font-screen-cyrillic 2015-02-02 15:09:13.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-screen-cyrillic 2023-08-29 13:33:34.000000000 -0400 @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/screen-cyrillic version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-screen-cyrillic-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-screen-cyrillic-(.*)\.tar\.gz diff -Nru xfonts-cyrillic-1.0.5/debian/watch.font-winitzki-cyrillic xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-winitzki-cyrillic --- xfonts-cyrillic-1.0.5/debian/watch.font-winitzki-cyrillic 2015-02-02 15:09:13.000000000 -0500 +++ xfonts-cyrillic-1.0.5+nmu1/debian/watch.font-winitzki-cyrillic 2023-08-29 13:33:34.000000000 -0400 @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/winitzki-cyrillic version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-winitzki-cyrillic-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-winitzki-cyrillic-(.*)\.tar\.gz
commit 2585c4669d6d44abc8c0e9e60d7fad2090c9c1a7
Author: Boyuan Yang <by...@debian.org>
Date: Tue Aug 29 13:38:00 2023 -0400
debian/source/format: Use "3.0 (native)" format.
diff --git a/debian/changelog b/debian/changelog
index 28a4648..7935a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-xfonts-cyrillic (1:1.0.6) UNRELEASED; urgency=medium
+xfonts-cyrillic (1:1.0.5+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
[ Julien Cristau ]
* Switch Vcs-* control fields to https.
@@ -12,7 +14,11 @@ xfonts-cyrillic (1:1.0.6) UNRELEASED; urgency=medium
* 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
+ [ Boyuan Yang ]
+ * debian/source/format: Explicitly use format "3.0 (native)".
+ + Current version corresponds to upstream release v1.0.4.
+
+ -- Boyuan Yang <by...@debian.org> Tue, 29 Aug 2023 13:36:25 -0400
xfonts-cyrillic (1:1.0.5) unstable; urgency=medium
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
signature.asc
Description: This is a digitally signed message part
