debian/changelog | 8 ++++++++
debian/patches/series | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6be74d068f96e5d0278fc3c1fdda4e36cd42501a
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Apr 7 12:10:29 2016 +0300
release to xenial
diff --git a/debian/changelog b/debian/changelog
index 11a0145..dc35c4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.3-1ubuntu2) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium
* Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
compiling the keymap fails in current xenial for some reason.
(LP: #1566878)
- -- Timo Aaltonen <tjaal...@debian.org> Thu, 07 Apr 2016 11:59:55 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 07 Apr 2016 12:10:12 +0300
xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium
commit 758c13cc951f870a6ff08b3ab71225e016fdfbe8
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Apr 7 12:10:11 2016 +0300
Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now, compiling
the keymap fails in current xenial for some reason. (LP: #1566878)
diff --git a/debian/changelog b/debian/changelog
index 6de2250..11a0145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.18.3-1ubuntu2) UNRELEASED; urgency=medium
+
+ * Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
+ compiling the keymap fails in current xenial for some reason.
+ (LP: #1566878)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 07 Apr 2016 11:59:55 +0300
+
xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium
* Merge from Debian.
diff --git a/debian/patches/series b/debian/patches/series
index 8281f58..80c0c56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,7 @@ os-treat-ssh-as-a-non-local-client.diff
105_nvidia_autodetect.patch
168_glibc_trace_to_stderr.patch
188_default_primary_to_first_busid.patch
-190_cache-xkbcomp_output_for_fast_start_up.patch
+#190_cache-xkbcomp_output_for_fast_start_up.patch
191-Xorg-add-an-extra-module-path.patch
226_fall_back_to_autoconfiguration.patch
