debian/changelog | 6 ++++++
debian/rules | 18 +++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 8c0a700d6ed7699c43845e8b1452650de2d8e618
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 12 10:13:49 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 258a8b8..d5bcbc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.21.14-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
* Don't enable valgrind on kfreebsd.
- -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 10:09:06 +0200
+ -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 10:09:25 +0200
xserver-xorg-video-intel (2:2.21.14-1) unstable; urgency=low
commit 4d040d1c23867a3f7c25e6a30b769c33aab1bf0e
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 12 10:09:24 2013 +0200
Don't enable valgrind on kfreebsd.
diff --git a/debian/changelog b/debian/changelog
index 20945cb..258a8b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.21.14-2) UNRELEASED; urgency=low
+
+ * Don't enable valgrind on kfreebsd.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 10:09:06 +0200
+
xserver-xorg-video-intel (2:2.21.14-1) unstable; urgency=low
* New upstream release (closes: #697336).
diff --git a/debian/rules b/debian/rules
index 437f5eb..dcca05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,23 @@ export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH), linux)
+valgrind = --enable-valgrind
+else
+valgrind = --disable-valgrind
+endif
+
# Enable SNA, pass builderstring:
override_dh_auto_configure:
- dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa
\
- --with-builderstring="$(SOURCE_NAME)
$(SOURCE_VERSION) ($(BUILDER))" \
- --disable-silent-rules --enable-valgrind
+ dh_auto_configure -- \
+ --enable-sna \
+ --enable-uxa \
+ --with-default-accel=uxa \
+ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
+ --disable-silent-rules \
+ $(valgrind)
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
--
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/e1v8nhl-0003ur...@vasks.debian.org
