debian/changelog | 2 +-
debian/patches/series | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d124f0e8050d883716e23c8cd6f1e710892083a0
Author: Bryce Harrington <br...@canonical.com>
Date: Thu Feb 7 18:22:44 2013 -0800
Patch 227 appears to fix fdo bug 24181
diff --git a/debian/patches/series b/debian/patches/series
index 9167c08..0ed7099 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@
228_autobind_gpu.patch
## send upstream
-227_null_ptr_midispcur.patch
232-xf86compatoutput-valgrind.patch
236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
@@ -31,6 +30,8 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=20742
208_switch_on_release.diff
# https://bugs.freedesktop.org/show_bug.cgi?id=865
+227_null_ptr_midispcur.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24181
233-xf86events-valgrind.patch
# http://patchwork.freedesktop.org/patch/12156/
commit 9c3bc3811f85b5a21d1cff3fa4d35d18ad96d3cc
Author: Bryce Harrington <br...@canonical.com>
Date: Thu Feb 7 18:19:37 2013 -0800
Reformat series. Some patches to send upstream are there already
Looks like these patches were sent to upstream bugzilla, but didn't get
picked up.
diff --git a/debian/changelog b/debian/changelog
index a85064a..3698723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1651,7 +1651,7 @@ xorg-server (2:1.9.0.902-1ubuntu4) natty; urgency=low
long-standing issue where e.g. <ctrl>+<shift>+<key> fails when
ctrl+shift is configured for layout switching.
(LP: #36812)
-2A
+
-- Bryce Harrington <br...@ubuntu.com> Thu, 06 Jan 2011 14:35:59 -0800
xorg-server (2:1.9.0.902-1ubuntu3) natty; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 3bfda7b..9167c08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,22 +17,21 @@
# drop after desktop support arrives
228_autobind_gpu.patch
-## In progress upstream
+## send upstream
+227_null_ptr_midispcur.patch
+232-xf86compatoutput-valgrind.patch
+236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
+
+## waiting for review by upstream
+111_armel-drv-fallbacks.patch
122_xext_fix_card32_overflow_in_xauth.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=27134
# http://lists.x.org/archives/xorg-devel/2010-April/007777.html
-
165_man_xorg_conf_no_device_ident.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=20742
-
-## To send upstream
208_switch_on_release.diff
-227_null_ptr_midispcur.patch
-232-xf86compatoutput-valgrind.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=865
233-xf86events-valgrind.patch
-236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
-
-## waiting for review by upstream
-111_armel-drv-fallbacks.patch
+# http://patchwork.freedesktop.org/patch/12156/
## from upstream, drop when rebasing to a new version
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3sez-0000dd...@vasks.debian.org
