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

xserver-xorg-video-intel: Changes to 'debian-unstable'



 debian/changelog                        |    7 +++++++
 debian/rules                            |    3 +++
 debian/xserver-xorg-video-intel.install |    2 --
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4b7e1e2a39f160902a9d3c95e838e6347991485f
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat May 14 19:01:27 2011 +0200

    Temporarily disable xvmc
    
    Allows us to sidestep the xcb-util mess and move to testing.

diff --git a/debian/changelog b/debian/changelog
index ec9f9e8..e262d50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high
+
+  * Temporarily disable xvmc to sidestep the xcb-util mess and move to
+    testing.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 14 May 2011 19:00:38 +0200
+
 xserver-xorg-video-intel (2:2.15.0-2) unstable; urgency=low
 
   * xcb-util was split up in 0.3.8 and libxcb-aux has been merged
diff --git a/debian/rules b/debian/rules
index cfa32f5..a8df03a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+override_dh_auto_configure:
+	dh_auto_configure -O--builddirectory=build/ -- --disable-xvmc
+
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
diff --git a/debian/xserver-xorg-video-intel.install b/debian/xserver-xorg-video-intel.install
index b6b04ff..15d87f0 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,6 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
 usr/share/man
 
 ../i915-kms.conf /etc/modprobe.d


Reply to: