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

[Git][xorg-team/font/xfonts-scalable][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-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:

Changes:

  • debian/changelog
    1 1 
     xfonts-scalable (1:1.0.3-2) UNRELEASED; urgency=medium
    2 2
    3 
    +  [ Julien Cristau ]
    3 4 
       * Remove Cyril and David from Uploaders.
    4 5 
       * Add Vcs-* control fields.
    5 6 
       * Use https URL in debian/watch.
    6 7
    7 
    - -- Julien Cristau <jcristau@debian.org>  Sat, 24 Sep 2016 14:52:31 +0200
    8 
    +  [ Simon McVittie ]
    9 
    +  * d/control: Update Vcs-* for migration to salsa.debian.org
    10 
    +  * Use recommended debhelper compat level 13 (Closes: #965894)
    11 
    +  * d/rules: Add missing build-arch, build-indep targets (Policy §4.9)
    12 
    +  * d/control: Declare that the build does not require (fake)root
    13 
    +
    14 
    + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jul 2022 11:23:59 +0100
    8 15
    9 16 
     xfonts-scalable (1:1.0.3-1.1) unstable; urgency=medium
    10 17

  • debian/compat deleted
    1 
    -5

  • debian/control
    ... ... @@ -3,15 +3,16 @@ Section: fonts
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Build-Depends:
    6 
    - debhelper (>= 5.0.31),
    6 
    + debhelper-compat (= 13),
    7 7 
      xfonts-utils (>= 1:7.6~),
    8 8 
      automake,
    9 9 
      autoconf,
    10 10 
      xutils-dev (>= 1:7.5+1),
    11 11 
      pkg-config,
    12 12 
     Standards-Version: 3.8.3
    13 
    -Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
    14 
    -Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/font/xfonts-scalable.git
    13 
    +Vcs-Git: https://salsa.debian.org/xorg-team/font/xfonts-scalable.git
    14 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/font/xfonts-scalable
    15 
    +Rules-Requires-Root: no
    15 16
    16 17 
     Package: xfonts-scalable
    17 18 
     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: $(STAMP_DIR)/prepare
    38 39 
     	dh_testdir
    39 40 
     	autoreconf -vfi
    ... ... @@ -45,6 +46,9 @@ build-stamp: $(STAMP_DIR)/prepare
    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
    ... ... @@ -64,7 +68,7 @@ clean: xsfclean
    64 68 
     install: build
    65 69 
     	dh_testdir
    66 70 
     	dh_testroot
    67 
    -	dh_clean -k
    71 
    +	dh_prep
    68 72 
     	dh_installdirs
    69 73
    70 74 
     	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
    ... ... @@ -81,7 +85,8 @@ binary-indep: build install
    81 85 
     	dh_testroot
    82 86
    83 87 
     	dh_installdocs
    84 
    -	dh_install --sourcedir=debian/tmp --fail-missing --exclude=fonts.dir --exclude=fonts.scale
    88 
    +	dh_install --sourcedir=debian/tmp --exclude=fonts.dir --exclude=fonts.scale
    89 
    +	dh_missing --fail-missing --exclude=fonts.dir --exclude=fonts.scale
    85 90 
     	dh_installxfonts
    86 91 
     	dh_installchangelogs
    87 92 
     	dh_compress

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

    Reply to: