[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 7 commits: d/compat: Switch to debhelper level 12

Mon Apr 22 11:57:38 BST 2019


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


Commits:
1ec90c05 by Guido Günther at 2019-04-22T10:19:42Z
d/compat: Switch to debhelper level 12

- - - - -
7b4ffeb9 by Guido Günther at 2019-04-22T10:19:43Z
d/rules: Newer debhelper puts the libs into multi arch dirs

There's no need to move them manually anymore.

- - - - -
fb6dd184 by Guido Günther at 2019-04-22T10:19:43Z
d/rules: s/no-restart-on-upgrade/no-stop-on-upgrade/

- - - - -
3764b71d by Guido Günther at 2019-04-22T10:19:43Z
d/rules: --prallel not needed anymore

- - - - -
1d920955 by Guido Günther at 2019-04-22T10:19:43Z
d/control: Add ${misc:Pre-Depends} for libvirt-daemon-system

This makes sure we pull in recent enough init-system-helpers

- - - - -
02a155be by Guido Günther at 2019-04-22T10:19:43Z
d/rules: Switch to dh_installsystemd

dh_systemd_start is no longer used.

- - - - -
67e9adf8 by Guido Günther at 2019-04-22T10:37:36Z
Document changes and release 5.2.0-2

- - - - -


10 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/libvirt-daemon-driver-storage-gluster.install
- debian/libvirt-daemon-driver-storage-rbd.install
- debian/libvirt-daemon-driver-storage-zfs.install
- debian/libvirt-daemon.install
- debian/libvirt-sanlock.install
- debian/libvirt-wireshark.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,44 @@
+libvirt (5.2.0-2) experimental; urgency=medium
+
+  [ Guido Günther ]
+  * [1ec90c0] d/compat: Switch to debhelper level 12
+      * [fb6dd18] d/rules: s/no-restart-on-upgrade/no-stop-on-upgrade/
+      * [3764b71] d/rules: --prallel not needed anymore
+      * [1d92095] d/control: Add ${misc:Pre-Depends} for
+        libvirt-daemon-system. This makes sure we pull in recent enough
+        init-system-helpers
+  * [02a155b] d/rules: Switch to dh_installsystemd
+    dh_systemd_start is no longer used.
+  * [bcad111] d/control: Fix typo
+  * [8609192] d/control: Drop Debian revision on iptables build-dep.  Any
+    version greater than 1.8.1 will do.
+  * [447dd58] libnss-libvirt: Install libnss_libvirt-guest as well
+    (Closes: #910288)
+  * [4fb7d11] d/control: Build-depend on libglusterfs-dev.
+    Since this is a recent addition we can drop the versioned dependency.
+    (Closes: #919663)
+  * [7b4ffeb] d/rules: Newer debhelper puts the libs into multi arch dirs.
+    There's no need to move them manually anymore.
+
+  [ Andrea Bolognani ]
+  * [dd9cdaa] Use HTTPS for all URLs.
+    This gets rid of the debian-watch-uses-insecure-uri informational Lintian
+    tag, and then some.
+  * [faaec12] Minimize upstream's signing key.
+    This gets rid of the public-upstream-key-not-minimal informational Lintian
+    tag.
+  * [8a0e6f1] Remove Priority field from binary packages.
+    This gets rid of the binary-control-field-duplicates-source informational
+    Lintian tag.
+
+  [ Christian Ehrhardt ]
+  * [08f3a23] d/libvirt-clients.manpages: add virkeycode and virkeyname man
+    pages.
+  * [0f359de] d/rules: mv logrotate files to silence dh_missing
+  * [f36ca33] dh_missing: ignore warning on libtool .la file
+
+ -- Guido Günther <agx at sigxcpu.org>  Mon, 22 Apr 2019 12:20:36 +0200
+
 libvirt (5.2.0-1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-8
+12


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.deb
 Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 Build-Depends:
  bash-completion,
- debhelper (>= 9.20160709~),
+ debhelper (>= 12~),
  dh-autoreconf,
  dh-apparmor [linux-any],
  libxml2-dev (>= 2.9.2+really2.9.1+dfsg1-0.2),
@@ -174,6 +174,8 @@ Description: Virtualization daemon ZFS storage driver
 
 Package: libvirt-daemon-system
 Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends},
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},


=====================================
debian/libvirt-daemon-driver-storage-gluster.install
=====================================
@@ -1,2 +1,2 @@
-/usr/lib/libvirt/storage-backend/libvirt_storage_backend_gluster.so
-/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_gluster.so
+usr/lib/*/libvirt/storage-file/libvirt_storage_file_gluster.so


=====================================
debian/libvirt-daemon-driver-storage-rbd.install
=====================================
@@ -1 +1 @@
-/usr/lib/libvirt/storage-backend/libvirt_storage_backend_rbd.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_rbd.so


=====================================
debian/libvirt-daemon-driver-storage-zfs.install
=====================================
@@ -1 +1 @@
-/usr/lib/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_zfs.so


=====================================
debian/libvirt-daemon.install
=====================================
@@ -1,14 +1,15 @@
 usr/sbin/*
-usr/lib/libvirt/libvirt*
-usr/lib/libvirt/lock-driver/lockd.so
-usr/lib/libvirt/connection-driver
+usr/lib/libvirt/libvirt_*
+usr/lib/libvirt/libvirt-guests.sh
+usr/lib/*/libvirt/lock-driver/lockd.so
+usr/lib/*/libvirt/connection-driver
 usr/share/augeas/*
 usr/share/bash-completion/*
 usr/share/man/man8/*
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_disk.so
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.so
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_logical.so
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_mpath.so
-usr/lib/libvirt/storage-backend/libvirt_storage_backend_scsi.so
-usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_disk.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_fs.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_logical.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_mpath.so
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_scsi.so
+usr/lib/*/libvirt/storage-file/libvirt_storage_file_fs.so


=====================================
debian/libvirt-sanlock.install
=====================================
@@ -1 +1 @@
-usr/lib/libvirt/lock-driver/sanlock.so
+usr/lib/*/libvirt/lock-driver/sanlock.so


=====================================
debian/libvirt-wireshark.install
=====================================
@@ -1 +1 @@
-/usr/lib/*/wireshark/
+usr/lib/*/wireshark/


=====================================
debian/rules
=====================================
@@ -85,6 +85,7 @@ else
 endif
 
 DEB_CONFIGURE_EXTRA_ARGS :=      \
+	--libexecdir=/usr/lib/libvirt \
 	--with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
 	--with-packager-version="$(DEB_RELEASE)" \
 	--with-default-editor="sensible-editor" \
@@ -149,7 +150,7 @@ LOGROTATE = $(basename $(basename $(notdir $(wildcard src/remote/libvirtd*.logro
 EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
 
 %:
-	dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel --with autoreconf --with systemd
+	dh $@ --builddirectory=$(DEB_BUILDDIR) --with autoreconf
 
 override_dh_auto_configure:
 	IPTABLES_PATH=/usr/sbin/iptables \
@@ -169,15 +170,6 @@ override_dh_auto_test:
 	fi
 
 override_dh_install-arch:
-	# Multiarch:
-	# don't configure with --libdir, but move the files manually, because
-	# we don't want to change other places in /usr/lib/
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	mv debian/tmp/usr/lib/lib*a \
-	   debian/tmp/usr/lib/lib*.so* \
-	   debian/tmp/usr/lib/pkgconfig \
-	   debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-
 	dh_install
 
 	# Copy upstream files to debian/ so dh_* can find them
@@ -223,7 +215,7 @@ endif
 	done
 
 	# Don't ship any la files
-	rm debian/libvirt-daemon/usr/lib/libvirt/connection-driver/*.la
+	rm debian/libvirt-daemon/usr/lib/*/libvirt/connection-driver/*.la
 	rm debian/libvirt-wireshark/usr/lib/*/wireshark/plugins/*/*/*.la
 	# Don't ship any files that are managed by the user only
 	rm debian/libvirt-daemon-system/etc/apparmor.d/local/*
@@ -232,13 +224,13 @@ endif
 
 
 override_dh_installinit:
-	dh_installinit -p libvirt-daemon-system --name=virtlogd --no-restart-on-upgrade
+	dh_installinit -p libvirt-daemon-system --name=virtlogd --no-stop-on-upgrade
 	dh_installinit -p libvirt-daemon-system --name=libvirtd --restart-after-upgrade -- defaults 28 72
-	dh_installinit -p libvirt-daemon-system --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
+	dh_installinit -p libvirt-daemon-system --name=libvirt-guests --no-stop-on-upgrade -- defaults 29 71
 
-override_dh_systemd_start:
-	dh_systemd_start -p libvirt-daemon-system --restart-after-upgrade libvirtd.service 
-	dh_systemd_start -p libvirt-daemon-system --no-restart-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
+override_dh_installsystemd:
+	dh_installsystemd -p libvirt-daemon-system --restart-after-upgrade libvirtd.service
+	dh_installsystemd -p libvirt-daemon-system --no-stop-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
 
 override_dh_installdocs:
 	dh_installdocs



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/6c6acf47831deb16ac1fa4583a1a04c888e04dae...67e9adf8767ffc463d7ed830a052a20f4e2a4990

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/6c6acf47831deb16ac1fa4583a1a04c888e04dae...67e9adf8767ffc463d7ed830a052a20f4e2a4990
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/20190422/9d20fa2d/attachment-0001.html>
