Commit 3d125257 authored by Liang Guo's avatar Liang Guo

Refresh d/pathes

parent abf3405d
......@@ -2,6 +2,9 @@ spice-vdagent (0.17.0-1) unstable; urgency=low
* New upstream release
* Refresh debian/copyright
* debian/patches:
- Remove libsystemd.patch, applied upstream
- Refresh other pathes
-- Liang Guo <guoliang@debian.org> Wed, 12 Oct 2016 15:41:11 +0800
......
......@@ -6,10 +6,10 @@ spice-vdagentd, this patch enables -PIE on spice-vdaget too.
bin_PROGRAMS = src/spice-vdagent
sbin_PROGRAMS = src/spice-vdagentd
-src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS)
-src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS)
+src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(PIE_CFLAGS)
+src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(PIE_LDFLAGS)
src_spice_vdagent_SOURCES = src/vdagent.c src/vdagent-x11.c src/vdagent-x11-randr.c src/vdagent-file-xfers.c src/udscs.c
src_spice_vdagentd_CFLAGS = $(DBUS_CFLAGS) $(LIBSYSTEMD_LOGIN_CFLAGS) \
-src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(ALSA_CFLAGS) -DUDSCS_NO_SERVER
-src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(ALSA_LIBS)
+src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(PIE_CFLAGS) $(ALSA_CFLAGS) -DUDSCS_NO_SERVER
+src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(PIE_LDFLAGS) $(ALSA_LIBS)
src_spice_vdagent_SOURCES = src/vdagent.c \
src/vdagent-x11.c \
src/vdagent-x11-randr.c \
Fix typo
--- a/src/vdagentd.c
+++ b/src/vdagentd.c
@@ -258,7 +258,7 @@
@@ -277,7 +277,7 @@
VDAgentFileXferStartMessage *s = (VDAgentFileXferStartMessage *)data;
if (!active_session_conn) {
cancel_file_xfer(vport,
send_file_xfer_status(vport,
- "Could not find an agent connnection belonging to the "
+ "Could not find an agent connection belonging to the "
"active session, cancelling client file-xfer request %u",
s->id);
s->id, VD_AGENT_FILE_XFER_STATUS_CANCELLED);
return;
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])
......@@ -2,4 +2,3 @@ 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
......@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/data/spice-vdagentd.service
+++ b/data/spice-vdagentd.service
@@ -7,7 +7,7 @@ After=dbus.target
@@ -7,7 +7,7 @@
[Service]
Type=forking
......@@ -15,7 +15,7 @@ Forwarded: not-needed
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
@@ -54,7 +54,7 @@
.SH FILES
The Sys-V initscript or systemd unit parses the following files:
.TP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment