--- xserver-xorg-video-sisusb-0.9.6.orig/ChangeLog
+++ xserver-xorg-video-sisusb-0.9.6/ChangeLog
@@ -1,3 +1,11 @@
+commit 293d0902705c272b83432a955fb6a3c96dd6cea7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Sep 25 08:54:52 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
 commit 894814fe2e54517c3b9a728238542a409bcb783a
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Jul 17 16:05:09 2012 +1000
--- xserver-xorg-video-sisusb-0.9.6.orig/autogen.sh
+++ xserver-xorg-video-sisusb-0.9.6/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/README.source
+++ xserver-xorg-video-sisusb-0.9.6/debian/README.source
@@ -0,0 +1,49 @@
+------------------------------------------------------
+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.
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/changelog
+++ xserver-xorg-video-sisusb-0.9.6/debian/changelog
@@ -0,0 +1,264 @@
+xserver-xorg-video-sisusb (1:0.9.6-2b1) staging; urgency=medium
+
+  * No-change rebuild against Xorg video ABI 18.
+
+ -- Jon Severinsson <jon@severinsson.net>  Wed, 11 Jun 2014 07:47:12 +0200
+
+xserver-xorg-video-sisusb (1:0.9.6-2) unstable; urgency=low
+
+  * Release to unstable.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 25 Sep 2013 13:07:42 +0200
+
+xserver-xorg-video-sisusb (1:0.9.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * Grab some patches to fix building from git.
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Thu, 19 Jul 2012 13:15:44 +0200
+
+xserver-xorg-video-sisusb (1:0.9.4-3) unstable; urgency=low
+
+  * Merge from upstream master branch up to 02451944ba to fix the
+    FTBFS against X server 1.12.
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 01 May 2012 19:32:48 +0200
+
+xserver-xorg-video-sisusb (1:0.9.4-2) unstable; urgency=low
+
+  * Switch to dh:
+    - Use debhelper 8.
+    - Use dh-autoreconf.
+    - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf
+      debhelper sequence.
+  * Remove xsfbs accordingly.
+  * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
+  * Update Uploaders list. Thanks, David & Brice!
+  * Add quilt build-dep for future use.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:56:02 +0100
+
+xserver-xorg-video-sisusb (1:0.9.4-1) experimental; urgency=low
+
+  [ Christopher James Halse Rogers ]
+  * New upstream version
+    - Fixes build against Xserver 1.9
+  * Bump Standards-Version to 3.9.1 (no changes needed)
+
+  [ Cyril Brulebois ]
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 21:11:20 +0200
+
+xserver-xorg-video-sisusb (1:0.9.3-2) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
+
+  [ Cyril Brulebois ]
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+    ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+    accordingly.
+  * Add myself to Uploaders.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 04 May 2010 00:38:11 +0200
+
+xserver-xorg-video-sisusb (1:0.9.3-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+  * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
+
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 06 Dec 2009 01:30:39 +0100
+
+xserver-xorg-video-sisusb (1:0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop obsolete build-dep on x11proto-xf86misc-dev.
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 11:54:09 +0100
+
+xserver-xorg-video-sisusb (1:0.9.0-4) experimental; urgency=low
+
+  * Add missing xutils-dev build-dep for real.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 04 Feb 2009 13:21:23 +0100
+
+xserver-xorg-video-sisusb (1:0.9.0-3) experimental; urgency=low
+
+  * Pull some upstream commits up to 74c729bc.
+  * Build against xserver 1.6 rc1.
+  * Allow parallel builds.
+  * Run autoreconf on build; add build-deps on automake, libtool and
+    xutils-dev.
+  * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org>  Tue, 03 Feb 2009 23:45:12 +0100
+
+xserver-xorg-video-sisusb (1:0.9.0-2) experimental; urgency=low
+
+  * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 10 Sep 2008 00:15:04 +0100
+
+xserver-xorg-video-sisusb (1:0.9.0-1) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * Add upstream URL to debian/copyright.
+
+  [ Julien Cristau ]
+  * New upstream release.
+  * Remove Branden from Uploaders with his permission, and add myself.
+  * Bump Standards-Version to 3.7.3.
+  * Drop the XS- prefix from Vcs-* control fields.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+    /usr/bin/Xorg and other modules, and that's not a bug, so we want
+    dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+    dpkg-dev >= 1.14.17.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 06 Jun 2008 12:40:05 +0200
+
+xserver-xorg-video-sisusb (1:0.8.1-9) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:43:48 -0400
+
+xserver-xorg-video-sisusb (1:0.8.1-8) experimental; urgency=low
+
+  * Build against and build-dep on xserver 1.4
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 09 Sep 2007 23:18:56 -0400
+
+xserver-xorg-video-sisusb (1:0.8.1-7) experimental; urgency=low
+
+  * Build against xserver 1.3.99.0 and build-dep against it.
+  * bump to standards version 3.7.2.2. No changes needed.
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 22 Aug 2007 21:08:27 -0400
+
+xserver-xorg-video-sisusb (1:0.8.1-6) UNRELEASED; urgency=low
+
+  [ Julien Cristau ]
+  * Add link to xserver-xorg-core bug script, so that bugreports contain
+    the user's config and log files.
+
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-sisusb.
+
+  [ Brice Goglin ]
+  * Install the upstream changelog.
+  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+    (needed to let xsfbs get access to serverminver).
+  * Add XS-Vcs-*.
+  * Add a link to www.X.org and a reference to the xf86-video-sisusb
+    module in the long description.
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Tue, 01 May 2007 12:39:16 +0200
+
+xserver-xorg-video-sisusb (1:0.8.1-5) experimental; urgency=low
+
+  * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 22:54:35 -0500
+
+xserver-xorg-video-sisusb (1:0.8.1-3) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:56 -0400
+
+xserver-xorg-video-sisusb (1:0.8.1-2) experimental; urgency=low
+
+  [ Drew Parsons ]
+  *  Provides: xserver-xorg-video-1.0 not xserver-xorg-video.
+
+  [ David Nusinow ]
+  * Bump xserver (build-)depends epochs to 2: to deal with botched
+    server upload
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 23:46:41 +0000
+
+xserver-xorg-video-sisusb (1:0.8.1-1) experimental; urgency=low
+
+  [ Andres Salomon ]
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+
+  [ David Nusinow ]
+  * New upstream release
+  * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for
+    the build-dep on xserver-xorg-dev.
+  * Bump debhelper compat to 5
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 16 Aug 2006 00:08:52 +0000
+
+xserver-xorg-video-sisusb (1:0.7.1.3-2) unstable; urgency=low
+
+  * Upload to modular
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:55 -0500
+
+xserver-xorg-video-sisusb (1:0.7.1.3-1) experimental; urgency=low
+
+  * First upload to Debian
+  * Change source package, package, and provides names to denote the
+    type of driver and that they are for xserver-xorg
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 19 Jan 2006 20:37:54 -0500
+
+xserver-xorg-driver-sisusb (1:0.7.1.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+  * Add provides on xserver-xorg-driver.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  4 Jan 2006 20:04:07 +1100
+
+xserver-xorg-driver-sisusb (1:0.7.1.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:12:09 +1100
+
+xserver-xorg-driver-sisusb (1:0.7.1.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:07:34 +1100
+
+xserver-xorg-driver-sisusb (1:0.7.1-0ubuntu2) dapper; urgency=low
+
+  * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev,
+    x11proto-randr-dev, x11proto-render-dev).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 12:57:56 +1100
+
+xserver-xorg-driver-sisusb (1:0.7.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:36:34 +1100
+
+xserver-xorg-driver-sisusb (1:0.7.0.1-1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 17:10:42 +1000
+
+xserver-xorg-driver-sisusb (1:0.7.0-1) breezy; urgency=low
+
+  * First xserver-xorg-driver-sisusb release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/compat
+++ xserver-xorg-video-sisusb-0.9.6/debian/compat
@@ -0,0 +1 @@
+8
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/control
+++ xserver-xorg-video-sisusb-0.9.6/debian/control
@@ -0,0 +1,38 @@
+Source: xserver-xorg-video-sisusb
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
+Build-Depends:
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.9.4),
+ x11proto-video-dev,
+ x11proto-xext-dev,
+ x11proto-xinerama-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ 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
+
+Package: xserver-xorg-video-sisusb
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver: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:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-sisusb driver module.
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/copyright
+++ xserver-xorg-video-sisusb-0.9.6/debian/copyright
@@ -0,0 +1,26 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/patches/series
+++ xserver-xorg-video-sisusb-0.9.6/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/rules
+++ xserver-xorg-video-sisusb-0.9.6/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+
+# Kill *.la files, and forget no-one:
+override_dh_install:
+	find debian/tmp -name '*.la' -delete
+	dh_install --fail-missing
+
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+	dh_shlibdeps -- --warnings=6
+
+%:
+	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/watch
+++ xserver-xorg-video-sisusb-0.9.6/debian/watch
@@ -0,0 +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
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/xserver-xorg-video-sisusb.install
+++ xserver-xorg-video-sisusb-0.9.6/debian/xserver-xorg-video-sisusb.install
@@ -0,0 +1,2 @@
+usr/lib/xorg/modules/drivers/*.so
+usr/share/man/man4/*
--- xserver-xorg-video-sisusb-0.9.6.orig/debian/xserver-xorg-video-sisusb.links
+++ xserver-xorg-video-sisusb-0.9.6/debian/xserver-xorg-video-sisusb.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-sisusb/script
--- xserver-xorg-video-sisusb-0.9.6.orig/src/sisusb_driver.c
+++ xserver-xorg-video-sisusb-0.9.6/src/sisusb_driver.c
@@ -39,7 +39,6 @@
 #include "shadowfb.h"
 #include "micmap.h"
 #include "mipointer.h"
-#include "mibstore.h"
 
 #include "sisusb_regs.h"
 #include "sisusb_dac.h"
@@ -1907,7 +1906,6 @@
     /* Initialize the accelerators */
     SiSUSBAccelInit(pScreen);
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
 
     /* NO SilkenMouse. Never. Ever. */
