debian/changelog | 31 ++++++++++++++++++++++++++++++-
debian/control | 7 ++++---
debian/patches/series | 1 +
3 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit 0899c79f46dbfc33b50b152a7100c120e397edad
Author: Bryce Harrington <br...@canonical.com>
Date: Wed Jan 26 12:28:12 2011 -0800
* New upstream release.
- Sandy Bridge RENDER and XVIDEO acceleration
- i965+ RENDER acceleration
- Fix backlight on Arrandale (LP: #705949)
* Remaining Ubuntu Changes:
- 107_solid_nullptr_check.patch: Check null return from
uxa_acquire_solid()
* Change dep on libudev-dev to not limit to linux-any (fixes FTBS when
using pbuilder, see deb bug 600823)
* Add python-dev recommends for xserver-xorg-video-intel, needed by
debian/apport-gpu-error-intel.py
* Drop 106_restore_backlight_at_mode_set.patch: Included in release
* Add 107_solid_null_ptr.patch: uxa_acquire_solid() can return NULL
under some circumstances, so check for this when called.
(LP: #705078)
* Add 106_restore_backlight_at_mode_set.patch: Force DPMS to On for all
outputs, to match kernel behavior, and restore the backlight level on
resume.
(LP: #685767)
diff --git a/debian/changelog b/debian/changelog
index 6bad586..86fc937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty; urgency=low
- * New upstream release. Remaining Ubuntu Changes:
+ * New upstream release.
+ - Sandy Bridge RENDER and XVIDEO acceleration
+ - i965+ RENDER acceleration
+ - Fix backlight on Arrandale (LP: #705949)
+ * Remaining Ubuntu Changes:
- debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev,
debian/xserver-xorg-video-intel:
Add apport script to collect debug information on GPU hangs
@@ -15,6 +19,14 @@ xserver-xorg-video-intel (2:2.14.0-1ubuntu1) natty;
urgency=low
Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades.
At best it's redundant (as the kernel defaults to KMS), at worst it
breaks
the ability to disable KMS.
+ - 107_solid_nullptr_check.patch: Check null return from uxa_acquire_solid()
+
+ [Bryce Harrington]
+ * Change dep on libudev-dev to not limit to linux-any (fixes FTBS when
+ using pbuilder, see deb bug 600823)
+ * Add python-dev recommends for xserver-xorg-video-intel, needed by
+ debian/apport-gpu-error-intel.py
+ * Drop 106_restore_backlight_at_mode_set.patch: Included in release
-- Robert Hooker <sarv...@ubuntu.com> Mon, 24 Jan 2011 12:58:42 -0500
@@ -37,6 +49,23 @@ xserver-xorg-video-intel (2:2.13.903-1) experimental;
urgency=low
-- Cyril Brulebois <k...@debian.org> Tue, 04 Jan 2011 15:43:17 +0100
+xserver-xorg-video-intel (2:2.13.901-2ubuntu3) natty; urgency=low
+
+ * Add 107_solid_null_ptr.patch: uxa_acquire_solid() can return NULL
+ under some circumstances, so check for this when called.
+ (LP: #705078)
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 21 Jan 2011 19:17:34 -0800
+
+xserver-xorg-video-intel (2:2.13.901-2ubuntu2) natty; urgency=low
+
+ * Add 106_restore_backlight_at_mode_set.patch: Force DPMS to On for all
+ outputs, to match kernel behavior, and restore the backlight level on
+ resume.
+ (LP: #685767)
+
+ -- Bryce Harrington <br...@ubuntu.com> Mon, 13 Dec 2010 15:26:39 -0800
+
xserver-xorg-video-intel (2:2.13.901-2ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index f5bb2f0..ba241b9 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,8 @@ Build-Depends:
libxcb-aux0-dev,
libxcb-dri2-0-dev,
# end xvmc
- libudev-dev [linux-any],
+# libudev-dev [linux-any],
+ libudev-dev,
dpkg-dev (>= 1.14.17),
quilt,
automake,
@@ -43,7 +44,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.g
Package: xserver-xorg-video-intel
Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Recommends: intel-gpu-tools
+Recommends: intel-gpu-tools, python-dev
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1),
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting,
xserver-xorg-driver-i810
Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1),
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting,
xserver-xorg-driver-i810, 915resolution
@@ -62,7 +63,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
Package: xserver-xorg-video-intel-dbg
Architecture: amd64 i386
-Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
+Depends: xserver-xorg-video-intel (= ${binary:Version}), ${misc:Depends},
${shlibs:Depends}
Recommends: intel-gpu-tools
Section: debug
Priority: extra
diff --git a/debian/patches/series b/debian/patches/series
index 3e44212..004eef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
101_copy-fb.patch
+107_solid_nullptr_check.patch
--
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/e1pibyb-0004pn...@alioth.debian.org
