xorg-server: Changes to 'debian-experimental'
debian/changelog | 4 ++--
debian/patches/02_Disable-DRI-in-Xephyr.patch | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit ecc713926b178331ea7bf8ee1679316904507ef9
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 24 17:17:09 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 6bda123..a332a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.5.1-1) UNRELEASED; urgency=low
+xorg-server (2:1.5.1-1) experimental; urgency=low
* New upstream bugfix release.
* 02_Disable-DRI-in-Xephyr.patch: don't use DRI in Xephyr, as it doesn't
work correctly.
* Merge changelog from 2:1.4.2-6 (all changes are upstream now).
- -- Julien Cristau <jcristau@debian.org> Sun, 21 Sep 2008 20:37:12 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 24 Sep 2008 17:49:18 +0200
xorg-server (2:1.5.0-1) experimental; urgency=low
commit dfed9e40315aa0675f433740088a65cb96954abe
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 24 17:33:53 2008 +0200
Build fix in the xephyr patch
diff --git a/debian/patches/02_Disable-DRI-in-Xephyr.patch b/debian/patches/02_Disable-DRI-in-Xephyr.patch
index 63c7e3f..8ca1cf7 100644
--- a/debian/patches/02_Disable-DRI-in-Xephyr.patch
+++ b/debian/patches/02_Disable-DRI-in-Xephyr.patch
@@ -4,15 +4,12 @@ Date: Sun, 21 Sep 2008 20:28:16 +0200
Subject: [PATCH] Disable DRI in Xephyr
Doesn't work right, see fdo#16955
----
- configure.ac | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0262274..3ca285a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1922,11 +1922,11 @@ if test "$KDRIVE" = yes; then
+@@ -1922,11 +1922,12 @@ if test "$KDRIVE" = yes; then
XEPHYR=$xephyr
fi
XEPHYR_DRI=no
@@ -26,6 +23,7 @@ index 0262274..3ca285a 100644
+# XEPHYR_DRI_LIBS=-lGL
+# AC_SUBST(XEPHYR_DRI_LIBS)
+# fi
++ AC_SUBST(XEPHYR_DRI_LIBS)
if test x$XEPHYR_DRI = xyes ; then
AC_DEFINE(XEPHYR_DRI,1,[enable DRI extension in xephyr])
fi
Reply to: