xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit bc7c884ad598cf35f268e15aabf11bcbb3495c48
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 9 17:34:58 2008 +0200
Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release warning in the Xorg log.
diff --git a/debian/changelog b/debian/changelog
index 953d551..4d16b9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.1~git20080507-2) UNRELEASED; urgency=low
+
+ * Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release
+ warning in the Xorg log.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 09 May 2008 17:32:45 +0200
+
xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low
* Pull from upstream server-1.4-branch, highlights:
diff --git a/debian/rules b/debian/rules
index f63e910..2c8dbc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+CPPFLAGS += -DPRE_RELEASE=0
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -83,7 +84,8 @@ build-stamp:
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)"
+ --localstatedir=/var $(confflags) CFLAGS="$(CFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
touch build-stamp
Reply to: