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

xorg-server: Changes to 'debian-unstable'



 debian/changelog                                    |    7 ++++++-
 debian/patches/09_debian_xserver_rtff.diff          |    6 +++---
 debian/patches/10_dont_look_in_home_for_config.diff |    6 +++---
 debian/patches/series                               |    4 ++--
 debian/xserver-xorg-core.NEWS                       |   11 +++++++++++
 5 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 0f12c9da5214fabdf6708fe70f6b1fc003542f47
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sat Jun 14 18:33:12 2008 +0200

    Add a NEWS entry about 48_xaa_nooffscreenpixmaps.diff

diff --git a/debian/changelog b/debian/changelog
index 7eb12a3..f2121a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Update patches to not require -p0, closes: #485185.
+  * Add a NEWS entry about 48_xaa_nooffscreenpixmaps.diff.
 
- -- Brice Goglin <bgoglin@debian.org>  Sat, 14 Jun 2008 18:21:05 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Sat, 14 Jun 2008 18:32:47 +0200
 
 xorg-server (2:1.4.1~git20080517-2) unstable; urgency=high
 
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 8552040..3f73c94 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,3 +1,14 @@
+xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
+
+  * XAA offscreen pixmaps are now disabled by default. It helps compositing
+    manager such as Compiz (see bug #433331) and works around some rendering
+    problems (see bug #478277). Option "XaaNoOffscreenPixmaps" is not needed
+    anymore. To revert to the old behavior, use
+      Option "XaaOffscreenPixmaps"
+    in the Device section of xorg.conf.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sat, 14 Jun 2008 18:29:57 +0200
+
 xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low
 
   * The server now includes a patch to always include the font paths

commit 5dd5d00f3445d81eb63411e14e93d03ee7e42230
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sat Jun 14 18:21:47 2008 +0200

    Update patches to not require -p0

diff --git a/debian/changelog b/debian/changelog
index 153b6c9..7eb12a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * New upstream release.
   * Security fixes from the previous upload are included upstream.
   * Cherry-pick patches from upstream git to make the LeftOf and Above options
@@ -8,7 +9,10 @@ xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
     they can be enabled with Option "XaaOffscreenPixmaps" (closes: #478277,
     #433331).
 
- -- Julien Cristau <jcristau@debian.org>  Wed, 11 Jun 2008 18:57:01 +0200
+  [ Brice Goglin ]
+  * Update patches to not require -p0, closes: #485185.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sat, 14 Jun 2008 18:21:05 +0200
 
 xorg-server (2:1.4.1~git20080517-2) unstable; urgency=high
 
diff --git a/debian/patches/09_debian_xserver_rtff.diff b/debian/patches/09_debian_xserver_rtff.diff
index e4c7e10..65039b3 100644
--- a/debian/patches/09_debian_xserver_rtff.diff
+++ b/debian/patches/09_debian_xserver_rtff.diff
@@ -3,10 +3,10 @@ $Id: 910_debian_Xserver_RTFF.diff 486 2005-08-03 04:51:11Z dnusinow $
 Give the user a far stronger clue as to what to do when their font configuration
 is horribly screwed up; this patch by Branden Robinson.
 
-Index: dix/main.c
+Index: a/dix/main.c
 ===================================================================
---- dix/main.c.orig	2006-11-13 19:59:22.000000000 +0100
-+++ dix/main.c	2006-11-26 01:55:13.000000000 +0100
+--- a/dix/main.c.orig	2006-11-13 19:59:22.000000000 +0100
++++ b/dix/main.c	2006-11-26 01:55:13.000000000 +0100
 @@ -407,10 +407,42 @@
  			defaultFontPath);
  	}
diff --git a/debian/patches/10_dont_look_in_home_for_config.diff b/debian/patches/10_dont_look_in_home_for_config.diff
index 5b27e7f..51f7cf9 100644
--- a/debian/patches/10_dont_look_in_home_for_config.diff
+++ b/debian/patches/10_dont_look_in_home_for_config.diff
@@ -1,7 +1,7 @@
-Index: hw/xfree86/common/xf86Config.c
+Index: a/hw/xfree86/common/xf86Config.c
 ===================================================================
---- hw/xfree86/common/xf86Config.c.orig	2007-08-16 22:47:18.000000000 -0400
-+++ hw/xfree86/common/xf86Config.c	2007-08-16 22:47:21.000000000 -0400
+--- a/hw/xfree86/common/xf86Config.c.orig	2007-08-16 22:47:18.000000000 -0400
++++ b/hw/xfree86/common/xf86Config.c	2007-08-16 22:47:21.000000000 -0400
 @@ -92,7 +92,6 @@
  			"/etc/X11/%R," "%P/etc/X11/%R," \
  			"%E," "%F," \
diff --git a/debian/patches/series b/debian/patches/series
index b477e51..2b0c641 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-001_ubuntu_add_extra_modelines_from_xorg.patch -p1
+001_ubuntu_add_extra_modelines_from_xorg.patch
 02_libvgahw_gcc4_volatile_fix.diff
 03_auto_load_driver.diff
 04_auto_load_driver_no_conf.diff
@@ -6,7 +6,7 @@
 06_use_proc_instead_of_sysfs_for_pci_domains.diff
 07_autoconfig_screen_with_device_section.diff
 08_better_dpms_logging.diff
-10_dont_look_in_home_for_config.diff -p0
+10_dont_look_in_home_for_config.diff
 11_dont_crash_on_bad_dri_mode.diff
 13_debian_add_xkbpath_env_variable.diff
 14_default_screen_section.diff


Reply to: