debian/changelog | 6 ++++++
debian/patches/17-xfree86-saner-conf-search-paths.diff | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 494d35180a3f032ab9d129ab8a36dab9f025021a
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Apr 20 17:47:26 2010 +0300
Update patch 17; Add missing __datadir__ to cpprules.in.
diff --git a/debian/changelog b/debian/changelog
index 0e383a8..8ed1d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.6.901-4) UNRELEASED; urgency=low
+
+ * Update patch 17; Add missing __datadir__ to cpprules.in.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
+
xorg-server (2:1.7.6.901-3) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/17-xfree86-saner-conf-search-paths.diff
b/debian/patches/17-xfree86-saner-conf-search-paths.diff
index b6ef2b5..0afe626 100644
--- a/debian/patches/17-xfree86-saner-conf-search-paths.diff
+++ b/debian/patches/17-xfree86-saner-conf-search-paths.diff
@@ -1,5 +1,6 @@
Merged patches:
+7962c8f78964d460c76f76dda2795b971a8c2a94
eb07b8606f9a1349baf8114bb36dc2712e5d3419
a4516965de447332794ee0afb9503c351fff6fe8
59f96734633fce3c2bee62bce860aed33033ce3e
@@ -220,11 +221,12 @@ Index: xorg-server/cpprules.in
===================================================================
--- xorg-server.orig/cpprules.in
+++ xorg-server/cpprules.in
-@@ -36,6 +36,7 @@
+@@ -36,6 +36,8 @@
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
+ -D__sysconfdir__=$(sysconfdir) \
++ -D__datadir__=$(datadir) \
-D__xconfigfile__=$(__XCONFIGFILE__) \
-D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o4ejh-0000wn...@alioth.debian.org
