[Pkg-libvirt-commits] [libvirt] 01/05: Split out daemon configuration
Guido Guenther
agx at moszumanska.debian.org
Tue Jul 22 21:03:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.2.6-1
in repository libvirt.
commit 7ca6a8a69e2f317a1ec5395d355994242bf43950
Author: Guido Günther <agx at sigxcpu.org>
Date: Sun Jul 1 18:41:02 2012 +0200
Split out daemon configuration
Closes: #679074
---
debian/control | 84 +++++++++++++++++++---
debian/libvirt-bin.maintscript | 5 +-
debian/libvirt-clients.install | 4 ++
...bvirt-bin.manpages => libvirt-clients.manpages} | 0
...libvirt-bin.dirs => libvirt-daemon-system.dirs} | 0
...bin.examples => libvirt-daemon-system.examples} | 0
debian/libvirt-daemon-system.install | 7 ++
...ault => libvirt-daemon-system.libvirtd.default} | 0
...td.init => libvirt-daemon-system.libvirtd.init} | 0
debian/libvirt-daemon-system.maintscript | 2 +
...bin.postinst => libvirt-daemon-system.postinst} | 4 +-
...irt-bin.postrm => libvirt-daemon-system.postrm} | 2 +-
debian/{libvirt-bin.NEWS => libvirt-daemon.NEWS} | 0
...{libvirt-bin.install => libvirt-daemon.install} | 3 -
debian/rules | 30 ++++----
15 files changed, 108 insertions(+), 33 deletions(-)
diff --git a/debian/control b/debian/control
index 7a1861a..1b76358 100644
--- a/debian/control
+++ b/debian/control
@@ -66,29 +66,89 @@ Standards-Version: 3.9.5
Package: libvirt-bin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate, gettext-base
+Depends:
+ ${misc:Depends},
+ libvirt-daemon-system,
+ libvirt-clients,
+Section: oldlibs
+Priority: extra
+Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This is a transitional package. You can safely remove it.
+
+Package: libvirt-clients
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libvirt0 (= ${binary:Version}),
+Section: admin
+Replaces: libvirt-bin (<< 1.2.6-1~)
+Conflicts: libvirt-bin (<< 1.2.6-1~)
+Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the libvirt shell virsh and other client binaries.
+
+Package: libvirt-daemon
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libvirt0 (= ${binary:Version}),
Enhances: qemu, qemu-kvm, xen
Section: admin
-Recommends: netcat-openbsd,
- bridge-utils,
- dnsmasq-base (>= 2.46-1),
- iptables (>= 1.4.10),
+Recommends:
qemu-kvm | qemu (>= 0.9.1),
libxml2-utils,
- ebtables,
+ netcat-openbsd,
+Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the libvirt-daemon.
+
+Package: libvirt-daemon-system
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ adduser,
+ gettext-base,
+ libvirt-clients (= ${binary:Version}),
+ libvirt-daemon (= ${binary:Version}),
+ logrotate,
+Recommends:
+ bridge-utils,
dmidecode,
+ dnsmasq-base (>= 2.46-1),
+ ebtables [linux-any],
iproute2,
+ iptables (>= 1.4.10) [linux-any],
parted,
- pm-utils
+ pm-utils,
+Section: admin
Suggests: policykit-1, radvd, auditd, systemtap, systemd, apparmor
Breaks: avahi-daemon (<< 0.6.31-3~)
-Description: programs for the libvirt library
+Replaces: libvirt-bin (<< 1.2.6-1~)
+Conflicts: libvirt-bin (<< 1.2.6-1~)
+Description: Libvirt daemon configuration files
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
a long term stable C API for different virtualization mechanisms. It currently
supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
.
- This package contains the supporting binaries to use with libvirt
+ This package contains the configuration files to run the libvirt daemon as a
+ system service.
Package: libvirt0
Architecture: any
@@ -144,7 +204,11 @@ Description: development files for the libvirt library
Package: libvirt-sanlock
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libvirt0 (= ${binary:Version}), augeas-tools
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ augeas-tools,
+ libvirt0 (= ${binary:Version}),
Priority: extra
Description: library for interfacing with different virtualization systems
Libvirt is a C toolkit to interact with the virtualization capabilities
diff --git a/debian/libvirt-bin.maintscript b/debian/libvirt-bin.maintscript
index f67541e..00c083c 100644
--- a/debian/libvirt-bin.maintscript
+++ b/debian/libvirt-bin.maintscript
@@ -1,2 +1,3 @@
-mv_conffile /etc/default/libvirt-bin /etc/default/libvirtd 1.2.5-1~
-mv_conffile /etc/init.d/libvirt-bin /etc/init.d/libvirtd 1.2.5-1~
+# libvirt-bin renamed to libvirtd
+mv_conffile /etc/default/libvirt-bin /etc/default/libvirtd 1.2.6-1~
+mv_conffile /etc/init.d/libvirt-bin /etc/init.d/libvirtd 1.2.6-1~
diff --git a/debian/libvirt-clients.install b/debian/libvirt-clients.install
new file mode 100644
index 0000000..f63b8e9
--- /dev/null
+++ b/debian/libvirt-clients.install
@@ -0,0 +1,4 @@
+usr/bin/*
+usr/share/man/man1/*
+etc/libvirt/libvirt.conf
+etc/libvirt/virt-login-shell.conf
diff --git a/debian/libvirt-bin.manpages b/debian/libvirt-clients.manpages
similarity index 100%
rename from debian/libvirt-bin.manpages
rename to debian/libvirt-clients.manpages
diff --git a/debian/libvirt-bin.dirs b/debian/libvirt-daemon-system.dirs
similarity index 100%
rename from debian/libvirt-bin.dirs
rename to debian/libvirt-daemon-system.dirs
diff --git a/debian/libvirt-bin.examples b/debian/libvirt-daemon-system.examples
similarity index 100%
rename from debian/libvirt-bin.examples
rename to debian/libvirt-daemon-system.examples
diff --git a/debian/libvirt-daemon-system.install b/debian/libvirt-daemon-system.install
new file mode 100644
index 0000000..af6e0bf
--- /dev/null
+++ b/debian/libvirt-daemon-system.install
@@ -0,0 +1,7 @@
+etc/libvirt/libvirtd.conf
+etc/libvirt/lxc.conf
+etc/libvirt/qemu.conf
+etc/libvirt/qemu-lockd.conf
+etc/libvirt/qemu-sanlock.conf
+etc/libvirt/virtlockd.conf
+etc/sasl2/*
diff --git a/debian/libvirt-bin.libvirtd.default b/debian/libvirt-daemon-system.libvirtd.default
similarity index 100%
rename from debian/libvirt-bin.libvirtd.default
rename to debian/libvirt-daemon-system.libvirtd.default
diff --git a/debian/libvirt-bin.libvirtd.init b/debian/libvirt-daemon-system.libvirtd.init
old mode 100644
new mode 100755
similarity index 100%
rename from debian/libvirt-bin.libvirtd.init
rename to debian/libvirt-daemon-system.libvirtd.init
diff --git a/debian/libvirt-daemon-system.maintscript b/debian/libvirt-daemon-system.maintscript
new file mode 100644
index 0000000..dbd40af
--- /dev/null
+++ b/debian/libvirt-daemon-system.maintscript
@@ -0,0 +1,2 @@
+mv_conffile /etc/default/libvirt-bin /etc/default/libvirtd 1.2.6-1~ libvirt-bin -- "$@"
+mv_conffile /etc/init.d/libvirt-bin /etc/init.d/libvirtd 1.2.6-1~ libvirt-bin -- "$@"
diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-daemon-system.postinst
similarity index 97%
rename from debian/libvirt-bin.postinst
rename to debian/libvirt-daemon-system.postinst
index 4c11cb0..73330ed 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-daemon-system.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for libvirt-bin
+# postinst script for libvirt-daemon-system
#
# see: dh_installdeb(1)
@@ -99,7 +99,7 @@ case "$1" in
# When renaming the .service file, systemd might become confused, we
# need to ensure that the libvirtd daemon is fully stopped before
# trying to restart it again. (Bug: #730604)
- if dpkg --compare-versions "$2" le-nl "1.2.4"; then
+ if dpkg --compare-versions "$2" le "1.2.6-1~"; then
if [ -d /run/systemd/system ]; then
start-stop-daemon --stop --quiet --pidfile /var/run/libvirtd.pid \
--oknodo --exec /usr/sbin/libvirtd --retry 1
diff --git a/debian/libvirt-bin.postrm b/debian/libvirt-daemon-system.postrm
similarity index 96%
rename from debian/libvirt-bin.postrm
rename to debian/libvirt-daemon-system.postrm
index ab42a94..c675fd7 100644
--- a/debian/libvirt-bin.postrm
+++ b/debian/libvirt-daemon-system.postrm
@@ -1,5 +1,5 @@
#!/bin/sh
-# postrm script for #PACKAGE#
+# postrm script for libvirt-daemon-system
#
# see: dh_installdeb(1)
diff --git a/debian/libvirt-bin.NEWS b/debian/libvirt-daemon.NEWS
similarity index 100%
rename from debian/libvirt-bin.NEWS
rename to debian/libvirt-daemon.NEWS
diff --git a/debian/libvirt-bin.install b/debian/libvirt-daemon.install
similarity index 78%
rename from debian/libvirt-bin.install
rename to debian/libvirt-daemon.install
index 298bdb7..74ba67f 100644
--- a/debian/libvirt-bin.install
+++ b/debian/libvirt-daemon.install
@@ -1,7 +1,4 @@
-usr/bin/*
usr/sbin/*
-etc/libvirt/*
-etc/sasl2/*
usr/lib/libvirt/libvirt*
usr/lib/libvirt/connection-driver
usr/share/augeas/*
diff --git a/debian/rules b/debian/rules
index aec32e0..24e4e02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,35 +135,35 @@ override_dh_install:
dh_install
# Copy upstream files to debian/ so dh_* can find them
cp debian/tmp/usr/lib/libvirt/libvirt-guests.sh \
- debian/libvirt-bin.libvirt-guests.init
+ debian/libvirt-daemon-system.libvirt-guests.init
cp tools/libvirt-guests.sysconf \
- debian/libvirt-bin.libvirt-guests.default
+ debian/libvirt-daemon-system.libvirt-guests.default
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
# Linux supports more nice things:
- dh_install -p libvirt-bin usr/lib/systemd/system lib/systemd/
- dh_install -p libvirt-bin usr/lib/libvirt/virt-aa-helper
- dh_install -p libvirt-bin etc/apparmor.d
- dh_install -p libvirt-bin usr/share/polkit-1
+ dh_install -p libvirt-daemon-system usr/lib/systemd/system lib/systemd/
+ dh_install -p libvirt-daemon-system usr/lib/libvirt/virt-aa-helper
+ dh_install -p libvirt-daemon-system etc/apparmor.d
+ dh_install -p libvirt-daemon-system usr/share/polkit-1
# Not all linux arches have systemtap yet
mkdir -p debian/tmp/usr/share/systemtap
- dh_install -p libvirt-bin usr/share/systemtap
+ dh_install -p libvirt-daemon-system usr/share/systemtap
endif
for l in $(LOGROTATE); do \
cp $(CURDIR)/debian/build/daemon/$$l.logrotate \
- debian/libvirt-bin.$$l.logrotate; \
+ debian/libvirt-daemon-system.$$l.logrotate; \
dh_installlogrotate --name=$$l; \
done
# Don't ship any la files
- rm debian/libvirt-bin/usr/lib/libvirt/connection-driver/*.la
+ rm debian/libvirt-daemon/usr/lib/libvirt/connection-driver/*.la
# Don't ship api files in the daemon package
- rm -r debian/libvirt-bin/usr/share/libvirt/api/
+ rm -r debian/libvirt-daemon/usr/share/libvirt/api/
override_dh_installinit:
dh_systemd_enable
- dh_installinit --name=libvirtd --restart-after-upgrade -- defaults 28 72
- dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
+ 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_systemd_start --restart-after-upgrade
override_dh_installdocs:
@@ -180,8 +180,8 @@ override_dh_strip:
override_dh_auto_clean:
[ ! -f Makefile ] || dh_auto_clean
- rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.init
- rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.default
- rm -f $(CURDIR)/debian/libvirt-bin.*.logrotate
+ rm -f $(CURDIR)/debian/libvirt-daemon-system.libvirt-guests.init
+ rm -f $(CURDIR)/debian/libvirt-daemon-system.libvirt-guests.default
+ rm -f $(CURDIR)/debian/libvirt-daemon-system.*.logrotate
rm -f $(CURDIR)/debian/*.service
rm -rf $(DEB_BUILDDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list