--- xserver-xorg-video-dummy-0.3.4.orig/autogen.sh
+++ xserver-xorg-video-dummy-0.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-dummy-0.3.4.orig/ChangeLog
+++ xserver-xorg-video-dummy-0.3.4/ChangeLog
@@ -1,89 +1,3 @@
-commit 77ae177fd77e90a6eaeebde9df88911256264329
-Author: Jamey Sharp <jamey@minilop.net>
-Date:   Fri Jun 4 16:09:34 2010 -0700
-
-    Use new server API to find the root window.
-    
-    Signed-off-by: Jamey Sharp <jamey@minilop.net>
-
-commit 2503a68673c6012a0bf2abba58aa5060654965f9
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sat Jun 12 15:39:03 2010 -0400
-
-    COPYING: replace stub file with actual Copyright notice
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit c4134a6cb6bf3d9364fd2374e79647859dbd57c3
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Feb 8 20:08:52 2010 -0500
-
-    config: move compiler flags from configure.ac to Makefile.am
-    
-    CFLAGS is an automake defined variable that should not be set
-    by the module. It should not be AC_SUBST either, it already is.
-    
-    Use AM_CFLAGS in Makefile.am. This will allow the user to override
-    the flags as they will be in the right order.
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 3370539eea599ff51a556507ec16a1570b8ed076
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Feb 8 19:07:22 2010 -0500
-
-    config: remove unrequired '-I$(top_srcdir)/src'
-    
-    The current dir is already included by default in the makefile
-    top_builddir = ..
-    DEFAULT_INCLUDES = -I. -I$(top_builddir)
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit ea7cc253b0f4ea97a197ec36b3ac06279b0b95f6
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Feb 8 18:42:52 2010 -0500
-
-    config: remove unused INCLUDES='-I$(top_srcdir)/src'
-    
-    This statement is redundant and not used in the makefile
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit bff6fc2f25648df0bbc0ea0723636260df987d34
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Feb 8 17:45:42 2010 -0500
-
-    config: remove unused variable XORG_INCS
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 17f6ec36df36a8999a95fd86e17013b1c44a7a2e
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Tue Dec 15 20:59:46 2009 -0500
-
-    configure.ac: sdkdir usage duplicates the sdk include dir
-    
-    The sdkdir variable provides a duplicate copy of the include/xorg
-    directory. The statement is removed as this was it's only used.
-    In the Makefile, there is now only one instance of the -I sdkdir
-    The sdkdir is provided in XORG_CFLAGS.
-    
-    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 86a7baa4156dc9569b7dde51b3042b7fd8093821
-Author: Michael Olbrich <m.olbrich@pengutronix.de>
-Date:   Thu Dec 10 14:53:50 2009 -0500
-
-    configure.ac: remove wrong include path. #24675
-    
-    Don't use $(prefix)/include as include path. It can break things
-    when cross-compiling with DESTDIR and prefix=/usr
-    
-    Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
 commit 483db0376d08be806c9bd51646f226f9510a4e48
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Dec 1 10:51:30 2009 -0500
--- xserver-xorg-video-dummy-0.3.4.orig/debian/copyright
+++ xserver-xorg-video-dummy-0.3.4/debian/copyright
@@ -0,0 +1,26 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2003 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 fur-
+nished 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 CON-
+NECTION 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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
--- xserver-xorg-video-dummy-0.3.4.orig/debian/README.source
+++ xserver-xorg-video-dummy-0.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-dummy-0.3.4.orig/debian/compat
+++ xserver-xorg-video-dummy-0.3.4/debian/compat
@@ -0,0 +1 @@
+8
--- xserver-xorg-video-dummy-0.3.4.orig/debian/control
+++ xserver-xorg-video-dummy-0.3.4/debian/control
@@ -0,0 +1,38 @@
+Source: xserver-xorg-video-dummy
+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.99.903),
+ x11proto-video-dev,
+ x11proto-xf86dga-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ xutils-dev
+Standards-Version: 3.9.1
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-dummy
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-dummy.git
+
+Package: xserver-xorg-video-dummy
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- dummy display driver
+ This package provides a 'dummy' display driver, which does not actually
+ display anything.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-dummy driver module.
--- xserver-xorg-video-dummy-0.3.4.orig/debian/watch
+++ xserver-xorg-video-dummy-0.3.4/debian/watch
@@ -0,0 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-dummy
+version=3
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-dummy-(.*)\.tar\.gz
--- xserver-xorg-video-dummy-0.3.4.orig/debian/xserver-xorg-video-dummy.links
+++ xserver-xorg-video-dummy-0.3.4/debian/xserver-xorg-video-dummy.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-dummy/script
--- xserver-xorg-video-dummy-0.3.4.orig/debian/changelog
+++ xserver-xorg-video-dummy-0.3.4/debian/changelog
@@ -0,0 +1,232 @@
+xserver-xorg-video-dummy (1:0.3.4-2+exp2) experimental; urgency=low
+
+  * Rebuild against Xserver 1.10 rc3.
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 04 Mar 2011 02:33:14 +0100
+
+xserver-xorg-video-dummy (1:0.3.4-2+exp1) experimental; urgency=low
+
+  * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 20 Feb 2011 20:30:02 +0100
+
+xserver-xorg-video-dummy (1:0.3.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.
+  * Update Uploaders list. Thanks, David & Brice!
+  * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
+  * Add quilt build-dep for future use.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:43:31 +0100
+
+xserver-xorg-video-dummy (1:0.3.4-1) experimental; urgency=low
+
+  [ Christopher James Halse Rogers ]
+  * New upstream release
+    - Fix build against Xserver 1.9
+  * Bump Standards-Version to 3.9.1
+
+  [ Cyril Brulebois ]
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 17:49:03 +0200
+
+xserver-xorg-video-dummy (1:0.3.3-2) unstable; urgency=medium
+
+  * Update xsfbs, use new ${xviddriver:Depends} substvar.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 14 May 2010 12:54:43 +0200
+
+xserver-xorg-video-dummy (1:0.3.3-1) 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 ]
+  * New upstream release.
+  * Add myself to Uploaders.
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 06 Apr 2010 04:41:45 +0200
+
+xserver-xorg-video-dummy (1:0.3.2-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 03:12:44 +0100
+
+xserver-xorg-video-dummy (1:0.3.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 11 Apr 2009 11:03:45 +0100
+
+xserver-xorg-video-dummy (1:0.3.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Run autoreconf on build; build-depend on automake, libtool and xutils-dev.
+  * Handle parallel builds.
+  * Build against xserver 1.6 rc1.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 25 Jan 2009 23:53:40 +0100
+
+xserver-xorg-video-dummy (1:0.3.0-2) experimental; urgency=low
+
+  * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 04 Sep 2008 19:29:32 +0200
+
+xserver-xorg-video-dummy (1:0.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.7.3.
+  * Drop the XS- prefix from Vcs-* control fields.
+  * Switch to debhelper compat 5.
+  * Add myself to Uploaders.
+  * 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>  Mon, 02 Jun 2008 21:55:35 +0200
+
+xserver-xorg-video-dummy (1:0.2.0-7) unstable; urgency=low
+
+  * Build against Xserver 1.4, closes: #442897.
+  * Add the upstream URL to debian/copyright.
+  * Add myself to Uploaders, and remove Branden with his permission.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 17 Sep 2007 23:33:10 +0200
+
+xserver-xorg-video-dummy (1:0.2.0-6) unstable; 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-dummy.
+
+  [ 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-dummy
+    module in the long description.
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+  [ David Nusinow ]
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 16:44:43 -0400
+
+xserver-xorg-video-dummy (1:0.2.0-5) experimental; urgency=low
+
+  * Minor updates from upstream
+  * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 22:54:21 -0500
+
+xserver-xorg-video-dummy (1:0.2.0-3) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Prepare for upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:33 -0400
+
+xserver-xorg-video-dummy (1:0.2.0-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:29 +0000
+
+xserver-xorg-video-dummy (1:0.2.0-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.
+
+ -- David Nusinow <dnusinow@debian.org>  Mon,  7 Aug 2006 20:11:25 +0000
+
+xserver-xorg-video-dummy (1:0.1.0.5-2) unstable; urgency=low
+
+  * Upload to modular
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:31 -0500
+
+xserver-xorg-video-dummy (1:0.1.0.5-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:36:41 -0500
+
+xserver-xorg-driver-dummy (1:0.1.0.5-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+  * Add provides on xserver-xorg-driver.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  4 Jan 2006 19:55:10 +1100
+
+xserver-xorg-driver-dummy (1:0.1.0.4-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:03:49 +1100
+
+xserver-xorg-driver-dummy (1:0.1.0.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:01:43 +1100
+
+xserver-xorg-driver-dummy (1:0.1.0.2-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:53:20 +1100
+
+xserver-xorg-driver-dummy (1:0.1.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:28:39 +1100
+
+xserver-xorg-driver-dummy (1:0.1.0.1-1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 17:00:10 +1000
+
+xserver-xorg-driver-dummy (1:0.1.0-1) breezy; urgency=low
+
+  * First xserver-xorg-driver-dummy release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
--- xserver-xorg-video-dummy-0.3.4.orig/debian/xserver-xorg-video-dummy.install
+++ xserver-xorg-video-dummy-0.3.4/debian/xserver-xorg-video-dummy.install
@@ -0,0 +1 @@
+usr/lib/xorg/modules/drivers/*.so
--- xserver-xorg-video-dummy-0.3.4.orig/debian/rules
+++ xserver-xorg-video-dummy-0.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-dummy-0.3.4.orig/debian/patches/series
+++ xserver-xorg-video-dummy-0.3.4/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
