ChangeLog | 16 +++++++ configure.ac | 2 debian/changelog | 8 +++ debian/control | 4 - debian/upstream/signing-key.asc | 89 ++++++++++++++++++++++++++++++++++++++++ debian/watch | 1 6 files changed, 116 insertions(+), 4 deletions(-)
New commits: commit 22cad24d38f238448535e0a12e2d8f528a72dce1 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:39:24 2017 +0100 Move URL from description to Homepage field. diff --git a/debian/changelog b/debian/changelog index c21f331..8b36ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-sisusb (1:0.9.7-1) UNRELEASED; urgency=medium * New upstream release. * Let uscan verify tarball signatures. + * Move URL from description to Homepage field. -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:35:59 +0100 diff --git a/debian/control b/debian/control index f0e308b..233f3e6 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: x11proto-render-dev, xutils-dev Standards-Version: 3.9.8 +Homepage: https://www.x.org Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb.git @@ -30,7 +31,4 @@ Provides: Description: X.Org X server -- SiS USB display driver This package provides the driver for SiS USB-attached video devices. . - More information about X.Org can be found at: - <URL:https://www.X.org> - . This package is built from the X.org xf86-video-sisusb driver module. commit 97eaf62746431a4fb26e988ba3d914a8f0fcfa45 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:37:15 2017 +0100 Let uscan verify tarball signatures. diff --git a/debian/changelog b/debian/changelog index 296d1ae..c21f331 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-sisusb (1:0.9.7-1) UNRELEASED; urgency=medium * New upstream release. + * Let uscan verify tarball signatures. -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:35:59 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..66c6066 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,89 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=E95b +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 5e3d773..c60713d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-sisusb version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-sisusb-(.*)\.tar\.gz commit 70551203ceaf8f7ac7aeb2a6d6bd20a1233b39a6 Author: Andreas Boll <[email protected]> Date: Wed Jan 18 14:36:24 2017 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 3562c4e..b523199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +commit fceb6ca43badf8ddb2fbfd7fb00648383a0a35e1 +Author: Matt Turner <[email protected]> +Date: Tue Jan 17 14:46:23 2017 -0800 + + xf86-video-sisusb 0.9.7 + + Signed-off-by: Matt Turner <[email protected]> + +commit 6d44eb7a6075b9cc359b44282a7095a8b46c8a38 +Author: Stefan Dirsch <[email protected]> +Date: Sat Dec 10 13:07:37 2016 +0100 + + Adapt Block/WakeupHandler signature for ABI 23 + + Signed-off-by: Stefan Dirsch <[email protected]> + commit 293d0902705c272b83432a955fb6a3c96dd6cea7 Author: Adam Jackson <[email protected]> Date: Tue Sep 25 08:54:52 2012 -0400 diff --git a/debian/changelog b/debian/changelog index 1d6251b..296d1ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-sisusb (1:0.9.7-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Andreas Boll <[email protected]> Wed, 18 Jan 2017 14:35:59 +0100 + xserver-xorg-video-sisusb (1:0.9.6-3) unstable; urgency=medium [ Andreas Boll ] commit fceb6ca43badf8ddb2fbfd7fb00648383a0a35e1 Author: Matt Turner <[email protected]> Date: Tue Jan 17 14:46:23 2017 -0800 xf86-video-sisusb 0.9.7 Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index a686034..18d71b7 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-sisusb], - [0.9.6], + [0.9.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-sisusb]) AC_CONFIG_SRCDIR([Makefile.am]) commit 6d44eb7a6075b9cc359b44282a7095a8b46c8a38 Author: Stefan Dirsch <[email protected]> Date: Sat Dec 10 13:07:37 2016 +0100 Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Stefan Dirsch <[email protected]> diff --git a/src/compat-api.h b/src/compat-api.h index 6bc946f..89976e4 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -75,8 +75,13 @@ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout +#define BLOCKHANDLER_ARGS arg, pTimeout +#else #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask +#endif #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS pScreen
