xserver-xorg-video-qxl: Changes to 'debian-unstable'
debian/README.source | 3
debian/Xspice.1 | 115 ++++++++++++++++++++++++++++++++++
debian/changelog | 9 ++
debian/compat | 2
debian/control | 25 ++++++-
debian/rules | 14 +++-
debian/xserver-xorg-video-qxl.install | 2
debian/xserver-xspice.docs | 2
debian/xserver-xspice.install | 3
debian/xserver-xspice.manpages | 1
10 files changed, 169 insertions(+), 7 deletions(-)
New commits:
commit 70f907c1846736af6dd322710b26b7f119b34df3
Author: Laurent Bigonville <bigon@debian.org>
Date: Sat May 30 13:05:50 2015 +0200
debian/control: Use canonical Vcs URL to please lintian
diff --git a/debian/changelog b/debian/changelog
index 82a8733..8b52f47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-video-qxl (0.1.4-2) UNRELEASED; urgency=medium
* Renable Xspice
* Bump debhelper compatibility to 9
* debian/control: Bump Standards-Version to 3.9.6
+ * debian/control: Use canonical Vcs URL to please lintian
- -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:58:19 +0200
+ -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 13:05:27 +0200
xserver-xorg-video-qxl (0.1.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9771cbc..e1c727f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Build-Depends:
python,
Standards-Version: 3.9.6
Homepage: http://spice-space.org/
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-qxl
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-qxl.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/driver/xserver-xorg-video-qxl
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-qxl.git
Package: xserver-xorg-video-qxl
Architecture: any
commit 43dd56e476505e26f8c89521406bd0815c14b1d1
Author: Laurent Bigonville <bigon@debian.org>
Date: Sat May 30 12:58:35 2015 +0200
debian/control: Bump Standards-Version to 3.9.6
diff --git a/debian/changelog b/debian/changelog
index 7da1074..82a8733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-qxl (0.1.4-2) UNRELEASED; urgency=medium
* Renable Xspice
* Bump debhelper compatibility to 9
+ * debian/control: Bump Standards-Version to 3.9.6
- -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:51:56 +0200
+ -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:58:19 +0200
xserver-xorg-video-qxl (0.1.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d3751f8..9771cbc 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
libspice-protocol-dev (>= 0.12.2~),
libspice-server-dev [amd64],
python,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Homepage: http://spice-space.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-qxl
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-qxl.git
commit 6bc0ce45d6e6b8e2d03b8b3b638f5ead4945d44c
Author: Laurent Bigonville <bigon@debian.org>
Date: Sat May 30 12:52:17 2015 +0200
Bump debhelper compatibility to 9
diff --git a/debian/changelog b/debian/changelog
index c105e63..7da1074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-qxl (0.1.4-2) UNRELEASED; urgency=medium
* Renable Xspice
+ * Bump debhelper compatibility to 9
- -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:49:45 +0200
+ -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:51:56 +0200
xserver-xorg-video-qxl (0.1.4-1) unstable; urgency=medium
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8067455..d3751f8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
pkg-config,
dh-autoreconf,
xserver-xorg-dev (>= 2:1.9.4),
commit c1990c51616f5179315851db26eb453ad4919463
Author: Laurent Bigonville <bigon@debian.org>
Date: Sat May 30 12:51:33 2015 +0200
Renable Xspice
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..fce6c23
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+The Xspice.1 manpage is generated using the following command:
+
+help2man --version-string="XSPICE" -S Xspice -N -n "X server and SPICE server" ./scripts/Xspice > debian/Xspice.1
diff --git a/debian/Xspice.1 b/debian/Xspice.1
new file mode 100644
index 0000000..2ed555c
--- /dev/null
+++ b/debian/Xspice.1
@@ -0,0 +1,115 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
+.TH XSPICE "1" "May 2015" "Xspice" "User Commands"
+.SH NAME
+Xspice \- X server and SPICE server
+.SH DESCRIPTION
+usage: Xspice [Xspice and Xorg options intermixed]
+.PP
+X and Spice server. example usage: Xspice \fB\-\-port\fR 5900 \fB\-\-disable\-ticketing\fR :1.0
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.HP
+\fB\-\-xorg\fR XORG
+.TP
+\fB\-\-auto\fR
+Automatically create a temporary xorg.conf and start
+the X server
+.TP
+\fB\-\-xsession\fR XSESSION
+If given, will run after Xorg launch. Should be a
+program like x\-session\-manager
+.HP
+\fB\-\-config\fR CONFIG
+.TP
+\fB\-\-port\fR PORT
+standard spice port
+.TP
+\fB\-\-exit\-on\-disconnect\fR
+Exit the X server when any client disconnects
+.TP
+\fB\-\-deferred\-fps\fR DEFERRED_FPS
+If given, render to a buffer and send updates only
+this many times per second
+.TP
+\fB\-\-tls\-port\fR TLS_PORT
+spice tls port
+.TP
+\fB\-\-disable\-ticketing\fR
+do not require a client password
+.TP
+\fB\-\-sasl\fR
+enable sasl
+.TP
+\fB\-\-x509\-dir\fR X509_DIR
+x509 directory for tls
+.TP
+\fB\-\-cacert\-file\fR CACERT_FILE
+ca certificate file for tls
+.TP
+\fB\-\-x509\-cert\-file\fR X509_CERT_FILE
+server certificate file for tls
+.TP
+\fB\-\-x509\-key\-file\fR X509_KEY_FILE
+server key file for tls
+.TP
+\fB\-\-x509\-key\-password\fR X509_KEY_PASSWORD
+key file password for tls
+.HP
+\fB\-\-tls\-ciphers\fR TLS_CIPHERS
+.HP
+\fB\-\-dh\-file\fR DH_FILE
+.TP
+\fB\-\-password\fR PASSWORD
+set password required to connect to server
+.TP
+\fB\-\-image\-compression\fR {off,auto_glz,auto_lz,quic,glz,lz}
+auto_glz by default
+.TP
+\fB\-\-jpeg\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-zlib\-glz\-wan\-compression\fR {auto,never,always}
+auto by default
+.TP
+\fB\-\-streaming\-video\fR {off,all,filter}
+filter by default
+.HP
+\fB\-\-ipv4\-only\fR
+.HP
+\fB\-\-ipv6\-only\fR
+.TP
+\fB\-\-vdagent\fR
+launch vdagent & vdagentd. They provide clipboard &
+resolution automation
+.TP
+\fB\-\-vdagent\-virtio\-path\fR VDAGENT_VIRTIO_PATH
+virtio socket path used by vdagentd
+.TP
+\fB\-\-vdagent\-uinput\-path\fR VDAGENT_UINPUT_PATH
+uinput socket path used by vdagent
+.TP
+\fB\-\-vdagentd\-exec\fR VDAGENTD_EXEC
+path to spice\-vdagentd (used with \fB\-\-vdagent\fR)
+.TP
+\fB\-\-vdagent\-exec\fR VDAGENT_EXEC
+path to spice\-vdagent (used with \fB\-\-vdagent\fR)
+.TP
+\fB\-\-vdagent\-no\-launch\fR
+do not launch vdagent & vdagentd, used for debugging
+or if some external script wants to take care of that
+.TP
+\fB\-\-vdagent\-uid\fR VDAGENT_UID
+set vdagent user id. changing it makes sense only in
+conjunction with \fB\-\-vdagent\-no\-launch\fR
+.TP
+\fB\-\-vdagent\-gid\fR VDAGENT_GID
+set vdagent group id. changing it makes sense only in
+conjunction with \fB\-\-vdagent\-no\-launch\fR
+.TP
+\fB\-\-audio\-fifo\-dir\fR AUDIO_FIFO_DIR
+set fifo directory for playback audio. designed to
+work with PulseAudio's module\-pipe\-sink
+.PP
+Any options not parsed by Xspice get passed to Xorg as is.
diff --git a/debian/changelog b/debian/changelog
index 9703852..c105e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-qxl (0.1.4-2) UNRELEASED; urgency=medium
+
+ * Renable Xspice
+
+ -- Laurent Bigonville <bigon@debian.org> Sat, 30 May 2015 12:49:45 +0200
+
xserver-xorg-video-qxl (0.1.4-1) unstable; urgency=medium
* Let uscan verify tarball signatures.
diff --git a/debian/control b/debian/control
index 2077405..8067455 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,8 @@ Build-Depends:
xutils-dev (>= 1:7.5),
quilt (>= 0.46-7~),
libspice-protocol-dev (>= 0.12.2~),
+ libspice-server-dev [amd64],
+ python,
Standards-Version: 3.9.4
Homepage: http://spice-space.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-qxl
@@ -50,3 +52,18 @@ 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
+Breaks: xserver-xorg-video-qxl (<< 0.1.4-2~)
+Replaces: xserver-xorg-video-qxl (<< 0.1.4-2~)
+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 dd63820..3c7a6ae 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)
+
override_dh_auto_build:
dh_auto_build -- V=1
@@ -14,11 +16,21 @@ 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
+ install -D -m 644 -o root -g root ./examples/spiceqxl.xorg.conf.example debian/tmp/etc/X11/spiceqxl.xorg.conf
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 -- --libdir=/usr/lib --enable-xspice
+else
+ dh_auto_configure -- --libdir=/usr/lib
+endif
+
%:
- dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+ dh $@ --with quilt,autoreconf,xsf,python2 --builddirectory=build/
diff --git a/debian/xserver-xorg-video-qxl.install b/debian/xserver-xorg-video-qxl.install
index daf7bfe..1254e24 100644
--- a/debian/xserver-xorg-video-qxl.install
+++ b/debian/xserver-xorg-video-qxl.install
@@ -1 +1 @@
-usr/lib/xorg/modules/drivers/*.so
+usr/lib/xorg/modules/drivers/qxl_drv.so
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..d4e1c62
--- /dev/null
+++ b/debian/xserver-xspice.install
@@ -0,0 +1,3 @@
+etc/X11/spiceqxl.xorg.conf
+usr/lib/xorg/modules/drivers/spiceqxl_drv.so
+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: