[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 3 commits: rules: Move virt-aa-helper to libvirt-daemon

[Guido Günther]

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


Commits:
81999fb5 by Andrea Bolognani at 2021-01-18T01:20:22+01:00
rules: Move virt-aa-helper to libvirt-daemon

It's an executable part of the daemon rather than configuration,
the latter being what the libvirt-daemon-system is supposed to
contain.

It just happens to be the last bit of architecture-dependent
content left in the package too, so with that out of the way we
can consider making it Arch: all in the future.

- - - - -
12a56259 by Andrea Bolognani at 2021-01-18T01:20:48+01:00
control: Don't use ${shlibs:Depends} where not needed

Specifically, packages that don't contain any dynamically
linked program: dpkg-gencontrol complains otherwise.

Gbp-Dch: Ignore

- - - - -
b9b6a955 by Andrea Bolognani at 2021-01-18T01:20:48+01:00
control: Make libvirt-daemon-system-{systemd,sysv} Arch: all

They contain architecture-independent data only.

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -149,7 +149,10 @@ Enhances:
 Breaks:
  libvirt-clients (<< 6.9.0-2~),
  libvirt-daemon-driver-lxc (<< 6.9.0-2~),
+ libvirt-daemon-system (<< 6.9.0-3~),
  libvirt-sanlock (<< 6.9.0-2~),
+Replaces:
+ libvirt-daemon-system (<< 6.9.0-3~),
 Description: Virtualization daemon
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
@@ -324,7 +327,6 @@ Depends:
  logrotate,
  policykit-1 [linux-any],
  ${misc:Depends},
- ${shlibs:Depends},
 Recommends:
  dmidecode,
  dnsmasq-base (>= 2.46-1),
@@ -356,12 +358,11 @@ Description: Libvirt daemon configuration files
 
 Package: libvirt-daemon-system-systemd
 Section: admin
-Architecture: any
+Architecture: all
 Depends:
  systemd-container,
  systemd-sysv,
  ${misc:Depends},
- ${shlibs:Depends},
 Conflicts:
  libvirt-daemon-system-sysv,
 Description: Libvirt daemon configuration files (systemd)
@@ -376,13 +377,12 @@ Description: Libvirt daemon configuration files (systemd)
 
 Package: libvirt-daemon-system-sysv
 Section: admin
-Architecture: any
+Architecture: all
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  lsb-base,
  ${misc:Depends},
- ${shlibs:Depends},
 Breaks:
  libvirt-daemon-system (<< 5.6.0-4~),
 Replaces:


=====================================
debian/rules
=====================================
@@ -236,7 +236,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	               usr/lib/systemd/system/$${f}* \
 	               lib/systemd/system/; \
 	done
-	dh_install -p libvirt-daemon-system usr/lib/libvirt/virt-aa-helper
+	dh_install -p libvirt-daemon usr/lib/libvirt/virt-aa-helper
 	dh_install -p libvirt-daemon-system etc/apparmor.d
 	dh_apparmor -p libvirt-daemon-system --profile-name=usr.lib.libvirt.virt-aa-helper
 	dh_apparmor -p libvirt-daemon-system --profile-name=usr.sbin.libvirtd



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f5ee6773af27176908cbafd473634ce6fce1c177...b9b6a955bcb0bdb4ff6673ca35848d28fb5923af

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/f5ee6773af27176908cbafd473634ce6fce1c177...b9b6a955bcb0bdb4ff6673ca35848d28fb5923af
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/20210119/c1cce2f8/attachment-0001.html>