[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: rules: Import dpkg/default.mk

[Guido Günther (@agx)]

Guido Günther pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
1f78bbf2 by Andrea Bolognani at 2023-02-21T23:42:52+01:00
rules: Import dpkg/default.mk

This is a superset of dpkg/buildflags.mk and contains some
extra variables that we're going to start using in a second.

Gbp-Dch: Ignore

- - - - -
dafa8d48 by Andrea Bolognani at 2023-02-21T23:59:58+01:00
rules: Use DEB_VERSION and DEB_VENDOR

Instead of extracting similar information from the Debian
changelog by calling dpkg-parsechangelog multiple times.

This addresses the Lintian tags

  libvirt source: debian-rules-parses-dpkg-parsechangelog [debian/rules:3]
  libvirt source: debian-rules-parses-dpkg-parsechangelog [debian/rules:4]

and results in the version number, as printed by libvirt on
daemon startup, to change from something like

  libvirt version: 9.0.0, package: 1 (Andrea Bolognani <eof at kiyuko.org> Sat, 28 Jan 2023 17:03:53 +0100)

to something like

  libvirt version: 9.0.0, package: 9.0.0-1 (Debian)

which is way more compact, contains the full Debian version in a
single field, prevents the maintainer's name and email address
from ending up embedded in countless bug reports across multiple
trackers, and actually allows us to differentiate between the
Debian build of a package and a same-source rebuild made by
derivatives such as Ubuntu.

Gbp-Dch: Ignore

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_RELEASE = $(shell dpkg-parsechangelog -SVersion | sed 's/[^-]\+-//')
-DEB_BUILDDATE = $(shell dpkg-parsechangelog -SDate)
-DEB_BUILDUSER = $(shell dpkg-parsechangelog -SMaintainer)
 NULL =
 
 DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
@@ -13,7 +10,7 @@ DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 
 DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
 
 ARCHES_LXC  = alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 ARCHES_XEN  = amd64 arm64 armhf
@@ -91,8 +88,8 @@ endif
 DEB_CONFIGURE_EXTRA_ARGS := \
     --libexecdir=/usr/lib/libvirt \
     -Drunstatedir=/run \
-    -Dpackager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
-    -Dpackager_version="$(DEB_RELEASE)" \
+    -Dpackager="$(DEB_VENDOR)" \
+    -Dpackager_version="$(DEB_VERSION)" \
     -Ddriver_qemu=enabled \
     -Ddriver_libvirtd=enabled \
     -Ddriver_remote=enabled \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f68f9c7363f4be4e9cce7eb4c86683911b7e6759...dafa8d4822c36cb2ab015540c163a2b646ee6f3d

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f68f9c7363f4be4e9cce7eb4c86683911b7e6759...dafa8d4822c36cb2ab015540c163a2b646ee6f3d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20230224/88264f94/attachment-0001.htm>