--- xserver-xorg-video-savage-2.3.4.orig/autogen.sh
+++ xserver-xorg-video-savage-2.3.4/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-savage-2.3.4.orig/debian/watch
+++ xserver-xorg-video-savage-2.3.4/debian/watch
@@ -0,0 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-savage
+version=3
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-savage-(.*)\.tar\.gz
--- xserver-xorg-video-savage-2.3.4.orig/debian/compat
+++ xserver-xorg-video-savage-2.3.4/debian/compat
@@ -0,0 +1 @@
+8
--- xserver-xorg-video-savage-2.3.4.orig/debian/README.source
+++ xserver-xorg-video-savage-2.3.4/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-savage-2.3.4.orig/debian/copyright
+++ xserver-xorg-video-savage-2.3.4/debian/copyright
@@ -0,0 +1,117 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+Copyright (c) 2003-2006, X.Org Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Copyright 2004  Felix Kuehling
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+
+Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- xserver-xorg-video-savage-2.3.4.orig/debian/changelog
+++ xserver-xorg-video-savage-2.3.4/debian/changelog
@@ -0,0 +1,395 @@
+xserver-xorg-video-savage (1:2.3.4-1.22.201403160927) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Sun, 16 Mar 2014 09:27:01 +0100
+
+xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low
+
+  * New upstream release
+    + Fix for new vgahw ABI (closes: #671800)
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 08 May 2012 11:44:31 +0200
+
+xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low
+
+  [ Tormod Volden ]
+  * New upstream release 
+  * Bump Standards-Version to 3.9.2 (no changes needed)
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 23 Oct 2011 17:15:11 +0200
+
+xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low
+
+  * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef
+    - aff8f96... Use proper casts on framebuffer addresses
+    - 6b22be0... savage: Fix initialization typo in SAVAGEDRIMoveBuffers
+    - 9872b5f... savage: Fix building with TRACEON defined
+    - b018d34... savage: Setup tiled surface registers in SavageEnterVT
+    - f3cd294... savage: Factor out a SAVAGEDRISetupTiledSurfaceRegs function
+    - 055ca25... savage: Cast all handles before printing them
+    - 3f18b33... savage: Fix ambiguity in SavageLoadPaletteSavage4
+    - 6f8aa9c... savage: Drop unused variables and functions
+    - df80590... savage: More (intermediate) casts to silence warnings
+    - 35d9734... savage: Replace deprecated x(c)alloc/xfree with m/calloc/free
+    - 0cbb6d2... savage: Add casts to silence build warnings
+  * Add myself as uploader
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Mon, 21 Feb 2011 23:43:12 +0100
+
+xserver-xorg-video-savage (1:2.3.2-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.
+  * Update Uploaders list. Thanks, David & Brice!
+  * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:55:01 +0100
+
+xserver-xorg-video-savage (1:2.3.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump xutils-dev build-dep for new macros.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 05 Dec 2010 18:33:38 +0100
+
+xserver-xorg-video-savage (1:2.3.1-3) experimental; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 20:59:43 +0200
+
+xserver-xorg-video-savage (1:2.3.1-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:12:21 +0200
+
+xserver-xorg-video-savage (1:2.3.1-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:54:17 +0100
+
+xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.8.2.
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+    choose a driver during autoconfiguration.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 22:28:54 +0200
+
+xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low
+
+  * Merge bugfix from 1:2.2.1-2.lenny1 stable update.
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 11:25:40 +0100
+
+xserver-xorg-video-savage (1:2.2.1-4) experimental; urgency=low
+
+  * Build against xserver 1.6 rc1.
+  * Allow parallel builds.
+  * Run autoreconf on build; add build-deps on automake, libtool and
+    xutils-dev.
+
+ -- Brice Goglin <bgoglin@debian.org>  Tue, 03 Feb 2009 23:07:21 +0100
+
+xserver-xorg-video-savage (1:2.2.1-3) experimental; urgency=low
+
+  * Drop patch 02_temporary_revert_pciaccess.
+  * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 08 Sep 2008 19:32:12 +0100
+
+xserver-xorg-video-savage (1:2.2.1-2.lenny1) stable; urgency=low
+
+  * Cherry-pick from upstream: Do not add panel modes when there is no panel
+    (closes: #520547).  Thanks, Tormod Volden!
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 20 Mar 2009 21:35:43 +0100
+
+xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low
+
+  * Reenable 02_temporary_revert_pciaccess.diff and append all recent
+    pci-rework changes, closes: #483989.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 05 Sep 2008 19:37:51 +0200
+
+xserver-xorg-video-savage (1:2.2.1-1) unstable; urgency=low
+
+  [ David Nusinow ]
+  * Add 03_request_16bit_depth.diff
+    We set the default depth for savage chips to 16bpp in the xserver
+    debconfage. This patch has the driver request that depth from the
+    server during init. If the user doesn't override this depth, it should be
+    used by the server, thus allowing us to drop this special case from the
+    debconfage.
+
+  [ Brice Goglin ]
+  * New upstream release.
+  * Disable 02_temporary_revert_pciaccess.diff for now since upstream
+    fixed some related code.
+  * Remove XS- prefix to Vcs-* fields in debian/rules.
+  * Bump Standards-Version to 3.7.3, no change needed.
+  * 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.
+
+ -- Brice Goglin <bgoglin@debian.org>  Thu, 22 May 2008 21:07:26 +0200
+
+xserver-xorg-video-savage (1:2.1.3-5) unstable; urgency=low
+
+  * Add 02_temporary_revert_pciaccess.diff to temporary revert
+    all the pci-rework code which does not seem to work even
+    when disabled, closes: #451074, #451219.
+
+ -- Brice Goglin <bgoglin@debian.org>  Thu, 15 Nov 2007 08:19:08 +0100
+
+xserver-xorg-video-savage (1:2.1.3-4) unstable; urgency=low
+
+  * Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2
+    + Fix crash in SavageSwitchMode(), closes: #440839.
+  * Add upstream URL to debian/copyright.
+  * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 11 Nov 2007 15:23:29 +0100
+
+xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:43:47 -0400
+
+xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low
+
+  [ Brice Goglin ]
+  * Drop the obsolete src/savage_image.c from the .diff.gz,
+    thanks Tormod Volden, closes: #438975.
+
+  [ David Nusinow ]
+  * Build against X server 1.4 and build-dep on it as well
+  * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this
+    driver supports so that the server can automatically load it
+  * Exclude savage_drv.la from dh_install
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 13 Sep 2007 20:40:23 -0400
+
+xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix implicit declaration of usleep() in savage_driver.c.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 17 Aug 2007 04:14:31 +0200
+
+xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * Pull more upstream fixes, up to b706ffe07fc61281d2dea406f828418f42e3da85
+    + Fix segfault in SavageDoAdjustFrame() on server 1.3, closes: #423485.
+    + Fix console corruption due to invalid shadow status, closes: #428089.
+    + Drop 01_savage_driver_disable_randr_on_rotation.diff, integrated
+      uptream.
+
+  [ Julien Cristau ]
+  * Add myself to Uploaders, and remove Branden with his permission.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 18 Jul 2007 03:06:12 +0200
+
+xserver-xorg-video-savage (1:2.1.2-5) unstable; urgency=low
+
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-savage.
+
+  [ Brice Goglin ]
+  * Pull fixes from upstream up-to 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96
+    + Drop 02_fix_respawn_crash_regression.diff, applied upstream
+    + Fix a markup error in savage.4 manpage, thanks Nate Bargmann
+      (closes: #401643).
+  * Don't build-dep on libdrm-dev on hurd-i386, thanks to Michael Banck
+    (closes: #392873).
+  * 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-savage
+    module in the long description.
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 05 May 2007 18:18:59 +0200
+
+xserver-xorg-video-savage (1:2.1.2-4) experimental; urgency=low
+
+  * Pull fixes from upstream
+  * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 22:54:33 -0500
+
+xserver-xorg-video-savage (1:2.1.2-3) unstable; urgency=medium
+
+  * SavageMamMem -> SavageMapMem in the previous patch. Thanks Mikael
+    Petersson for reporting the bug, and Jon K Hellan for noticing the fix.
+    Closes: #405061, #405021
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 30 Dec 2006 19:07:13 -0500
+
+xserver-xorg-video-savage (1:2.1.2-2) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Add link to xserver-xorg-core bug script, so that bugreports contain
+    the user's config and log files.
+  * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
+    versions don't have the bug script.
+  * Add patch by Mikko Rapeli <mikko.rapeli@iki.fi> to fix a crash when the
+    last client exits and the server is respawned, closes: #397084. Thanks,
+    Mikko!
+
+  [ David Nusinow ]
+  * Remove duplicate libdrm-dev build-dep
+
+ -- David Nusinow <dnusinow@debian.org>  Fri, 29 Dec 2006 19:45:29 -0500
+
+xserver-xorg-video-savage (1:2.1.2-1) unstable; urgency=low
+
+  * New upstream release
+    + Fixes DRI lock handling. Closes: #389794
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 30 Sep 2006 14:31:03 -0400
+
+xserver-xorg-video-savage (1:2.1.1-4) unstable; urgency=low
+
+  * Add build-depends on quilt. Thanks lamont. (closes: #388640)
+  * Standards version bump to 3.7.2.0. No change needed.
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 21 Sep 2006 22:15:30 -0400
+
+xserver-xorg-video-savage (1:2.1.1-3) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:49 -0400
+
+xserver-xorg-video-savage (1:2.1.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:39 +0000
+
+xserver-xorg-video-savage (1:2.1.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>  Tue, 15 Aug 2006 23:28:46 +0000
+
+xserver-xorg-video-savage (1:2.0.2.3-4) unstable; urgency=low
+
+  * Upload to modular
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:53 -0500
+
+xserver-xorg-video-savage (1:2.0.2.3-3) experimental; urgency=low
+
+  * Rename .install file so that files actually get installed to the package.
+    Thanks Peter Eisentraut. (closes: #354848)
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 11 Mar 2006 18:37:06 -0500
+
+xserver-xorg-video-savage (1:2.0.2.3-2) experimental; urgency=low
+
+  * Port patches from trunk
+    + general/099f_savage_driver_disable_randr_on_rotation.diff
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Feb 2006 18:51:40 -0500
+
+xserver-xorg-video-savage (1:2.0.2.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>  Fri, 13 Jan 2006 00:39:54 -0500
+
+xserver-xorg-driver-savage (1:2.0.2.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:02:00 +1100
+
+xserver-xorg-driver-savage (1:2.0.2.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:10:51 +1100
+
+xserver-xorg-driver-savage (1:2.0.2.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+  * Bump Build-Depends on libdrm-dev to >> 2.0.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:25:58 +1100
+
+xserver-xorg-driver-savage (1:2.0.2-0ubuntu2) dapper; urgency=low
+
+  * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev,
+    x11proto-randr-dev, x11proto-render-dev, libdrm (>> 1.0.5),
+    x11proto-xf86dri-dev).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 12:57:29 +1100
+
+xserver-xorg-driver-savage (1:2.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:35:08 +1100
+
+xserver-xorg-driver-savage (1:2.0.1.1-1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 18:36:23 +1000
+
+xserver-xorg-driver-savage (1:2.0.1-1) breezy; urgency=low
+
+  * First xserver-xorg-driver-savage release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
--- xserver-xorg-video-savage-2.3.4.orig/debian/xserver-xorg-video-savage.install
+++ xserver-xorg-video-savage-2.3.4/debian/xserver-xorg-video-savage.install
@@ -0,0 +1,2 @@
+usr/lib/xorg/modules/drivers/*.so
+usr/share/man/man4/*
--- xserver-xorg-video-savage-2.3.4.orig/debian/control
+++ xserver-xorg-video-savage-2.3.4/debian/control
@@ -0,0 +1,44 @@
+Source: xserver-xorg-video-savage
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders:
+ Cyril Brulebois <kibi@debian.org>,
+ Tormod Volden <debian.tormod@gmail.com>
+Build-Depends:
+ debhelper (>= 8),
+ dh-autoreconf,
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.9.4),
+ x11proto-video-dev,
+ x11proto-xext-dev,
+ x11proto-gl-dev,
+ libgl1-mesa-dev | libgl-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ libdrm-dev (>> 2.0) [!hurd-i386],
+ x11proto-xf86dri-dev,
+ quilt,
+ xutils-dev (>= 1:7.5+4),
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
+
+Package: xserver-xorg-video-savage
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- Savage display driver
+ This package provides the driver for the S3/VIA Savage/ProSavage/Twister family
+ of chipsets.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-savage driver module.
--- xserver-xorg-video-savage-2.3.4.orig/debian/xserver-xorg-video-savage.links
+++ xserver-xorg-video-savage-2.3.4/debian/xserver-xorg-video-savage.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-savage/script
--- xserver-xorg-video-savage-2.3.4.orig/debian/rules
+++ xserver-xorg-video-savage-2.3.4/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-savage-2.3.4.orig/debian/patches/series
+++ xserver-xorg-video-savage-2.3.4/debian/patches/series
@@ -0,0 +1 @@
+03_request_16bit_depth.diff
--- xserver-xorg-video-savage-2.3.4.orig/debian/patches/03_request_16bit_depth.diff
+++ xserver-xorg-video-savage-2.3.4/debian/patches/03_request_16bit_depth.diff
@@ -0,0 +1,13 @@
+Index: xserver-xorg-video-savage/src/savage_driver.c
+===================================================================
+--- xserver-xorg-video-savage.orig/src/savage_driver.c	2008-05-22 07:53:05.000000000 +0200
++++ xserver-xorg-video-savage/src/savage_driver.c	2008-05-22 20:55:51.000000000 +0200
+@@ -1292,7 +1292,7 @@
+      * We support bpp of 8, 16, and 32.
+      */
+ 
+-    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support32bppFb))
++    if (!xf86SetDepthBpp(pScrn, 16, 0, 0, Support32bppFb))
+ 	return FALSE;
+     else {
+         int requiredBpp;
