xorg-server: Changes to 'ubuntu'
debian/changelog | 10 +++-------
debian/patches/include-selection-h.patch | 12 ------------
debian/patches/series | 1 -
3 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 1073da625435541993aa28049a4cabbcbe925c0b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Oct 3 17:07:43 2013 +0300
merge changes with the rejected upload and release a real -3ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 4064d43..d14bd68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.14.3-3ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-3ubuntu1) saucy; urgency=low
+ * Merge from unreleased debian git.
* rrcrtc-brackets-are-hard.patch: Replace xf86-detach-scanout.patch
with this patch from Fedora. Should fix crashers on hybrid systems
(LP: #1210025)
@@ -7,12 +8,6 @@ xorg-server (2:1.14.3-3ubuntu2) UNRELEASED; urgency=low
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 03 Oct 2013 15:30:22 +0300
-xorg-server (2:1.14.3-3ubuntu1) saucy; urgency=low
-
- * Merge from unreleased debian git.
-
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 03 Oct 2013 12:54:24 +0300
-
xorg-server (2:1.14.3-4) UNRELEASED; urgency=low
* rules: Drop defoma support from the font path. (Closes: #689233,
commit 164027e386b0cb7b6482b7b038f0f16fe2d38b90
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Oct 3 17:01:52 2013 +0300
Drop include-selection-h.patch, not needed anymore.
diff --git a/debian/changelog b/debian/changelog
index 7e71f33..4064d43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.14.3-3ubuntu2) UNRELEASED; urgency=low
* rrcrtc-brackets-are-hard.patch: Replace xf86-detach-scanout.patch
with this patch from Fedora. Should fix crashers on hybrid systems
(LP: #1210025)
+ * Drop include-selection-h.patch, not needed anymore.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 03 Oct 2013 15:30:22 +0300
diff --git a/debian/patches/include-selection-h.patch b/debian/patches/include-selection-h.patch
deleted file mode 100644
index e145c36..0000000
--- a/debian/patches/include-selection-h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/dix/window.c b/dix/window.c
-index 49ef4a0..5b87238 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -110,6 +110,7 @@ Equipment Corporation.
- #include "input.h"
- #include "inputstr.h"
- #include "resource.h"
-+#include "selection.h"
- #include "colormapst.h"
- #include "cursorstr.h"
- #include "dixstruct.h"
diff --git a/debian/patches/series b/debian/patches/series
index 6e482a1..69b99c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -54,7 +54,6 @@ autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch
rrcrtc-brackets-are-hard.patch
config-add-no-removal.patch
-include-selection-h.patch
glx-remove-current-context-cache.patch
glx-fix-memory-leak.patch
Reply to: