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


Commits:
18a02f6b by Simon McVittie at 2022-07-21T10:52:34+01:00
d/control: Update Vcs-* for migration to salsa.debian.org

- - - - -
df31d46d by Simon McVittie at 2022-07-21T11:04:22+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: #965901

- - - - -
08d314fe by Simon McVittie at 2022-07-21T11:09:29+01:00
d/rules: Add missing targets build-arch, build-indep (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.

- - - - -
85bea910 by Simon McVittie at 2022-07-21T11:09:46+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.

- - - - -
9f73254a by Simon McVittie at 2022-07-21T11:22:48+01:00
Update changelog

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
 xfonts-encodings (1:1.0.4-3) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Switch Vcs-* control fields to https.
   * Switch xorg.freedesktop.org URLs in packaging to https.
 
- -- Julien Cristau <[email protected]>  Sun, 21 Aug 2016 19:26:36 +0200
+  [ 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 <[email protected]>  Thu, 21 Jul 2022 11:22:28 +0100
 
 xfonts-encodings (1:1.0.4-2) unstable; urgency=low
 


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


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <[email protected]>
 Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper-compat (= 13),
 Build-Depends-Indep:
  pkg-config,
  xfonts-utils (>= 1:7.6~),
@@ -11,8 +11,9 @@ Build-Depends-Indep:
  automake,
  xutils-dev (>= 1:7.5+1),
 Standards-Version: 3.8.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-encodings.git
-Vcs-Browser: https://anonscm.debian.org/git/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


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



View it on GitLab: 
https://salsa.debian.org/xorg-team/font/xfonts-encodings/-/compare/b47576d4715f4ca89e72924859bbbd030cea3cd3...9f73254a4913ef561232802807903716463c9182

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/font/xfonts-encodings/-/compare/b47576d4715f4ca89e72924859bbbd030cea3cd3...9f73254a4913ef561232802807903716463c9182
You're receiving this email because of your account on salsa.debian.org.


Reply via email to