Control: tag -1 pending Hi,On Mon, 20 Jul 2020 19:35:37 +0000 Niels Thykier <nthykier@master.debian.org> wrote:
The package xbitmaps uses debhelper with a compat level of 5 or 6, which is deprecated and scheduled for removal[1]. Please bump the debhelper compat at your earliest convenience /outside the freeze/! * Compat 13 is recommended (supported in stable-backports) * Compat 7 is the bare minimum
I have just uploaded my NMU to DELAYED/5 with the attached debdiff. I felt uncomfortable with the provided changes in the bug report as they are bigger than needed to fix the issue, so I only bumped compat level to 11 as that was the highest level that still worked without other changes (confirmed with diffoscope). I have included the changes prepared in git, except the removal of Cyril as maintainer as that would make the package instant RC buggy again (policy 3.3). (I notified him on IRC).
Please let me know if I should delay or cancel the upload. Paul
diff -u xbitmaps-1.1.1/debian/changelog xbitmaps-1.1.1/debian/changelog --- xbitmaps-1.1.1/debian/changelog +++ xbitmaps-1.1.1/debian/changelog @@ -1,3 +1,19 @@ +xbitmaps (1.1.1-2.2) unstable; urgency=medium + + * Non-maintainer upload + + [ Julien Cristau ] + * Don't use dh_testroot in debian/rules clean. + * Update upstream URL in debian/watch to use https. + * Update Vcs-* control fields to use https. + + [ Paul Gevers ] + * Bump debhelper compat level to 11 (highest one not requiring other + changes) (Closes: #965878) + * Update Vcs-* control fields to salsa + + -- Paul Gevers <elbrus@debian.org> Wed, 12 Oct 2022 21:10:53 +0200 + xbitmaps (1.1.1-2.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -u xbitmaps-1.1.1/debian/compat xbitmaps-1.1.1/debian/compat --- xbitmaps-1.1.1/debian/compat +++ xbitmaps-1.1.1/debian/compat @@ -1 +1 @@ -5 +11 diff -u xbitmaps-1.1.1/debian/control xbitmaps-1.1.1/debian/control --- xbitmaps-1.1.1/debian/control +++ xbitmaps-1.1.1/debian/control @@ -4,12 +4,12 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Cyril Brulebois <kibi@debian.org> Build-Depends: - debhelper (>= 5), + debhelper (>= 11), xutils-dev (>= 1:7.5~), automake, Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xbitmaps -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xbitmaps.git +Vcs-Git: https://salsa.debian.org/xorg-team/data/xbitmaps.git +Vcs-Browser: https://salsa.debian.org/xorg-team/data/xbitmaps Package: xbitmaps Architecture: all diff -u xbitmaps-1.1.1/debian/rules xbitmaps-1.1.1/debian/rules --- xbitmaps-1.1.1/debian/rules +++ xbitmaps-1.1.1/debian/rules @@ -44,9 +44,7 @@ clean: dh_testdir - dh_testroot rm -f build-stamp - rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* @@ -55,7 +53,6 @@ rm -f aclocal.m4 config.h.in configure install-sh missing rm -f config.guess config.sub find -name Makefile.in -delete - dh_clean install: build diff -u xbitmaps-1.1.1/debian/watch xbitmaps-1.1.1/debian/watch --- xbitmaps-1.1.1/debian/watch +++ xbitmaps-1.1.1/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/data/bitmaps version=3 -http://xorg.freedesktop.org/releases/individual/data/ xbitmaps-(.*)\.tar\.gz +https://xorg.freedesktop.orgreleases/individual/data/ xbitmaps-(.*)\.tar\.gz
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature