xserver-xorg-video-qxl: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 18 +++++++++++++++++-
debian/rules | 13 ++++++++++++-
debian/xserver-xorg-video-qxl.docs | 2 ++
debian/xserver-xspice.docs | 2 ++
debian/xserver-xspice.install | 1 +
debian/xserver-xspice.manpages | 1 +
7 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit a0c5478d935122d0e6183af5781d512dd039229e
Author: Liang Guo <bluestonechina@gmail.com>
Date: Mon Apr 16 22:05:24 2012 +0800
Add debian/xserver-xorg-video-qxl.docs
diff --git a/debian/changelog b/debian/changelog
index 32fd258..6bb3bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-qxl (0.0.17-2) unstable; urgency=low
* Enable Xspice (Closes: 668537)
+ * Add debian/xserver-xorg-video-qxl.docs.
- -- Liang Guo <bluestonechina@gmail.com> Sun, 15 Apr 2012 15:10:01 +0800
+ -- Liang Guo <bluestonechina@gmail.com> Mon, 16 Apr 2012 22:04:27 +0800
xserver-xorg-video-qxl (0.0.17-1) unstable; urgency=low
diff --git a/debian/xserver-xorg-video-qxl.docs b/debian/xserver-xorg-video-qxl.docs
new file mode 100644
index 0000000..724e084
--- /dev/null
+++ b/debian/xserver-xorg-video-qxl.docs
@@ -0,0 +1,2 @@
+README
+TODO
commit 45a36eae7a7cf1bab77b197868b3ee89f04ff937
Author: Liang Guo <bluestonechina@gmail.com>
Date: Mon Apr 16 22:01:03 2012 +0800
Enable Xspice
diff --git a/debian/changelog b/debian/changelog
index b539a0f..32fd258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-qxl (0.0.17-2) unstable; urgency=low
+
+ * Enable Xspice (Closes: 668537)
+
+ -- Liang Guo <bluestonechina@gmail.com> Sun, 15 Apr 2012 15:10:01 +0800
+
xserver-xorg-video-qxl (0.0.17-1) unstable; urgency=low
[ Liang Guo ]
diff --git a/debian/control b/debian/control
index bbfbfb0..2701e96 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5),
quilt (>= 0.46-7~),
- libspice-protocol-dev (>= 0.8.1~)
+ libspice-protocol-dev (>= 0.8.1~),
+ libspice-server-dev [amd64],
+ python,
Standards-Version: 3.9.3
Homepage: http://spice-space.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-qxl
@@ -51,3 +53,17 @@ Description: X.Org X server -- QXL display driver (debugging symbols)
other SPICE-compatible KVM/Qemu emulator.
.
This package contains the debugging symbols for this driver.
+
+Package: xserver-xspice
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xserver-xorg, xserver-xorg-video-qxl (>= 0.0.17-2), python-argparse
+Description: Xspice X server
+ Xspice is an X server and Spice server in one. It consists of a wrapper script
+ for executing Xorg with the right parameters and environment variables, a
+ module names spiceqxl_drv.so implementing three drivers: a video mostly
+ code identical to the guest qxl X driver, and keyboard and mouse reading from
+ the spice inputs channel.
+ .
+ Xspice allows regular X connections, while a spice client provides the keyboard
+ and mouse and video output.
+
diff --git a/debian/rules b/debian/rules
index 1cb9c56..c3c8e8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
.PHONY: override_dh_strip
override_dh_strip:
dh_strip --dbg-package=xserver-xorg-video-qxl-dbg
@@ -11,11 +13,20 @@ override_dh_auto_install:
# Kill *.la files, and forget no-one:
override_dh_install:
find debian/tmp -name '*.la' -delete
+ -rm -r debian/tmp/usr/share
dh_install --fail-missing
# That's a plugin, use appropriate warning level:
override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
+# Enable Xspice support
+override_dh_auto_configure:
+ifeq ($(DEB_HOST_GNU_TYPE), x86_64-linux-gnu)
+ dh_auto_configure -- --enable-xspice
+else
+ dh_auto_configure
+endif
+
%:
- dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+ dh $@ --with quilt,autoreconf,xsf,python2 --builddirectory=build/
diff --git a/debian/xserver-xspice.docs b/debian/xserver-xspice.docs
new file mode 100644
index 0000000..61fc1f0
--- /dev/null
+++ b/debian/xserver-xspice.docs
@@ -0,0 +1,2 @@
+README.xspice
+examples/spiceqxl.xorg.conf.example
diff --git a/debian/xserver-xspice.install b/debian/xserver-xspice.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/xserver-xspice.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/xserver-xspice.manpages b/debian/xserver-xspice.manpages
new file mode 100644
index 0000000..8f8662a
--- /dev/null
+++ b/debian/xserver-xspice.manpages
@@ -0,0 +1 @@
+debian/Xspice.1
Reply to: