xorg-server: Changes to 'ubuntu'
debian/changelog | 11 ++++++++++-
debian/inputabiver | 1 +
debian/serverminver | 2 +-
debian/videoabiver | 1 +
debian/xserver-xorg-dev.install | 4 ++++
5 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit d54462527a08823e2903bd0c4825cb4a4b09ec65
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Feb 23 10:32:03 2011 +1100
Bump serverminver for Xi 2.1 patch
diff --git a/debian/changelog b/debian/changelog
index 66d510f..0903cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,9 @@ xorg-server (2:1.9.99.902-2ubuntu1) UNRELEASED; urgency=low
- Temporarily re-add these to xserver-xorg-dev so we don't need to merge
all the driver changes from Debian en masse. These should be dropped
once all drivers have been merged from Debian, and certainly in Natty+1.
+ * debian/serverminver:
+ - Include 2ubuntu1 string; Xi 2.1 bumps the minor input ABI, so drivers
+ built against it need the Xi 2.1 patched server.
[ Timo Aaltonen ]
* debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
diff --git a/debian/serverminver b/debian/serverminver
index 1a6b1be..932c994 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.9.99.902
+2:1.9.99.902-2ubuntu1~
ABI_VIDEODRV_VERSION:9.0
ABI_XINPUT_VERSION:12.2
commit 74f9c25446e6fd6f3ac1fad301c32858055806eb
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Feb 23 09:43:36 2011 +1100
(Temporarily) re-add inputabiver and videoabiver.
Once we've merged each driver from Debian at least once, these
can and should be dropped, but there's no reason to block the server
waiting for those merges
diff --git a/debian/changelog b/debian/changelog
index 1742935..66d510f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,12 @@ xorg-server (2:1.9.99.902-2ubuntu1) UNRELEASED; urgency=low
regenerate, and possibly other times. (LP: #711422)
* 214_glx_dri_searchdirs.patch:
- Fix dlclose/free snafu. (LP: #722563)
+ * debian/inputabiver:
+ * debian/videoabiver:
+ * debian/xserver-xorg-dev.install
+ - Temporarily re-add these to xserver-xorg-dev so we don't need to merge
+ all the driver changes from Debian en masse. These should be dropped
+ once all drivers have been merged from Debian, and certainly in Natty+1.
[ Timo Aaltonen ]
* debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
@@ -95,7 +101,7 @@ xorg-server (2:1.9.99.902-2ubuntu1) UNRELEASED; urgency=low
- Moved 203_gestures-extension.patch to 502_gestures-extension.patch
- Bump dependency on x11proto-input for xi 2.1
- -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 21 Feb 2011 20:45:49 -0500
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 23 Feb 2011 09:40:07 +1100
xorg-server (2:1.9.99.902-2) experimental; urgency=low
diff --git a/debian/inputabiver b/debian/inputabiver
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/debian/inputabiver
@@ -0,0 +1 @@
+12
diff --git a/debian/videoabiver b/debian/videoabiver
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/videoabiver
@@ -0,0 +1 @@
+9
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index 9ec3c60..c08fa52 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -4,3 +4,7 @@ main/usr/share/aclocal usr/share
../../debian/local/dh_xsf_substvars usr/bin
../../debian/local/xsf.pm /usr/share/perl5/Debian/Debhelper/Sequence/
+
+# Temporary, so we don't have a driver flag day:
+../../debian/inputabiver usr/share/xserver-xorg
+../../debian/videoabiver usr/share/xserver-xorg
Reply to: