[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-experimental'



 debian/changelog |    8 ++++++++
 debian/rules     |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9fea699e75a694e85e37e0df2944262c69fa9ecd
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Mon Feb 21 10:29:55 2011 +1100

    Fix --disable-builddocs configure flag

diff --git a/debian/changelog b/debian/changelog
index 0d5bd6f..cde7036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.9.99.902-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Change --disable-builddocs configure flag to --disable-devel-docs to
+      match upstream renaming.  Avoids the problem 16-oot-build.diff fixes.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 21 Feb 2011 10:10:47 +1100
+
 xorg-server (2:1.9.99.902-2) experimental; urgency=low
 
   * Bump dependency on x11proto-randr-dev, needed since xorg-server.pc
diff --git a/debian/rules b/debian/rules
index 80ca5d5..eb3c542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ confflags += \
 	     --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \
 	     --with-xkb-path=/usr/share/X11/xkb \
 	     --with-xkb-output=/var/lib/xkb \
-	     --disable-builddocs \
+	     --disable-devel-docs \
 	     --disable-install-libxf86config \
 	     --enable-mitshm \
 	     --enable-xres \


Reply to: