xorg-server: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/rules | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 665aca8ed071df9c433c6c433bc19a830a420b9c
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sun May 16 18:59:05 2010 -0400
debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb with disabled xace.
diff --git a/debian/changelog b/debian/changelog
index 4756dd8..79469de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,8 @@ xorg-server (2:1.8.1-1ubuntu1) UNRELEASED; urgency=low
[ Robert Hooker ]
* Fix 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.
* Drop 164_trap-aspect-ratios.patch: obsolete.
+ * debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb
+ with disabled xace.
-- Robert Hooker <sarvatt@ubuntu.com> Sun, 16 May 2010 17:13:42 -0400
diff --git a/debian/rules b/debian/rules
index e5fba1e..7eb8552 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,6 @@ confflags += \
--disable-install-libxf86config \
--enable-mitshm \
--enable-xres \
- --enable-xcsecurity \
--disable-xcalibrate \
--disable-tslib \
--disable-multibuffer \
@@ -126,6 +125,7 @@ confflags_main = \
--enable-xdm-auth-1 \
--enable-glx \
$(dri) \
+ --enable-xcsecurity \
--enable-xinerama \
--enable-xf86vidmode \
--enable-xace \
@@ -151,6 +151,7 @@ confflags_udeb = \
--disable-xvmc \
--enable-dga \
--disable-screensaver \
+ --disable-xcsecurity \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-glx \
Reply to: