[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/font/xfonts-encodings][debian-unstable] 5 commits: d/control: Update Vcs-* for migration to salsa.debian.org

Title: GitLab

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:

Changes:

  • debian/changelog
    1 1 
     xfonts-encodings (1:1.0.4-3) UNRELEASED; urgency=medium
    2 2
    3 
    +  [ Julien Cristau ]
    3 4 
       * Switch Vcs-* control fields to https.
    4 5 
       * Switch xorg.freedesktop.org URLs in packaging to https.
    5 6
    6 
    - -- Julien Cristau <jcristau@debian.org>  Sun, 21 Aug 2016 19:26:36 +0200
    7 
    +  [ Simon McVittie ]
    8 
    +  * d/control: Update Vcs-* for migration to salsa.debian.org
    9 
    +  * Use recommended debhelper compat level 13 (Closes: #965901)
    10 
    +  * d/rules: Add missing targets build-arch, build-indep (Policy §4.9)
    11 
    +  * d/control: Declare that the build does not require (fake)root
    12 
    +
    13 
    + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jul 2022 11:22:28 +0100
    7 14
    8 15 
     xfonts-encodings (1:1.0.4-2) unstable; urgency=low
    9 16

  • debian/compat deleted
    1 
    -5

  • debian/control
    ... ... @@ -3,7 +3,7 @@ Section: x11
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Build-Depends:
    6 
    - debhelper (>= 5.0.0),
    6 
    + debhelper-compat (= 13),
    7 7 
     Build-Depends-Indep:
    8 8 
      pkg-config,
    9 9 
      xfonts-utils (>= 1:7.6~),
    ... ... @@ -11,8 +11,9 @@ Build-Depends-Indep:
    11 11 
      automake,
    12 12 
      xutils-dev (>= 1:7.5+1),
    13 13 
     Standards-Version: 3.8.3
    14 
    -Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-encodings.git
    15 
    -Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-encodings.git
    14 
    +Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-encodings.git
    15 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-encodings
    16 
    +Rules-Requires-Root: no
    16 17
    17 18 
     Package: xfonts-encodings
    18 19 
     Architecture: all

  • debian/rules
    ... ... @@ -34,6 +34,7 @@ endif
    34 34
    35 35
    36 36 
     build: build-stamp
    37 
    +build-indep: build-stamp
    37 38 
     build-stamp:
    38 39 
     	dh_testdir
    39 40 
     	autoreconf -vfi
    ... ... @@ -45,6 +46,9 @@ build-stamp:
    45 46 
     	cd build && $(MAKE)
    46 47 
     	>$@
    47 48
    49 
    +build-arch:
    50 
    +# Nothing to do
    51 
    +
    48 52 
     clean: xsfclean
    49 53 
     	dh_testdir
    50 54 
     	dh_testroot
    ... ... @@ -63,7 +67,7 @@ clean: xsfclean
    63 67 
     install: build
    64 68 
     	dh_testdir
    65 69 
     	dh_testroot
    66 
    -	dh_clean -k
    70 
    +	dh_prep
    67 71 
     	dh_installdirs
    68 72 
     	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
    69 73
    ... ... @@ -77,7 +81,8 @@ binary-indep: build install
    77 81 
     	dh_testroot
    78 82
    79 83 
     	dh_installdocs
    80 
    -	dh_install --sourcedir=debian/tmp --list-missing
    84 
    +	dh_install --sourcedir=debian/tmp
    85 
    +	dh_missing --list-missing
    81 86 
     	dh_installchangelogs
    82 87 
     	dh_link
    83 88 
     	dh_strip

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: