Control: tags 965894 + pending I've prepared an NMU for xfonts-scalable (versioned as 1:1.0.3-1.3) with the attached diff, also available at <https://salsa.debian.org/xorg-team/font/xfonts-scalable/-/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-scalable_1.0.3-1.2 xfonts-scalable_1.0.3-1.3 .gitignore | 78 +++++++++++++++++++++++++++++++++ debian/compat | 1 xfonts-scalable-1.0.3/debian/changelog | 18 +++++++ xfonts-scalable-1.0.3/debian/control | 6 +- xfonts-scalable-1.0.3/debian/rules | 9 ++- xfonts-scalable-1.0.3/debian/watch | 3 - 6 files changed, 109 insertions(+), 6 deletions(-) diff -u xfonts-scalable-1.0.3/debian/changelog xfonts-scalable-1.0.3/debian/changelog --- xfonts-scalable-1.0.3/debian/changelog +++ xfonts-scalable-1.0.3/debian/changelog @@ -1,3 +1,21 @@ +xfonts-scalable (1:1.0.3-1.3) unstable; urgency=medium + + * Non-maintainer upload, incorporating changes from the maintainers' + packaging repository + + [ Julien Cristau ] + * Remove Cyril and David from Uploaders. + * Add Vcs-* control fields. + * Use https URL in debian/watch. + + [ Simon McVittie ] + * d/control: Update Vcs-* for migration to salsa.debian.org + * Use recommended debhelper compat level 13 (Closes: #965894) + * d/rules: Add missing build-arch, build-indep targets (Policy ยง4.9) + * d/control: Declare that the build does not require (fake)root + + -- Simon McVittie <s...@debian.org> Sun, 15 Jan 2023 14:18:32 +0000 + xfonts-scalable (1:1.0.3-1.2) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. reverted: --- xfonts-scalable-1.0.3/debian/compat +++ xfonts-scalable-1.0.3.orig/debian/compat @@ -1 +0,0 @@ -5 diff -u xfonts-scalable-1.0.3/debian/control xfonts-scalable-1.0.3/debian/control --- xfonts-scalable-1.0.3/debian/control +++ xfonts-scalable-1.0.3/debian/control @@ -2,15 +2,17 @@ Section: fonts Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: - debhelper (>= 5.0.31), + debhelper-compat (= 13), xfonts-utils (>= 1:7.6~), automake, autoconf, xutils-dev (>= 1:7.5+1), pkg-config, Standards-Version: 3.8.3 +Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-scalable.git +Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-scalable +Rules-Requires-Root: no Package: xfonts-scalable Architecture: all diff -u xfonts-scalable-1.0.3/debian/rules xfonts-scalable-1.0.3/debian/rules --- xfonts-scalable-1.0.3/debian/rules +++ xfonts-scalable-1.0.3/debian/rules @@ -34,6 +34,7 @@ build: build-stamp +build-indep: build-stamp build-stamp: $(STAMP_DIR)/prepare dh_testdir autoreconf -vfi @@ -45,6 +46,9 @@ cd build && $(MAKE) >$@ +build-arch: +# Nothing to do + clean: xsfclean dh_testdir dh_testroot @@ -64,7 +68,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install @@ -81,7 +85,8 @@ dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --fail-missing --exclude=fonts.dir --exclude=fonts.scale + dh_install --sourcedir=debian/tmp --exclude=fonts.dir --exclude=fonts.scale + dh_missing --fail-missing --exclude=fonts.dir --exclude=fonts.scale dh_installxfonts dh_installchangelogs dh_compress diff -u xfonts-scalable-1.0.3/debian/watch xfonts-scalable-1.0.3/debian/watch --- xfonts-scalable-1.0.3/debian/watch +++ xfonts-scalable-1.0.3/debian/watch @@ -1,2 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/font/bitstream-type1 version=3 -http://xorg.freedesktop.org/releases/individual/font/ font-bitstream-type1-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/font/ font-bitstream-type1-(.*)\.tar\.gz only in patch2: unchanged: --- xfonts-scalable-1.0.3.orig/.gitignore +++ xfonts-scalable-1.0.3/.gitignore @@ -0,0 +1,78 @@ +# +# 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 bitstream-type1 +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +#