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

xserver-xorg-video-intel: Changes to 'ubuntu'



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

New commits:
commit 5b26c5e4c044ba0fc376edd934c254c3218de27b
Author: Bryce Harrington <bryce@canonical.com>
Date:   Mon Apr 15 10:35:17 2013 -0700

    Drop --enable-valgrind to fix FTBS.

diff --git a/debian/changelog b/debian/changelog
index 909ed8c..6c2e6f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu3) raring-proposed; urgency=low
+
+  * rules: Drop --enable-valgrind for now (causes FTBS).
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 15 Apr 2013 10:33:24 -0700
+
 xserver-xorg-video-intel (2:2.21.6-0ubuntu2) raring; urgency=low
 
   * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
     apport hook.  This hook is now provided by the xdiagnose package.
     (LP: #997470)
+  * Re-merge from debian to enable valgrind.
 
  -- Bryce Harrington <bryce@ubuntu.com>  Thu, 11 Apr 2013 12:11:29 -0700
 
diff --git a/debian/rules b/debian/rules
index cef06f5..7f8e4ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILDER        := $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {pri
 
 # Enable SNA, pass builderstring:
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=sna --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" --enable-valgrind
+	dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=sna --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))"
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:


Reply to: