debian/changelog | 15 +++++++++++++++ debian/compat | 2 +- debian/control | 14 ++++++-------- debian/copyright | 2 +- debian/rules | 6 +++++- debian/watch | 2 +- src/compat-api.h | 5 +++++ 7 files changed, 34 insertions(+), 12 deletions(-)
New commits: commit d22c85f4ae255e5bddd0a8fc6ebde28fae6231fa Author: Mateusz Łukasik <mat...@linuxmint.pl> Date: Thu Dec 15 17:52:12 2016 +0100 Use arch:linux-any (Closes: #745173). diff --git a/debian/changelog b/debian/changelog index 518f78e..8f4d2d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium + [ Andreas Boll ] * Cherry-pick commit 6d44eb7 (Adapt Block/WakeupHandler signature for ABI 23) from upstream master branch (Closes: #846698). * Bump debhelper compat to 10. @@ -7,6 +8,9 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium * Remove Cyril from Uploaders. * Bump Standards-Version to 3.9.8. + [ Mateusz Łukasik ] + * Use arch:linux-any (Closes: #745173). + -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 xserver-xorg-video-sisusb (1:0.9.6-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 43028fa..f0e308b 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisus Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb.git Package: xserver-xorg-video-sisusb -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, commit 258b57af07372316a98d711c978b98dbc6a0ea97 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 17:43:06 2016 +0100 Bump Standards-Version to 3.9.8. diff --git a/debian/changelog b/debian/changelog index edec45b..518f78e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium * Bump debhelper compat to 10. * Switch URLs to https. * Remove Cyril from Uploaders. + * Bump Standards-Version to 3.9.8. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 diff --git a/debian/control b/debian/control index bc53282..43028fa 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, xutils-dev -Standards-Version: 3.9.3 +Standards-Version: 3.9.8 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 commit 58f718fa98c47037d7ca2c666c1c87f15acc7173 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 17:41:57 2016 +0100 Remove Cyril from Uploaders. diff --git a/debian/changelog b/debian/changelog index b00182c..edec45b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium ABI 23) from upstream master branch (Closes: #846698). * Bump debhelper compat to 10. * Switch URLs to https. + * Remove Cyril from Uploaders. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 diff --git a/debian/control b/debian/control index 7a7712d..bc53282 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: xserver-xorg-video-sisusb Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 10), quilt, commit 2ac30118277866bd2e730a4320cf319a00a5908e Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 17:41:00 2016 +0100 Switch URLs to https. diff --git a/debian/changelog b/debian/changelog index 4c76702..b00182c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium * Cherry-pick commit 6d44eb7 (Adapt Block/WakeupHandler signature for ABI 23) from upstream master branch (Closes: #846698). * Bump debhelper compat to 10. + * Switch URLs to https. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 diff --git a/debian/control b/debian/control index 1db0b57..7a7712d 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: x11proto-render-dev, xutils-dev Standards-Version: 3.9.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sisusb -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sisusb.git +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 Package: xserver-xorg-video-sisusb Architecture: any @@ -32,6 +32,6 @@ 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:http://www.X.org> + <URL:https://www.X.org> . This package is built from the X.org xf86-video-sisusb driver module. diff --git a/debian/copyright b/debian/copyright index 8a53ef4..d0a69d1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ +https://xorg.freedesktop.org/releases/individual/driver/ Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria diff --git a/debian/watch b/debian/watch index c858e46..5e3d773 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-sisusb version=3 -http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-sisusb-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-sisusb-(.*)\.tar\.gz commit 4fe5b25fea435c1ed366735f0ae0baf6c76e2515 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 17:35:13 2016 +0100 Bump debhelper compat to 10. diff --git a/debian/changelog b/debian/changelog index 4f6cbc2..4c76702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium * Cherry-pick commit 6d44eb7 (Adapt Block/WakeupHandler signature for ABI 23) from upstream master branch (Closes: #846698). + * Bump debhelper compat to 10. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 diff --git a/debian/compat b/debian/compat index 45a4fb7..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +10 diff --git a/debian/control b/debian/control index fdbe35b..1db0b57 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: - debhelper (>= 8), - dh-autoreconf, + debhelper (>= 10), quilt, pkg-config, xserver-xorg-dev (>= 2:1.9.4), diff --git a/debian/rules b/debian/rules index 3d192dc..4891efa 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=\$${exec_prefix}/lib + # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: dh_auto_install --destdir=debian/tmp @@ -14,4 +18,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ + dh $@ --with quilt,xsf --builddirectory=build/ commit 947bb4f241473f2a63199baa5a211d4f7f91c855 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 17:30:37 2016 +0100 Document the cherry-pick in debian/changelog diff --git a/debian/changelog b/debian/changelog index eee30c0..4f6cbc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-sisusb (1:0.9.6-3) UNRELEASED; urgency=medium + + * Cherry-pick commit 6d44eb7 (Adapt Block/WakeupHandler signature for + ABI 23) from upstream master branch (Closes: #846698). + + -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 17:30:12 +0100 + xserver-xorg-video-sisusb (1:0.9.6-2) unstable; urgency=low * Release to unstable. commit bda03499b53b190cc2b9ea3b6d7718b654e8b126 Author: Stefan Dirsch <sndir...@suse.de> Date: Sat Dec 10 13:07:37 2016 +0100 Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Stefan Dirsch <sndir...@suse.de> (cherry picked from commit 6d44eb7a6075b9cc359b44282a7095a8b46c8a38) 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