Control: tags 965901 + pending I've prepared an NMU for xfonts-encodings (versioned as 1:1.0.4-2.2) with the attached diff, also available at <https://salsa.debian.org/xorg-team/font/xfonts-encodings/-/merge_requests/2>.
Since this only contains changes that were already merged into the maintainers' VCS months ago, I'm going to upload a NMU without further delay. Thanks, smcv
diffstat for xfonts-encodings_1.0.4-2.1 xfonts-encodings_1.0.4-2.2 .gitignore | 80 ++++++++++++++++++++++++++++++++ debian/compat | 1 xfonts-encodings-1.0.4/debian/changelog | 17 ++++++ xfonts-encodings-1.0.4/debian/control | 7 +- xfonts-encodings-1.0.4/debian/copyright | 2 xfonts-encodings-1.0.4/debian/rules | 9 ++- xfonts-encodings-1.0.4/debian/watch | 2 7 files changed, 110 insertions(+), 8 deletions(-) diff -u xfonts-encodings-1.0.4/debian/changelog xfonts-encodings-1.0.4/debian/changelog --- xfonts-encodings-1.0.4/debian/changelog +++ xfonts-encodings-1.0.4/debian/changelog @@ -1,3 +1,20 @@ +xfonts-encodings (1:1.0.4-2.2) unstable; urgency=medium + + * Non-maintainer upload, incorporating changes from the maintainers' + packaging repository + + [ Julien Cristau ] + * Switch Vcs-* control fields to https. + * Switch xorg.freedesktop.org URLs in packaging to https. + + [ Simon McVittie ] + * d/control: Update Vcs-* for migration to salsa.debian.org + * Use recommended debhelper compat level 13 (Closes: #965901) + * d/rules: Add missing targets build-arch, build-indep (Policy ยง4.9) + * d/control: Declare that the build does not require (fake)root + + -- Simon McVittie <s...@debian.org> Sun, 15 Jan 2023 14:14:38 +0000 + xfonts-encodings (1:1.0.4-2.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. reverted: --- xfonts-encodings-1.0.4/debian/compat +++ xfonts-encodings-1.0.4.orig/debian/compat @@ -1 +0,0 @@ -5 diff -u xfonts-encodings-1.0.4/debian/control xfonts-encodings-1.0.4/debian/control --- xfonts-encodings-1.0.4/debian/control +++ xfonts-encodings-1.0.4/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <debia...@lists.debian.org> Build-Depends: - debhelper (>= 5.0.0), + debhelper-compat (= 13), Build-Depends-Indep: pkg-config, xfonts-utils (>= 1:7.6~), @@ -11,8 +11,9 @@ automake, xutils-dev (>= 1:7.5+1), Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-encodings.git -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-encodings.git +Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-encodings.git +Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-encodings +Rules-Requires-Root: no Package: xfonts-encodings Architecture: all diff -u xfonts-encodings-1.0.4/debian/copyright xfonts-encodings-1.0.4/debian/copyright --- xfonts-encodings-1.0.4/debian/copyright +++ xfonts-encodings-1.0.4/debian/copyright @@ -1,5 +1,5 @@ This package contains the encodings tarball downloaded from -http://xorg.freedesktop.org/releases/individual/font/ +https://xorg.freedesktop.org/releases/individual/font/ The XFree86/Xorg encoding files are in the public domain. diff -u xfonts-encodings-1.0.4/debian/rules xfonts-encodings-1.0.4/debian/rules --- xfonts-encodings-1.0.4/debian/rules +++ xfonts-encodings-1.0.4/debian/rules @@ -34,6 +34,7 @@ build: build-stamp +build-indep: build-stamp build-stamp: dh_testdir autoreconf -vfi @@ -45,6 +46,9 @@ cd build && $(MAKE) >$@ +build-arch: +# Nothing to do + clean: xsfclean dh_testdir dh_testroot @@ -63,7 +67,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install @@ -77,7 +81,8 @@ dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp + dh_missing --list-missing dh_installchangelogs dh_link dh_strip diff -u xfonts-encodings-1.0.4/debian/watch xfonts-encodings-1.0.4/debian/watch --- xfonts-encodings-1.0.4/debian/watch +++ xfonts-encodings-1.0.4/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/font/encodings version=3 -http://xorg.freedesktop.org/releases/individual/font/ encodings-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ encodings-(.*)\.tar\.gz only in patch2: unchanged: --- xfonts-encodings-1.0.4.orig/.gitignore +++ xfonts-encodings-1.0.4/.gitignore @@ -0,0 +1,80 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for encodings +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# +*.enc.gz +*.dir