debian/changelog | 21 ++++++++++++++++++++-
debian/patches/101_fix_use_of_privates.diff | 23 +++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit a409ee1e228b0da0a91193c2531ca3d83407f537
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Feb 1 16:32:00 2011 +1100
Merge changes since 1ubuntu2 into git
diff --git a/debian/changelog b/debian/changelog
index 5bb193a..e73bf1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+xserver-xorg-video-savage (1:2.3.1-2ubuntu4) natty; urgency=low
+
+ * Rebuild against Xserver 1.10
+
+ -- Bryce Harrington <br...@ubuntu.com> Mon, 31 Jan 2011 18:38:53 -0800
+
+xserver-xorg-video-savage (1:2.3.1-2ubuntu3) natty; urgency=low
+
+ * 101_fix_use_of_privates.diff: From upstream, fixes crashes due to
+ use of uninitialized privates. LP: #635362
+
+ -- Tormod Volden <debian.tor...@gmail.com> Thu, 16 Dec 2010 00:14:17 +0100
+
+xserver-xorg-video-savage (1:2.3.1-2ubuntu2) maverick; urgency=low
+
+ * No-change rebuild against Xserver 1.9 ABI
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 09 Aug 2010
13:40:59 +1000
+
xserver-xorg-video-savage (1:2.3.1-2ubuntu1) maverick; urgency=low
* Merge from Debian unstable. remaining changes:
diff --git a/debian/patches/101_fix_use_of_privates.diff
b/debian/patches/101_fix_use_of_privates.diff
new file mode 100644
index 0000000..641ccd1
--- /dev/null
+++ b/debian/patches/101_fix_use_of_privates.diff
@@ -0,0 +1,23 @@
+From 830e58d086828fa0431303df32a847ddd3022654 Mon Sep 17 00:00:00 2001
+From: Keith Packard <kei...@keithp.com>
+Date: Thu, 25 Nov 2010 01:58:06 +0000
+Subject: savage: fix use of privates without initialisation
+
+Fixes bug 31614.
+
+Signed-off-by: Dave Airlie <airl...@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 7c3ce90..1cb91f6 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -4267,6 +4267,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b)
+ ol = 0;
+ }
+ if (!(pScreen = pScrn->pScreen)
++ || !psav->FBStart2nd
+ || !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen)))
+ return;
+ key = ((Shift(r,psav->overlay.redShift) & psav->overlay.redMask)
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index ddccdcf..c063179 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
03_request_16bit_depth.diff
100_bustype_pci_by_default.diff
+101_fix_use_of_privates.diff
commit 1d4ff03e22a23dc2f88b683cec0687fa92ebb7e0
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Jun 10 11:35:33 2010 +1000
Finalise changelog
diff --git a/debian/changelog b/debian/changelog
index f046cc6..5bb193a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-savage (1:2.3.1-2ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.1-2ubuntu1) maverick; urgency=low
* Merge from Debian unstable. remaining changes:
- 10_bustype_pci_by_default.diff (LP: 33617, 37218)
--
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/e1pk8r5-0003cu...@alioth.debian.org
