debian/changelog | 6 +++--- debian/patches/15-nouveau.diff | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 7f248edd7b45fe97fd4f57d297aafe28107b2240 Author: Julien Cristau <[email protected]> Date: Mon Jun 7 23:22:52 2010 +0200 Upload to experimental diff --git a/debian/changelog b/debian/changelog index 3cac7df..d0b80d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.8.1.901-1) UNRELEASED; urgency=low +xorg-server (2:1.8.1.901-1) experimental; urgency=low [ Julien Cristau ] * New upstream release @@ -8,7 +8,7 @@ xorg-server (2:1.8.1.901-1) UNRELEASED; urgency=low * 16-xaa-fbcomposite-fix-negative-size.diff: - mi hunk merged upstream. Update to keep just the fbpict.c hunk. - -- Christopher James Halse Rogers <[email protected]> Fri, 04 Jun 2010 14:16:14 +1000 + -- Julien Cristau <[email protected]> Mon, 07 Jun 2010 23:22:48 +0200 xorg-server (2:1.8.1-1) experimental; urgency=low commit 91e9fd832d45f72b02e70a824e373fd52546d73c Author: Julien Cristau <[email protected]> Date: Mon Jun 7 23:21:32 2010 +0200 Fix changelog typo diff --git a/debian/changelog b/debian/changelog index 40f9a3f..3cac7df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ xorg-server (2:1.8.1.901-1) UNRELEASED; urgency=low [ Julien Cristau ] * New upstream release - * Merge changes from 2:1.7.7-1. + * Merge changes from 2:1.7.7-2. [ Christopher James Halse Rogers ] * 16-xaa-fbcomposite-fix-negative-size.diff: commit 01dab61b8cda9e26e38903601022c45b463d530d Author: Julien Cristau <[email protected]> Date: Mon Jun 7 23:20:55 2010 +0200 Rediff 15-nouveau.diff diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff index 7bd766a..453f0dc 100644 --- a/debian/patches/15-nouveau.diff +++ b/debian/patches/15-nouveau.diff @@ -46,7 +46,7 @@ Index: xorg-server/glx/glxdri2.c =================================================================== --- xorg-server.orig/glx/glxdri2.c +++ xorg-server/glx/glxdri2.c -@@ -683,6 +683,7 @@ +@@ -678,6 +678,7 @@ const __DRIextension **extensions; const __DRIconfig **driConfigs; int i; @@ -54,7 +54,7 @@ Index: xorg-server/glx/glxdri2.c screen = xcalloc(1, sizeof *screen); if (screen == NULL) -@@ -709,7 +710,9 @@ +@@ -704,7 +705,9 @@ screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { @@ -65,7 +65,7 @@ Index: xorg-server/glx/glxdri2.c filename, dlerror()); goto handle_error; } -@@ -800,7 +803,7 @@ +@@ -795,7 +798,7 @@ xfree(screen); -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
