debian/changelog | 11 +++++++++++ debian/patches/199_xfvb-help-typo.patch | 13 +++++++++++++ debian/patches/200_randr-null.patch | 13 +++++++++++++ debian/patches/series | 2 ++ 4 files changed, 39 insertions(+)
New commits: commit 1e0c877257d934f572c2c3cc9ae4f3766daa8c99 Author: Bryce Harrington <[email protected]> Date: Mon Feb 8 19:32:50 2010 -0800 Add two patches Robert Collins requested diff --git a/debian/changelog b/debian/changelog index c0002ee..d60e9f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,19 @@ +xorg-server (2:1.7.4-2ubuntu2) karmic; urgency=low + + + + -- Bryce Harrington <[email protected]> Mon, 08 Feb 2010 19:31:15 -0800 + xorg-server (2:1.7.4-2ubuntu1) UNRELEASED; urgency=low + [Timo Aaltonen] * Merge from Debian unstable. * Drop patch 101, included in Debian. + [Robert Collins] + * Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990) + * Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389) + -- Timo Aaltonen <[email protected]> Fri, 05 Feb 2010 16:14:37 +0200 xorg-server (2:1.7.4-2) unstable; urgency=low diff --git a/debian/patches/199_xfvb-help-typo.patch b/debian/patches/199_xfvb-help-typo.patch new file mode 100644 index 0000000..442ecde --- /dev/null +++ b/debian/patches/199_xfvb-help-typo.patch @@ -0,0 +1,13 @@ +=== modified file 'hw/vfb/InitOutput.c' +--- a/hw/vfb/InitOutput.c 2009-06-11 20:34:06 +0000 ++++ b/hw/vfb/InitOutput.c 2010-02-02 06:28:05 +0000 +@@ -249,7 +249,7 @@ + ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); + ErrorF("-pixdepths list-of-int support given pixmap depths\n"); + #ifdef RENDER +- ErrorF("+/-render turn on/of RENDER extension support" ++ ErrorF("+/-render turn on/off RENDER extension support" + "(default on)\n"); + #endif + ErrorF("-linebias n adjust thin line pixelization\n"); + diff --git a/debian/patches/200_randr-null.patch b/debian/patches/200_randr-null.patch new file mode 100644 index 0000000..63a875b --- /dev/null +++ b/debian/patches/200_randr-null.patch @@ -0,0 +1,13 @@ +=== modified file 'randr/randr.c' +--- a/randr/randr.c 2009-12-19 01:44:12 +0000 ++++ b/randr/randr.c 2010-02-02 16:28:26 +0000 +@@ -234,7 +234,7 @@ + /* + * Calling function best set these function vectors + */ +- pScrPriv->rrGetInfo = 0; ++ pScrPriv->rrGetInfo = NULL; + pScrPriv->maxWidth = pScrPriv->minWidth = pScreen->width; + pScrPriv->maxHeight = pScrPriv->minHeight = pScreen->height; + + diff --git a/debian/patches/series b/debian/patches/series index 0c0d23f..7caf3a0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,3 +35,5 @@ 196_xvfb-fbscreeninit-handling.patch 197_xvfb-randr.patch 198_nohwaccess.patch +199_xfvb-help-typo.patch +200_randr-null.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
