xserver-xorg-video-qxl: Changes to 'debian-unstable'
debian/README.source | 49 ---------------------------
debian/Xspice.1 | 72 -----------------------------------------
debian/changelog | 10 +++++
debian/control | 17 ---------
debian/patches/series | 1
debian/patches/xextproto.diff | 17 +++++++++
debian/rules | 18 +---------
debian/source/format | 1
debian/source/options | 2 -
debian/watch | 2 -
debian/xserver-xspice.docs | 2 -
debian/xserver-xspice.install | 1
debian/xserver-xspice.manpages | 1
13 files changed, 32 insertions(+), 161 deletions(-)
New commits:
commit e5c461ea3151f276349d923ad83689d4c5a4c973
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 22:03:43 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4a6768b..2ec1904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
+xserver-xorg-video-qxl (0.1.1-2) unstable; urgency=medium
* Remove Liang Guo and Cyril Brulebois from Uploaders.
* Back to source format 1.0.
@@ -6,7 +6,7 @@ xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
* Use verbose build rules.
* Add patch to fix misdetection of xextproto.
- -- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 22:03:36 +0200
xserver-xorg-video-qxl (0.1.1-1) unstable; urgency=low
commit e51d88872f819bf3de98160c444d51cd9dd81ecd
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:57:31 2014 +0200
Add patch to fix misdetection of xextproto.
diff --git a/debian/changelog b/debian/changelog
index 19ebd05..4a6768b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
* Back to source format 1.0.
* Stop building/shipping Xspice (closes: #738744, #729054, #729053)
* Use verbose build rules.
+ * Add patch to fix misdetection of xextproto.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d5ca016
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+xextproto.diff
diff --git a/debian/patches/xextproto.diff b/debian/patches/xextproto.diff
new file mode 100644
index 0000000..0e42800
--- /dev/null
+++ b/debian/patches/xextproto.diff
@@ -0,0 +1,17 @@
+Index: xserver-xorg-video-qxl/src/qxl_drmmode.c
+===================================================================
+--- xserver-xorg-video-qxl.orig/src/qxl_drmmode.c
++++ xserver-xorg-video-qxl/src/qxl_drmmode.c
+@@ -37,12 +37,7 @@
+ #include "X11/Xatom.h"
+ #include "xf86DDC.h"
+ /* DPMS */
+-#ifdef HAVE_XEXTPROTO_71
+ #include <X11/extensions/dpmsconst.h>
+-#else
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
+-#endif
+ #include <cursorstr.h>
+
+ #include "qxl.h"
commit 3d587665964cf5a74c9021c8d394eac83788ad98
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:47:15 2014 +0200
Use verbose build rules.
diff --git a/debian/changelog b/debian/changelog
index 105bba8..19ebd05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
* Remove Liang Guo and Cyril Brulebois from Uploaders.
* Back to source format 1.0.
* Stop building/shipping Xspice (closes: #738744, #729054, #729053)
+ * Use verbose build rules.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
diff --git a/debian/rules b/debian/rules
index 1cb9c56..dd63820 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+override_dh_auto_build:
+ dh_auto_build -- V=1
+
.PHONY: override_dh_strip
override_dh_strip:
dh_strip --dbg-package=xserver-xorg-video-qxl-dbg
commit 8f18c491abc8ac4c26eca235e3b5362719e5dd1c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:42:33 2014 +0200
Stop building/shipping Xspice (closes: #738744, #729054, #729053)
diff --git a/debian/Xspice.1 b/debian/Xspice.1
deleted file mode 100644
index 02fc49d..0000000
--- a/debian/Xspice.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.8.
-.TH XSPICE "1" "April 2012" "Xspice" "User Commands"
-.SH NAME
-Xspice \- X server and SPICE server
-.SH DESCRIPTION
-usage: Xspice [Xspice and Xorg options intermixed]
-.PP
-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
-.HP
-\fB\-\-config\fR CONFIG
-.TP
-\fB\-\-port\fR PORT
-standard spice port
-.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
-.PP
-Any options not parsed by Xspice get passed to Xorg as is.
-.SH SEE ALSO
-Spice related documents can be found at http://www.spice-space.org/documentation.html
-.PP
-This manual page was generated with help2man by Liang Guo <bluestonechina@gmail.com>, for the Debian project (and may be used by others).
diff --git a/debian/changelog b/debian/changelog
index 7d24394..105bba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
* Remove Liang Guo and Cyril Brulebois from Uploaders.
* Back to source format 1.0.
+ * Stop building/shipping Xspice (closes: #738744, #729054, #729053)
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
diff --git a/debian/control b/debian/control
index ee12279..2077405 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,6 @@ Build-Depends:
xutils-dev (>= 1:7.5),
quilt (>= 0.46-7~),
libspice-protocol-dev (>= 0.12.2~),
- libspice-server-dev [amd64 i386],
- 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
@@ -52,17 +50,3 @@ 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 88452b3..1cb9c56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/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
@@ -13,24 +11,11 @@ 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
-ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
- dh_auto_configure -- --enable-xspice
-else
- dh_auto_configure
-endif
-endif
-
%:
- dh $@ --with quilt,autoreconf,xsf,python2 --builddirectory=build/
+ dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
diff --git a/debian/xserver-xspice.docs b/debian/xserver-xspice.docs
deleted file mode 100644
index 61fc1f0..0000000
--- a/debian/xserver-xspice.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.xspice
-examples/spiceqxl.xorg.conf.example
diff --git a/debian/xserver-xspice.install b/debian/xserver-xspice.install
deleted file mode 100644
index e772481..0000000
--- a/debian/xserver-xspice.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/xserver-xspice.manpages b/debian/xserver-xspice.manpages
deleted file mode 100644
index 8f8662a..0000000
--- a/debian/xserver-xspice.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/Xspice.1
commit 84203eb7418f4b9cdf19b19da63324cf297b31c1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:12:57 2014 +0200
Back to source format 1.0.
diff --git a/debian/changelog b/debian/changelog
index 330a729..7d24394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
* Remove Liang Guo and Cyril Brulebois from Uploaders.
+ * Back to source format 1.0.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 1df5173..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-diff-ignore = autogen.sh|.git|TODO.xspice|ChangeLog|Makefile.in|aclocal.m4|config.guess|config.h.in|config.sub|configure|depcomp|install-sh|ltmain.sh|missing|tests
-
diff --git a/debian/watch b/debian/watch
index 55de277..16b4938 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-qxl
version=3
-http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-qxl-(.*)\.tar\.bz2
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-qxl-(.*)\.tar\.gz
commit b9316a59a18b60c6f822924886a28aaedeb9b0a3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:10:16 2014 +0200
Delete README.source
Not really useful here.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4ecd5e6..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,49 +0,0 @@
-------------------------------------------------------
-Quick Guide To Patching This Package For The Impatient
-------------------------------------------------------
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit"
- (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to
-debian/patches and add the name of the patch to debian/patches/series.
-
-------------------------------------
-Guide To The X Strike Force Packages
-------------------------------------
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
- may be git'cherry-picked into the Debian repository. In this
- case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
- with quilt as documented in /usr/share/doc/quilt/README.source.
commit f7cee09722dc1adf2c490d54222f954cd0cdeb25
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 19 21:09:52 2014 +0200
Remove Liang Guo and Cyril Brulebois from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index d929e0f..330a729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-qxl (0.1.1-2) UNRELEASED; urgency=medium
+
+ * Remove Liang Guo and Cyril Brulebois from Uploaders.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jun 2014 21:09:28 +0200
+
xserver-xorg-video-qxl (0.1.1-1) unstable; urgency=low
[Michele Cane]
diff --git a/debian/control b/debian/control
index 8790a56..ee12279 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-qxl
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Liang Guo <bluestonechina@gmail.com>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
pkg-config,
Reply to: