Package: spice-vdagent Version: 0.15.0-1.2 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for spice-vdagent (versioned as 0.15.0-1.3) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. diff -Nru spice-vdagent-0.15.0/debian/changelog spice-vdagent-0.15.0/debian/changelog --- spice-vdagent-0.15.0/debian/changelog 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/changelog 2015-07-19 15:12:45.000000000 +0200 @@ -1,3 +1,20 @@ +spice-vdagent (0.15.0-1.3) unstable; urgency=medium + + * Non-maintainer upload. + [ Laurent Bigonville ] + * Properly install the systemd .service and other support files (Closes: + #791422) + * debian/spice-vdagent.init: Pass parameters from $SPICE_VDAGENTD_EXTRA_ARGS + variable to the spice-vdagentd daemon, so both LSB initscript and .service + files behave the same. + * debian/rules: Call dh_install with --list-missing parameter + + [ Michael Biebl ] + * Use of the new libsystemd library instead of libsystemd-login (Closes: + #779782) + + -- Laurent Bigonville <bi...@debian.org> Sun, 19 Jul 2015 15:05:48 +0200 + spice-vdagent (0.15.0-1.2) unstable; urgency=medium * Non-maintainer upload, with permission from maintainer. diff -Nru spice-vdagent-0.15.0/debian/control spice-vdagent-0.15.0/debian/control --- spice-vdagent-0.15.0/debian/control 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/control 2015-07-19 14:57:08.000000000 +0200 @@ -3,6 +3,7 @@ Maintainer: Liang Guo <guoli...@debian.org> Build-Depends: debhelper (>= 7.0.50~), pkg-config, + dh-systemd, libspice-protocol-dev (>= 0.12.5), libdbus-1-dev, libx11-dev, @@ -14,7 +15,8 @@ autoconf, automake, libglib2.0-dev (>= 2.12), - libsystemd-login-dev, + systemd, + libsystemd-dev Standards-Version: 3.9.4 Section: x11 Homepage: http://www.spice-space.org/ diff -Nru spice-vdagent-0.15.0/debian/patches/libsystemd.patch spice-vdagent-0.15.0/debian/patches/libsystemd.patch --- spice-vdagent-0.15.0/debian/patches/libsystemd.patch 1970-01-01 01:00:00.000000000 +0100 +++ spice-vdagent-0.15.0/debian/patches/libsystemd.patch 2015-07-19 14:55:59.000000000 +0200 @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 79905a8..f25d5d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,11 +82,14 @@ PKG_CHECK_MODULES(SPICE, [spice-protocol >= 0.12.5]) + + if test "$with_session_info" = "auto" || test "$with_session_info" = "systemd"; then + PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN], +- [libsystemd-login >= 42], ++ [libsystemd >= 209], + [have_libsystemd_login="yes"], +- [have_libsystemd_login="no"]) ++ [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN], ++ [libsystemd-login >= 42], ++ [have_libsystemd_login="yes"], ++ [have_libsystemd_login="no"])]) + if test x"$have_libsystemd_login" = "xno" && test "$with_session_info" = "systemd"; then +- AC_MSG_ERROR([libsystemd-login support explicitly requested, but some required packages are not available]) ++ AC_MSG_ERROR([systemd support explicitly requested, but neither libsystemd nor libsystemd-login were found]) + fi + if test x"$have_libsystemd_login" = "xyes"; then + AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, [1], [If defined, vdagentd will be compiled with libsystemd-login support]) diff -Nru spice-vdagent-0.15.0/debian/patches/series spice-vdagent-0.15.0/debian/patches/series --- spice-vdagent-0.15.0/debian/patches/series 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/patches/series 2015-07-19 14:56:29.000000000 +0200 @@ -1,3 +1,5 @@ fix-typo-in-vdagentd-c.patch fix-spelling-error-in-manpage.patch enable-pie-on-spice-vdagent.patch +systemd_service_default_file.patch +libsystemd.patch diff -Nru spice-vdagent-0.15.0/debian/patches/systemd_service_default_file.patch spice-vdagent-0.15.0/debian/patches/systemd_service_default_file.patch --- spice-vdagent-0.15.0/debian/patches/systemd_service_default_file.patch 1970-01-01 01:00:00.000000000 +0100 +++ spice-vdagent-0.15.0/debian/patches/systemd_service_default_file.patch 2015-07-19 14:55:38.000000000 +0200 @@ -0,0 +1,26 @@ +Description: Adjust the path to the default file +Author: Laurent Bigonville <bi...@debian.org> +Forwarded: not-needed + +--- a/data/spice-vdagentd.service ++++ b/data/spice-vdagentd.service +@@ -7,7 +7,7 @@ After=dbus.target + + [Service] + Type=forking +-EnvironmentFile=-/etc/sysconfig/spice-vdagentd ++EnvironmentFile=-/etc/default/spice-vdagentd + ExecStartPre=/bin/rm -f /var/run/spice-vdagentd/spice-vdagent-sock + ExecStart=/usr/sbin/spice-vdagentd $SPICE_VDAGENTD_EXTRA_ARGS + PIDFile=/var/run/spice-vdagentd/spice-vdagentd.pid +--- a/data/spice-vdagentd.1.in ++++ b/data/spice-vdagentd.1.in +@@ -47,7 +47,7 @@ only one \fBspice-vdagent\fR is allowed + .SH FILES + The Sys-V initscript or systemd unit parses the following files: + .TP +-/etc/sysconfig/spice-vdagentd ++/etc/default/spice-vdagentd + Default cmdline options can be passed to \fBspice-vdagentd\fR by setting + them in the \fISPICE_VDAGENTD_EXTRA_ARGS\fR variable in this file + .SH SEE ALSO diff -Nru spice-vdagent-0.15.0/debian/rules spice-vdagent-0.15.0/debian/rules --- spice-vdagent-0.15.0/debian/rules 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/rules 2015-07-19 14:55:38.000000000 +0200 @@ -17,4 +17,10 @@ --enable-pie=yes \ --with-session-info=systemd %: - dh $@ + dh $@ --with systemd + +override_dh_install: + dh_install --list-missing +# We cannot add this to the .link file because dh_link is called after +# dh_systemd_* helpers during normal build + dh_link lib/systemd/system/spice-vdagentd.service lib/systemd/system/spice-vdagent.service diff -Nru spice-vdagent-0.15.0/debian/spice-vdagent.init spice-vdagent-0.15.0/debian/spice-vdagent.init --- spice-vdagent-0.15.0/debian/spice-vdagent.init 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/spice-vdagent.init 2015-07-19 14:55:38.000000000 +0200 @@ -41,7 +41,7 @@ # In case the previous running vdagentd crashed rm -f /var/run/spice-vdagentd/spice-vdagent-sock log_daemon_msg "Starting Agent daemon for Spice guests" "spice-vdagent" - if start-stop-daemon --start --quiet --oknodo --pidfile $pidfile --exec $exec -- ; then + if start-stop-daemon --start --quiet --oknodo --pidfile $pidfile --exec $exec -- $SPICE_VDAGENTD_EXTRA_ARGS ; then log_end_msg 0 else log_end_msg 1 diff -Nru spice-vdagent-0.15.0/debian/spice-vdagent.install spice-vdagent-0.15.0/debian/spice-vdagent.install --- spice-vdagent-0.15.0/debian/spice-vdagent.install 2014-10-07 16:47:57.000000000 +0200 +++ spice-vdagent-0.15.0/debian/spice-vdagent.install 2015-07-19 14:55:38.000000000 +0200 @@ -3,3 +3,6 @@ usr/share etc/xdg/autostart/spice-vdagent.desktop etc/rsyslog.d/spice-vdagentd.conf +usr/lib/tmpfiles.d +lib/udev/rules.d +lib/systemd/system -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
