Timo Aaltonen pushed to branch debian-unstable at X Strike Force / font / 
xfonts-scalable


Commits:
d8ae598f by Simon McVittie at 2022-07-21T10:57:08+01:00
d/control: Update Vcs-* for migration to salsa.debian.org

- - - - -
020b14f4 by Simon McVittie at 2022-07-21T11:05:23+01:00
Use recommended debhelper compat level 13

Compat levels 5 and 6 can no longer be built in bookworm.

- d/rules: Replace deprecated dh_clean -k with dh_prep
- d/rules: Replace deprecated dh_install --list-missing with
  dh_missing --list-missing

According to diffoscope, the only change to the resulting binary package
is that this compat level adds the upstream changelog.

Closes: #965894

- - - - -
1a905ea9 by Simon McVittie at 2022-07-21T11:23:37+01:00
d/rules: Add missing build-arch, build-indep targets (Policy §4.9)

This resolves the equivalent of #999177 for this package.

diffoscope confirms that this does not alter the contents of the
resulting binary package.

- - - - -
8e637334 by Simon McVittie at 2022-07-21T11:23:48+01:00
d/control: Declare that the build does not require (fake)root

diffoscope confirms that this does not alter the contents of the
resulting binary package.

- - - - -
5410658a by Simon McVittie at 2022-07-21T11:24:15+01:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,17 @@
 xfonts-scalable (1:1.0.3-2) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Remove Cyril and David from Uploaders.
   * Add Vcs-* control fields.
   * Use https URL in debian/watch.
 
- -- Julien Cristau <[email protected]>  Sat, 24 Sep 2016 14:52:31 +0200
+  [ 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 <[email protected]>  Thu, 21 Jul 2022 11:23:59 +0100
 
 xfonts-scalable (1:1.0.3-1.1) unstable; urgency=medium
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-5


=====================================
debian/control
=====================================
@@ -3,15 +3,16 @@ Section: fonts
 Priority: optional
 Maintainer: Debian X Strike Force <[email protected]>
 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://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
+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


=====================================
debian/rules
=====================================
@@ -34,6 +34,7 @@ endif
 
 
 build: build-stamp
+build-indep: build-stamp
 build-stamp: $(STAMP_DIR)/prepare
        dh_testdir
        autoreconf -vfi
@@ -45,6 +46,9 @@ build-stamp: $(STAMP_DIR)/prepare
        cd build && $(MAKE)
        >$@
 
+build-arch:
+# Nothing to do
+
 clean: xsfclean
        dh_testdir
        dh_testroot
@@ -64,7 +68,7 @@ clean: xsfclean
 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 @@ binary-indep: build install
        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



View it on GitLab: 
https://salsa.debian.org/xorg-team/font/xfonts-scalable/-/compare/7186c0d533a7c9064ee06636ffa219ef5560704f...5410658a402f6825a93fcf82513ed47b0c433a7d

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/font/xfonts-scalable/-/compare/7186c0d533a7c9064ee06636ffa219ef5560704f...5410658a402f6825a93fcf82513ed47b0c433a7d
You're receiving this email because of your account on salsa.debian.org.


Reply via email to