from:"Alberto Milone"

glamor-egl: Changes to 'ubuntu'

2013-11-26 Thread Alberto Milone

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db34db4f03a08fd3f7e2074db2d799f753de71a3
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Nov 26 16:07:19 2013 +0100

Release 0.5.1-0ubuntu6 in trusty

diff --git a/debian/changelog b/debian/changelog
index 8e7e85f..6456753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-glamor-egl (0.5.1-0ubuntu6) UNRELEASED; urgency=low
+glamor-egl (0.5.1-0ubuntu6) trusty; urgency=low
 
   * Add a hook to SetWindowPixmap to fix recordmydesktop crashing. (LP: 
#1244324)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 05 Nov 2013 
14:11:10 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 06 Nov 2013 
10:36:44 +0100
 
 glamor-egl (0.5.1-0ubuntu5) trusty; urgency=low
 


-- 
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/e1vlkht-0004y9...@moszumanska.debian.org

glamor-egl: Changes to 'ubuntu'

2013-11-26 Thread Alberto Milone

 debian/changelog   |8 
 debian/xserver-xorg-glamoregl.dirs |2 ++
 debian/xserver-xorg-glamoregl.install  |2 +-
 debian/xserver-xorg-glamoregl.postinst |   18 ++
 debian/xserver-xorg-glamoregl.prerm|   16 
 5 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 0079af736116b7c26190959238bcdc36a0b6663c
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Nov 26 16:44:56 2013 +0100

Release 0.5.1-0ubuntu7

diff --git a/debian/changelog b/debian/changelog
index dc67099..5f437fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-glamor-egl (0.5.1-0ubuntu7) UNRELEASED; urgency=low
+glamor-egl (0.5.1-0ubuntu7) trusty; urgency=low
 
-  * 
+  * Create an alternative for the glamor.conf xorg snippet.
+This makes it possible for other drivers to override
+the xorg.conf.d snippet.
 
- -- Alberto Milone alberto.mil...@canonical.com  Tue, 26 Nov 2013 16:11:15 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 26 Nov 2013 16:44:19 
+0100
 
 glamor-egl (0.5.1-0ubuntu6) trusty; urgency=low
 

commit 70a9d93e9e784f3da386c348316a83d533237762
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Nov 25 17:24:18 2013 +0100

Create an alternative for the glamor.conf xorg snippet

This makes it possible for other drivers to override
the xorg.conf.d snippet.

diff --git a/debian/xserver-xorg-glamoregl.dirs 
b/debian/xserver-xorg-glamoregl.dirs
new file mode 100644
index 000..8163880
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.dirs
@@ -0,0 +1,2 @@
+/usr/share/glamor
+/usr/share/X11/xorg.conf.d
diff --git a/debian/xserver-xorg-glamoregl.install 
b/debian/xserver-xorg-glamoregl.install
index 24f274f..cc3220d 100644
--- a/debian/xserver-xorg-glamoregl.install
+++ b/debian/xserver-xorg-glamoregl.install
@@ -1,2 +1,2 @@
 usr/lib/*/xorg/modules/libglamoregl.so usr/lib/xorg/modules
-usr/share/X11/xorg.conf.d/glamor.conf
+usr/share/X11/xorg.conf.d/glamor.conf  usr/share/glamor
diff --git a/debian/xserver-xorg-glamoregl.postinst 
b/debian/xserver-xorg-glamoregl.postinst
new file mode 100644
index 000..629f335
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (C) 2013 Canonical Ltd
+# Authors: Alberto Milone alberto.mil...@canonical.com
+
+set -e
+
+case $1 in
+configure)
+# Use alternatives to make it easier for 3rd party modules to
+# override glamor
+update-alternatives --force \
+  --install /usr/share/X11/xorg.conf.d/glamoregl.conf glamor_conf \
+  /usr/share/glamor/glamor.conf 500
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/xserver-xorg-glamoregl.prerm 
b/debian/xserver-xorg-glamoregl.prerm
new file mode 100644
index 000..335bb52
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2013 Canonical Ltd
+# Authors: Alberto Milone alberto.mil...@canonical.com
+
+set -e
+
+case $1 in
+remove)
+# Use alternatives to make it easier for 3rd party modules to
+# override glamor
+update-alternatives --remove glamor_conf /usr/share/glamor/glamor.conf
+esac
+
+#DEBHELPER#
+
+exit 0

commit f1c1bab8ce1ce52e3e7439347c5b678e6552d9cb
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Nov 26 16:11:19 2013 +0100

Start work on 0.5.1-0ubuntu7

diff --git a/debian/changelog b/debian/changelog
index 6456753..dc67099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glamor-egl (0.5.1-0ubuntu7) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 26 Nov 2013 16:11:15 
+0100
+
 glamor-egl (0.5.1-0ubuntu6) trusty; urgency=low
 
   * Add a hook to SetWindowPixmap to fix recordmydesktop crashing. (LP: 
#1244324)


-- 
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/e1vllne-0005kf...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2013-06-16 Thread Alberto Milone

 debian/changelog  |   14 +
 debian/patches/series |1 
 debian/patches/xf86-fixup-detection.patch |   79 ++
 3 files changed, 94 insertions(+)

New commits:
commit 31fe86c4bd0e28fa5515e3755931d90f5f7bb426
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 14 17:22:01 2013 +0200

Release 2:1.13.3-0ubuntu12

diff --git a/debian/changelog b/debian/changelog
index 846d6bb..aea1674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xorg-server (2:1.13.3-0ubuntu12) UNRELEASED; urgency=low
+xorg-server (2:1.13.3-0ubuntu12) saucy; urgency=low
 
-  * 
+  * Disable xf86-fixup-detection.patch for now as it breaks PRIME
+with nvidia.
 
- -- Alberto Milone alberto.mil...@canonical.com  Fri, 14 Jun 2013 13:48:05 
+0200
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 14 Jun 2013 17:21:16 
+0200
 
 xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low
 

commit e70b437c7dfb0269f5b33a0ae34d961f2a373e9e
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 14 15:48:03 2013 +0200

disable xf86-fixup-detection.patch for now

The patch currently breaks PRIME with nvidia

diff --git a/debian/patches/series b/debian/patches/series
index 41520ff..34abd18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,7 +44,7 @@ include-GPU-screens-in-DPMS-code.patch
 
 # hybrid graphics fixes for xserver 1.13
 228_autobind_gpu.patch
-xf86-fixup-detection.patch
+#xf86-fixup-detection.patch
 
 # hotplug fixes
 xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch

commit 309eda47aa99ff05aa6cd6f359ac0a7a65419098
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 14 13:48:12 2013 +0200

Start work on 2:1.13.3-0ubuntu12

diff --git a/debian/changelog b/debian/changelog
index a9ab4d0..846d6bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.13.3-0ubuntu12) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 14 Jun 2013 13:48:05 
+0200
+
 xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low
 
   * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)

commit 99c8acc83b89190ffcf5f83a62cd70a1283b6cb3
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 14 13:47:48 2013 +0200

Release to Saucy

diff --git a/debian/changelog b/debian/changelog
index ef81dab..a9ab4d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low
+
+  * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)
+- xf86-fixup-detection.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 13 Jun 2013 
13:00:58 +0200
+
 xorg-server (2:1.13.3-0ubuntu10) saucy; urgency=low
 
   * Add patch to fix DPMS. (LP: #1184999)

commit daabf2b23246a0987ed60b76c56ede56b132d46b
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 14 13:46:12 2013 +0200

Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)

Author: Maarten Lankhorst

diff --git a/debian/patches/series b/debian/patches/series
index 4290015..41520ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,6 +44,7 @@ include-GPU-screens-in-DPMS-code.patch
 
 # hybrid graphics fixes for xserver 1.13
 228_autobind_gpu.patch
+xf86-fixup-detection.patch
 
 # hotplug fixes
 xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch
diff --git a/debian/patches/xf86-fixup-detection.patch 
b/debian/patches/xf86-fixup-detection.patch
new file mode 100644
index 000..e454c75
--- /dev/null
+++ b/debian/patches/xf86-fixup-detection.patch
@@ -0,0 +1,79 @@
+--- a/hw/xfree86/common/xf86pciBus.c
 b/hw/xfree86/common/xf86pciBus.c
+@@ -546,6 +546,15 @@
+ for (k = 0; k  xf86NumEntities; k++) {
+ EntityPtr pEnt = xf86Entities[k];
+ 
++#ifdef XSERVER_PLATFORM_BUS
++if (pEnt-bus.type == BUS_PLATFORM 
++pEnt-bus.id.plat-pdev 
++MATCH_PCI_DEVICES(pEnt-bus.id.plat-pdev, pPci)) 
{
++foundScreen = TRUE;
++break;
++}
++#endif
++
+ if (pEnt-bus.type != BUS_PCI)
+ continue;
+ if (pEnt-bus.id.pci == pPci) {
+--- a/hw/xfree86/common/xf86platformBus.c
 b/hw/xfree86/common/xf86platformBus.c
+@@ -167,11 +167,12 @@
+ for (i = 0; i  xf86NumEntities; i++) {
+ const EntityPtr u = xf86Entities[i];
+ 
+-if (pd-pdev  u-bus.type == BUS_PCI)
+-return !MATCH_PCI_DEVICES(pd-pdev, u-bus.id.pci);
+-if ((u-bus.type == BUS_PLATFORM)  (pd == u-bus.id.plat)) {
++if (pd-pdev  u-bus.type == BUS_PCI 
++MATCH_PCI_DEVICES(pd-pdev, u-bus.id.pci))
++return FALSE

xorg-server: Changes to 'ubuntu'

2012-02-09 Thread Alberto Milone

 debian/changelog|8 +
 debian/patches/226_fall_back_to_autoconfiguration.patch |  105 
 debian/patches/series   |1 
 3 files changed, 113 insertions(+), 1 deletion(-)

New commits:
commit 403e6572b3a7e121c4fff33a687fcef721d5d8a9
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Thu Feb 9 16:48:37 2012 +0100

Fall back to autoconfiguration for graphics drivers in some cases

* Fall back to autoconfiguration for graphics drivers in some cases
  - Add 226_fall_back_to_autoconfiguration.patch

diff --git a/debian/changelog b/debian/changelog
index 52f69ac..a4f2e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xorg-server (2:1.11.3-0ubuntu11) UNRELEASED; urgency=low
 
+  [ Chase Douglas ]
   * Allow for non-root config paths so xorg-gtest can be run without root
 - Add 225_non-root_config_paths.patch backported from upstream
 
- -- Chase Douglas chase.doug...@ubuntu.com  Thu, 02 Feb 2012 17:01:49 -0800
+  [ Alberto Milone]
+  * debian/patches/226_fall_back_to_autoconfiguration.patch:
+- Fall back to autoconfiguration for graphics drivers in some cases
+  instead of letting X fail when configuration files are available.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Thu, 09 Feb 2012 16:57:10 
+0100
 
 xorg-server (2:1.11.3-0ubuntu10) precise; urgency=low
 
diff --git a/debian/patches/226_fall_back_to_autoconfiguration.patch 
b/debian/patches/226_fall_back_to_autoconfiguration.patch
new file mode 100644
index 000..4a513fb
--- /dev/null
+++ b/debian/patches/226_fall_back_to_autoconfiguration.patch
@@ -0,0 +1,105 @@
+From 1d22d773f67f8c00ab8881d2cce00ef95abf24f7 Mon Sep 17 00:00:00 2001
+From: Alberto Milone alberto.mil...@canonical.com
+Date: Fri, 27 Jan 2012 19:31:55 +0100
+Subject: [PATCH 1/1] Try to fall back to autoconfiguration in some cases
+ despite having configuration files
+
+Fall back to autoconfiguration if either the graphics
+driver module specified in configuration files can't be
+found or if there's no device supported by the specified
+driver.
+
+Signed-off-by: Alberto Milone alberto.mil...@canonical.com
+---
+ hw/xfree86/common/xf86Globals.c |1 +
+ hw/xfree86/common/xf86Init.c|   31 ++-
+ hw/xfree86/common/xf86Priv.h|1 +
+ 3 files changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
+index 16d5557..a1a06ad 100644
+--- a/hw/xfree86/common/xf86Globals.c
 b/hw/xfree86/common/xf86Globals.c
+@@ -155,6 +155,7 @@ int xf86NumDrivers = 0;
+ InputDriverPtr *xf86InputDriverList = NULL;
+ int xf86NumInputDrivers = 0;
+ int xf86NumScreens = 0;
++Bool xf86AttemptedFallback = FALSE;
+ 
+ const char *xf86VisualNames[] = {
+   StaticGray,
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 0a47140..a0c7f51 100644
+--- a/hw/xfree86/common/xf86Init.c
 b/hw/xfree86/common/xf86Init.c
+@@ -411,20 +411,34 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char 
**argv)
+   free(optionlist);
+ }
+ 
++Fallback:
+ /* Load all driver modules specified in the config file */
+ /* If there aren't any specified in the config file, autoconfig them */
+ /* FIXME: Does not handle multiple active screen sections, but I'm not
+  * sure if we really want to handle that case*/
+ configured_device = xf86ConfigLayout.screens-screen-device;
+-if ((!configured_device) || (!configured_device-driver)) {
++if (xf86AttemptedFallback) {
++configured_device-driver = NULL;
++if (!autoConfigDevice(configured_device)) {
++xf86Msg(X_ERROR, Auto configuration on fallback failed\n);
++return;
++}
++}
++else if ((!configured_device) || (!configured_device-driver)) {
+ if (!autoConfigDevice(configured_device)) {
+ xf86Msg(X_ERROR, Automatic driver configuration failed\n);
+ return ;
+ }
+ }
+ if ((modulelist = xf86DriverlistFromConfig())) {
+-  xf86LoadModules(modulelist, NULL);
+-  free(modulelist);
++  if (!xf86LoadModules(modulelist, NULL)  !xf86AttemptedFallback) {
++  free(modulelist);
++  xf86AttemptedFallback = TRUE;
++  goto Fallback;
++  }
++  else {
++  free(modulelist);
++  }
+ }
+ 
+ /* Load all input driver modules specified in the config file. */
+@@ -483,8 +497,15 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+ else
+   xf86Info.dontVTSwitch = TRUE;
+ 
+-if (xf86BusConfig() == FALSE)
+-return;
++if (xf86BusConfig() == FALSE) {
++if (!xf86AttemptedFallback) {
++xf86AttemptedFallback = TRUE;
++goto Fallback;
++}
++else {
++return;
++}
++}
+ 
+ xf86PostProbe();
+ 
+diff --git a/hw/xfree86/common/xf86Priv.h b

mesa: Changes to 'ubuntu'

2011-06-24 Thread Alberto Milone

 debian/changelog |8 
 debian/control   |7 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit f5137326912d800d3684ab25f2608e2dfd67765c
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 24 12:21:54 2011 +0200

Release 7.10.3-0ubuntu4

diff --git a/debian/changelog b/debian/changelog
index 9d0860a..d78bb4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-mesa (7.10.3-0ubuntu4) UNRELEASED; urgency=low
+mesa (7.10.3-0ubuntu4) oneiric; urgency=low
 
-  * 
+  * debian/control:
+- Make the Breaks against the proprietary drivers versioned again now that
+  the proprietary drivers work well with multi-arch mesa. (LP: #798049)
 
- -- Alberto Milone alberto.mil...@canonical.com  Fri, 24 Jun 2011 12:08:21 
+0200
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 24 Jun 2011 12:18:53 
+0200
 
 mesa (7.10.3-0ubuntu3) oneiric; urgency=low
 

commit 606eb684f987df70e2578bc14992e31d5423cc61
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 24 12:17:28 2011 +0200

Set versioned Breaks on fglrx and on the nvidia flavours

diff --git a/debian/control b/debian/control
index eebf3db..8597c39 100644
--- a/debian/control
+++ b/debian/control
@@ -394,9 +394,10 @@ Conflicts: libgl1, libgl1-mesa-dri ( 6.4.0)
 Replaces: libgl1, libgl1-mesa-dri ( 6.4.0)
 Provides: libgl1
 Breaks: 
- nvidia-current,
- nvidia-173,
- fglrx,
+ nvidia-current (= 275.09.07-0ubuntu1),
+ nvidia-96 (= 96.43.19-0ubuntu8),
+ nvidia-173 (= 173.14.30-0ubuntu2),
+ fglrx (= 2:8.850-0ubuntu1),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the OpenGL API -- GLX runtime

commit 1e82b0ff59aabc1ce6f38ca5298cabb060164dc2
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jun 24 12:10:05 2011 +0200

Start work on 7.10.3-0ubuntu4

diff --git a/debian/changelog b/debian/changelog
index d51ff74..9d0860a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.10.3-0ubuntu4) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 24 Jun 2011 12:08:21 
+0200
+
 mesa (7.10.3-0ubuntu3) oneiric; urgency=low
 
   * debian/rules:


-- 
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/e1qa5eu-0002vk...@vasks.debian.org

xserver-xorg-input-evdev: Changes to 'ubuntu'

2011-03-01 Thread Alberto Milone

 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8d09337a53e38ba1b2d13fd6ddb3e0ad1d95c56c
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Mar 1 16:56:53 2011 +0100

Release 1:2.6.0-1ubuntu9

diff --git a/debian/changelog b/debian/changelog
index 37aa16b..0a0f3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-evdev (1:2.6.0-1ubuntu9) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.0-1ubuntu9) natty; urgency=low
 
+  [ Chase Douglas ]
   * Fix evdev when handling devices with full array of abs axes (LP: #725202)
 
- -- Chase Douglas chase.doug...@ubuntu.com  Tue, 01 Mar 2011 09:10:35 -0500
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 01 Mar 2011 16:56:14 
+0100
 
 xserver-xorg-input-evdev (1:2.6.0-1ubuntu8) natty; urgency=low
 


-- 
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/e1pus4h-0004rx...@alioth.debian.org

xserver-xorg-video-ati: Changes to 'ubuntu'

2010-09-06 Thread Alberto Milone

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 184a3e02b8c81bfe0b45f68bad6d8ab56129636e
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Sep 6 12:36:30 2010 +0200

Remove d which was accidentally prepended to the package name in the 
changelog

diff --git a/debian/changelog b/debian/changelog
index 05bfaa1..b85fd31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dxserver-xorg-video-ati (1:6.13.1-1ubuntu5) maverick; urgency=low
+xserver-xorg-video-ati (1:6.13.1-1ubuntu5) maverick; urgency=low
 
   * debian/patches/101_ref-count-dri2-buffers.patch:
 + Replace with version that got applied upstream.  Resolves another X crash


-- 
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/e1osz6l-00035p...@alioth.debian.org

mesa: Changes to 'ubuntu'

2010-07-15 Thread Alberto Milone

 debian/changelog |   10 ++
 debian/control   |8 
 2 files changed, 18 insertions(+)

New commits:
commit 1b76d3ecea38b6c136b170bc11c9b3acb1921637
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Thu Jul 15 19:57:48 2010 +0200

Make libegl1-mesa-dev depend on additional libraries, as specified in egl.pc

diff --git a/debian/changelog b/debian/changelog
index 5b6bc42..bbb13ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.8.1-3ubuntu3) maverick; urgency=low
+
+  [ Alexandros Frantzis ]
+  * Make libegl1-mesa-dev depend on the following libraries which
+contain the required .pc files, as specified in egl.pc:
+libdrm-dev, x11proto-dri2-dev, x11proto-gl-dev, libx11-dev,
+libxext-dev, libxxf86vm-dev, libxdamage-dev, libxfixes-dev.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Thu, 15 Jul 2010 19:01:10 
+0200
+
 mesa (7.8.1-3ubuntu2) maverick; urgency=low
 
   * Fix up the mesa-common-dev header installation location
diff --git a/debian/control b/debian/control
index 02eef4f..2fba98c 100644
--- a/debian/control
+++ b/debian/control
@@ -152,6 +152,14 @@ Section: libdevel
 Architecture: any
 Depends:
  libegl1-mesa (= ${binary:Version}),
+ libdrm-dev (= 2.4.19) [!hurd-i386],
+ x11proto-dri2-dev (= 2.1),
+ x11proto-gl-dev (= 1.4.11),
+ libx11-dev,
+ libxext-dev,
+ libxxf86vm-dev, 
+ libxdamage-dev,
+ libxfixes-dev, 
  ${misc:Depends},
 Description: A free implementation of the EGL API -- development files
  This package contains the development environment required for compiling 


-- 
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/e1ozsko-0002hx...@alioth.debian.org

xorg-server: Changes to 'ubuntu'

2010-04-12 Thread Alberto Milone

 debian/changelog |6 ++
 debian/patches/111_armel-drv-fallbacks.patch |8 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 32a6a97f450fc4231fbcb5696fb528998e778c57
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Apr 12 17:30:02 2010 +0200

Adding changes from Alexander Sack to add support for omapfb
in 111_armel-drv-fallbacks.patch

diff --git a/debian/changelog b/debian/changelog
index 0be473b..e8cd6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.6-2ubuntu3) lucid; urgency=low
+
+  * add support for omapfb to 111_armel-drv-fallbacks.patch
+
+ -- Alexander Sack a...@ubuntu.com  Mon, 12 Apr 2010 14:43:42 +0200
+
 xorg-server (2:1.7.6-2ubuntu2) lucid; urgency=low
 
   [Bryce Harrington]
diff --git a/debian/patches/111_armel-drv-fallbacks.patch 
b/debian/patches/111_armel-drv-fallbacks.patch
index 35ebc71..835be3f 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -46,15 +46,17 @@ Index: xorg-server-1.7.6/hw/xfree86/common/xf86AutoConfig.c
  static void
  listPossibleVideoDrivers(char *matches[], int nmatches)
  {
-@@ -544,7 +571,16 @@
+@@ -544,7 +571,18 @@
  #if !defined(__linux__)  defined(__sparc__)
matches[i++] = xnfstrdup(wsfb);
  #else
 +#if defined(__linux__)  defined(__arm__)
 +if (test_sysfs_device(mxc_gpu, imx))
-+  matches[i++] = xnfstrdup(imx);
++   matches[i++] = xnfstrdup(imx);
 +else if (test_sysfs_device(dovefb, dovefb))
-+matches[i++] = xnfstrdup(dovefb);
++   matches[i++] = xnfstrdup(dovefb);
++else if (test_sysfs_device(omapfb, omapfb))
++   matches[i++] = xnfstrdup(omapfb);
 +else
 +  matches[i++] = xnfstrdup(fbdev);
 +#else


-- 
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/e1o1lc9-0001bg...@alioth.debian.org

mesa: Changes to 'ubuntu'

2010-03-10 Thread Alberto Milone

 debian/changelog |9 +
 debian/rules |6 ++
 2 files changed, 15 insertions(+)

New commits:
commit 19592243c5830e6e1947c6f753aa6e40d0908da6
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Wed Mar 10 13:32:20 2010 +0100

* debian/rules: pass --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
  to confflags-dri on i386 so that /usr/lib32/dri is used for 32 bit
  compatibility on 64 bit systems (LP: #248392).

diff --git a/debian/changelog b/debian/changelog
index 7471eae..2f0457f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.7-4ubuntu2) UNRELEASED; urgency=low
+
+  [Alberto Milone]
+  * debian/rules: pass --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
+to confflags-dri on i386 so that /usr/lib32/dri is used for 32 bit
+compatibility on 64 bit systems (LP: #248392).
+
+ -- Alberto Milone alberto.mil...@canonical.com  Wed, 10 Mar 2010 13:26:38 
+0100
+
 mesa (7.7-4ubuntu1) lucid; urgency=low
 
   [Timo Aaltonen]
diff --git a/debian/rules b/debian/rules
index 5ffef65..f661e9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,12 @@ confflags-dri = \
$(DIRECT_RENDERING) \
$(confflags-common)
 
+# Add /usr/lib32/dri/ on 32 bit systems so that this path is used
+# for 32 bit compatibility on 64 bit systems
+ifeq ($(DEB_BUILD_ARCH),i386)
+   confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
+endif
+
 confflags-osmesa = \
--with-driver=osmesa \
--with-demos= \


-- 
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/e1npl7a-00063m...@alioth.debian.org

mesa: Changes to 'ubuntu'

2010-01-20 Thread Alberto Milone

 debian/changelog|9 +
 debian/libgl1-mesa-glx.postinst |5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 10f76b6b997e84e388ee9b91b4eeac397ff0c92c
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Wed Jan 20 13:16:49 2010 +0100

* debian/libgl1-mesa-glx.postinst:
  - Pass LDCONFIG_NOTRIGGER=y to ldconfig as it needs to be run
immediately as we're changing /etc/ld.so.conf.d/ with
alternatives.

diff --git a/debian/changelog b/debian/changelog
index f81b38e..90996b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.7-0ubuntu8) UNRELEASED; urgency=low
+
+  * debian/libgl1-mesa-glx.postinst:
+- Pass LDCONFIG_NOTRIGGER=y to ldconfig as it needs to be run
+  immediately as we're changing /etc/ld.so.conf.d/ with
+  alternatives.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Wed, 20 Jan 2010 13:12:56 
+0100
+
 mesa (7.7-0ubuntu7) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst
diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
index 2a8a485..3365113 100644
--- a/debian/libgl1-mesa-glx.postinst
+++ b/debian/libgl1-mesa-glx.postinst
@@ -12,8 +12,9 @@ case $1 in
 --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/mesa/ld.so.conf 500 \
 --slave /usr/lib/xorg/extra-modules xorg_extra_modules 
/usr/lib/xorg/x11-extra-modules
 
-  # explicit ldconfig due to alternatives
-  ldconfig
+  # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ 
with
+  # alternatives.
+  LDCONFIG_NOTRIGGER=y ldconfig
 
 esac
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-20 Thread Alberto Milone

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64c97be7383e3c0580f9b7dd84f6fc52b9728497
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Wed Jan 20 13:32:21 2010 +0100

Release 7.7-0ubuntu8.

diff --git a/debian/changelog b/debian/changelog
index 90996b1..877c1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (7.7-0ubuntu8) UNRELEASED; urgency=low
+mesa (7.7-0ubuntu8) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst:
 - Pass LDCONFIG_NOTRIGGER=y to ldconfig as it needs to be run
   immediately as we're changing /etc/ld.so.conf.d/ with
   alternatives.
 
- -- Alberto Milone alberto.mil...@canonical.com  Wed, 20 Jan 2010 13:12:56 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Wed, 20 Jan 2010 13:17:54 
+0100
 
 mesa (7.7-0ubuntu7) lucid; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-19 Thread Alberto Milone

 debian/changelog|   11 ++-
 debian/libgl1-mesa-glx.postinst |2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 61a54825487cc6b2141d3702852484b2bd1fcb21
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Jan 19 17:03:21 2010 +0100

* debian/libgl1-mesa-glx.postinst
  - Install alternative with --force so that files that
already exist are overwritten thus avoiding to install a
broken alternative.

diff --git a/debian/changelog b/debian/changelog
index 91e06ed..9c01f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.7-0ubuntu7) UNRELEASED; urgency=low
+
+  * debian/libgl1-mesa-glx.postinst
+- Install alternative with --force so that files that
+  already exist are overwritten thus avoiding to install a
+  broken alternative.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 19 Jan 2010 16:49:41 
+0100
+
 mesa (7.7-0ubuntu6) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst
diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
index 2e01e7d..2a8a485 100644
--- a/debian/libgl1-mesa-glx.postinst
+++ b/debian/libgl1-mesa-glx.postinst
@@ -8,7 +8,7 @@ THIS_SCRIPT=postinst
 case $1 in
   configure)
   # Use alternatives to make it easier to switch between Mesa and 3rd party 
modules
-  update-alternatives \
+  update-alternatives --force \
 --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/mesa/ld.so.conf 500 \
 --slave /usr/lib/xorg/extra-modules xorg_extra_modules 
/usr/lib/xorg/x11-extra-modules
 

commit b63f66e9bc8f0872779e505d3c649ceb8ea10863
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Jan 19 16:48:01 2010 +0100

Release 7.7-0ubuntu6.

diff --git a/debian/changelog b/debian/changelog
index cb411b4..91e06ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.7-0ubuntu6) UNRELEASED; urgency=low
+mesa (7.7-0ubuntu6) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst
 - Remove gl_libraries slave link as the file in ld.so.conf.d is


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-19 Thread Alberto Milone

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e2228d61177e1e5a824d21fff15776df2f76e6e
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Jan 19 18:21:31 2010 +0100

Release 7.7-0ubuntu7.

diff --git a/debian/changelog b/debian/changelog
index 9c01f2b..f81b38e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (7.7-0ubuntu7) UNRELEASED; urgency=low
+mesa (7.7-0ubuntu7) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.postinst
 - Install alternative with --force so that files that
   already exist are overwritten thus avoiding to install a
   broken alternative.
 
- -- Alberto Milone alberto.mil...@canonical.com  Tue, 19 Jan 2010 16:49:41 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 19 Jan 2010 17:29:19 
+0100
 
 mesa (7.7-0ubuntu6) lucid; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-17 Thread Alberto Milone

 debian/changelog|8 
 debian/libgl1-mesa-glx.postinst |1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d2e60e9553be68d3a93074be0c029b4b3623ebe4
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Sun Jan 17 16:56:45 2010 +0100

* debian/libgl1-mesa-glx.postinst
  - Remove gl_libraries slave link as the file in ld.so.conf.d is
enough.

diff --git a/debian/changelog b/debian/changelog
index 6ded00d..cb411b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.7-0ubuntu6) UNRELEASED; urgency=low
+
+  * debian/libgl1-mesa-glx.postinst
+- Remove gl_libraries slave link as the file in ld.so.conf.d is
+  enough. 
+
+ -- Alberto Milone alberto.mil...@canonical.com  Sun, 17 Jan 2010 16:55:36 
+0100
+
 mesa (7.7-0ubuntu5) lucid; urgency=low
 
   * debian/rules:
diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
index 07dbe04..2e01e7d 100644
--- a/debian/libgl1-mesa-glx.postinst
+++ b/debian/libgl1-mesa-glx.postinst
@@ -10,7 +10,6 @@ case $1 in
   # Use alternatives to make it easier to switch between Mesa and 3rd party 
modules
   update-alternatives \
 --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/mesa/ld.so.conf 500 \
---slave /usr/lib/GL gl_libraries /usr/lib/mesa \
 --slave /usr/lib/xorg/extra-modules xorg_extra_modules 
/usr/lib/xorg/x11-extra-modules
 
   # explicit ldconfig due to alternatives


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-15 Thread Alberto Milone

 debian/patches/191-Xorg-add-an-extra-module-path.patch |   99 +
 1 file changed, 99 insertions(+)

New commits:
commit cd3206879cc124f02407b55ffbbc46b05f3b8bc6
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jan 15 13:06:43 2010 +0100

Add 191-Xorg-add-an-extra-module-path.patch as it was introduced
in 2:1.7.3.902-1ubuntu4.

diff --git a/debian/patches/191-Xorg-add-an-extra-module-path.patch 
b/debian/patches/191-Xorg-add-an-extra-module-path.patch
new file mode 100644
index 000..82bba96
--- /dev/null
+++ b/debian/patches/191-Xorg-add-an-extra-module-path.patch
@@ -0,0 +1,99 @@
+From 416a66de9d428a11776331926c23a61188b8fc16 Mon Sep 17 00:00:00 2001
+From: Ander Conselvan de Oliveira an...@localhost.(none)
+Date: Thu, 12 Mar 2009 09:45:57 -0300
+Subject: [PATCH 908/911] Xorg: add an extra module path
+
+If the extra module path is not an empty string (the default value),
+module path will be searched first in the extra module path and then in
+the default module path. This should simplify the alternatives system
+used on Mandriva's fglrx package.
+---
+diff --git a/configure.ac b/configure.ac
+index 10cf26f..2ab3bf7 100644
+--- a/configure.ac
 b/configure.ac
+@@ -471,6 +471,10 @@ AC_ARG_WITH(module-dir,  
AS_HELP_STRING([--with-module-dir=DIR],
+ [Directory where modules are installed 
(default: $libdir/xorg/modules)]),
+   [ moduledir=$withval ],
+   [ moduledir=${libdir}/xorg/modules ])
++AC_ARG_WITH(extra-module-dir,AS_HELP_STRING([--with-extra-module-dir=DIR],
++[Extra module directory to search for modules 
before the default one (default: empty)]),
++  [ extra_moduledir=$withval ],
++  [ extra_moduledir= ])
+ AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR],
+ [Directory where log files are kept (default: 
$localstatedir/log)]),
+   [ logdir=$withval ],
+@@ -1673,6 +1677,7 @@ if test x$XORG = xyes; then
+   AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration 
file])
+   AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration 
file])
+   AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search 
path])
++  AC_DEFINE_DIR(EXTRA_MODULE_PATH, extra_moduledir, [Extra module search 
path, searched before the default one])
+   AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install 
path])
+   AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
+   AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, [$VENDOR_WEB], [Vendor web 
address for support])
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 6fbf613..9921700 100644
+--- a/hw/xfree86/common/xf86Config.c
 b/hw/xfree86/common/xf86Config.c
+@@ -641,11 +641,21 @@ configFiles(XF86ConfFilesPtr fileconf)
+   
+   /* ModulePath */
+ 
+-  if (fileconf) {
+-if (xf86ModPathFrom != X_CMDLINE  fileconf-file_modulepath) {
++  if (xf86ModPathFrom != X_CMDLINE) {
++if (fileconf  fileconf-file_modulepath) {
+   xf86ModulePath = fileconf-file_modulepath;
+   xf86ModPathFrom = X_CONFIG;
+ }
++else if (strcmp(xf86ExtraModulePath, ) != 0) {
++  char *newpath = malloc(strlen(xf86ExtraModulePath)
++   + strlen(xf86ModulePath)
++   + 2);
++  strcpy(newpath, xf86ExtraModulePath);
++  strcat(newpath, ,);
++  strcat(newpath, xf86ModulePath);
++
++  xf86ModulePath = newpath;
++}
+   }
+ 
+   xf86Msg(xf86ModPathFrom, ModulePath set to \%s\\n, xf86ModulePath);
+diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
+index 98f8284..eb92588 100644
+--- a/hw/xfree86/common/xf86Globals.c
 b/hw/xfree86/common/xf86Globals.c
+@@ -144,6 +144,7 @@ xf86InfoRec xf86Info = {
+ };
+ const char *xf86ConfigFile = NULL;
+ const char *xf86ModulePath = DEFAULT_MODULE_PATH;
++const char *xf86ExtraModulePath = EXTRA_MODULE_PATH;
+ MessageType xf86ModPathFrom = X_DEFAULT;
+ const char *xf86LogFile = DEFAULT_LOGPREFIX;
+ MessageType xf86LogFileFrom = X_DEFAULT;
+diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
+index 3bb1571..fcd2a38 100644
+--- a/hw/xfree86/common/xf86Priv.h
 b/hw/xfree86/common/xf86Priv.h
+@@ -77,6 +77,7 @@ extern _X_EXPORT  struct pci_slot_match xf86IsolateDevice;
+ 
+ extern _X_EXPORT  xf86InfoRec xf86Info;
+ extern _X_EXPORT  const char *xf86ModulePath;
++extern _X_EXPORT  const char *xf86ExtraModulePath;
+ extern _X_EXPORT  MessageType xf86ModPathFrom;
+ extern _X_EXPORT  const char *xf86LogFile;
+ extern _X_EXPORT  MessageType xf86LogFileFrom;
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index 9fe7cde..e6ad59b 100644
+--- a/include/xorg-config.h.in
 b/include/xorg-config.h.in

xorg-server: Changes to 'ubuntu'

2010-01-14 Thread Alberto Milone

 debian/changelog|8 
 debian/xserver-xorg-core.preinst.in |4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c198370f2e692df6486b7cc3ad83be6eeb53d522
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Thu Jan 14 12:54:26 2010 +0100

* Release 2:1.7.3.902-1ubuntu6
* debian/xserver-xorg-core.preinst.in:
  - Correct the name of the alternative that we need to remove.
Thanks to Steve Langasek for spotting the error.

diff --git a/debian/changelog b/debian/changelog
index 8a5acba..438699e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu6) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+- Correct the name of the alternative that we need to remove.
+  Thanks to Steve Langasek for spotting the error.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Thu, 14 Jan 2010 12:50:19 
+0100
+
 xorg-server (2:1.7.3.902-1ubuntu5) lucid; urgency=low
 
   * debian/xserver-xorg-core.preinst.in:
diff --git a/debian/xserver-xorg-core.preinst.in 
b/debian/xserver-xorg-core.preinst.in
index 21e9fcb..11e9f41 100644
--- a/debian/xserver-xorg-core.preinst.in
+++ b/debian/xserver-xorg-core.preinst.in
@@ -13,8 +13,8 @@ upgrade|install)
 remove_conffile_lookup xserver-xorg-core /etc/X11/xserver/SecurityPolicy
   fi
 
-  if dpkg --compare-versions $2 lt-nl 2:1.7.3.902-1ubuntu5; then 
-update-alternatives --remove gl_conf /usr/lib/standard-x11/standard.conf 
|| true
+  if dpkg --compare-versions $2 lt-nl 2:1.7.3.902-1ubuntu6; then 
+update-alternatives --remove gl_conf /usr/lib/standard-x11/ld.so.conf || 
true
   fi
 esac
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-13 Thread Alberto Milone

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2abf1c52886971caa34ff63fbbde754cdd34357a
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Wed Jan 13 23:59:46 2010 +0100

Release 7.7-0ubuntu5

diff --git a/debian/changelog b/debian/changelog
index f4f3356..6ded00d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.7-0ubuntu5) UNRELEASED; urgency=low
+mesa (7.7-0ubuntu5) lucid; urgency=low
 
   * debian/rules:
 - Remove invalid install -d command.
@@ -12,7 +12,7 @@ mesa (7.7-0ubuntu5) UNRELEASED; urgency=low
   * debian/libglu1-mesa-dev.links:
 - Remove file as we install libGLU in the right place now.
 
- -- Alberto Milone alberto.mil...@canonical.com  Wed, 13 Jan 2010 15:23:17 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Wed, 13 Jan 2010 20:18:17 
+0100
 
 mesa (7.7-0ubuntu4) lucid; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-13 Thread Alberto Milone

 debian/changelog|8 
 debian/xserver-xorg-core.preinst.in |4 
 2 files changed, 12 insertions(+)

New commits:
commit 101b3e638c9763a0b087fe7d30fdc385c94abcf2
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Thu Jan 14 00:52:47 2010 +0100

* Release 2:1.7.3.902-1ubuntu5.
* debian/xserver-xorg-core.preinst.in:
  - Make sure that the alternative which was previously provided by
xserver-xorg-core is removed.

diff --git a/debian/changelog b/debian/changelog
index 78438c0..8a5acba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu5) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+- Make sure that the alternative which was previously provided by
+  xserver-xorg-core is removed.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 12 Jan 2010 11:37:49 
+0100
+
 xorg-server (2:1.7.3.902-1ubuntu4) lucid; urgency=low
 
   * debian/patches/191-Xorg-add-an-extra-module-path.patch:
diff --git a/debian/xserver-xorg-core.preinst.in 
b/debian/xserver-xorg-core.preinst.in
index c1b84a2..21e9fcb 100644
--- a/debian/xserver-xorg-core.preinst.in
+++ b/debian/xserver-xorg-core.preinst.in
@@ -12,6 +12,10 @@ upgrade|install)
   if dpkg --compare-versions $2 lt-nl 2:1.5.2-1; then
 remove_conffile_lookup xserver-xorg-core /etc/X11/xserver/SecurityPolicy
   fi
+
+  if dpkg --compare-versions $2 lt-nl 2:1.7.3.902-1ubuntu5; then 
+update-alternatives --remove gl_conf /usr/lib/standard-x11/standard.conf 
|| true
+  fi
 esac
 
 #DEBHELPER#


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/changelog|   15 +++
 debian/libgl1-mesa-dev.links|1 +
 debian/libgl1-mesa-glx.postinst |   26 ++
 debian/libgl1-mesa-glx.prerm|   23 +++
 debian/rules|   15 +++
 5 files changed, 80 insertions(+)

New commits:
commit 1ae93fc243f46d78fb87f61ac8e5efc43a740755
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 14:46:19 2010 +0100

* debian/libgl1-mesa-dev.links:
  - Add link to /usr/lib/mesa/libGL.so in /usr/lib so as not to break
software that build against mesa (LP: #505359).
* debian/libgl1-mesa-glx.{postinst|prerm}:
  - Use alternatives so that /usr/lib/GL is a slave which points to
/usr/lib/mesa.
* debian/rules:
  - Install /usr/lib/mesa/ld.so.conf
  - Create an empty directory (for alternatives) just to be sure:
/usr/lib/xorg/x11-extra-modules.

diff --git a/debian/changelog b/debian/changelog
index 3fd74b3..5acc597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mesa (7.7-0ubuntu3) lucid; urgency=low
+
+  * debian/libgl1-mesa-dev.links:
+- Add link to /usr/lib/mesa/libGL.so in /usr/lib so as not to break
+  software that build against mesa (LP: #505359).
+  * debian/libgl1-mesa-glx.{postinst|prerm}:
+- Use alternatives so that /usr/lib/GL is a slave which points to
+  /usr/lib/mesa.
+  * debian/rules:
+- Install /usr/lib/mesa/ld.so.conf
+- Create an empty directory (for alternatives) just to be sure:
+  /usr/lib/xorg/x11-extra-modules.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 12:04:53 
+0100
+
 mesa (7.7-0ubuntu2) lucid; urgency=low
 
   * Moving just libGL.so.* to /usr/lib/mesa broke all builds depending on
diff --git a/debian/libgl1-mesa-dev.links b/debian/libgl1-mesa-dev.links
new file mode 100644
index 000..f40fe08
--- /dev/null
+++ b/debian/libgl1-mesa-dev.links
@@ -0,0 +1 @@
+/usr/lib/libGL.so /usr/lib/mesa/libGL.so
diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
new file mode 100644
index 000..77df041
--- /dev/null
+++ b/debian/libgl1-mesa-glx.postinst
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=libgl1-mesa-glx
+THIS_SCRIPT=postinst
+
+case $1 in
+  configure)
+  # Use alternatives to make it easier to switch between Mesa and 3rd party 
modules
+  update-alternatives \
+--install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/GL/ld.so.conf 500 \
+--slave /usr/lib/GL gl_libraries /usr/lib/mesa \
+--slave /usr/lib/xorg/extra-modules xorg_extra_modules 
/usr/lib/xorg/x11-extra-modules
+
+  # explicit ldconfig due to alternatives
+  ldconfig
+
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:
+
diff --git a/debian/libgl1-mesa-glx.prerm b/debian/libgl1-mesa-glx.prerm
new file mode 100644
index 000..d3d78e4
--- /dev/null
+++ b/debian/libgl1-mesa-glx.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=libgl1-mesa-glx
+THIS_SCRIPT=prerm
+
+case $1 in
+  remove)
+  # Use alternatives to make it easier to switch between Mesa and 3rd party 
modules
+  update-alternatives --remove gl_conf /usr/lib/GL/ld.so.conf
+
+  # explicit ldconfig due to alternatives
+  ldconfig
+
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:
+
diff --git a/debian/rules b/debian/rules
index 71d3a49..002524e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -230,6 +230,21 @@ binary-arch: install
dh_installdocs -s
dh_installexamples -s
dh_install -s --sourcedir=debian/tmp --list-missing
+
+   # Create an ld.so.conf which says where to find libGL from Mesa
+   $(INSTALL) -d $(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa
+   echo /usr/lib/mesa \
+$(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa/ld.so.conf
+
+ifeq ($(DEB_BUILD_ARCH),amd64)
+   # Add the path to 32bit libGL from Mesa (on 64 bit)
+   echo /usr/lib32/mesa \
+$(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa/ld.so.conf
+endif
+
+   # Empty directory for the alternative
+   mkdir -p $(CURDIR)/debian/libgl1-mesa-glx/usr/lib/xorg/x11-extra-modules
+
dh_installman -s
dh_lintian -s
dh_link -s


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/changelog |   21 +
 debian/patches/series|1 +
 debian/rules |   17 +
 debian/xserver-xorg-core.links   |1 -
 debian/xserver-xorg-core.postinst.in |7 ---
 debian/xserver-xorg-core.prerm.in|   20 
 6 files changed, 23 insertions(+), 44 deletions(-)

New commits:
commit d6216c651bac42e822637de6e170307a3dba28d6
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 14:59:18 2010 +0100

* debian/patches/191-Xorg-add-an-extra-module-path.patch:
  - Patch from Mandriva to allow the use of an extra-modules-dir so that
the modules installed in this dir will override the ones in the
default directory.
* debian/rules:
  - Remove alternatives stuff introduced in a previous upload.
  - Configure with --with-extra-module-dir=/usr/lib/xorg/extra-modules.
  - Do not install libglx.so and libdri.so in a different place any more.
  - Do not install ld.so.conf file any more. Mesa will deal with this.
* debian/xserver-xorg-core.links:
  - Do not create link to /usr/lib/xvmcconfig-standard/XvMCConfig.
  - Remove links file.
* debian/xserver-xorg-core.postinst.in:
  - Do not install an alternative any more. Mesa will deal with this.
* debian/xserver-xorg-core.prerm.in:
  - Remove file.

diff --git a/debian/changelog b/debian/changelog
index 46f9863..78438c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xorg-server (2:1.7.3.902-1ubuntu4) lucid; urgency=low
+
+  * debian/patches/191-Xorg-add-an-extra-module-path.patch:
+- Patch from Mandriva to allow the use of an extra-modules-dir so that
+  the modules installed in this dir will override the ones in the
+  default directory.
+  * debian/rules:
+- Remove alternatives stuff introduced in a previous upload.
+- Configure with --with-extra-module-dir=/usr/lib/xorg/extra-modules.
+- Do not install libglx.so and libdri.so in a different place any more.
+- Do not install ld.so.conf file any more. Mesa will deal with this.
+  * debian/xserver-xorg-core.links:
+- Do not create link to /usr/lib/xvmcconfig-standard/XvMCConfig.
+- Remove links file.
+  * debian/xserver-xorg-core.postinst.in:
+- Do not install an alternative any more. Mesa will deal with this.
+  * debian/xserver-xorg-core.prerm.in:
+- Remove file.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 14:48:35 
+0100
+
 xorg-server (2:1.7.3.902-1ubuntu3) lucid; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/patches/series b/debian/patches/series
index 14bfd24..641e603 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@
 188_default_primary_to_first_busid.patch
 189_xserver_1.5.0_bg_none_root.patch
 190_cache-xkbcomp_output_for_fast_start_up.patch
+191-Xorg-add-an-extra-module-path.patch
diff --git a/debian/rules b/debian/rules
index b9ef54b..c0ddca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ confflags += \
 --disable-debug \
 $(config_tests) \
 --with-int10=x86emu \
+--with-extra-module-dir=/usr/lib/xorg/extra-modules \
 --with-os-vendor=$(VENDOR) \
 --with-builderstring=$(SOURCE_NAME) $(SOURCE_VERSION) 
($(BUILDER)) \
 
--with-default-font-path=/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins
 \
@@ -217,22 +218,6 @@ binary-arch: build install
$(INSTALL) -m 755 -d 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
 
-   # Create an ld.so.conf which says where to find libGL from Mesa
-   $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11
-   echo /usr/lib/mesa \
-$(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
-
-ifeq ($(DEB_BUILD_ARCH),amd64)
-   # Add the path to 32bit libGL from Mesa (on 64 bit)
-   echo /usr/lib32/mesa \
-$(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
-endif
-   # Keep the following files separate from other extensions so that we 
can use alternatives
-   $(INSTALL) -d 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard
-   mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libdri.so \
-   $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/
-   mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libglx.so \
-   $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/
 ifeq

mesa: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/changelog  |4 +++-
 debian/libglu1-mesa-dev.links |1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 384798183820db38cee0eb64992de5a6cd81d043
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 15:56:16 2010 +0100

* debian/libglu-mesa-dev.links:
  - Add link to /usr/lib/mesa/libGLU.so in /usr/lib/libGLU.so.

diff --git a/debian/changelog b/debian/changelog
index 5acc597..e0b8dc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,14 @@ mesa (7.7-0ubuntu3) lucid; urgency=low
   * debian/libgl1-mesa-glx.{postinst|prerm}:
 - Use alternatives so that /usr/lib/GL is a slave which points to
   /usr/lib/mesa.
+  * debian/libglu-mesa-dev.links:
+- Add link to /usr/lib/mesa/libGLU.so in /usr/lib/libGLU.so.
   * debian/rules:
 - Install /usr/lib/mesa/ld.so.conf
 - Create an empty directory (for alternatives) just to be sure:
   /usr/lib/xorg/x11-extra-modules.
 
- -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 12:04:53 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 15:54:58 
+0100
 
 mesa (7.7-0ubuntu2) lucid; urgency=low
 
diff --git a/debian/libglu1-mesa-dev.links b/debian/libglu1-mesa-dev.links
new file mode 100644
index 000..1d38041
--- /dev/null
+++ b/debian/libglu1-mesa-dev.links
@@ -0,0 +1 @@
+/usr/lib/libGLU.so /usr/lib/mesa/libGLU.so


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/changelog  |   11 +--
 debian/libglu1-mesa-dev.links |1 +
 debian/rules  |2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 7b3b43f18726d0987cb8ece572ec01bbb7708cbf
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 17:41:40 2010 +0100

* debian/libglu1-mesa-dev.links:
  - Add link to libGLU.a.

diff --git a/debian/libglu1-mesa-dev.links b/debian/libglu1-mesa-dev.links
index 1d38041..f314d9c 100644
--- a/debian/libglu1-mesa-dev.links
+++ b/debian/libglu1-mesa-dev.links
@@ -1 +1,2 @@
 /usr/lib/libGLU.so /usr/lib/mesa/libGLU.so
+/usr/lib/libGLU.a /usr/lib/mesa/libGLU.a

commit 89936460a1ddf9c40a4e03677ba6a38114d9c4a7
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 17:41:03 2010 +0100

Integrate changes from ubuntu3 in Lucid.

diff --git a/debian/changelog b/debian/changelog
index e0b8dc5..f95fac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.7-0ubuntu3) lucid; urgency=low
+mesa (7.7-0ubuntu4) lucid; urgency=low
 
   * debian/libgl1-mesa-dev.links:
 - Add link to /usr/lib/mesa/libGL.so in /usr/lib so as not to break
@@ -13,7 +13,14 @@ mesa (7.7-0ubuntu3) lucid; urgency=low
 - Create an empty directory (for alternatives) just to be sure:
   /usr/lib/xorg/x11-extra-modules.
 
- -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 15:54:58 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Mon, 11 Jan 2010 16:49:14 
+0100
+
+mesa (7.7-0ubuntu3) lucid; urgency=low
+
+  * Add -l/usr/lib/mesa to dh_shlibdeps to fix FTBFS, thanks to 
+Albert Damen for the patch!
+
+ -- Stefan Potyra sistp...@ubuntu.com  Sun, 10 Jan 2010 00:41:48 +0100
 
 mesa (7.7-0ubuntu2) lucid; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 002524e..e5cdd3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -256,7 +256,7 @@ endif
dh_fixperms -s
dh_makeshlibs -s
dh_installdeb -s
-   dh_shlibdeps -s
+   dh_shlibdeps -s -l/usr/lib/mesa
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s -- -Zlzma


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/libgl1-mesa-glx.postinst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9b6dc1f3e95cce24244afec5a51bda13dfc3f9c
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 18:43:51 2010 +0100

* debian/libgl1-mesa-glx.postinst:
  - Fix path to ld.so.conf file.

diff --git a/debian/libgl1-mesa-glx.postinst b/debian/libgl1-mesa-glx.postinst
index 77df041..07dbe04 100644
--- a/debian/libgl1-mesa-glx.postinst
+++ b/debian/libgl1-mesa-glx.postinst
@@ -9,7 +9,7 @@ case $1 in
   configure)
   # Use alternatives to make it easier to switch between Mesa and 3rd party 
modules
   update-alternatives \
---install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/GL/ld.so.conf 500 \
+--install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/mesa/ld.so.conf 500 \
 --slave /usr/lib/GL gl_libraries /usr/lib/mesa \
 --slave /usr/lib/xorg/extra-modules xorg_extra_modules 
/usr/lib/xorg/x11-extra-modules
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-11 Thread Alberto Milone

 debian/libgl1-mesa-dev.links  |2 +-
 debian/libglu1-mesa-dev.links |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f8a1d28e53cf40b4d705b640ba9312760b83dd96
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 11 19:48:58 2010 +0100

* debian/libgl1-mesa-dev.links, libglu1-mesa-dev.links:
  - Fix paths.

diff --git a/debian/libgl1-mesa-dev.links b/debian/libgl1-mesa-dev.links
index f40fe08..9b5e7bc 100644
--- a/debian/libgl1-mesa-dev.links
+++ b/debian/libgl1-mesa-dev.links
@@ -1 +1 @@
-/usr/lib/libGL.so /usr/lib/mesa/libGL.so
+/usr/lib/mesa/libGL.so /usr/lib/libGL.so
diff --git a/debian/libglu1-mesa-dev.links b/debian/libglu1-mesa-dev.links
index f314d9c..c9e42f0 100644
--- a/debian/libglu1-mesa-dev.links
+++ b/debian/libglu1-mesa-dev.links
@@ -1,2 +1,2 @@
-/usr/lib/libGLU.so /usr/lib/mesa/libGLU.so
-/usr/lib/libGLU.a /usr/lib/mesa/libGLU.a
+/usr/lib/mesa/libGLU.so /usr/lib/libGLU.so
+/usr/lib/mesa/libGLU.a /usr/lib/libGLU.a


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-08 Thread Alberto Milone

 debian/changelog   |8 
 debian/libgl1-mesa-glx.install |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 79d8b71233401015b233770fd2c0613771ae5573
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jan 8 18:54:36 2010 +0100

  * debian/libgl1-mesa-glx.install:
- Install libGL.so* in /usr/lib/mesa so as to allow things to
  work with alternatives.

diff --git a/debian/changelog b/debian/changelog
index 780c863..cfcfe34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.6.1~rc3-1ubuntu3) lucid; urgency=low
+
+  * debian/libgl1-mesa-glx.install:
+- Install libGL.so* in /usr/lib/mesa so as to allow things to
+  work with alternatives.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 08 Jan 2010 18:53:35 
+0100
+
 mesa (7.6.1~rc3-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian unstable.
diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install
index 1a30ecd..03f26c4 100644
--- a/debian/libgl1-mesa-glx.install
+++ b/debian/libgl1-mesa-glx.install
@@ -1 +1 @@
-usr/lib/glx/libGL.so.* usr/lib
+usr/lib/glx/libGL.so.* usr/lib/mesa


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-08 Thread Alberto Milone

 debian/changelog |8 
 debian/rules |   10 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit ec1960838e2acfc6c09990db77d5d15c57c13eb6
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jan 8 18:58:47 2010 +0100

* debian/rules:
  - Make sure that /usr/lib/standard-x11/ld.so.conf points to
the libraries provided by mesa.

diff --git a/debian/changelog b/debian/changelog
index cf545df..7d40ede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.902-1ubuntu2) lucid; urgency=low
+
+  * debian/rules:
+- Make sure that /usr/lib/standard-x11/ld.so.conf points to
+  the libraries provided by mesa.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 08 Jan 2010 18:55:52 
+0100
+
 xorg-server (2:1.7.3.902-1ubuntu1) lucid; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 31193e5..b9ef54b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,12 +217,16 @@ binary-arch: build install
$(INSTALL) -m 755 -d 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
 
-   # Create an empty ld.so.conf
+   # Create an ld.so.conf which says where to find libGL from Mesa
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11
-   echo # This file is knowingly empty since the libraries are in the 
standard\n\
-   # search path. Please do not remove this file. \
+   echo /usr/lib/mesa \
 $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
 
+ifeq ($(DEB_BUILD_ARCH),amd64)
+   # Add the path to 32bit libGL from Mesa (on 64 bit)
+   echo /usr/lib32/mesa \
+$(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
+endif
# Keep the following files separate from other extensions so that we 
can use alternatives
$(INSTALL) -d 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard
mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libdri.so \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

mesa: Changes to 'ubuntu'

2010-01-08 Thread Alberto Milone

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23c2d492842a9975e2c1b307646cffb6509615ac
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jan 8 19:41:59 2010 +0100

Fix ubuntu revision.

diff --git a/debian/changelog b/debian/changelog
index cfcfe34..e8d212c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (7.6.1~rc3-1ubuntu3) lucid; urgency=low
+mesa (7.6.1~rc3-1ubuntu2) lucid; urgency=low
 
   * debian/libgl1-mesa-glx.install:
 - Install libGL.so* in /usr/lib/mesa so as to allow things to
   work with alternatives.
 
- -- Alberto Milone alberto.mil...@canonical.com  Fri, 08 Jan 2010 18:53:35 
+0100
+ -- Alberto Milone alberto.mil...@canonical.com  Fri, 08 Jan 2010 19:38:14 
+0100
 
 mesa (7.6.1~rc3-1ubuntu1) lucid; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-07 Thread Alberto Milone

 debian/rules |4 ++--
 debian/xserver-xorg-core.postinst.in |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 32d219657bcd6adeed41eb139690dbdf74bca625
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Thu Jan 7 16:37:03 2010 +0100

Install libglx.so and libdri.so in /usr/lib/standard-x11 as X
seems to prefer the file in /usr/lib/xorg/modules/extensions/standard/
over links in /usr/lib/xorg/modules/extensions/.

diff --git a/debian/rules b/debian/rules
index eb631e3..d65f150 100755
--- a/debian/rules
+++ b/debian/rules
@@ -231,9 +231,9 @@ binary-arch: build install
# Keep the following files separate from other extensions so that we 
can use alternatives
$(INSTALL) -d 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard
mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libdri.so \
-   
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/
+   $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/
mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libglx.so \
-   
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/
+   $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/
 ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-core/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules 
debian/xserver-xorg-core/lib/udev/rules.d
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index 3e31fbb..0df4640 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -17,8 +17,8 @@ case $1 in
   # Use alternatives to make it easier to switch between X11 and 3rd party 
modules
   update-alternatives \
 --install /etc/ld.so.conf.d/GL.conf gl_conf 
/usr/lib/standard-x11/ld.so.conf 500 \
---slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so 
/usr/lib/xorg/modules/extensions/standard/libdri.so \
---slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so 
/usr/lib/xorg/modules/extensions/standard/libglx.so \
+--slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so 
/usr/lib/standard-x11/libdri.so \
+--slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so 
/usr/lib/standard-x11/libglx.so \
 --slave /usr/lib/XvMCConfig xvmcconfig 
/usr/lib/xvmcconfig-standard/XvMCConfig
 esac
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-06 Thread Alberto Milone

 debian/changelog |3 ++-
 debian/xserver-xorg-core.postinst.in |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2f1ba7b2526249f94887344cac0f225da45cfe30
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Wed Jan 6 18:28:41 2010 +0100

Look for XvMCConfig in /usr/lib/xvmcconfig-standard and install
the slave in /usr/lib.

diff --git a/debian/changelog b/debian/changelog
index ee21df3..b1b2960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ xorg-server (2:1.7.3.901-1ubuntu5) lucid; urgency=low
 
   * Use alternatives to make it easier to switch between X11 and 3rd
 party modules.
-  * Add link to /usr/lib/XvMCConfig and use it for alternatives.
+  * Add link to /usr/lib/xvmcconfig-standard/XvMCConfig and use it
+for alternatives.
 
  -- Alberto Milone alberto.mil...@canonical.com  Mon, 04 Jan 2010 12:08:17 
+0100
 
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index 88024f8..3e31fbb 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -19,7 +19,7 @@ case $1 in
 --install /etc/ld.so.conf.d/GL.conf gl_conf 
/usr/lib/standard-x11/ld.so.conf 500 \
 --slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so 
/usr/lib/xorg/modules/extensions/standard/libdri.so \
 --slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so 
/usr/lib/xorg/modules/extensions/standard/libglx.so \
---slave /etc/X11/XvMCConfig xvmcconfig /usr/lib/XvMCConfig-alt
+--slave /usr/lib/XvMCConfig xvmcconfig 
/usr/lib/xvmcconfig-standard/XvMCConfig
 esac
 
 #DEBHELPER#


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2010-01-04 Thread Alberto Milone

 debian/changelog |8 
 debian/rules |   13 +
 debian/xserver-xorg-core.links   |1 +
 debian/xserver-xorg-core.postinst.in |7 +++
 debian/xserver-xorg-core.prerm.in|   20 
 5 files changed, 49 insertions(+)

New commits:
commit 5f14c395e39fa92f36d0637ddd3a4874e073c0bd
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Mon Jan 4 12:09:51 2010 +0100

Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 8c71a2e..ee21df3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.901-1ubuntu5) lucid; urgency=low
+
+  * Use alternatives to make it easier to switch between X11 and 3rd
+party modules.
+  * Add link to /usr/lib/XvMCConfig and use it for alternatives.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Mon, 04 Jan 2010 12:08:17 
+0100
+
 xorg-server (2:1.7.3.901-1ubuntu4) lucid; urgency=low
 
   * xvfb: Depend again on xauth. Depend on x11-xkb-utils. LP: #500102.

commit ce9c6f194c86939ae0c35c83cf7979149a9fe2c2
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Jan 1 17:52:29 2010 +0100

Use alternatives to make it easier to switch between X11 and 3rd party 
modules.

diff --git a/debian/rules b/debian/rules
index abd059b..eb631e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -221,6 +221,19 @@ binary-arch: build install
   
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver
$(INSTALL) -m 755 -d 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script 
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
+
+   # Create an empty ld.so.conf
+   $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11
+   echo # This file is knowingly empty since the libraries are in the 
standard\n\
+   # search path. Please do not remove this file. \
+$(CURDIR)/debian/xserver-xorg-core/usr/lib/standard-x11/ld.so.conf
+
+   # Keep the following files separate from other extensions so that we 
can use alternatives
+   $(INSTALL) -d 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard
+   mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libdri.so \
+   
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/
+   mv 
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/libglx.so \
+   
$(CURDIR)/debian/xserver-xorg-core/usr/lib/xorg/modules/extensions/standard/
 ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-core/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules 
debian/xserver-xorg-core/lib/udev/rules.d
diff --git a/debian/xserver-xorg-core.links b/debian/xserver-xorg-core.links
new file mode 100644
index 000..22e8730
--- /dev/null
+++ b/debian/xserver-xorg-core.links
@@ -0,0 +1 @@
+/usr/lib/XvMCConfig /usr/lib/XvMCConfig-alt
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index a8cb2a2..88024f8 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -13,6 +13,13 @@ case $1 in
 remove_conffile_commit /etc/X11/xserver/SecurityPolicy
 rmdir /etc/X11/xserver 2/dev/null || true
   fi
+
+  # Use alternatives to make it easier to switch between X11 and 3rd party 
modules
+  update-alternatives \
+--install /etc/ld.so.conf.d/GL.conf gl_conf 
/usr/lib/standard-x11/ld.so.conf 500 \
+--slave /usr/lib/xorg/modules/extensions/libdri.so libdri.so 
/usr/lib/xorg/modules/extensions/standard/libdri.so \
+--slave /usr/lib/xorg/modules/extensions/libglx.so libglx.so 
/usr/lib/xorg/modules/extensions/standard/libglx.so \
+--slave /etc/X11/XvMCConfig xvmcconfig /usr/lib/XvMCConfig-alt
 esac
 
 #DEBHELPER#
diff --git a/debian/xserver-xorg-core.prerm.in 
b/debian/xserver-xorg-core.prerm.in
new file mode 100644
index 000..db68169
--- /dev/null
+++ b/debian/xserver-xorg-core.prerm.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+remove|upgrade)
+  if [ ! -f /usr/lib/standard-x11/standard.conf ]; then
+update-alternatives --remove gl_conf /usr/lib/standard-x11/standard.conf
+  fi
+  ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sts=2 sw=2 tw=0:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2009-12-25 Thread Alberto Milone

 debian/changelog |6 ++
 debian/control   |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 13df23a017fe82cafce290ea9402c9d4a0540f09
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Fri Dec 25 12:03:11 2009 +0100

Pull doko's changes

diff --git a/debian/changelog b/debian/changelog
index 9f8932d..8c71a2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.3.901-1ubuntu4) lucid; urgency=low
+
+  * xvfb: Depend again on xauth. Depend on x11-xkb-utils. LP: #500102.
+
+ -- Matthias Klose d...@ubuntu.com  Thu, 24 Dec 2009 12:20:02 +0100
+
 xorg-server (2:1.7.3.901-1ubuntu3) lucid; urgency=low
 
   * Update 100_rethrow_signals.patch to work with xserver 1.7
diff --git a/debian/control b/debian/control
index 0eb2adf..a784ac4 100644
--- a/debian/control
+++ b/debian/control
@@ -225,7 +225,9 @@ Depends:
  xserver-common (= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
-Recommends: xauth
+ xauth,
+ x11-xkb-utils
+Recommends: libgl1-mesa-dri
 Description: Virtual Framebuffer 'fake' X server
  Xvfb provides an X server that can run on machines with no display hardware
  and no physical input devices. It emulates a dumb framebuffer using virtual


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2009-12-15 Thread Alberto Milone

 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch |   26 
+-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit c3f7b193bc78e7e50caa47d07c1b38020dab0e67
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Dec 15 13:18:26 2009 +0100

Make 190_cache-xkbcomp_output_for_fast_start_up.patch build again with 
xserver 1.7.

diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch 
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index e429653..50f3be5 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -90,10 +90,10 @@ index ba8d50b..c086dd1 100644
  #define   PRE_ERROR_MSG \The XKEYBOARD keymap compiler (xkbcomp) 
reports:\
  #define   ERROR_PREFIX\ \
  #define   POST_ERROR_MSG1 \Errors from xkbcomp are not fatal to the X 
server\
-@@ -177,6 +172,47 @@ OutputDirectory(
+@@ -176,6 +171,47 @@ OutputDirectory(
+ }
  }
  
- static Bool
 +#ifndef SHA_DIGEST_LENGTH
 +#define SHA_DIGEST_LENGTH 20
 +#endif
@@ -135,10 +135,10 @@ index ba8d50b..c086dd1 100644
 +
 +/* call xkbcomp and compile XKB keymap, return xkm file name in
 +   nameRtrn */
+ static Bool
  XkbDDXCompileKeymapByNames(   XkbDescPtr  xkb,
XkbComponentNamesPtrnames,
-   unsignedwant,
-@@ -185,7 +221,11 @@ XkbDDXCompileKeymapByNames(   XkbDescPtr  
xkb,
+@@ -185,7 +221,11 @@ XkbDDXCompileKeymapByNames(   XkbDescPtr  
int nameRtrnLen)
  {
  FILE *out;
@@ -151,7 +151,7 @@ index ba8d50b..c086dd1 100644
  
  const char*emptystring = ;
  const char*xkbbasedirflag = emptystring;
-@@ -196,14 +236,67 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
xkb,
+@@ -196,14 +236,67 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
  /* WIN32 has no popen. The input must be stored in a file which is
 used as input for xkbcomp. xkbcomp does not read from stdin. */
  char tmpname[PATH_MAX];
@@ -160,9 +160,8 @@ index ba8d50b..c086dd1 100644
  #else
 -const char *xkmfile = -;
 +const char *xkbfile = -;
- #endif
- 
--snprintf(keymap, sizeof(keymap), server-%s, display);
++#endif
++
 +/* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
 +   of which SHA1 is generated and used as result xkm file name  */
 +memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
@@ -182,12 +181,13 @@ index ba8d50b..c086dd1 100644
 +   ErrorF([xkb] XkbDDXCompileKeymapByNames compiling keymap:\n);
 +   fputs(xkbKeyMapBuf, stderr);
 +}
-+#endif
+ #endif
 +if (!ret) {
 +ErrorF([xkb] Generating XKB Keymap failed, giving up compiling 
keymap\n);
 +return False;
 +}
-+
+ 
+-snprintf(keymap, sizeof(keymap), server-%s, display);
 +DebugF([xkb] computing SHA1 of keymap\n);
 +if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
 +snprintf(xkmfile, sizeof(xkmfile), server-%s, sha1Asc);
@@ -222,7 +222,7 @@ index ba8d50b..c086dd1 100644
  
  #ifdef WIN32
  strcpy(tmpname, Win32TempDir());
-@@ -227,19 +320,30 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
xkb,
+@@ -227,19 +320,30 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
}
  }
  
@@ -256,7 +256,7 @@ index ba8d50b..c086dd1 100644
  #ifndef WIN32
  out= Popen(buf,w);
  #else
-@@ -247,31 +351,43 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
xkb,
+@@ -247,31 +351,43 @@ XkbDDXCompileKeymapByNames(  XkbDescPtr  
  #endif
  
  if (out!=NULL) {
@@ -313,7 +313,7 @@ index ba8d50b..c086dd1 100644
  #ifdef WIN32
  /* remove the temporary file */
  unlink(tmpname);
-@@ -286,9 +402,17 @@ XkbDDXCompileKeymapByNames(   XkbDescPtr  
xkb,
+@@ -286,9 +402,17 @@ XkbDDXCompileKeymapByNames(   XkbDescPtr  
  }
  if (nameRtrn)
nameRtrn[0]= '\0';


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'ubuntu'

2009-12-15 Thread Alberto Milone

 debian/changelog |8 
 1 file changed, 8 insertions(+)

New commits:
commit fa606aa3dc1521da1a226fa410cf6f93071d536e
Author: Alberto Milone alberto.mil...@canonical.com
Date:   Tue Dec 15 13:47:52 2009 +0100

Update the debian/changelog with the changes from the previous commit.

diff --git a/debian/changelog b/debian/changelog
index a1a1ab6..2a8c10f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.3.901-1ubuntu2) UNRELEASED; urgency=low
+
+  [ Alberto Milone ]
+  * debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch:
+Make the patch build again with xserver 1.7.
+
+ -- Alberto Milone alberto.mil...@canonical.com  Tue, 15 Dec 2009 13:46:54 
+0100
+
 xorg-server (2:1.7.3.901-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian experimental.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Re: Ubuntu X feature work for Intrepid

2008-07-15 Thread Alberto Milone

On Tue, 2008-07-15 at 19:34 +0200, Brice Goglin wrote:
 Bryce Harrington wrote:
 
  xorg-options-editor
  ---
  In Hardy we implemented an early version of the new xrandr-enabled
  Screen Resolution tool.  While it was generally well received, it lacks
  a lot of advanced functionality.
 
 My feeling about RandR-GUI is that many people want to write a new one
 from scratch but nobody completes it or even maintains it in the end. I
 have been very disappointed by grandr (segfaults...) and urandr
 (upstream already dead?). I'd really like to have a good one. I don't
 really care about modify driver/server options, but RandR 1.2 really
 needs a good GUI for all our users.
 

I'm the author of URandR and of xorg-options-editor.

URandR is not dead, I decided to rewrite it and it currently detects the
screens and updates the GUI but can't apply the settings. I can work on
it however (currently) I'm very busy with my other projects.

One thing which I'm working on with Bryce is the Screen Resolution tool
(originally created by a Fedora developer). The plan is to extend the
functionality of this RandR GUI so that it can calculate and set the
required virtual resolution (through X-Kit and PolicyKit) in order to
set up multiple screens xinerama style when the framebuffer is not
enough. I did it in Python. Bryce will deal with the C code.

Here's a screencast of how it works:
http://albertomilone.com/screen_resolution.ogg


The code is in my PPA:
https://launchpad.net/~x-kit/+archive

a simple apt-get install screen-resolution-extra should install x-kit as
a dependency. Then all you will have to do is type:

python /usr/share/screen-resolution-extra/policyui.py 0,0:1024x768
1024,0:1280x1024 0,768:1024x768

and you will have the virtual resolution in your xorg.conf.


 What kind of xorg.conf modification does these tools need?
 
 I wonder how all this would interact with the Debian installer which
 currently tries to setup an almost empty xorg.conf. Modifying an almost
 empty xorg.conf requires a very good knowledge of the server default
 behavior if we don't want to break 10 things when adding a section to
 add a single option.
 
 I wonder if it would be easier to bypass xorg.conf completely and make
 the server query some external database at startup like input-hotplug
 does for device configuration.
 
 Brice
 
 

As regards xorg-options-editor,

* each graphics card represented by a Device section in the xorg.conf
will appear in the treeview. If no device section is found then we can
detect the available graphics cards and create empty Device sections for
them.

* when you click on a device in the treeview you will see all the
options from its respective Device and Screen section. X-Kit makes it
easy to find the relationship between Screen and Device sections. If no
Screen sections are available, and an option to the Screen section must
be added then a new Screen section (linked to a specific Device section)
will be created.


No such thing as breaking the xorg.conf should happen with X-Kit.

Here's a brief screencast:
http://albertomilone.com/xorgoptionsedit.ogg

Regards,

Alberto Milone


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

glamor-egl: Changes to 'ubuntu'

glamor-egl: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xserver-xorg-input-evdev: Changes to 'ubuntu'

xserver-xorg-video-ati: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

mesa: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu'

Re: Ubuntu X feature work for Intrepid

35 matches

Site Navigation

Mail list logo

Footer information