debian/changelog | 7 +++++++
debian/patches/103_inputproto_1.4.3_is_fine.patch | 11 +++++++++++
debian/patches/series | 1 +
3 files changed, 19 insertions(+)
New commits:
commit f9687ffe36ec44683facec3706408337dc629846
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Aug 28 13:25:07 2008 +0300
Don't require inputproto 1.4.4 in configure.ac..
diff --git a/debian/changelog b/debian/changelog
index 3147094..62ad036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.99.906-2ubuntu2) intrepid; urgency=low
+
+ * 103_inputproto_1.4.3_is_fine.patch:
+ - Don't require inputproto 1.4.4 in configure.ac..
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Aug 2008 13:24:05 +0300
+
xorg-server (2:1.4.99.906-2ubuntu1) intrepid; urgency=low
* Merge with Debian experimental.
diff --git a/debian/patches/103_inputproto_1.4.3_is_fine.patch
b/debian/patches/103_inputproto_1.4.3_is_fine.patch
new file mode 100644
index 0000000..7f06cd5
--- /dev/null
+++ b/debian/patches/103_inputproto_1.4.3_is_fine.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -662,7 +662,7 @@ else
+ RENDERPROTO="renderproto"
+ fi
+
+-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0]
[damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans
[scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >=
1.4.4] [kbproto >= 1.0.3]"
++REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0]
[damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans
[scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >=
1.4.3] [kbproto >= 1.0.3]"
+ REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
+
+ dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/debian/patches/series b/debian/patches/series
index fcfcf82..03dd975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
100_xserver_exa_force_greedy.patch
101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
102_ubuntu_sharevts_load_cpu.patch
+103_inputproto_1.4.3_is_fine.patch
104_psb_auto.patch
107_fedora_dont_backfill_bg_none.patch
110_fedora_no_move_damage.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
