xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit e2f7f2463569792e425fb82f22e27e63abb1f127
Author: Timo Aaltonen 
Date:   Sat Nov 4 08:52:15 2017 +0200

release to bionic

diff --git a/debian/changelog b/debian/changelog
index 9a3d3ec..3b14ab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+19ubuntu3) UNRELEASED; urgency=medium
+xorg (1:7.7+19ubuntu3) bionic; urgency=medium
 
   * control: Add python3-apport to xserver-xorg depends due to the apport hook.
 (LP: #1730035)
 
- -- Timo Aaltonen   Sat, 04 Nov 2017 07:56:48 +0200
+ -- Timo Aaltonen   Sat, 04 Nov 2017 08:51:54 +0200
 
 xorg (1:7.7+19ubuntu2) artful; urgency=medium
 

commit fd3d7d2ad81630c99102a3b2ad1fb2f7d6e1a473
Author: Timo Aaltonen 
Date:   Sat Nov 4 08:48:40 2017 +0200

control: Add python3-apport to xserver-xorg depends due to the apport hook. 
(LP: #1730035)

diff --git a/debian/changelog b/debian/changelog
index 1bd75e7..9a3d3ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+19ubuntu3) UNRELEASED; urgency=medium
+
+  * control: Add python3-apport to xserver-xorg depends due to the apport hook.
+(LP: #1730035)
+
+ -- Timo Aaltonen   Sat, 04 Nov 2017 07:56:48 +0200
+
 xorg (1:7.7+19ubuntu2) artful; urgency=medium
 
   * control, source_xorg.py, xserver-xorg.install, rules: Import apport package
diff --git a/debian/control b/debian/control
index 5dd4dc1..92358d5 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  xkb-data (>= 1.4),
- x11-xkb-utils
+ x11-xkb-utils,
+ python3-apport,
 Recommends:
  libgl1-mesa-dri,
  xserver-xorg-legacy [linux-any],

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog|9 
 debian/control  |2 
 debian/source_xorg.py   |  684 
 debian/xserver-xorg.install |1 
 debian/xserver-xorg.links   |  143 +
 5 files changed, 839 insertions(+)

New commits:
commit 60f94ba53ce041f99a0730f8025e5590730f1c86
Author: Timo Aaltonen 
Date:   Thu Aug 31 13:45:37 2017 +0300

release to artful

diff --git a/debian/changelog b/debian/changelog
index 1c55c96..1bd75e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.7+19ubuntu2) UNRELEASED; urgency=medium
+xorg (1:7.7+19ubuntu2) artful; urgency=medium
 
   * control, source_xorg.py, xserver-xorg.install, rules: Import apport package
 hook and links from xdiagnose 3.8.7.
   * source_xorg.py: Drop obsolete stuff from the hook, attach Xorg.0.log
 from home directory.
 
- -- Timo Aaltonen   Tue, 29 Aug 2017 13:57:00 +0300
+ -- Timo Aaltonen   Thu, 31 Aug 2017 13:43:41 +0300
 
 xorg (1:7.7+19ubuntu1) artful; urgency=medium
 

commit 467cd86e163bb98976167ccc7bd3a488bf4b4a4b
Author: Timo Aaltonen 
Date:   Tue Aug 29 16:37:09 2017 +0300

source_xorg.py: Drop obsolete stuff from the hook, attach Xorg.0.log from 
home directory.

diff --git a/debian/changelog b/debian/changelog
index b41a93f..1c55c96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.7+19ubuntu2) UNRELEASED; urgency=medium
 
   * control, source_xorg.py, xserver-xorg.install, rules: Import apport package
 hook and links from xdiagnose 3.8.7.
+  * source_xorg.py: Drop obsolete stuff from the hook, attach Xorg.0.log
+from home directory.
 
  -- Timo Aaltonen   Tue, 29 Aug 2017 13:57:00 +0300
 
diff --git a/debian/source_xorg.py b/debian/source_xorg.py
index 1f570fc..7ef9864 100755
--- a/debian/source_xorg.py
+++ b/debian/source_xorg.py
@@ -115,7 +115,6 @@ def is_xorg_input_package(pkg):
 def is_xorg_video_package(pkg):
 if (pkg[:18] == 'xserver-xorg-video' or
 pkg[:6] == 'nvidia' or
-pkg[:5] == 'fglrx' or
 pkg[:10] == 'xf86-video'):
 return True
 else:
@@ -132,7 +131,7 @@ def nonfree_graphics_module(module_list = '/proc/modules'):
 return None
 
 for m in mods:
-if m == "nvidia" or m == "fglrx":
+if m == "nvidia":
 return m
 
 def attach_command_output(report, command_list, key):
@@ -331,7 +330,6 @@ def attach_xorg_package_versions(report, ui=None):
 "xserver-xorg-core",
 "libgl1-mesa-glx",
 "libgl1-mesa-dri",
-"libgl1-mesa-dri-experimental",
 "libdrm2",
 "compiz",
 "xserver-xorg-input-evdev",
@@ -339,18 +337,23 @@ def attach_xorg_package_versions(report, ui=None):
 "xserver-xorg-video-ati",
 "xserver-xorg-video-nouveau"]:
 report['version.%s' %(package)] = package_versions(package)
-if report.get('Architecture', '') == 'amd64':
-report['version.ia32-libs'] = package_versions('ia32-libs')
 
 def attach_xorg_info(report, ui=None):
 '''
 Attaches basic xorg debugging info
 '''
+from pathlib import Path
+HomeXorgLog = os.path.join(str(Path.home()), 
'.local/share/xorg/Xorg.0.log')
+
 attach_file_if_exists(report, '/var/log/boot.log', 'BootLog')
 attach_file_if_exists(report, '/var/log/plymouth-debug.log', 
'PlymouthDebug')
 attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
-attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog')
-attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
+if os.path.exists(HomeXorgLog) :
+attach_file_if_exists(report, HomeXorgLog, 'XorgLog')
+attach_file_if_exists(report, HomeXorgLog + '.old', 'XorgLogOld')
+else:
+attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog')
+attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
 
 if os.path.lexists('/var/log/Xorg.0.log') and has_xorglog:
 try:
@@ -541,23 +544,6 @@ def attach_nvidia_info(report, ui=None):
 if report.get('SourcePackage','Unknown') in core_x_packages:
 report['SourcePackage'] = "nvidia-graphics-drivers"
 
-def attach_fglrx_info(report, ui=None):
-'''
-Gathers special files for the fglrx proprietary driver
-'''
-if nonfree_graphics_module() != 'fglrx':
-return
-
-report['version.fglrx-installer'] = package_versions("fglrx-installer")
-
-attach_command_output(report, ['jockey-text', '-l'], 'JockeyStatus')
-attach_command_output(report, ['update-alternatives', '--display', 
'gl_conf'], 'GlConf')
-
-# File any X crash with -fglrx involved with the -fglrx bugs
-if report.get('SourcePackage','Unknown') in core_x_packages:
-if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in 
report):
-

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   15 +++
 debian/control   |1 +
 2 files changed, 16 insertions(+)

New commits:
commit 479baf11cbf9d6ebf3366d77fa399ddcefb2afc1
Author: Timo Aaltonen 
Date:   Wed May 3 19:06:32 2017 +0300

release to artful

diff --git a/debian/changelog b/debian/changelog
index 0ca76f9..f6a3289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+19ubuntu1) artful; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Wed, 03 May 2017 19:06:02 +0300
+
 xorg (1:7.7+19) unstable; urgency=high
 
   * Team upload.

commit 2d3d428aeff8c265a10f281494f529501859313d
Author: Julien Cristau 
Date:   Wed May 3 11:38:53 2017 +0200

xserver-xorg now Recommends xserver-xorg-legacy

We'd have liked to avoid installing the setuid Xorg wrapper by default
in stretch, but this seems to break too much still (closes: #861683).

diff --git a/debian/changelog b/debian/changelog
index fd0a6a2..8528129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.7+19) unstable; urgency=high
+
+  * Team upload.
+  * xserver-xorg now Recommends xserver-xorg-legacy, we'd have liked to avoid
+installing the setuid Xorg wrapper by default in stretch, but this seems
+to break too much still (closes: #861683).
+
+ -- Julien Cristau   Wed, 03 May 2017 11:38:16 +0200
+
 xorg (1:7.7+18) unstable; urgency=medium
 
   * Call db_purge without arguments in postinst to fix error uncovered by
diff --git a/debian/control b/debian/control
index 9ea3b2f..9d50a49 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
+ xserver-xorg-legacy [linux-any],
 Provides: xserver
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |   34 --
 debian/compat  |2 +-
 debian/control |7 ++-
 debian/rules   |2 +-
 debian/x11-common.postinst |4 ++--
 5 files changed, 38 insertions(+), 11 deletions(-)

New commits:
commit 66373f4bd28bfe64d9e6f49cd75bb2757e77e3e1
Author: Timo Aaltonen 
Date:   Mon Apr 24 16:39:22 2017 +0300

update changelog, release

diff --git a/debian/changelog b/debian/changelog
index 242d090..48d61cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+18ubuntu1) artful; urgency=medium
+
+  * Merge from Debian.
+- drop -synaptics from -input-all Recommends (LP: #1685542)
+
+ -- Timo Aaltonen   Mon, 24 Apr 2017 16:38:55 +0300
+
 xorg (1:7.7+18) unstable; urgency=medium
 
   * Call db_purge without arguments in postinst to fix error uncovered by

commit 1f4d2a18493f894bf63cc7587d7ef3806be1cd26
Author: Timo Aaltonen 
Date:   Tue Apr 4 00:48:02 2017 +0300

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 6accf06..8c68096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.7+16ubuntu3) UNRELEASED; urgency=medium
+xorg (1:7.7+16ubuntu3) zesty; urgency=medium
 
   * control: Drop alt recommends on xorg-driver-video, because it makes
 no sense for Recommends.
   * control: Drop xserver-xorg-video-freedreno from video-all (arm).
 (LP: #1679323)
 
- -- Timo Aaltonen   Wed, 01 Feb 2017 10:44:07 +0200
+ -- Timo Aaltonen   Tue, 04 Apr 2017 00:47:23 +0300
 
 xorg (1:7.7+16ubuntu2) zesty; urgency=medium
 

commit e65d05182e7ce5958fd46435bbe3bfae36ab7fd4
Author: Timo Aaltonen 
Date:   Tue Apr 4 00:47:20 2017 +0300

control: Drop xserver-xorg-video-freedreno from video-all (arm). (LP: 
#1679323)

diff --git a/debian/changelog b/debian/changelog
index 29066a0..6accf06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.7+16ubuntu3) UNRELEASED; urgency=medium
 
   * control: Drop alt recommends on xorg-driver-video, because it makes
 no sense for Recommends.
+  * control: Drop xserver-xorg-video-freedreno from video-all (arm).
+(LP: #1679323)
 
  -- Timo Aaltonen   Wed, 01 Feb 2017 10:44:07 +0200
 
diff --git a/debian/control b/debian/control
index c2f2049..f23c79a 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,6 @@ Depends:
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [arm64 armel armhf],
  xserver-xorg-video-dummy [s390x],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],

commit 0dc2ca8b5d161437e49af9eb9adc5eecb7a9d950
Author: Julien Cristau 
Date:   Wed Nov 23 08:50:59 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c794f9b..fd0a6a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.7+18) UNRELEASED; urgency=medium
+xorg (1:7.7+18) unstable; urgency=medium
 
   * Call db_purge without arguments in postinst to fix error uncovered by
 adding "set -e" in 1:7.7+17 (closes: #845398).  Thanks, Samuel Thibault
 and Tianon Gravi!
 
- -- Julien Cristau   Wed, 23 Nov 2016 08:34:41 +0100
+ -- Julien Cristau   Wed, 23 Nov 2016 08:50:50 +0100
 
 xorg (1:7.7+17) unstable; urgency=medium
 

commit 2c7fd3d94825f4fd9a770a824a712dfcda109835
Author: Julien Cristau 
Date:   Wed Nov 23 08:42:42 2016 +0100

Call db_purge without arguments in postinst

Fixes error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398).
Thanks, Samuel Thibault and Tianon Gravi!

The bug was introduced by me in 1:7.7+10 but was hidden until now
because errors were being ignored.  Yay me.

diff --git a/debian/changelog b/debian/changelog
index 8c53b1e..c794f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+18) UNRELEASED; urgency=medium
+
+  * Call db_purge without arguments in postinst to fix error uncovered by
+adding "set -e" in 1:7.7+17 (closes: #845398).  Thanks, Samuel Thibault
+and Tianon Gravi!
+
+ -- Julien Cristau   Wed, 23 Nov 2016 08:34:41 +0100
+
 xorg (1:7.7+17) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/x11-common.postinst b/debian/x11-common.postinst
index 2230165..e84e126 100644
--- a/debian/x11-common.postinst
+++ b/debian/x11-common.postinst
@@ -4,8 +4,7 @@ set -e
 if [ -f /usr/share/debconf/confmodule ]; then
   . /usr/share/debconf/confmodule
 
-  db_purge x11-common/xwrapper/allowed_users
-  db_purge x11-common/xwrapper/actual_allowed_users
+  db_purge
 fi
 
 #DEBHELPER#

commit 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1ff8fd87e4b1bfae3f2c6efc2756d6647994daf4
Author: Timo Aaltonen 
Date:   Wed Feb 1 10:44:27 2017 +0200

control: Drop alt recommends on xorg-driver-video, because it makes no 
sense for Recommends.

diff --git a/debian/changelog b/debian/changelog
index 0fe5c53..29066a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+16ubuntu3) UNRELEASED; urgency=medium
+
+  * control: Drop alt recommends on xorg-driver-video, because it makes
+no sense for Recommends.
+
+ -- Timo Aaltonen   Wed, 01 Feb 2017 10:44:07 +0200
+
 xorg (1:7.7+16ubuntu2) zesty; urgency=medium
 
   * control: Add -synaptics to input-all Recommends for linux, and move
diff --git a/debian/control b/debian/control
index 87e1b8d..c2f2049 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
- xserver-xorg-video-all | xorg-driver-video,
+ xserver-xorg-video-all,
 Provides: xserver
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the

xorg: Changes to 'ubuntu-yakkety-lts'

[Timo Aaltonen]

New branch 'ubuntu-yakkety-lts' available with the following commits:
commit fb2eb0f3a8751c435af91d07d8f33a88be770135
Author: Timo Aaltonen 
Date:   Wed Feb 1 10:41:29 2017 +0200

control: Drop xorg-driver-video alt recommends to allow easier install of 
the hwe stack.

commit 79e6af963ee7d7dec7f794b6d77720326c234a04
Author: Timo Aaltonen 
Date:   Fri Jan 20 14:19:54 2017 +0200

upload to archive

commit 81d89d43f86900a0399e7671668280e09fbc
Author: Timo Aaltonen 
Date:   Fri Jan 20 14:19:40 2017 +0200

use versioned Provides for xserver-xorg

commit 38e637a5169f5fe37f09ee62fdb904cc657545fc
Author: Timo Aaltonen 
Date:   Fri Jan 20 10:11:27 2017 +0200

hwe-16.04

xorg: Changes to 'ubuntu-yakkety'

[Timo Aaltonen]

New branch 'ubuntu-yakkety' available with the following commits:

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit 583b04f713340ea91e8d809edebf5f7e6cdb5d8f
Author: Timo Aaltonen 
Date:   Thu Oct 20 20:28:39 2016 +0300

release to zesty

diff --git a/debian/changelog b/debian/changelog
index 2e4b413..0fe5c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+16ubuntu2) UNRELEASED; urgency=medium
+xorg (1:7.7+16ubuntu2) zesty; urgency=medium
 
   * control: Add -synaptics to input-all Recommends for linux, and move
 wacom there.
 
- -- Timo Aaltonen   Thu, 20 Oct 2016 20:19:15 +0300
+ -- Timo Aaltonen   Thu, 20 Oct 2016 20:28:30 +0300
 
 xorg (1:7.7+16ubuntu1) zesty; urgency=low
 

commit 53ebf1d3543af0316becab150b9ec3540f370594
Author: Timo Aaltonen 
Date:   Thu Oct 20 20:26:36 2016 +0300

control: Add -synaptics to input-all Recommends for linux, and move wacom 
there.

This adds synaptics back to the list of drivers to install after latest 
merge,
and allows uninstalling synaptics/wacom for easier testing of -libinput.

diff --git a/debian/changelog b/debian/changelog
index 2825838..2e4b413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+16ubuntu2) UNRELEASED; urgency=medium
+
+  * control: Add -synaptics to input-all Recommends for linux, and move
+wacom there.
+
+ -- Timo Aaltonen   Thu, 20 Oct 2016 20:19:15 +0300
+
 xorg (1:7.7+16ubuntu1) zesty; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/control b/debian/control
index f98c639..87e1b8d 100644
--- a/debian/control
+++ b/debian/control
@@ -80,9 +80,10 @@ Depends:
  xserver-xorg-input-libinput [linux-any],
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!linux-any],
- xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
  ${misc:Depends},
 Recommends:
+ xserver-xorg-input-synaptics [linux-any],
+ xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
 Description: X.Org X server -- input driver metapackage
  This package depends on the full suite of input drivers for the X.Org X server
  (Xorg).  It does not provide any drivers itself, and may be removed if you 
wish

xorg: Changes to 'ubuntu'

[Steve Langasek]

 debian/changelog |   62 +++
 debian/control   |7 ++
 2 files changed, 65 insertions(+), 4 deletions(-)

New commits:
commit dca2125abde9bac91e7fa093605ba8681066068e
Author: Cyril Brulebois 
Date:   Thu Jul 14 15:33:07 2016 +0200

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index c749469..b21f7cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+16) UNRELEASED; urgency=medium
+xorg (1:7.7+16) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * control: Drop -evdev and -synaptics from x-x-input-all Depends for
@@ -14,7 +14,7 @@ xorg (1:7.7+16) UNRELEASED; urgency=medium
 with Xorg's vmmouse driver but works with the generic evdev and
 libinput drivers. Closes: #831286
 
- -- Timo Aaltonen   Thu, 09 Jun 2016 14:10:30 +0300
+ -- Cyril Brulebois   Thu, 14 Jul 2016 15:32:12 +0200
 
 xorg (1:7.7+15) unstable; urgency=medium
 

commit c19bd1e1fa4606548628e644e7878103677fe01d
Author: Cyril Brulebois 
Date:   Thu Jul 14 15:32:07 2016 +0200

Drop xserver-xorg-input-vmmouse from xserver-xorg-input-all Depends 
(Closes: #831286).

The kernel driver for the VMware mouse device is incompatible with
Xorg's vmmouse driver but works with the generic evdev and libinput
drivers.

diff --git a/debian/changelog b/debian/changelog
index 5bd8e3c..c749469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ xorg (1:7.7+16) UNRELEASED; urgency=medium
   * Drop xserver-xorg-input-void from s390x.  The server can come up with no
 input devices nowadays, -input-void isn't necessary.
 
+  [ Cyril Brulebois ]
+  * Drop xserver-xorg-input-vmmouse from xserver-xorg-input-all Depends,
+since the kernel driver for the VMware mouse device is incompatible
+with Xorg's vmmouse driver but works with the generic evdev and
+libinput drivers. Closes: #831286
+
  -- Timo Aaltonen   Thu, 09 Jun 2016 14:10:30 +0300
 
 xorg (1:7.7+15) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 67c765b..080af84 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,6 @@ Depends:
  xserver-xorg-input-libinput [linux-any],
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!linux-any],
- xserver-xorg-input-vmmouse [amd64 i386 x32],
  ${misc:Depends},
 Recommends:
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],

commit c27bf3b31daf30db47663fcbcd3bdd9596cc3a08
Author: Julien Cristau 
Date:   Thu Jun 16 08:28:21 2016 +0200

Drop xserver-xorg-input-void from s390x.

The server can come up with no input devices nowadays, -input-void isn't
necessary.

diff --git a/debian/changelog b/debian/changelog
index 2e03710..5bd8e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 xorg (1:7.7+16) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * control: Drop -evdev and -synaptics from x-x-input-all Depends for
 linux.
 
+  [ Julien Cristau ]
+  * Drop xserver-xorg-input-void from s390x.  The server can come up with no
+input devices nowadays, -input-void isn't necessary.
+
  -- Timo Aaltonen   Thu, 09 Jun 2016 14:10:30 +0300
 
 xorg (1:7.7+15) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6ae964e..67c765b 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,6 @@ Depends:
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!linux-any],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
- xserver-xorg-input-void [s390x],
  ${misc:Depends},
 Recommends:
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],

commit efa0e40bf2dc0cd237c038e4c354fc5c8b24c184
Author: Timo Aaltonen 
Date:   Thu Jun 9 14:34:08 2016 +0300

fix x-x-i-all dep on synaptics

diff --git a/debian/control b/debian/control
index 68cde96..6ae964e 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Depends:
  xserver-xorg-input-kbd [!linux-any],
  xserver-xorg-input-libinput [linux-any],
  xserver-xorg-input-mouse [!linux-any],
- xserver-xorg-input-synaptics [hurd-any kfreebsd-any !s390x],
+ xserver-xorg-input-synaptics [!linux-any],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
  xserver-xorg-input-void [s390x],
  ${misc:Depends},

commit e80e7ec285c353ecf59c2deeed759ed7c16cff50
Author: Timo Aaltonen 
Date:   Thu Jun 9 14:10:53 2016 +0300

control: Drop -evdev and -synaptics from x-x-input-all Depends for linux.

diff --git a/debian/changelog b/debian/changelog
index f499df0..2e03710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+16) UNRELEASED; urgency=medium
+
+  * control: Drop -evdev and -synaptics from x-x-input-all Depends for
+linux.
+
+ -- Timo Aaltonen   Thu, 09 Jun 2016 14:10:30 +0300
+
 

xorg: Changes to 'ubuntu'

[Steve Langasek]

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

New commits:
commit 9492ec65c75d3fe9de2bbd691b0c29a9330fc2b1
Author: Steve Langasek 
Date:   Tue Sep 27 10:09:19 2016 -0700

releasing package xorg version 1:7.7+13ubuntu4

diff --git a/debian/changelog b/debian/changelog
index 029a254..d1dd990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xorg (1:7.7+13ubuntu4) UNRELEASED; urgency=medium
+xorg (1:7.7+13ubuntu4) yakkety; urgency=medium
 
+  [ Timo Aaltonen ]
   * control: Drop vmmouse from -input-all depends, our kernel has had
 the virtual driver for some time.
 
- -- Timo Aaltonen   Wed, 03 Aug 2016 01:54:36 +0300
+ -- Steve Langasek   Tue, 27 Sep 2016 10:08:59 -0700
 
 xorg (1:7.7+13ubuntu3) xenial; urgency=medium
 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit d7f18a8725a363fc8e943e0ca186ccecf5d98461
Author: Timo Aaltonen 
Date:   Wed Aug 3 01:56:02 2016 +0300

control: Drop vmmouse from -input-all depends, our kernel has had the 
virtual driver for some time.

diff --git a/debian/changelog b/debian/changelog
index b286dd3..029a254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu4) UNRELEASED; urgency=medium
+
+  * control: Drop vmmouse from -input-all depends, our kernel has had
+the virtual driver for some time.
+
+ -- Timo Aaltonen   Wed, 03 Aug 2016 01:54:36 +0300
+
 xorg (1:7.7+13ubuntu3) xenial; urgency=medium
 
   * control: Drop freedreno and void from video/input-all so that they
diff --git a/debian/control b/debian/control
index 4bb1398..4421d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,6 @@ Depends:
  xserver-xorg-input-kbd [!linux-any],
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!s390x],
- xserver-xorg-input-vmmouse [amd64 i386 x32],
 # xserver-xorg-input-void [s390x],
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
  ${misc:Depends},

commit caf55a20346d71f40b8544f9c27f3eec558b6d1f
Author: Timo Aaltonen 
Date:   Fri Mar 4 16:53:41 2016 +0200

control: Drop freedreno and void from video/input-all so that they don't 
block the transition while MIR's are being processed.

diff --git a/debian/changelog b/debian/changelog
index fb304fc..b286dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu3) xenial; urgency=medium
+
+  * control: Drop freedreno and void from video/input-all so that they
+don't block the transition while MIR's are being processed.
+
+ -- Timo Aaltonen   Fri, 04 Mar 2016 16:53:04 +0200
+
 xorg (1:7.7+13ubuntu2) xenial; urgency=medium
 
   * control: Demote -intel to -video-all Recommends, allowing uninstall
diff --git a/debian/control b/debian/control
index 29814a9..4bb1398 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Depends:
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [armel armhf],
+# xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
@@ -81,7 +81,7 @@ Depends:
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!s390x],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
- xserver-xorg-input-void [s390x],
+# xserver-xorg-input-void [s390x],
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
  ${misc:Depends},
 Recommends:

commit bcae57cba1be70bb37ea43735fe5e6b8d3436124
Author: Timo Aaltonen 
Date:   Thu Feb 18 07:38:40 2016 +0200

release to staging ppa

diff --git a/debian/changelog b/debian/changelog
index 3a485db..fb304fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+13ubuntu2) UNRELEASED; urgency=medium
+xorg (1:7.7+13ubuntu2) xenial; urgency=medium
 
   * control: Demote -intel to -video-all Recommends, allowing uninstall
 without removing the metapackage.

commit d501af1ecf3d6bd8526ff58ff549ba58b59c1121
Author: Timo Aaltonen 
Date:   Thu Feb 18 07:35:25 2016 +0200

control: Demote -intel to -video-all Recommends, allowing uninstall without 
removing the metapackage.

diff --git a/debian/changelog b/debian/changelog
index 68e78bf..3a485db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu2) UNRELEASED; urgency=medium
+
+  * control: Demote -intel to -video-all Recommends, allowing uninstall
+without removing the metapackage.
+
+ -- Timo Aaltonen   Thu, 18 Feb 2016 07:35:17 +0200
+
 xorg (1:7.7+13ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff --git a/debian/control b/debian/control
index 063d043..29814a9 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,12 @@ Depends:
  xserver-xorg-video-fbdev [!s390x],
  xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
- xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
  xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],
  ${misc:Depends},
 Recommends:
+ xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-qxl [amd64 i386 x32],
 Suggests:
  xserver-xorg-video-geode [i386],

xorg: Changes to 'ubuntu-xenial'

[Timo Aaltonen]

New branch 'ubuntu-xenial' available with the following commits:
commit caf55a20346d71f40b8544f9c27f3eec558b6d1f
Author: Timo Aaltonen 
Date:   Fri Mar 4 16:53:41 2016 +0200

control: Drop freedreno and void from video/input-all so that they don't 
block the transition while MIR's are being processed.

commit bcae57cba1be70bb37ea43735fe5e6b8d3436124
Author: Timo Aaltonen 
Date:   Thu Feb 18 07:38:40 2016 +0200

release to staging ppa

commit d501af1ecf3d6bd8526ff58ff549ba58b59c1121
Author: Timo Aaltonen 
Date:   Thu Feb 18 07:35:25 2016 +0200

control: Demote -intel to -video-all Recommends, allowing uninstall without 
removing the metapackage.

xorg: Changes to 'ubuntu'

[Robert Ancell]

 debian/changelog |   14 ++
 debian/control   |6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 77ea62b8e64a1e0037d2a8b9ef2e3a591dfcd89b
Author: Robert Ancell 
Date:   Mon May 30 16:37:21 2016 +1200

control: Drop freedreno and void from video/input-all so that they don't 
block the transition while MIR's are being processed.

diff --git a/debian/changelog b/debian/changelog
index fb304fc..b286dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu3) xenial; urgency=medium
+
+  * control: Drop freedreno and void from video/input-all so that they
+don't block the transition while MIR's are being processed.
+
+ -- Timo Aaltonen   Fri, 04 Mar 2016 16:53:04 +0200
+
 xorg (1:7.7+13ubuntu2) xenial; urgency=medium
 
   * control: Demote -intel to -video-all Recommends, allowing uninstall
diff --git a/debian/control b/debian/control
index 29814a9..4bb1398 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Depends:
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [armel armhf],
+# xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
@@ -81,7 +81,7 @@ Depends:
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!s390x],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
- xserver-xorg-input-void [s390x],
+# xserver-xorg-input-void [s390x],
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
  ${misc:Depends},
 Recommends:

commit 10166896cba4331891b9a40912f2abd6cb63a135
Author: Robert Ancell 
Date:   Mon May 30 16:37:03 2016 +1200

control: Demote -intel to -video-all Recommends, allowing uninstall without 
removing the metapackage.

diff --git a/debian/changelog b/debian/changelog
index 68e78bf..fb304fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu2) xenial; urgency=medium
+
+  * control: Demote -intel to -video-all Recommends, allowing uninstall
+without removing the metapackage.
+
+ -- Timo Aaltonen   Thu, 18 Feb 2016 07:35:17 +0200
+
 xorg (1:7.7+13ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff --git a/debian/control b/debian/control
index 063d043..29814a9 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,12 @@ Depends:
  xserver-xorg-video-fbdev [!s390x],
  xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
- xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
  xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],
  ${misc:Depends},
 Recommends:
+ xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-qxl [amd64 i386 x32],
 Suggests:
  xserver-xorg-video-geode [i386],

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/README.source   |   24 -
 debian/changelog   |   21 +
 debian/control |5 
 debian/rules   |2 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 xsf-docs/Makefile  |2 
 8 files changed, 25 insertions(+), 968 deletions(-)

New commits:
commit a67f3864b46aadbe694f0a820372cf0027eb8c22
Author: Timo Aaltonen 
Date:   Fri Feb 5 18:00:06 2016 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 6567a2f..68e78bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+13ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen   Fri, 05 Feb 2016 17:56:38 +0200
+
 xorg (1:7.7+13) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 49c7887cf9ebb204dc5325740e9c4c309e5fb0f5
Author: Timo Aaltonen 
Date:   Tue Jan 26 18:29:28 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 8ec9dd4..7c25b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+13) UNRELEASED; urgency=medium
+xorg (1:7.7+13) unstable; urgency=medium
 
   [ Andreas Boll ]
   * Merge xsf-docs up to 13946cb commit:
@@ -11,7 +11,7 @@ xorg (1:7.7+13) UNRELEASED; urgency=medium
   [ Timo Aaltonen ]
   * control: Add xserver-xorg-video-amdgpu to -video-all Depends.
 
- -- Andreas Boll   Tue, 13 Oct 2015 11:04:42 +0200
+ -- Timo Aaltonen   Tue, 26 Jan 2016 18:24:15 +0200
 
 xorg (1:7.7+12) unstable; urgency=medium
 

commit 54cc9ec87a445f5facc44a82c6da446c2d141abf
Author: Andreas Boll 
Date:   Tue Jan 26 16:06:04 2016 +0100

Bump Standards-Version to 3.9.6 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 93993f8..8ec9dd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg (1:7.7+13) UNRELEASED; urgency=medium
   Thanks, Eduard Sanou!
   * rules: Remove unused variable ARCH.
   * Delete obsolete debian/xsfbs.
+  * Bump Standards-Version to 3.9.6 (no changes needed).
 
   [ Timo Aaltonen ]
   * control: Add xserver-xorg-video-amdgpu to -video-all Depends.
diff --git a/debian/control b/debian/control
index b7fc597..7de60f2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends:
  dpkg (>= 1.16.1),
  debhelper (>= 9),

commit b8d5a97cdb23b68f745b1d49764024a6c0450598
Author: Andreas Boll 
Date:   Tue Jan 26 16:04:04 2016 +0100

Remove kfreebsd from -amdgpu

-amdgpu is not yet supported on kfreebsd.

diff --git a/debian/control b/debian/control
index a719095..b7fc597 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Description: X.Org X server
 Package: xserver-xorg-video-all
 Architecture: any
 Depends:
- xserver-xorg-video-amdgpu [!hurd-any !s390x],
+ xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
  xserver-xorg-video-freedreno [armel armhf],

commit 85e6b361a476549644ed915b612286587b6ef608
Author: Timo Aaltonen 
Date:   Tue Jan 26 15:12:56 2016 +0200

fix -amdgpu archs to match -ati

diff --git a/debian/control b/debian/control
index 3f68220..a719095 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Description: X.Org X server
 Package: xserver-xorg-video-all
 Architecture: any
 Depends:
- xserver-xorg-video-amdgpu [amd64 i386 kfreebsd-any x32],
+ xserver-xorg-video-amdgpu [!hurd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
  xserver-xorg-video-freedreno [armel armhf],

commit fb0ec0934a498623d0e8058c44991e5011e0271c
Author: Timo Aaltonen 
Date:   Wed Jan 20 23:55:34 2016 +0200

control: Add xserver-xorg-video-amdgpu to -video-all Depends.

diff --git a/debian/changelog b/debian/changelog
index 7f59c09..93993f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xorg (1:7.7+13) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Merge xsf-docs up to 13946cb commit:
 - makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
   Thanks, Eduard Sanou!
   * rules: Remove unused variable ARCH.
   * Delete obsolete debian/xsfbs.
 
+  [ Timo Aaltonen ]
+  * control: Add xserver-xorg-video-amdgpu to -video-all Depends.
+
  -- Andreas Boll   Tue, 13 Oct 2015 11:04:42 +0200
 
 xorg (1:7.7+12) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e882038..3f68220 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/TODO|4 
 debian/changelog   |   86 +
 debian/compat  |2 
 debian/control |   38 
 debian/local/Xwrapper.config.5 |  103 --
 debian/local/xserver-wrapper.c |  379 ---
 debian/po/POTFILES.in  |1 
 debian/po/ar.po|  462 -
 debian/po/ast.po   |  495 --
 debian/po/be.po|  464 -
 debian/po/bg.po| 1023 -
 debian/po/bn.po|  176 ---
 debian/po/bs.po| 1032 -
 debian/po/ca.po|  505 --
 debian/po/cs.po| 1506 ---
 debian/po/da.po| 1628 -
 debian/po/de.po| 1049 -
 debian/po/dz.po| 1003 
 debian/po/el.po|  524 --
 debian/po/eo.po|  473 -
 debian/po/es.po| 1066 --
 debian/po/eu.po|  497 --
 debian/po/fi.po| 1002 
 debian/po/fr.po|  521 --
 debian/po/gl.po| 1350 
 debian/po/gu.po|  451 -
 debian/po/he.po|  451 -
 debian/po/hr.po|  984 
 debian/po/hu.po| 1412 -
 debian/po/id.po|  481 --
 debian/po/it.po| 1052 -
 debian/po/ja.po|  482 --
 debian/po/kk.po|  450 -
 debian/po/km.po|  963 
 debian/po/ko.po|  454 -
 debian/po/ku.po|   76 -
 debian/po/lt.po|  985 
 debian/po/ml.po|  476 -
 debian/po/mr.po|  983 
 debian/po/nb.po|  991 
 debian/po/ne.po|  991 
 debian/po/nl.po| 1752 
 debian/po/nn.po| 1016 -
 debian/po/pl.po| 1646 --
 debian/po/pothead.in   |   30 
 debian/po/pt.po| 1605 -
 debian/po/pt_BR.po | 1779 -
 debian/po/ro.po|  510 --
 debian/po/ru.po| 1025 -
 debian/po/sk.po|  976 
 debian/po/sq.po| 1021 -
 debian/po/sr.po|   60 -
 debian/po/s...@latin.po  |   61 -
 debian/po/sv.po|  504 --
 debian/po/ta.po|  983 
 debian/po/templates.pot|   53 -
 debian/po/th.po|  929 ---
 debian/po/tr.po| 1025 -
 debian/po/vi.po|  468 -
 debian/po/wo.po|  483 --
 debian/po/zh_CN.po |  932 ---
 debian/po/zh_TW.po |  925 ---
 debian/rules   |  148 ---
 debian/scripts/vars.alpha  |   26 
 debian/scripts/vars.amd64  |   36 
 debian/scripts/vars.arm|   18 
 debian/scripts/vars.arm64  |8 
 debian/scripts/vars.armeb  |   19 
 debian/scripts/vars.armel  |   18 
 debian/scripts/vars.armhf  |   14 
 debian/scripts/vars.hppa   |   18 
 debian/scripts/vars.hurd-i386  |   20 
 debian/scripts/vars.i386   |   42 
 debian/scripts/vars.ia64   |   23 
 debian/scripts/vars.kfreebsd-amd64 |   20 
 debian/scripts/vars.kfreebsd-i386  |   22 
 debian/scripts/vars.m32r   |   26 
 debian/scripts/vars.m68k   |   24 
 debian/scripts/vars.mips   |   26 
 debian/scripts/vars.mipsel |   26 
 debian/scripts/vars.powerpc|   24 
 debian/scripts/vars.powerpcspe |   24 
 debian/scripts/vars.ppc64  |   14 
 debian/scripts/vars.ppc64el|7 
 debian/scripts/vars.s390   |8 
 debian/scripts/vars.s390x  |8 
 debian/scripts/vars.sh4|   28 
 debian/scripts/vars.sparc  |   24 
 debian/scripts/vars.sparc64|   24 
 debian/scripts/vars.x32|1 
 debian/x11-common.config.in|   89 -
 debian/x11-common.manpages |1 
 debian/x11-common.postinst |  

xorg: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog|   23 +++
 debian/control  |8 ++---
 debian/local/xserver-wrapper.c  |   38 ++---
 debian/scripts/vars.amd64   |1 
 debian/scripts/vars.arm64   |1 
 debian/scripts/vars.armhf   |2 -
 debian/scripts/vars.i386|1 
 debian/scripts/vars.ppc64el |1 
 debian/x11-common.init  |2 +
 debian/xserver-xorg.postinst.in |   60 
 debian/xserver-xorg.preinst.in  |   32 -
 debian/xserver-xorg.prerm.in|   33 --
 12 files changed, 50 insertions(+), 152 deletions(-)

New commits:
commit 9a9063f58e9117ed3d72a909b57d5abdeaa281a7
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Thu Mar 12 13:27:51 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 1f518ef..da633b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+xorg (1:7.7+7ubuntu3) vivid; urgency=medium
 
   * Modesetting has been removed, remove from vars.
   * Do not require vesa on armhf, only fbdev is useful.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 09 Mar 2015 
11:46:22 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 09 Mar 2015 
11:51:24 +0100
 
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 

commit 999f9dbce073dc385000d7ecdd723235654a4b74
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Mar 9 11:48:25 2015 +0100

Remove modesetting driver from all archs, and only require fbdev on armhf.

Modesetting has been moved to xorg-server now.

diff --git a/debian/changelog b/debian/changelog
index 5ba80df..1f518ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+
+  * Modesetting has been removed, remove from vars.
+  * Do not require vesa on armhf, only fbdev is useful.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 09 Mar 2015 
11:46:22 +0100
+
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca7cae8..88b3807 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Package: xserver-xorg
 Architecture: any
 Depends:
  xserver-xorg-core (= 2:1.15.0.901),
- xserver-xorg-video-all | xorg-driver-video,
+ xserver-xorg-video-all | xserver-xorg-core (= 2:1.17) | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],
  ${shlibs:Depends},
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 1d86e89..f6c115c 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
-   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
index 3a9a86e..8ce095a 100644
--- a/debian/scripts/vars.arm64
+++ b/debian/scripts/vars.arm64
@@ -1,6 +1,5 @@
 XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-modesetting, \
 
 
 XSERVER_XORG_INPUT_DEPENDS=\
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index cb63601..e281045 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,8 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-modesetting, \
-   xserver-xorg-video-vesa, \
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 922e152..3938700 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
-   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el
index 54348df..e963f06 100644
--- a/debian/scripts/vars.ppc64el
+++ b/debian/scripts/vars.ppc64el
@@ -1,6 +1,5 @@
 XSERVER_XORG_VIDEO_DEPENDS=\
 xserver-xorg-video-fbdev, \
-xserver-xorg-video-modesetting, \
 
 
 XSERVER_XORG_INPUT_DEPENDS=\

commit 92e0aab7088619401247107911e2ecb4804a47d7
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Feb 9 10:48:56 2015 +0100

Cope with /etc/X11/X not existing.

Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
Remove creation of /etc/X11/X symlink, but keep existing.
Do not chdir to /etc/X11 if the symlink has an absolute 

xorg: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

New branch 'ubuntu-trusty' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcadb-0002om...@moszumanska.debian.org

xorg: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |   18 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 3f3595e88120b0a1f4ca11152190df597c656766
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Oct 9 11:54:59 2014 +0200

Fixup the xorg packages to work correctly with the renamed utopic stack.

diff --git a/debian/changelog b/debian/changelog
index d2198da..a77530f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+1ubuntu8.1) UNRELEASED; urgency=medium
+
+  * Fixup the xorg packages to work correctly with the renamed utopic stack.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 09 Oct 2014 
11:46:23 +0200
+
 xorg (1:7.7+1ubuntu8) trusty; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/control b/debian/control
index 272ab8e..d95bc6f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,9 @@ Package: xserver-xorg
 Architecture: any
 Depends:
  xserver-xorg-core (= 2:1.11) | xserver-xorg-core-omap-revert [armhf],
- xserver-xorg-video-all  | xserver-xorg-video-omap-revert [armhf] | 
xorg-driver-video,
- xserver-xorg-input-all | xorg-driver-input,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-video-all (= 0~) | xorg-driver-video,
+ xserver-xorg-input-all (= 0~) | xorg-driver-input,
+ xserver-xorg-input-evdev (= 0~) [linux-any],
  hal (= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
@@ -44,7 +44,15 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
-Provides: xserver
+Provides:
+ xserver-xorg-renamed,
+ xserver,
+Replaces:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Conflicts:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server.  It does not provide the actual server itself.
@@ -78,7 +86,7 @@ Description: X.Org X server -- input driver metapackage
 Package: xorg
 Architecture: any
 Depends:
- xserver-xorg (= ${binary:Version}),
+ xserver-xorg (= ${binary:Version}) | xserver-xorg-renamed,
  libgl1-mesa-glx | libgl1 [!armhf],
  libgl1-mesa-dri [!armhf],
  libglu1-mesa [!armhf],


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcaz2-0005lr...@moszumanska.debian.org

xorg: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |7 +++
 debian/control   |3 +++
 debian/rules |3 ++-
 debian/scripts/vars.i386 |6 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit ebe0873b6062871b3dd4f3503f1220e9037d01b8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Sep 15 10:42:24 2014 +0200

Lower geode to suggests. (LP: #1368158)

Explicitly add inkscape to build-depends.

diff --git a/debian/changelog b/debian/changelog
index c275b14..8a9ff90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+7ubuntu2) utopic; urgency=medium
+
+  * Lower geode to suggests. (LP: #1368158)
+  * Explicitly add inkscape to build-depends.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 15 Sep 2014 
09:36:48 +0200
+
 xorg (1:7.7+7ubuntu1) utopic; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 44c7de2..9090ed1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
  po-debconf,
 # xsf-docs:
  asciidoc,
+ inkscape,
 Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
@@ -55,6 +56,8 @@ Depends:
  ${misc:Depends},
 Recommends:
  ${F:XServer-Xorg-Video-Recommends},
+Suggests:
+ ${F:XServer-Xorg-Video-Suggests},
 Replaces: xserver-xorg-driver-all
 Conflicts: xserver-xorg-driver-all
 Description: X.Org X server -- output driver metapackage
diff --git a/debian/rules b/debian/rules
index 676942e..7bd6397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,7 +139,8 @@ binary-arch: build install
dh_gencontrol -- 
-VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
 
-VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
 
-VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) \
-
-VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS)
+
-VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS) \
+
-VF:XServer-Xorg-Video-Suggests=$(XSERVER_XORG_VIDEO_SUGGESTS)
dh_md5sums
dh_builddeb
touch $@-stamp
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 8cd7d79..922e152 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -24,11 +24,15 @@ XSERVER_XORG_VIDEO_DEPENDS= \
 
 
 XSERVER_XORG_VIDEO_RECOMMENDS= \
-   xserver-xorg-video-geode, \
xserver-xorg-video-qxl, \
 
 
 
+XSERVER_XORG_VIDEO_SUGGESTS= \
+   xserver-xorg-video-geode, \
+
+
+
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-vmmouse, \
xserver-xorg-input-synaptics, \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xtrto-00026d...@moszumanska.debian.org

xorg: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

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

New commits:
commit d76e1ef528f2d7ed78b94952d67b96e9050666ae
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Wed Sep 10 20:04:29 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 521c9d5..c275b14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xorg (1:7.7+7ubuntu1) UNRELEASED; urgency=medium
+xorg (1:7.7+7ubuntu1) utopic; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from debian.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 31 Jan 2014 15:32:24 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 10 Sep 2014 
20:04:07 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xrofo-0007bo...@moszumanska.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |   64 +
 debian/scripts/vars.alpha  |   13 ---
 debian/scripts/vars.amd64  |   11 +++---
 debian/scripts/vars.arm|4 +-
 debian/scripts/vars.arm64  |   13 ---
 debian/scripts/vars.armeb  |6 ++-
 debian/scripts/vars.armel  |8 ++--
 debian/scripts/vars.armhf  |4 +-
 debian/scripts/vars.hppa   |4 --
 debian/scripts/vars.hurd-i386  |   13 +--
 debian/scripts/vars.i386   |   11 ++
 debian/scripts/vars.ia64   |8 
 debian/scripts/vars.kfreebsd-amd64 |   13 +--
 debian/scripts/vars.kfreebsd-i386  |   13 +--
 debian/scripts/vars.m32r   |   12 --
 debian/scripts/vars.m68k   |   12 --
 debian/scripts/vars.mips   |   13 ---
 debian/scripts/vars.mipsel |   12 --
 debian/scripts/vars.powerpc|2 -
 debian/scripts/vars.ppc64  |4 --
 debian/scripts/vars.sh4|   13 ---
 debian/scripts/vars.sparc  |   13 ---
 debian/scripts/vars.sparc64|   13 ---
 xsf-docs/howto/report-bugs.txt |   11 ++
 24 files changed, 129 insertions(+), 161 deletions(-)

New commits:
commit 6f8db04dce78d4c7eb8129f1da42cd9a9ea4b950
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sat Jan 11 12:31:55 2014 +0200

import changes from distro

diff --git a/debian/changelog b/debian/changelog
index 5a4ac25..bf210d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu8) UNRELEASED; urgency=low
 
   [ Bryce Harrington ]
   * scripts/vars.arm*: Don't include -ati or -nouveau, to save
@@ -11,6 +11,18 @@ xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 18 Feb 2013 
16:17:23 +
 
+xorg (1:7.7+1ubuntu7) trusty; urgency=medium
+
+  * Just depend on xserver-xorg-video-dummy on ppc64el.
+
+ -- Matthias Klose d...@ubuntu.com  Wed, 18 Dec 2013 12:11:13 +0100
+
+xorg (1:7.7+1ubuntu6) saucy; urgency=low
+
+  * Just depend on xserver-xorg-video-dummy on AArch64.
+
+ -- Matthias Klose d...@ubuntu.com  Thu, 10 Oct 2013 15:56:36 +0200
+
 xorg (1:7.7+1ubuntu5) raring; urgency=low
 
   * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
new file mode 100644
index 000..525866e
--- /dev/null
+++ b/debian/scripts/vars.arm64
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-dummy
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-void
diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el
new file mode 100644
index 000..525866e
--- /dev/null
+++ b/debian/scripts/vars.ppc64el
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-dummy
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-void

commit 6fa6baee21b317dc311f528b826b7b01749378df
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 19:57:04 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8b7ff1c..1abe9aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+5) UNRELEASED; urgency=medium
+xorg (1:7.7+5) unstable; urgency=medium
 
   * Add minimal arm64 support (using fbdev/evdev drivers); closes: #731766.
 Thanks, Wookey!
 
- -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 19:53:43 +0100
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 19:56:46 +0100
 
 xorg (1:7.7+4) unstable; urgency=low
 

commit 7bda7f24b64b9f20860e22e51219cd1588329bcd
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 19:55:51 2013 +0100

Add minimal arm64 support (using fbdev/evdev drivers)

diff --git a/debian/changelog b/debian/changelog
index e24c718..8b7ff1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+5) UNRELEASED; urgency=medium
+
+  * Add minimal arm64 support (using fbdev/evdev drivers); closes: #731766.
+Thanks, Wookey!
+
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 19:53:43 +0100
+
 xorg (1:7.7+4) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
new file mode 100644
index 000..3a9a86e
--- /dev/null
+++ b/debian/scripts/vars.arm64
@@ -0,0 +1,9 @@
+XSERVER_XORG_VIDEO_DEPENDS=\
+   xserver-xorg-video-fbdev, \
+   xserver-xorg-video-modesetting, \
+
+
+XSERVER_XORG_INPUT_DEPENDS=\
+   xserver-xorg-input-evdev, \
+
+

commit 3d8373a67966ad2b4b169b233a8545d8bad306e9
Author: Julien Cristau jcris...@debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog|   16 ++--
 debian/scripts/vars.arm64   |8 
 debian/scripts/vars.ppc64el |8 
 3 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit 01b5f3727abc81a4981d2131171e8607fa9ae37f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 29 16:08:09 2014 +0100

release to trusty

diff --git a/debian/changelog b/debian/changelog
index bf210d2..d2198da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1ubuntu8) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu8) trusty; urgency=low
 
   [ Bryce Harrington ]
   * scripts/vars.arm*: Don't include -ati or -nouveau, to save
@@ -9,7 +9,7 @@ xorg (1:7.7+1ubuntu8) UNRELEASED; urgency=low
   * Drop libgl1-mesa-glx, -dri, and libglu from armhf; these are highly likely
 to be useless on an armhf system.
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 18 Feb 2013 
16:17:23 +
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 29 Jan 2014 
16:07:39 +0100
 
 xorg (1:7.7+1ubuntu7) trusty; urgency=medium
 

commit 9eed9bd9cc485ee56331e466823a43d9635223cd
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 29 16:06:15 2014 +0100

Just depend on xserver-xorg-video-dummy on ppc64el.

diff --git a/debian/changelog b/debian/changelog
index 79712f7..bf210d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1ubuntu7) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu8) UNRELEASED; urgency=low
 
   [ Bryce Harrington ]
   * scripts/vars.arm*: Don't include -ati or -nouveau, to save
@@ -11,6 +11,12 @@ xorg (1:7.7+1ubuntu7) UNRELEASED; urgency=low
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 18 Feb 2013 
16:17:23 +
 
+xorg (1:7.7+1ubuntu7) trusty; urgency=medium
+
+  * Just depend on xserver-xorg-video-dummy on ppc64el.
+
+ -- Matthias Klose d...@ubuntu.com  Wed, 18 Dec 2013 12:11:13 +0100
+
 xorg (1:7.7+1ubuntu6) saucy; urgency=low
 
   * Just depend on xserver-xorg-video-dummy on AArch64.
diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el
new file mode 100644
index 000..525866e
--- /dev/null
+++ b/debian/scripts/vars.ppc64el
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-dummy
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-void

commit 6a0a7e813a595b552df54f74a3dae4150ba9f109
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 29 16:04:53 2014 +0100

Just depend on xserver-xorg-video-dummy on AArch64.

diff --git a/debian/changelog b/debian/changelog
index 5a4ac25..79712f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu7) UNRELEASED; urgency=low
 
   [ Bryce Harrington ]
   * scripts/vars.arm*: Don't include -ati or -nouveau, to save
@@ -11,6 +11,12 @@ xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 18 Feb 2013 
16:17:23 +
 
+xorg (1:7.7+1ubuntu6) saucy; urgency=low
+
+  * Just depend on xserver-xorg-video-dummy on AArch64.
+
+ -- Matthias Klose d...@ubuntu.com  Thu, 10 Oct 2013 15:56:36 +0200
+
 xorg (1:7.7+1ubuntu5) raring; urgency=low
 
   * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
new file mode 100644
index 000..525866e
--- /dev/null
+++ b/debian/scripts/vars.arm64
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-dummy
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-void


-- 
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/e1w8wxm-0003nz...@moszumanska.debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |   10 +-
 debian/control   |4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 6d5792f641fa606aa11b0a1b61af0d920561ad89
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Sep 24 10:19:27 2013 +0200

Import xorg package from saucy.

diff --git a/debian/changelog b/debian/changelog
index 45b24b3..95151ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+1ubuntu5) raring; urgency=low
+
+  * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to
+satisfy depends on armhf.
+- Allows building a custom armhf server there.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 07 May 2013 
16:29:10 +0200
+
 xorg (1:7.7+1ubuntu4) quantal; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 04fe8e0..b699c03 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Description: X Window System (X.Org) infrastructure
 Package: xserver-xorg
 Architecture: any
 Depends:
- xserver-xorg-core (= 2:1.11),
- xserver-xorg-video-all | xorg-driver-video,
+ xserver-xorg-core (= 2:1.11) | xserver-xorg-core-omap-revert [armhf],
+ xserver-xorg-video-all  | xserver-xorg-video-omap-revert [armhf] | 
xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],
  hal (= 0.5.14-4~) [kfreebsd-any],


-- 
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/e1vonus-0005dl...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

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

New commits:
commit a0243bb16f056d57571bf30f977d5c002eeefd64
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Mon Feb 18 16:18:06 2013 +

Remove glx bits on armhf

These are unlikely to be useful on an armhf machine

diff --git a/debian/changelog b/debian/changelog
index 5d9886e..4f989ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 xorg (1:7.7+1ubuntu5) UNRELEASED; urgency=low
 
+  [ Bryce Harrington ]
   * scripts/vars.arm*: Don't include -ati or -nouveau, to save
 installation space.  The drivers build for some arm targets, but no
 known devices actually work with them.
 
- -- Bryce Harrington br...@ubuntu.com  Mon, 26 Nov 2012 12:15:57 -0800
+  [ Christopher James Halse Rogers ]
+  * Drop libgl1-mesa-glx, -dri, and libglu from armhf; these are highly likely
+to be useless on an armhf system.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 18 Feb 2013 
16:17:23 +
 
 xorg (1:7.7+1ubuntu4) quantal; urgency=low
 
diff --git a/debian/control b/debian/control
index 04fe8e0..fbb34b3 100644
--- a/debian/control
+++ b/debian/control
@@ -79,9 +79,9 @@ Package: xorg
 Architecture: any
 Depends:
  xserver-xorg (= ${binary:Version}),
- libgl1-mesa-glx | libgl1,
- libgl1-mesa-dri,
- libglu1-mesa,
+ libgl1-mesa-glx | libgl1 [!armhf],
+ libgl1-mesa-dri [!armhf],
+ libglu1-mesa [!armhf],
  xfonts-base (= 1:1.0.0-1),
  x11-apps,
  x11-session-utils,


-- 
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/e1u7tqb-0002km...@vasks.debian.org

xorg: Changes to 'ubuntu-precise'

[Maarten Lankhorst]

New branch 'ubuntu-precise' available with the following commits:


-- 
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/e1tqn8a-0004qb...@vasks.debian.org

xorg: Changes to 'ubuntu-precise'

[Maarten Lankhorst]

 debian/changelog |   45 ++-
 debian/control   |   31 ++-
 debian/local/Xsession.5  |7 +
 debian/local/Xsession.d/35x11-common_xhost-local |   10 ++
 debian/x11-common.init   |   90 +++
 5 files changed, 146 insertions(+), 37 deletions(-)

New commits:
commit ef5475bed21e8090a0d029e114890dfe7e389b21
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jan 3 16:58:51 2013 +0100

sync with xorg 7.6+12ubuntu2 uploaded to precise

diff --git a/debian/changelog b/debian/changelog
index 7e8fd25..7196ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg (1:7.6+12ubuntu2) precise-proposed; urgency=low
+
+  * Update package to enable support for quantal backport stack (LP: #1095686)
+  * Add xserver-xorg-lts-precise which can be installed to rollback from 
renamed stack
+- depends on unrenamed xserver-xorg, recommends unrenamed versions of 
packages
+  * Allow xserver-xorg-renamed to satisfy xorg's xserver-xorg dependency
+  * Require unrenamed versions of packages in xserver-xorg
+  * Add conflicts/replaces in xserver-xorg to xorg-renamed-package,
+and provide xserver-xorg-renamed
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 22 Nov 2012 
00:00:43 +0100
+
 xorg (1:7.6+12ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable.
diff --git a/debian/control b/debian/control
index 04fe8e0..6effb2a 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,9 @@ Package: xserver-xorg
 Architecture: any
 Depends:
  xserver-xorg-core (= 2:1.11),
- xserver-xorg-video-all | xorg-driver-video,
- xserver-xorg-input-all | xorg-driver-input,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-video-all (= 0~) | xorg-driver-video,
+ xserver-xorg-input-all (= 0~) | xorg-driver-input,
+ xserver-xorg-input-evdev (= 0~) [linux-any],
  hal (= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
@@ -44,7 +44,28 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
-Provides: xserver
+Provides:
+ xserver-xorg-renamed,
+ xserver,
+Replaces:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Conflicts:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Description: X.Org X server
+ This package depends on the full suite of the server and drivers for the
+ X.Org X server.  It does not provide the actual server itself.
+
+Package: xserver-xorg-lts-precise
+Architecture: any
+Depends:
+ xserver-xorg (= 0~),
+Recommends:
+ libgl1-mesa-dri (= 0~),
+ libgl1-mesa-glx (= 0~),
+ xserver-xorg-video-all (= 0~),
+ xserver-xorg-input-all (= 0~),
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server.  It does not provide the actual server itself.
@@ -78,7 +99,7 @@ Description: X.Org X server -- input driver metapackage
 Package: xorg
 Architecture: any
 Depends:
- xserver-xorg (= ${binary:Version}),
+ xserver-xorg (= ${binary:Version}) | xserver-xorg-renamed,
  libgl1-mesa-glx | libgl1,
  libgl1-mesa-dri,
  libglu1-mesa,

commit aae5708284ebb931ff4241fe50b21f9033b5f245
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Mar 22 19:42:43 2012 +0200

update the changelog for release

diff --git a/debian/changelog b/debian/changelog
index 0417729..7e8fd25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6+12ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 22 Mar 2012 19:42:07 +0200
+
 xorg (1:7.6+12) unstable; urgency=high
 
   * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the

commit 75d568a94a7ccfb37a51711c9f1ac42f584ec140
Author: Julien Cristau jcris...@debian.org
Date:   Sat Mar 3 18:55:44 2012 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2be2fa8..5f8f3d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+12) UNRELEASED; urgency=high
+xorg (1:7.6+12) unstable; urgency=high
 
   * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the
 x11-common init script.  A malicious user could trick us into changing
@@ -7,7 +7,7 @@ xorg (1:7.6+12) UNRELEASED; urgency=high
 vladz, Tim Morgan and Bernhard R. Link for their help getting this right
 (any remaining bugs are my own).
 
- -- Julien Cristau jcris...@debian.org  Fri, 02 Mar 2012 21:38:07 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 18:54:30 +0100
 
 xorg (1:7.6+11) unstable; urgency=low
 

commit 0418b8dd8fa6940285f7f6b71302655942c15fb7
Author: Julien Cristau jcris...@debian.org
Date:   Fri Mar 2 21:57:56 2012 +0100

Be more careful before running chown/chmod in x11-common.init

Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the 
x11-common
init script.  A malicious user could trick us into changing
ownership/permissions of an 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog  |8 
 debian/scripts/vars.armeb |3 +--
 debian/scripts/vars.armel |3 +--
 debian/scripts/vars.armhf |4 +---
 4 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit ebd8e72e701b5d11c0615ae241effef06265b287
Author: Bryce Harrington br...@canonical.com
Date:   Mon Nov 26 12:18:53 2012 -0800

Drop -ati and -nouveau for default installation on arm.

diff --git a/debian/changelog b/debian/changelog
index 45b24b3..5d9886e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+1ubuntu5) UNRELEASED; urgency=low
+
+  * scripts/vars.arm*: Don't include -ati or -nouveau, to save
+installation space.  The drivers build for some arm targets, but no
+known devices actually work with them.
+
+ -- Bryce Harrington br...@ubuntu.com  Mon, 26 Nov 2012 12:15:57 -0800
+
 xorg (1:7.7+1ubuntu4) quantal; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 1f30685..313eb7a 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,8 +3,7 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
-   xserver-xorg-video-cirrus, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-vesa, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index f9cf9ba..8c83ff8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,8 +3,7 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
-   xserver-xorg-video-fbdev, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-fbdev, \
xserver-xorg-video-modesetting, \
xserver-xorg-video-omap, \
xserver-xorg-video-sisusb, \
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index 5ac6d6a..f77c066 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -3,11 +3,9 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
-   xserver-xorg-video-fbdev, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-fbdev, \
xserver-xorg-video-modesetting, \
xserver-xorg-video-omap, \
-   xserver-xorg-video-nouveau, \
xserver-xorg-video-vesa, \
 
 


-- 
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/e1td59b-0002yn...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit 743fa701de19f38d82350271acaa6b31e13ab87e
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Oct 2 16:57:04 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 15d1e6e..45b24b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xorg (1:7.7+1ubuntu4) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu4) quantal; urgency=low
 
-  * remove xserver-xorg-video-geode
+  [ Maarten Lankhorst ]
+  * scripts/vars.i386: Remove xserver-xorg-video-geode from -video-all.
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 01 Oct 2012 
23:44:37 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 02 Oct 2012 16:56:32 +0300
 
 xorg (1:7.7+1ubuntu3) quantal; 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/e1tj2z3-00080w...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |6 ++
 debian/scripts/vars.i386 |1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9acfa008923cde4113140c2d6ca29a1efb33b59f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Oct 1 23:44:54 2012 +0200

remove xserver-xorg-video-geode

diff --git a/debian/changelog b/debian/changelog
index c8562f5..15d1e6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+1ubuntu4) UNRELEASED; urgency=low
+
+  * remove xserver-xorg-video-geode
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Mon, 01 Oct 2012 
23:44:37 +0200
+
 xorg (1:7.7+1ubuntu3) quantal; urgency=low
 
   * remove xserver-xorg-video-cirrus from armel and hf
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 1390f3b..a26617e 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -7,7 +7,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-geode, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-modesetting, \


-- 
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/e1tinnr-0004mj...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog  |8 
 debian/scripts/vars.amd64 |1 -
 debian/scripts/vars.armel |3 ++-
 debian/scripts/vars.armhf |2 ++
 debian/scripts/vars.i386  |1 -
 5 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 4d20a47d16ec73d9faf05f4baa692445077915cb
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 23 18:59:01 2012 +0200

scripts/vars.*: update video depends

* remove xserver-xorg-video-cirrus from all archs
* add xserver-xorg-video-modesetting to armel and armhf
* add xserver-xorg-video-omap to armel and armhf

diff --git a/debian/changelog b/debian/changelog
index 038b967..675ecc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+1ubuntu3) UNRELEASED; urgency=low
+
+  * remove xserver-xorg-video-cirrus from all archs
+  * add xserver-xorg-video-modesetting to armel and armhf
+  * add xserver-xorg-video-omap to armel and armhf
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
18:57:08 +0200
+
 xorg (1:7.7+1ubuntu2) quantal; urgency=low
 
   * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index f2be7c4..bd64581 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -5,7 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 1f30685..f9cf9ba 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -4,8 +4,9 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
-   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
+   xserver-xorg-video-modesetting, \
+   xserver-xorg-video-omap, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-vesa, \
 
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index ae27e54..5ac6d6a 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,6 +5,8 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
+   xserver-xorg-video-modesetting, \
+   xserver-xorg-video-omap, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-vesa, \
 
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 1390f3b..b8047f1 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -5,7 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
xserver-xorg-video-intel, \


-- 
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/e1t4aky-0003pr...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog |2 ++
 debian/copyright |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3388caa9182ee2f487b23bccb7307ee2e28c2780
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 3 14:43:54 2012 +0200

Update debian/copyright to refer to new address

* Update debian/copyright to refer to new address:
  - Fixes lintian old-fsf-address-in-copyright-file

diff --git a/debian/changelog b/debian/changelog
index 675ecc3..a2b020d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg (1:7.7+1ubuntu3) UNRELEASED; urgency=low
   * remove xserver-xorg-video-cirrus from all archs
   * add xserver-xorg-video-modesetting to armel and armhf
   * add xserver-xorg-video-omap to armel and armhf
+  * Update debian/copyright to refer to new address:
+- Fixes lintian old-fsf-address-in-copyright-file
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
18:57:08 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 572288a..6b29ddc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,8 +71,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License with
 the Debian operating system, in /usr/share/common-licenses/GPL;  if
-not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA 02111-1307 USA
+not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
 

 © 2010-2011 Cyril Brulebois k...@debian.org


-- 
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/e1t4b2a-0005ii...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Maarten Lankhorst]

 debian/changelog  |6 +++---
 debian/scripts/vars.amd64 |1 +
 debian/scripts/vars.i386  |1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 45533eafc19d5148e488d40eee355eff89bbbef0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 23 19:23:55 2012 +0200

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 5036658..c8562f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1ubuntu3) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu3) quantal; urgency=low
 
   * remove xserver-xorg-video-cirrus from armel and hf
   * add xserver-xorg-video-modesetting to armel and armhf
@@ -6,7 +6,7 @@ xorg (1:7.7+1ubuntu3) UNRELEASED; urgency=low
   * Update debian/copyright to refer to new address:
 - Fixes lintian old-fsf-address-in-copyright-file
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
19:21:25 +0200
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
19:23:35 +0200
 
 xorg (1:7.7+1ubuntu2) quantal; urgency=low
 

commit 3456c49e13a1467d4e1338cf3f82b4f042390e89
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Aug 23 19:22:06 2012 +0200

only remove xserver-xorg-video-cirrus from armel and armhf for now

diff --git a/debian/changelog b/debian/changelog
index a2b020d..5036658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 xorg (1:7.7+1ubuntu3) UNRELEASED; urgency=low
 
-  * remove xserver-xorg-video-cirrus from all archs
+  * remove xserver-xorg-video-cirrus from armel and hf
   * add xserver-xorg-video-modesetting to armel and armhf
   * add xserver-xorg-video-omap to armel and armhf
   * Update debian/copyright to refer to new address:
 - Fixes lintian old-fsf-address-in-copyright-file
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
18:57:08 +0200
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 23 Aug 2012 
19:21:25 +0200
 
 xorg (1:7.7+1ubuntu2) quantal; urgency=low
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index bd64581..f2be7c4 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -5,6 +5,7 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
+   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index b8047f1..1390f3b 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -5,6 +5,7 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
+   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
xserver-xorg-video-intel, \


-- 
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/e1t4b9o-0007zv...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |8 
 debian/scripts/vars.amd64 |1 -
 debian/scripts/vars.i386  |1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 9c804c057e536cdae78f860cefe8ad6824a2b044
Author: Timo Aaltonen Timo Aaltonen tjaal...@cc.hut.fi
Date:   Tue Aug 21 21:08:48 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 5908444..038b967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+1ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu2) quantal; urgency=low
 
   * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to
-XSERVER_XORG_VIDEO_DEPENDS.
+XSERVER_XORG_VIDEO_DEPENDS. (LP: #1039648)
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 09 Aug 2012 09:15:08 +0300
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 21 Aug 2012 21:08:18 +0300
 
 xorg (1:7.7+1ubuntu1) quantal; urgency=low
 

commit f533735442a758a748316d5000fc3ac9270e2a21
Author: Timo Aaltonen Timo Aaltonen tjaal...@cc.hut.fi
Date:   Tue Aug 21 21:07:42 2012 +0300

displaylink is obsolete, drop it

diff --git a/debian/changelog b/debian/changelog
index 4d5a8bf..5908444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xorg (1:7.7+1ubuntu2) UNRELEASED; urgency=low
 
-  * scripts/vars.{amd64,i386}: Add -displaylink and -modesetting to
+  * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to
 XSERVER_XORG_VIDEO_DEPENDS.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 09 Aug 2012 09:15:08 +0300
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 60b6f62..f2be7c4 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
-   xserver-xorg-video-displaylink, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 27ee486..1390f3b 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
-   xserver-xorg-video-displaylink \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
xserver-xorg-video-intel, \


-- 
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/e1t3suq-0003st...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |7 +++
 debian/scripts/vars.amd64 |2 ++
 debian/scripts/vars.i386  |2 ++
 3 files changed, 11 insertions(+)

New commits:
commit 14633bdcfab59a1c4b638e38765eac3a2b13cee9
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Aug 9 09:16:23 2012 +0300

scripts/vars.{amd64,i386}: Add -displaylink and -modesetting to 
XSERVER_XORG_VIDEO_DEPENDS.

diff --git a/debian/changelog b/debian/changelog
index 0fff102..4d5a8bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+1ubuntu2) UNRELEASED; urgency=low
+
+  * scripts/vars.{amd64,i386}: Add -displaylink and -modesetting to
+XSERVER_XORG_VIDEO_DEPENDS.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 09 Aug 2012 09:15:08 +0300
+
 xorg (1:7.7+1ubuntu1) quantal; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index dcc028d..60b6f62 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -6,9 +6,11 @@
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
+   xserver-xorg-video-displaylink, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 06ec95c..27ee486 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -6,10 +6,12 @@
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
+   xserver-xorg-video-displaylink \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \


-- 
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/e1szm2m-0001ac...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit b0807e6ffe250ae6572121292c1b95682f4380a9
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jul 3 16:07:43 2012 +0300

release 1:7.7+1ubuntu1 to quantal

diff --git a/debian/changelog b/debian/changelog
index a5a3f43..0fff102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.7+1ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu1) quantal; urgency=low
 
+  [ Maarten Lankhorst ]
   * Merge from Debian unstable, remaining changes:
 - Add apport hook
 - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
@@ -28,7 +29,7 @@ xorg (1:7.7+1ubuntu1) UNRELEASED; urgency=low
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
14:17:40 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 03 Jul 2012 16:06:54 +0300
 
 xorg (1:7.7+1) unstable; 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/e1sm6cn-0003gf...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   29 +++
 debian/local/Xsession.5  |7 +
 debian/local/Xsession.d/35x11-common_xhost-local |   10 ++
 debian/x11-common.init   |   90 +++
 4 files changed, 106 insertions(+), 30 deletions(-)

New commits:
commit aae5708284ebb931ff4241fe50b21f9033b5f245
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Mar 22 19:42:43 2012 +0200

update the changelog for release

diff --git a/debian/changelog b/debian/changelog
index 0417729..7e8fd25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6+12ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 22 Mar 2012 19:42:07 +0200
+
 xorg (1:7.6+12) unstable; urgency=high
 
   * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the

commit 75d568a94a7ccfb37a51711c9f1ac42f584ec140
Author: Julien Cristau jcris...@debian.org
Date:   Sat Mar 3 18:55:44 2012 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2be2fa8..5f8f3d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+12) UNRELEASED; urgency=high
+xorg (1:7.6+12) unstable; urgency=high
 
   * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the
 x11-common init script.  A malicious user could trick us into changing
@@ -7,7 +7,7 @@ xorg (1:7.6+12) UNRELEASED; urgency=high
 vladz, Tim Morgan and Bernhard R. Link for their help getting this right
 (any remaining bugs are my own).
 
- -- Julien Cristau jcris...@debian.org  Fri, 02 Mar 2012 21:38:07 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 18:54:30 +0100
 
 xorg (1:7.6+11) unstable; urgency=low
 

commit 0418b8dd8fa6940285f7f6b71302655942c15fb7
Author: Julien Cristau jcris...@debian.org
Date:   Fri Mar 2 21:57:56 2012 +0100

Be more careful before running chown/chmod in x11-common.init

Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the 
x11-common
init script.  A malicious user could trick us into changing
ownership/permissions of an arbitrary directory, and elevate their 
privileges
(closes: #661627).  Reference: CVE-2012-1093.

diff --git a/debian/changelog b/debian/changelog
index 53edbbe..2be2fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6+12) UNRELEASED; urgency=high
+
+  * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the
+x11-common init script.  A malicious user could trick us into changing
+ownership/permissions of an arbitrary directory, and elevate their
+privileges (closes: #661627).  Reference: CVE-2012-1093.  Thanks to
+vladz, Tim Morgan and Bernhard R. Link for their help getting this right
+(any remaining bugs are my own).
+
+ -- Julien Cristau jcris...@debian.org  Fri, 02 Mar 2012 21:38:07 +0100
+
 xorg (1:7.6+11) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/x11-common.init b/debian/x11-common.init
index 34835ac..014594b 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -2,17 +2,17 @@
 # /etc/init.d/x11-common: set up the X server and ICE socket directories
 ### BEGIN INIT INFO
 # Provides:  x11-common
-# Required-Start:$local_fs
-# Required-Stop: $local_fs
+# Required-Start:$remote_fs
+# Required-Stop: $remote_fs
 # Default-Start: S
 # Default-Stop:
 ### END INIT INFO
 
 set -e
 
-PATH=/bin:/sbin
-SOCKET_DIR=/tmp/.X11-unix
-ICE_DIR=/tmp/.ICE-unix
+PATH=/usr/bin:/usr/sbin:/bin:/sbin
+SOCKET_DIR=.X11-unix
+ICE_DIR=.ICE-unix
 
 . /lib/lsb/init-functions
 if [ -f /etc/default/rcS ]; then
@@ -26,36 +26,60 @@ do_restorecon () {
   fi
 }
 
-set_up_socket_dir () {
-  if [ $VERBOSE != no ]; then
-log_begin_msg Setting up X server socket directory $SOCKET_DIR...
-  fi
-  if [ -e $SOCKET_DIR ]  [ ! -d $SOCKET_DIR ]; then
-mv $SOCKET_DIR $SOCKET_DIR.$$
-  fi
-  mkdir -p $SOCKET_DIR
-  chown root:root $SOCKET_DIR
-  chmod 1777 $SOCKET_DIR
-  do_restorecon $SOCKET_DIR
-  [ $VERBOSE != no ]  log_end_msg 0 || return 0
-}
+# create a directory in /tmp.
+# assumes /tmp has a sticky bit set (or is only writeable by root)
+set_up_dir () {
+  DIR=/tmp/$1
 
-set_up_ice_dir () {
   if [ $VERBOSE != no ]; then
-log_begin_msg Setting up ICE socket directory $ICE_DIR...
+log_progress_msg $DIR
   fi
-  if [ -e $ICE_DIR ]  [ ! -d $ICE_DIR ]; then
-mv $ICE_DIR $ICE_DIR.$$
+  # if $DIR exists and isn't a directory, move it aside
+  if [ -e $DIR ]  ! [ -d $DIR ] || [ -h $DIR ]; then
+mv $DIR $(mktemp -d $DIR.XX)
   fi
-  mkdir -p $ICE_DIR
-  chown root:root $ICE_DIR
-  chmod 1777 $ICE_DIR
-  do_restorecon $ICE_DIR
-  [ $VERBOSE != no ]  log_end_msg 0 || return 0
+
+  error=0
+  while :; do
+if [ $error -ne 0 ] ; then
+  # an error means the file-system is readonly or an attacker
+  # is doing evil things, distinguish by 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit ee496c4f41fad79c658136baf688e1a162bcf936
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Jan 23 07:43:23 2012 +0200

tabs to spaces

diff --git a/debian/changelog b/debian/changelog
index 6131143..7e41414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,8 @@ xorg (1:7.6+10ubuntu1) precise; urgency=low
   + Add -geode to video-all for i386.
   + Drop video drivers that are likely irrelevant for ARM.
   + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo
-   from xserver-xorg-video-all dependencies. They are unmaintained and
-   obsolete.
+from xserver-xorg-video-all dependencies. They are unmaintained and
+obsolete.
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 

commit 0df738e652f37ea9a040cc1e9adf6e8a173af3ab
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Jan 23 07:38:52 2012 +0200

release to precise

diff --git a/debian/changelog b/debian/changelog
index 999b38c..6131143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.6+10ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable, remaining changes:
 - Add apport hook
@@ -28,7 +28,7 @@ xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 20 Jan 2012 16:56:59 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 23 Jan 2012 07:38:32 +0200
 
 xorg (1:7.6+10) unstable; urgency=high
 


-- 
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/e1rpci8-0004j4...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit 2044c44b745e292cbc24986126fa7b6a514e8730
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Jan 20 18:52:24 2012 +0200

drop the psb-to-vesa mangling of xorg.conf, we're well past the previous 
LTS-LTS upgrade path

diff --git a/debian/changelog b/debian/changelog
index 2b5a65a..999b38c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,6 @@ xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
   + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo
from xserver-xorg-video-all dependencies. They are unmaintained and
obsolete.
-- debian/xserver-xorg.postinst.in:
-  Also migrate users from psb → vesa.
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 3f37d4c..e595e94 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -117,15 +117,14 @@ if [ -n $UPGRADE ]; then
 fi
 fi
 
-if dpkg --compare-versions $2 lt-nl 1:7.4~5ubuntu1; then
+if dpkg --compare-versions $2 lt-nl 1:7.4~3; then
   # We're upgrading from pre-7.4.  We need to replace i810 with intel, and
-  # via with openchrome, and psb with vesa.
+  # via with openchrome.
   if [ -e $XORGCONFIG ]; then
 LC_ALL=C sed -e'

/^[[:space:]]*Section[[:space:]]\+Device[[:space:]]*$/I,/^[[:space:]]*EndSection[[:space:]]*$/I
 {
/^[[:space:]]*Driver[[:space:]]\+i810/I s/i810/intel/I
/^[[:space:]]*Driver[[:space:]]\+via/I s/via/openchrome/I
-   /^[[:space:]]*Driver[[:space:]]\+psb/s/psb/vesa/
}
' $XORGCONFIG  ${XORGCONFIG}.madwizard-new
 if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then

commit 37c2a719c8b7e50476ce53873d11d5e045623b17
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Jan 20 18:47:32 2012 +0200

update the merge changelog

diff --git a/debian/changelog b/debian/changelog
index d74ab2f..2b5a65a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+- Add apport hook
+- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
+  Recommends.
+- debian/local/Xsession:
+  Truncate xsession-errors on startup if too big
+- debian/local/Xsession.d/20x11-common_process-args:
+  Add support for session command containing args.
+- debian/local/Xsession.d/60x11-common_localhost:
+  Authorise all processes running with the user's credentials to connect
+  to the server.
+- debian/local/Xsession.d/60x11-common_xdg_path:
+  Add session script to set xdg path depending on the selected session.
+- debian/rules, debian/control:
+  Add dependencies on x11-common, since pkgbinarymangler moves the docs
+  there to save some space on the image.
+- debian/scripts/vars.*:
+  + Don't drop wacom from input-all.
+  + Add -vmmouse to input-all for amd64 and i386.
+  + Add -qxl to video-all for amd64 and i386.
+  + Add -geode to video-all for i386.
+  + Drop video drivers that are likely irrelevant for ARM.
+  + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo
+   from xserver-xorg-video-all dependencies. They are unmaintained and
+   obsolete.
+- debian/xserver-xorg.postinst.in:
+  Also migrate users from psb → vesa.
+- debian/x11-common.{preinst,postinst,postrm}.in:
+  Clean up the old failsafe-x files.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 20 Jan 2012 16:56:59 +0200
+
 xorg (1:7.6+10) unstable; urgency=high
 
   * Fixes for xserver-wrapper:


-- 
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/e1rohiy-0004dg...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog | 2633 ---
 debian/control   |6 
 debian/local/xserver-wrapper.c   |   14 
 debian/po/sr.po  |   60 
 debian/po/s...@latin.po|   61 
 debian/rules |9 
 debian/scripts/vars.s390x|8 
 debian/xserver-xorg.postinst.in  |   17 
 xsf-docs/index.txt   |1 
 xsf-docs/reference/squeeze-backports.txt |  134 -
 10 files changed, 291 insertions(+), 2652 deletions(-)

New commits:
commit f2dba93ad941cbc42fb4adc0b6c0ce2b63b7c0bc
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 23:46:14 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 13dc513..632ff14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10) UNRELEASED; urgency=low
+xorg (1:7.6+10) unstable; urgency=high
 
   * Fixes for xserver-wrapper:
 - when we drop privileges, don't forget to also reset effective group id,
@@ -9,7 +9,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
 - use major() and minor() macros instead of manually extracting them
   * Build the X wrapper with hardening enabled.
 
- -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 15 Dec 2011 23:45:48 +0100
 
 xorg (1:7.6+9) unstable; urgency=low
 

commit 0ebabb840bf52e5e5347414487668ae26ec16332
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:22:22 2011 +0100

Build the X wrapper with hardening enabled.

diff --git a/debian/changelog b/debian/changelog
index 20d3f7f..13dc513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
   things like /dev/tty and /dev/ptmx, which are world-readable (closes:
   #652249).  Thanks to vladz for the report.
 - use major() and minor() macros instead of manually extracting them
+  * Build the X wrapper with hardening enabled.
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/control b/debian/control
index b825221..dfa7aa4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
 Standards-Version: 3.9.2
 Build-Depends:
+ dpkg (= 1.16.1),
  debhelper (= 7),
  po-debconf,
 # xsf-docs:
diff --git a/debian/rules b/debian/rules
index 861737a..8d2c970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,13 @@ CC=$(DEB_HOST_GNU_TYPE)-gcc
 else
 CC ?=gcc
 endif
+CFLAGS = \
+   -Wall \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CFLAGS)
+CPPFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CPPFLAGS)
+LDFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
LDFLAGS)
 
 # debhelper
 export DH_OPTIONS
@@ -49,7 +56,7 @@ build: build-stamp
 build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
-   $(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/local/X 
debian/local/xserver-wrapper.c
$(MAKE) -C xsf-docs
touch $@
 

commit 1d5cfd6fe0d46fcfcb6f79316cdc600f6da77f54
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:06:31 2011 +0100

xserver-wrapper: use major() and minor() macros instead of manually 
extracting them

diff --git a/debian/changelog b/debian/changelog
index ac28258..20d3f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 xorg (1:7.6+10) UNRELEASED; urgency=low
 
-  * xserver-wrapper: when we drop privileges, don't forget to also reset
-effective group id, since we're installed setgid root.
-  * xserver-wrapper: revert change to allow devices with major 5 as consoles.
-This includes things like /dev/tty and /dev/ptmx, which are
-world-readable (closes: #652249).  Thanks to vladz for the report.
+  * Fixes for xserver-wrapper:
+- when we drop privileges, don't forget to also reset effective group id,
+  since we're installed setgid root.
+- revert change to allow devices with major 5 as consoles.  This includes
+  things like /dev/tty and /dev/ptmx, which are world-readable (closes:
+  #652249).  Thanks to vladz for the report.
+- use major() and minor() macros instead of manually extracting them
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 1e0d416..d4a6ab8 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -162,8 +162,8 @@ onConsole()
 return FALSE;
   }
   if (S_ISCHR(s.st_mode) 
-(((s.st_rdev  8)  0xff) == TTY_MAJOR_DEV 
- 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |7 +++
 debian/x11-common.postinst.in |3 +++
 debian/x11-common.postrm.in   |3 +++
 debian/x11-common.preinst.in  |3 +++
 4 files changed, 16 insertions(+)

New commits:
commit 6cd9a37e5902672b4ac0eef093cf1ae276abf292
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Aug 26 13:01:56 2011 +0300

Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config files 
to purge.

diff --git a/debian/changelog b/debian/changelog
index 73fb79e..8a2c372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+7ubuntu7) UNRELEASED; urgency=low
+
+  * Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config
+files to purge.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 26 Aug 2011 11:49:20 +0300
+
 xorg (1:7.6+7ubuntu6) oneiric; urgency=low
 
   * debian/control: Remove Recommends on xdiagnose as well; apparently it
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index b834efa..8fe6e97 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -33,6 +33,9 @@ configure)
 remove_conffile_commit /etc/gdm/failsafeXServer
 remove_conffile_commit /etc/gdm/failsafeXinit
   fi
+  if dpkg --compare-versions $2 lt-nl 1:7.6+7ubuntu7; then
+remove_conffile_commit /etc/init/failsafe-x.conf
+  fi
 esac
 
 # only mess with config file it exists; otherwise, assume that's the way the
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index af470e8..e960f71 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -30,6 +30,9 @@ abort-install|abort-upgrade)
 remove_conffile_rollback /etc/gdm/failsafeXServer
 remove_conffile_rollback /etc/gdm/failsafeXinit
   fi
+  if dpkg --compare-versions $2 lt-nl 1:7.6+7ubuntu7; then
+remove_conffile_rollback /etc/init/failsafe-x.conf
+  fi
 esac
 
 # clean up non-conffile configuration files and related materials on purge
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 3609fa2..290b5c1 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -26,6 +26,9 @@ if [ $1 = install ] || [ $1 = upgrade ]; then
 remove_conffile_lookup x11-common /etc/gdm/failsafeXServer
 remove_conffile_lookup x11-common /etc/gdm/failsafeXinit
   fi
+  if dpkg --compare-versions $2 lt-nl 1:7.6+7ubuntu7; then
+remove_conffile_lookup x11-common /etc/init/failsafe-x.conf
+  fi
 fi
 
 #DEBHELPER#


-- 
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/e1qwtes-0006yi...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit 3b637af274603c0b4fbc66fd495e5795bbb09633
Author: Bryce Harrington br...@canonical.com
Date:   Fri Jul 22 13:34:05 2011 -0700

Drop xdiagnose as a direct dependency of xorg

Since it depends on gtk, this pulls gtk in for kubuntu which they
dislike.  This will exclude derivative distros from X diagnostics,
unless xdiagnose is manually installed.

diff --git a/debian/changelog b/debian/changelog
index d6b1dbf..ea7a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu6) oneiric; urgency=low
+
+  * debian/control: Remove Recommends on xdiagnose as well; apparently it
+still causes gtk3 to be included for kubuntu.  Derivitive distros will
+need to opt-in with their seeds if they wish to have X diagnostics
+included.
+
+ -- Bryce Harrington br...@ubuntu.com  Fri, 22 Jul 2011 13:30:15 -0700
+
 xorg (1:7.6+7ubuntu5) oneiric; urgency=low
 
   * debian/control: Move xdiagnose dependency to ubuntu-desktop.
diff --git a/debian/control b/debian/control
index 2e69ccd..1363381 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: x11-common
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
-Recommends: xdiagnose
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not


-- 
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/e1qkms9-0004h3...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit f03328fe66ae59da131dde14437dee08b8fa7456
Author: Bryce Harrington br...@canonical.com
Date:   Fri Jul 22 13:37:27 2011 -0700

Sp.

diff --git a/debian/changelog b/debian/changelog
index ea7a16b..73fb79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 xorg (1:7.6+7ubuntu6) oneiric; urgency=low
 
   * debian/control: Remove Recommends on xdiagnose as well; apparently it
-still causes gtk3 to be included for kubuntu.  Derivitive distros will
+still causes gtk3 to be included for kubuntu.  Derivative distros will
 need to opt-in with their seeds if they wish to have X diagnostics
-included.
+included, or users will have to manually install xdiagnose themselves.
 
  -- Bryce Harrington br...@ubuntu.com  Fri, 22 Jul 2011 13:30:15 -0700
 

commit e37c5fc67f8508b250a0282864f869c6fa57d660
Author: Bryce Harrington br...@canonical.com
Date:   Fri Jul 22 13:34:05 2011 -0700

Drop xdiagnose as a direct dependency of xorg

Since it depends on gtk, this pulls gtk in for kubuntu which they
dislike.  This will exclude derivative distros from X diagnostics,
unless xdiagnose is manually installed.

diff --git a/debian/changelog b/debian/changelog
index d6b1dbf..ea7a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu6) oneiric; urgency=low
+
+  * debian/control: Remove Recommends on xdiagnose as well; apparently it
+still causes gtk3 to be included for kubuntu.  Derivitive distros will
+need to opt-in with their seeds if they wish to have X diagnostics
+included.
+
+ -- Bryce Harrington br...@ubuntu.com  Fri, 22 Jul 2011 13:30:15 -0700
+
 xorg (1:7.6+7ubuntu5) oneiric; urgency=low
 
   * debian/control: Move xdiagnose dependency to ubuntu-desktop.
diff --git a/debian/control b/debian/control
index 2e69ccd..1363381 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: x11-common
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
-Recommends: xdiagnose
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not


-- 
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/e1qkmtf-0004kb...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog |8 
 debian/control   |3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit bd2319509b0ce3757b934365b13f1dbcf87e7955
Author: Bryce Harrington br...@canonical.com
Date:   Thu Jul 21 17:48:41 2011 -0700

Revert dependency on xdiagnose for kubuntu

diff --git a/debian/changelog b/debian/changelog
index a36f106..d6b1dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.6+7ubuntu5) oneiric; urgency=low
+
+  * debian/control: Move xdiagnose dependency to ubuntu-desktop.
+xdiagnose has a gtk dependency, which would pull in gtk3 to kubuntu.
+(LP: #814346)
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 21 Jul 2011 17:47:16 -0700
+
 xorg (1:7.6+7ubuntu4) oneiric; urgency=low
 
   * debian/control:  Add Depends on xdiagnose, to ensure it always gets
diff --git a/debian/control b/debian/control
index 9e77e5d..2e69ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 Package: x11-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2), xdiagnose
+Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
+Recommends: xdiagnose
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not


-- 
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/e1qk3vd-0006ax...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog |9 +
 debian/rules |   26 --
 2 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 78abf4acc8963b2c055b3780f6a3a1ea0b8a2181
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Tue Jul 19 17:37:01 2011 +1000

Drop manual doc directory symlinking.

It's a bit dangerous, and it's caused LP #812665.  We can let
pkgbinarymangler handle this for us now.

diff --git a/debian/changelog b/debian/changelog
index e12b0c3..9562104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu3) oneiric; urgency=low
+
+  * debian/rules:
+- Reverse the symlinking of /usr/share/doc directories to x11-common.
+  This should now be handled automatically by pkgbinarymangler, and the
+  directory symlink now causes file conflicts.  (LP: #812665)
+  
+ -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 19 Jul 2011 
17:32:01 +1000
+
 xorg (1:7.6+7ubuntu2) oneiric; urgency=low
 
   * debian/local/Xsession.d/60x11-common_xdg_path: Add session script to
diff --git a/debian/rules b/debian/rules
index 5304491..44aba1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,14 +78,13 @@ binary-indep: build install
dh_lintian
dh_link
dh_compress
-   t=x11-common; \
-   for p in $$(dh_listpackages -i -N$$t); do \
- rm -rf debian/$$p/usr/share/doc/$$p; \
- ln -s $$t debian/$$p/usr/share/doc/$$p; \
+   set -e ;\
+   for p in $$(dh_listpackages -i); do \
  ( \
-   echo # doc dir is now a symlink to $$p; \
-   echo 'if [ $$1 = upgrade ]  [ ! -L /usr/share/doc/'$$p' ]; 
then'; \
-   echo rm -rf /usr/share/doc/$$p; \
+   echo # Undo doc-dir symlinking.  Leave this to pkgbinarymangler; \
+   echo # This can be removed after the next LTS ; \
+   echo 'if [ $$1 = upgrade ]  [ -L /usr/share/doc/'$$p' ]; then'; 
\
+   echo rm -f /usr/share/doc/$$p; \
echo fi; \
  )  debian/$$p.preinst.debhelper; \
done
@@ -121,14 +120,13 @@ endif
dh_link
dh_strip
dh_compress
-   t=x11-common; \
-   for p in $$(dh_listpackages -s -N$$t); do \
- rm -rf debian/$$p/usr/share/doc/$$p; \
- ln -s $$t debian/$$p/usr/share/doc/$$p; \
+   set -e ;\
+   for p in $$(dh_listpackages -a); do \
  ( \
-   echo # doc dir is now a symlink to $$p; \
-   echo 'if [ $$1 = upgrade ]  [ ! -L /usr/share/doc/'$$p' ]; 
then'; \
-   echo rm -rf /usr/share/doc/$$p; \
+   echo # Undo doc-dir symlinking.  Leave this to pkgbinarymangler.; 
\
+   echo # This can be removed after the next LTS ; \
+   echo 'if [ $$1 = upgrade ]  [ -L /usr/share/doc/'$$p' ]; then'; 
\
+   echo rm -f /usr/share/doc/$$p; \
echo fi; \
  )  debian/$$p.preinst.debhelper; \
done


-- 
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/e1qjlpx-00044c...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit 9b17062301023ef65b225f07e245343810e39075
Author: Bryce Harrington br...@canonical.com
Date:   Tue Jul 19 18:20:50 2011 -0700

Depends on xdiagnose so it will always be installed

diff --git a/debian/changelog b/debian/changelog
index 9562104..a36f106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+xorg (1:7.6+7ubuntu4) oneiric; urgency=low
+
+  * debian/control:  Add Depends on xdiagnose, to ensure it always gets
+installed.
+
+ -- Bryce Harrington br...@ubuntu.com  Tue, 19 Jul 2011 18:19:24 -0700
+
 xorg (1:7.6+7ubuntu3) oneiric; urgency=low
 
   * debian/rules:
 - Reverse the symlinking of /usr/share/doc directories to x11-common.
   This should now be handled automatically by pkgbinarymangler, and the
   directory symlink now causes file conflicts.  (LP: #812665)
-  
+
  -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 19 Jul 2011 
17:32:01 +1000
 
 xorg (1:7.6+7ubuntu2) oneiric; urgency=low
diff --git a/debian/control b/debian/control
index 2e69ccd..9e77e5d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 Package: x11-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
-Recommends: xdiagnose
+Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2), xdiagnose
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not


-- 
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/e1qjlyf-0004kf...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit 521f1b7f572cddf50f6a0735f60f0a3fade7ae21
Author: Bryce Harrington br...@canonical.com
Date:   Mon Jul 18 12:12:53 2011 -0700

Bump for release

diff --git a/debian/changelog b/debian/changelog
index 32ddb21..e12b0c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.6+7ubuntu2) oneiric; urgency=low
 
-  * add debian/local/Xsession.d/60x11-common_xdg_path to set
-xdg path depending on the selected session
-(compatible with lightdm, gdm and kdm now) (LP: #804734)
+  * debian/local/Xsession.d/60x11-common_xdg_path: Add session script to
+set xdg path depending on the selected session (compatible with
+lightdm, gdm and kdm now) (LP: #804734)
 
  -- Didier Roche didro...@ubuntu.com  Wed, 06 Jul 2011 09:39:17 +0200
 


-- 
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/e1qitjn-0007p7...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/changelog  |   10 ++
 debian/control|1 +
 debian/local/Xsession.d/60xdg_path-on-session |   22 ++
 3 files changed, 33 insertions(+)

New commits:
commit 2862c0aa4d4d5412afe4916720ae8806831cac75
Author: Didier Roche didro...@ubuntu.com
Date:   Wed Jul 6 09:40:33 2011 +0200

Set xdg path depending on selected session

diff --git a/debian/changelog b/debian/changelog
index 4b64e8b..6c0a569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low
+
+  * add debian/local/Xsession.d/60xdg_path-on-session to set
+xdg path depending on the selected session
+(compatible with lightdm and gdm now) (LP: #804734)
+  * debian/control:  
+   - add the replaces: to gdm which contained this file
+
+ -- Didier Roche didro...@ubuntu.com  Wed, 06 Jul 2011 09:39:17 +0200
+
 xorg (1:7.6+7ubuntu1) oneiric; urgency=low
 
   * Merge from Debian unstable, remaining changes:
diff --git a/debian/control b/debian/control
index 2e69ccd..49b64d0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
 Recommends: xdiagnose
+Replaces: gdm ( 3.0.4-0ubuntu4)
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not
diff --git a/debian/local/Xsession.d/60xdg_path-on-session 
b/debian/local/Xsession.d/60xdg_path-on-session
new file mode 100644
index 000..29491c3
--- /dev/null
+++ b/debian/local/Xsession.d/60xdg_path-on-session
@@ -0,0 +1,22 @@
+# This file is sourced by Xsession(5), not executed.
+# Add additionnal xdg paths depending on selected desktop session
+
+DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
+DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+if [ -n $DESKTOP_SESSION ]; then
+  # readd default if was empty
+  if [ -z $XDG_CONFIG_DIRS ]; then
+XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS
+  fi
+  
XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
+  export XDG_CONFIG_DIRS
+  # gnome is already added if gnome-session installed
+  if [ $DESKTOP_SESSION != gnome ]; then
+ if [ -z $XDG_DATA_DIRS ]; then
+   XDG_DATA_DIRS=$DEFAULT_XDG_DATA_DIRS
+ fi
+ XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
+ export XDG_DATA_DIRS
+  fi
+fi
+


-- 
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/e1qenfj-0002i1...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |6 ++
 debian/control|1 -
 debian/local/Xsession.d/60x11-common_xdg_path |   22 ++
 debian/local/Xsession.d/60xdg_path-on-session |   22 --
 4 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 447c24a4aa74f5d138b33791f5e4700b1be548dc
Author: Didier Roche didro...@ubuntu.com
Date:   Wed Jul 6 12:24:23 2011 +0200

Rename 60xdg_path-on-session to 60x11-common_xdg_path

diff --git a/debian/changelog b/debian/changelog
index 6c0a569..32ddb21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
 xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low
 
-  * add debian/local/Xsession.d/60xdg_path-on-session to set
+  * add debian/local/Xsession.d/60x11-common_xdg_path to set
 xdg path depending on the selected session
-(compatible with lightdm and gdm now) (LP: #804734)
-  * debian/control:  
-   - add the replaces: to gdm which contained this file
+(compatible with lightdm, gdm and kdm now) (LP: #804734)
 
  -- Didier Roche didro...@ubuntu.com  Wed, 06 Jul 2011 09:39:17 +0200
 
diff --git a/debian/control b/debian/control
index 49b64d0..2e69ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
 Recommends: xdiagnose
-Replaces: gdm ( 3.0.4-0ubuntu4)
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further
  installation of the X Window System in any configuration; it does not
diff --git a/debian/local/Xsession.d/60x11-common_xdg_path 
b/debian/local/Xsession.d/60x11-common_xdg_path
new file mode 100644
index 000..29491c3
--- /dev/null
+++ b/debian/local/Xsession.d/60x11-common_xdg_path
@@ -0,0 +1,22 @@
+# This file is sourced by Xsession(5), not executed.
+# Add additionnal xdg paths depending on selected desktop session
+
+DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
+DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+if [ -n $DESKTOP_SESSION ]; then
+  # readd default if was empty
+  if [ -z $XDG_CONFIG_DIRS ]; then
+XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS
+  fi
+  
XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
+  export XDG_CONFIG_DIRS
+  # gnome is already added if gnome-session installed
+  if [ $DESKTOP_SESSION != gnome ]; then
+ if [ -z $XDG_DATA_DIRS ]; then
+   XDG_DATA_DIRS=$DEFAULT_XDG_DATA_DIRS
+ fi
+ XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
+ export XDG_DATA_DIRS
+  fi
+fi
+
diff --git a/debian/local/Xsession.d/60xdg_path-on-session 
b/debian/local/Xsession.d/60xdg_path-on-session
deleted file mode 100644
index 29491c3..000
--- a/debian/local/Xsession.d/60xdg_path-on-session
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-# Add additionnal xdg paths depending on selected desktop session
-
-DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
-DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
-if [ -n $DESKTOP_SESSION ]; then
-  # readd default if was empty
-  if [ -z $XDG_CONFIG_DIRS ]; then
-XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS
-  fi
-  
XDG_CONFIG_DIRS=$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION:$XDG_CONFIG_DIRS
-  export XDG_CONFIG_DIRS
-  # gnome is already added if gnome-session installed
-  if [ $DESKTOP_SESSION != gnome ]; then
- if [ -z $XDG_DATA_DIRS ]; then
-   XDG_DATA_DIRS=$DEFAULT_XDG_DATA_DIRS
- fi
- XDG_DATA_DIRS=/usr/share/$DESKTOP_SESSION:$XDG_DATA_DIRS
- export XDG_DATA_DIRS
-  fi
-fi
-


-- 
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/e1qeqrm-0006ni...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

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

New commits:
commit ee6f15ba634defd5bb3519242306da8766f688b3
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jun 14 15:45:45 2011 +0300

Update the changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 8a6dc27..4b64e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+7ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.6+7ubuntu1) oneiric; urgency=low
 
   * Merge from Debian unstable, remaining changes:
 - Add apport hook
@@ -42,7 +42,7 @@ xorg (1:7.6+7ubuntu1) UNRELEASED; urgency=low
 rendition, s3virge, tseng, voodoo from xserver-xorg-video-all
 dependencies. They are unmaintained and obsolete.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 20 May 2011 17:07:13 +0300
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 14 Jun 2011 15:39:40 +0300
 
 xorg (1:7.6+7) unstable; 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/e1qycoz-0002fm...@vasks.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |   70 
 debian/control|   15 -
 debian/rules  |   11 
 debian/scripts/validate-posix-sh  |   63 
 debian/scripts/vars.amd64 |9 
 debian/scripts/vars.arm   |   16 +
 debian/scripts/vars.hurd-i386 |2 
 debian/scripts/vars.i386  |   10 
 debian/scripts/vars.powerpc   |2 
 debian/x11-common.postinst.in |2 
 debian/x11-common.postrm.in   |2 
 debian/x11-common.preinst.in  |2 
 debian/xserver-xorg.postrm.in |2 
 xsf-docs/.gitignore   |1 
 xsf-docs/Makefile |   51 +--
 xsf-docs/asciidoc-xhtml11.css |  424 ++
 xsf-docs/asciidoc-xhtml11.js  |  128 +
 xsf-docs/faq/general.mdwn |   58 
 xsf-docs/faq/general.txt  |   91 ++
 xsf-docs/howto/build-mesa.mdwn|  201 --
 xsf-docs/howto/build-mesa.txt |  221 +++
 xsf-docs/howto/configure-input.mdwn   |  176 
 xsf-docs/howto/configure-input.txt|  193 +
 xsf-docs/howto/report-bugs.mdwn   |   38 --
 xsf-docs/howto/report-bugs.txt|   51 +++
 xsf-docs/howto/triage-bugs.mdwn   |   95 --
 xsf-docs/howto/triage-bugs.txt|  104 +++
 xsf-docs/howto/use-gdb.mdwn   |  141 -
 xsf-docs/howto/use-gdb.txt|  176 
 xsf-docs/howto/use-xrandr.mdwn|  173 
 xsf-docs/howto/use-xrandr.txt |  214 +++
 xsf-docs/index.mdwn   |   34 --
 xsf-docs/index.txt|   50 +++
 xsf-docs/mdwn2html|   63 
 xsf-docs/reference/dependencies.mdwn  |  221 ---
 xsf-docs/reference/dependencies.txt   |  242 +
 xsf-docs/reference/experimental.txt   |   98 ++
 xsf-docs/reference/git-usage.txt  |  200 ++
 xsf-docs/reference/squeeze-backports.mdwn |   65 
 xsf-docs/reference/squeeze-backports.txt  |   76 +
 xsf-docs/reference/upstream-contacts.mdwn |   43 ---
 xsf-docs/reference/upstream-contacts.txt  |   46 +++
 xsf-docs/upstream-features.mdwn   |   16 -
 xsf-docs/upstream-features.txt|   17 +
 xsf-docs/xsf.css  |   96 --
 45 files changed, 2463 insertions(+), 1546 deletions(-)

New commits:
commit 00f8b1bb33decd67684a1be9e33a4d37ac7c3043
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Jun 9 16:43:41 2011 +0300

Add a note about the merge to the changelog

diff --git a/debian/changelog b/debian/changelog
index 7149141..8a6dc27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,27 @@
 xorg (1:7.6+7ubuntu1) UNRELEASED; urgency=low
 
+  * Merge from Debian unstable, remaining changes:
+- Add apport hook
+- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
+  Recommends.
+- debian/local/Xsession:
+  Truncate xsession-errors on startup if too big
+- debian/local/Xsession.d/20x11-common_process-args:
+  Add support for session command containing args.
+- debian/local/Xsession.d/60x11-common_localhost:
+  Authorise all processes running with the user's credentials to connect
+  to the server.
+- debian/rules, debian/control:
+  Add dependencies on x11-common, and symlink /usr/share/doc directories
+  of all packages to x11-common's.
+- debian/scripts/vars.*:
+  + Don't drop wacom from input-all.
+  + Add -vmmouse to input-all for amd64 and i386.
+  + Add -qxl to video-all for amd64 and i386.
+  + Add -geode to video-all for i386.
+  + Drop video drivers that are likely irrelevant for ARM.
+- debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
+
   [ Bryce Harrington ]
   * apport/source_xorg.py:
 - Move Failsafe-X out of the xorg package to xdiagnose

commit 9dbfbea11b93f0f773f68550413c207438ba48c1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Jun 9 16:12:32 2011 +0300

Bump the version in checking for x11-common failsafe conffile removals

diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 2e86601..b834efa 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -23,7 +23,7 @@ 
XWRAPPER_CONFIG_ROSTER=$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE
 
 case $1 in
 configure)
-  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu4; then
+  if dpkg --compare-versions $2 lt-nl 1:7.6+7ubuntu1; then
 remove_conffile_commit /etc/gdm/failsafe-xorg.conf
 remove_conffile_commit /etc/gdm/failsafeBlacklist
 remove_conffile_commit /etc/gdm/failsafeDexconf
diff --git a/debian/x11-common.postrm.in 

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog  |9 -
 debian/rules  |2 +-
 debian/x11-common.postinst.in |8 +++-
 debian/x11-common.postrm.in   |   18 --
 debian/x11-common.preinst.in  |   18 --
 5 files changed, 28 insertions(+), 27 deletions(-)

New commits:
commit 91504666cdcbe0c8c3695c29cd6bb99374ecb9f9
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri May 20 17:30:03 2011 +0300

Fix whitespace in x11-common.postinst.in

diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index f0f29a1..2e86601 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -41,7 +41,7 @@ if [ -e $XWRAPPER_CONFIG ] || [ -z $UPGRADE ]; then
   ALLOWED_USERS=
   if db_get x11-common/xwrapper/actual_allowed_users; then
 ALLOWED_USERS=$RET
-  fi 
+  fi
   if [ -n $ALLOWED_USERS ]; then
 NEW_XWRAPPER_CONFIG=$(tempfile -m 644)
 if ! [ -e $XWRAPPER_CONFIG ]; then

commit a5cece8fd27c7cd5a8a16d9acf45788b2248daf4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri May 20 17:27:11 2011 +0300

Rework the x11-common.{postinst,postrm,preinst} failsafe conffile handling

the previous ones added in 1:7.6+4ubuntu1 were wrong too.

diff --git a/debian/changelog b/debian/changelog
index 3a775a6..3ed8943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * rules: A stampfile generation was commented out by mistake, uncomment
 it.
+  * Rework the x11-common.{postinst,postrm,preinst} failsafe conffile
+handling, the previous ones added in 1:7.6+4ubuntu1 were wrong too.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 20 May 2011 17:07:13 +0300
 
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index 8e38199..f0f29a1 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -23,15 +23,13 @@ 
XWRAPPER_CONFIG_ROSTER=$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE
 
 case $1 in
 configure)
-  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu1; then
+  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu4; then
 remove_conffile_commit /etc/gdm/failsafe-xorg.conf
+remove_conffile_commit /etc/gdm/failsafeBlacklist
 remove_conffile_commit /etc/gdm/failsafeDexconf
 remove_conffile_commit /etc/gdm/failsafeDexconf.old
 remove_conffile_commit /etc/gdm/failsafeHelpmsg
 remove_conffile_commit /etc/gdm/failsafeInstall
-  fi
-  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu4; then
-remove_conffile_commit /etc/gdm/failsafeBlacklist
 remove_conffile_commit /etc/gdm/failsafeXServer
 remove_conffile_commit /etc/gdm/failsafeXinit
   fi
diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in
index 91a5961..6d54cfb 100644
--- a/debian/x11-common.postrm.in
+++ b/debian/x11-common.postrm.in
@@ -20,17 +20,15 @@ 
XWRAPPER_CONFIG_ROSTER=$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster
 
 case $1 in
 abort-install|abort-upgrade)
-  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu1; then
-remove_conffile_commit /etc/gdm/failsafe-xorg.conf
-remove_conffile_commit /etc/gdm/failsafeDexconf
-remove_conffile_commit /etc/gdm/failsafeDexconf.old
-remove_conffile_commit /etc/gdm/failsafeHelpmsg
-remove_conffile_commit /etc/gdm/failsafeInstall
-  fi
   if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu4; then
-remove_conffile_commit /etc/gdm/failsafeBlacklist
-remove_conffile_commit /etc/gdm/failsafeXServer
-remove_conffile_commit /etc/gdm/failsafeXinit
+remove_conffile_rollback /etc/gdm/failsafe-xorg.conf
+remove_conffile_rollback /etc/gdm/failsafeBlacklist
+remove_conffile_rollback /etc/gdm/failsafeDexconf
+remove_conffile_rollback /etc/gdm/failsafeDexconf.old
+remove_conffile_rollback /etc/gdm/failsafeHelpmsg
+remove_conffile_rollback /etc/gdm/failsafeInstall
+remove_conffile_rollback /etc/gdm/failsafeXServer
+remove_conffile_rollback /etc/gdm/failsafeXinit
   fi
 esac
 
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 45dd07c..6fbfae1 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -16,17 +16,15 @@ CONFIG_DIR=/etc/X11
 #INCLUDE_SHELL_LIB#
 
 if [ $1 = install ] || [ $1 = upgrade ]; then
-  if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu1; then
-remove_conffile_commit /etc/gdm/failsafe-xorg.conf
-remove_conffile_commit /etc/gdm/failsafeDexconf
-remove_conffile_commit /etc/gdm/failsafeDexconf.old
-remove_conffile_commit /etc/gdm/failsafeHelpmsg
-remove_conffile_commit /etc/gdm/failsafeInstall
-  fi
   if dpkg --compare-versions $2 lt-nl 1:7.6+4ubuntu4; then
-remove_conffile_commit /etc/gdm/failsafeXBackup
-remove_conffile_commit /etc/gdm/failsafeXServer
-remove_conffile_commit /etc/gdm/failsafeXinit
+remove_conffile_lookup x11-common /etc/gdm/failsafe-xorg.conf
+remove_conffile_lookup x11-common 

xorg: Changes to 'ubuntu-failsafex-extraction'

[Bryce Harrington]

New branch 'ubuntu-failsafex-extraction' available with the following commits:
commit 1c5870fb9d2ca18525b23f218645af64ef38f87c
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed May 18 03:51:53 2011 +0200

Re-remove apport hook

commit 1a9f8f7d47e27a11218770ad947d055f1c7679c1
Merge: a6b6833 52f6e85
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed May 18 03:51:32 2011 +0200

Merge branch 'ubuntu' of ssh://git.debian.org/git/pkg-xorg/debian/xorg into 
ubuntu

Conflicts:
debian/apport/source_xorg.py

commit a6b68336823c27949f36f67ea2c4ce45c952
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed May 18 03:24:52 2011 +0200

Update packaging to reflect removal of failsafe-x

commit 4c236a1891cfd90442572a59000c64e29402e5b9
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed May 18 03:24:10 2011 +0200

Migrate the failsafe-x bits out of xorg to xdiagnose


-- 
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/e1qmvzn-0003uw...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py|  468 
 debian/changelog|8 
 debian/control  |1 
 debian/local/Failsafe/README|   20 -
 debian/local/Failsafe/failsafeBlacklist |6 
 debian/local/Failsafe/failsafeXServer   |  160 --
 debian/local/Failsafe/failsafeXinit |  231 ---
 debian/po-failsafe/POTFILES.in  |1 
 debian/rules|3 
 debian/x11-common.failsafe-x.upstart|   13 
 debian/x11-common.install   |2 
 debian/x11-common.links |   55 ---
 debian/x11-common.postinst.in   |5 
 debian/x11-common.postrm.in |5 
 debian/x11-common.preinst.in|5 
 15 files changed, 21 insertions(+), 962 deletions(-)

New commits:
commit 32586e8e14e5879e313eb840c2004c0344601317
Author: Bryce Harrington br...@canonical.com
Date:   Fri May 13 08:33:12 2011 -0700

* apport/source_xorg.py:
  - Simplify answers for bug reporters filing post-release reports.
(LP: 778758)
  - Remove attach_drm_info().  This is useful info but we use it very
infrequently, and it is already available in other log files.  But the
call makes bug reports a bit cluttered since it adds a lot of lines to
the report itself.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a60ad4c..1b03afe 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -148,9 +148,9 @@ def check_is_supported(report, ui=None):
 certain it should be reported here? %(distro_codename),
 [
 I don't know,
-Yes, I already know the fix for this problem.,
-Yes, The problem began right after doing a system software 
update.,
-Yes, I have gone through technical support, and they have 
referred me here.,
+Yes, and I know the fix for this problem.,
+Yes, the problem began right after doing a system software 
update.,
+Yes.,
 No, please point me to a good place to get support.,
 ]
 )
diff --git a/debian/changelog b/debian/changelog
index 65a62d2..b8f2637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
 
-  * apport/source_xorg.py: Remove attach_drm_info().  This is useful info
-but we use it very infrequently, and it is already available in other
-log files.  But the call makes bug reports a bit cluttered since it
-adds a lot of lines to the report itself.
+  * apport/source_xorg.py:
+- Simplify answers for bug reporters filing post-release reports.
+  (LP: #778758)
+- Remove attach_drm_info().  This is useful info but we use it very
+  infrequently, and it is already available in other log files.  But the
+  call makes bug reports a bit cluttered since it adds a lot of lines to
+  the report itself.
 
  -- Bryce Harrington br...@ubuntu.com  Thu, 07 Apr 2011 14:02:40 -0700
 

commit c4d45fbfec0a4792d7dbd2e668d32b894e5e1c7c
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed May 18 03:24:10 2011 +0200

Migrate the failsafe-x bits out of xorg to xdiagnose

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
deleted file mode 100644
index a60ad4c..000
--- a/debian/apport/source_xorg.py
+++ /dev/null
@@ -1,468 +0,0 @@
-#!/usr/bin/python
-
-'''Xorg Apport interface
-
-Copyright (C) 2007, 2008 Canonical Ltd.
-Author: Bryce Harrington bryce.harring...@ubuntu.com
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
-the full text of the license.
-
-Testing:  APPORT_STAGING=yes
-'''
-
-import os.path
-import glob
-import re
-import subprocess
-from apport.hookutils import *
-from launchpadlib.launchpad import Launchpad
-
-core_x_packages = [
-'xorg', 'xorg-server', 'xserver-xorg-core', 'mesa'
-]
-keyboard_packages = [
-'xorg', 'xkeyboard-config', 'xserver-xorg-input-keyboard', 
'xserver-xorg-input-evdev'
-]
-
-##
-#
-# Apport helper routines
-#
-##
-def retrieve_ubuntu_release_statuses():
-'''
-Attempts to access launchpad to get a mapping of Ubuntu releases to status.
-
-Returns a dictionary of ubuntu release keywords to their current status,
-or None in cause of a failure reading launchpad.
-'''
-releases = { }
-try:
-lp = Launchpad.login_anonymously('apport', 'production')
-d = lp.distributions['ubuntu']
-for series in d.series:
-releases[series.name] = series.status
-except:
-releases = None
-return releases

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |6 +++---
 debian/changelog |   13 -
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 52f6e8547a11cb711b439d5c0beeacdaa75aae6a
Author: Bryce Harrington br...@canonical.com
Date:   Fri May 13 08:33:12 2011 -0700

* apport/source_xorg.py:
  - Simplify answers for bug reporters filing post-release reports.
(LP: 778758)
  - Remove attach_drm_info().  This is useful info but we use it very
infrequently, and it is already available in other log files.  But the
call makes bug reports a bit cluttered since it adds a lot of lines to
the report itself.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a60ad4c..1b03afe 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -148,9 +148,9 @@ def check_is_supported(report, ui=None):
 certain it should be reported here? %(distro_codename),
 [
 I don't know,
-Yes, I already know the fix for this problem.,
-Yes, The problem began right after doing a system software 
update.,
-Yes, I have gone through technical support, and they have 
referred me here.,
+Yes, and I know the fix for this problem.,
+Yes, the problem began right after doing a system software 
update.,
+Yes.,
 No, please point me to a good place to get support.,
 ]
 )
diff --git a/debian/changelog b/debian/changelog
index 65a62d2..c4b78b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
+xorg (1:7.6+4ubuntu5) natty; urgency=low
 
-  * apport/source_xorg.py: Remove attach_drm_info().  This is useful info
-but we use it very infrequently, and it is already available in other
-log files.  But the call makes bug reports a bit cluttered since it
-adds a lot of lines to the report itself.
+  * apport/source_xorg.py:
+- Simplify answers for bug reporters filing post-release reports.
+  (LP: 778758)
+- Remove attach_drm_info().  This is useful info but we use it very
+  infrequently, and it is already available in other log files.  But the
+  call makes bug reports a bit cluttered since it adds a lot of lines to
+  the report itself.
 
  -- Bryce Harrington br...@ubuntu.com  Thu, 07 Apr 2011 14:02:40 -0700
 


-- 
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/e1qkumq-0008af...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |1 -
 debian/changelog |9 +
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit b5c016102f7ce49e280eeb831a5353386597c361
Author: Bryce Harrington br...@canonical.com
Date:   Thu Apr 7 14:05:00 2011 -0700

apport/source_xorg.py: Remove attach_drm_info().  This is useful info but 
we use it very infrequently, and it is already available in other log files.  
But the call makes bug reports a bit cluttered since it adds a lot of lines to 
the report itself.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index e228488..a60ad4c 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -450,7 +450,6 @@ def add_info(report, ui):
 attach_dist_upgrade_status(report, ui)
 attach_graphic_card_pci_info(report, ui)
 attach_hardware(report)
-attach_drm_info(report)
 attach_dkms_info(report, ui)
 attach_nvidia_info(report, ui)
 attach_fglrx_info(report, ui)
diff --git a/debian/changelog b/debian/changelog
index 3d87b11..65a62d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
+
+  * apport/source_xorg.py: Remove attach_drm_info().  This is useful info
+but we use it very infrequently, and it is already available in other
+log files.  But the call makes bug reports a bit cluttered since it
+adds a lot of lines to the report itself.
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 07 Apr 2011 14:02:40 -0700
+
 xorg (1:7.6+4ubuntu3) natty; urgency=low
 
   * apport/source_xorg.py:  Fix typo in previous upload


-- 
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/e1q7wol-0001v9...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |4 ++--
 debian/changelog |6 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c34ef2e7703ad4c832f35369ba972d7f73c683e0
Author: Bryce Harrington br...@canonical.com
Date:   Tue Apr 5 11:58:12 2011 -0700

apport/source_xorg.py:  Fix typo in previous upload

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 646f671..e228488 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -292,7 +292,7 @@ def attach_xorg_package_versions(report, ui=None):
 xserver-xorg-video-ati,
 xserver-xorg-video-nouveau]:
 report['version.%s' %(package)] = package_versions(package)
-if report['Architecture'] == 'amd64':
+if 'Architecture' in report and report['Architecture'] == 'amd64':
 report['version.ia32-libs'] = package_versions('ia32-libs')
 
 def attach_2d_info(report, ui=None):
@@ -334,7 +334,7 @@ def attach_3d_info(report, ui=None):
   'drirc')
 
 if (is_process_running('compiz') or
-(report.get('SourcePackage','Unknown') == compiz and 
report.get('ProblemType', '') == 'Crash'
+(report.get('SourcePackage','Unknown') == compiz and 
report.get('ProblemType', '') == 'Crash')
  ):
 report['CompositorRunning'] = 'compiz'
 compiz_version = command_output(['compiz', '--version'])
diff --git a/debian/changelog b/debian/changelog
index cbc1fac..3d87b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6+4ubuntu3) natty; urgency=low
+
+  * apport/source_xorg.py:  Fix typo in previous upload
+
+ -- Bryce Harrington br...@ubuntu.com  Tue, 05 Apr 2011 11:57:48 -0700
+
 xorg (1:7.6+4ubuntu2) natty; urgency=low
 
   * apport/source_xorg.py:


-- 
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/e1q7bsh-0003hb...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |7 +--
 debian/changelog |   11 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 4ef86f851228a6971e14e60f48102dcdf3c66f8c
Author: Bryce Harrington br...@canonical.com
Date:   Mon Apr 4 19:03:14 2011 -0700

* apport/source_xorg.py:
  + Wildcarding package names doesn't seem to work.  Look for dri
experimental package directly.
(LP: #749809, #747725)
  + Include compiz version tag if the problem is a compiz crash
(LP: #744355)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index d703a31..646f671 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -284,7 +284,8 @@ def attach_xorg_package_versions(report, ui=None):
 for package in [
 xserver-xorg,
 libgl1-mesa-glx,
-libgl1-mesa-dri*,
+libgl1-mesa-dri,
+libgl1-mesa-dri-experimental,
 libdrm2,
 compiz,
 xserver-xorg-video-intel,
@@ -332,7 +333,9 @@ def attach_3d_info(report, ui=None):
   os.path.expanduser('~/.drirc'),
   'drirc')
 
-if is_process_running('compiz'):
+if (is_process_running('compiz') or
+(report.get('SourcePackage','Unknown') == compiz and 
report.get('ProblemType', '') == 'Crash'
+ ):
 report['CompositorRunning'] = 'compiz'
 compiz_version = command_output(['compiz', '--version'])
 if compiz_version:
diff --git a/debian/changelog b/debian/changelog
index c6095c3..cbc1fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6+4ubuntu2) natty; urgency=low
+
+  * apport/source_xorg.py:
++ Wildcarding package names doesn't seem to work.  Look for dri
+  experimental package directly.
+  (LP: #749809, #747725)
++ Include compiz version tag if the problem is a compiz crash
+  (LP: #744355)
+
+ -- Bryce Harrington br...@ubuntu.com  Mon, 04 Apr 2011 19:01:36 -0700
+
 xorg (1:7.6+4ubuntu1) natty; urgency=low
 
   [ Timo Aaltonen ]


-- 
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/e1q6vcp-kk...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit 66390cb5d338b729e4f6722d234c318781fe57c9
Author: Bryce Harrington br...@canonical.com
Date:   Thu Mar 31 23:19:27 2011 -0700

Bump for release

diff --git a/debian/changelog b/debian/changelog
index a071dcb..f3ecca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.6+4ubuntu1) natty; urgency=low
 
   [Timo Aaltonen]
   * Merge from Debian unstable. Remaining Ubuntu changes:
@@ -34,7 +34,7 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
 video-all for amd64 and i386, to provide remote graphical
 desktop functionality for KVM.
 
- -- Bryce Harrington br...@ubuntu.com  Thu, 24 Mar 2011 11:06:36 -0700
+ -- Bryce Harrington br...@ubuntu.com  Thu, 31 Mar 2011 23:19:10 -0700
 
 xorg (1:7.6+4) unstable; 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/e1q5xht-0004w2...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog  |   14 --
 debian/scripts/vars.arm   |   23 +--
 debian/scripts/vars.armeb |   22 +-
 3 files changed, 10 insertions(+), 49 deletions(-)

New commits:
commit 87190c3d4b4970af744892a33308a9adb7a9fbc0
Author: Bryce Harrington br...@canonical.com
Date:   Fri Apr 1 00:08:10 2011 -0700

Mention cleanup of vars.arm*

diff --git a/debian/changelog b/debian/changelog
index f3ecca7..c6095c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xorg (1:7.6+4ubuntu1) natty; urgency=low
 
-  [Timo Aaltonen]
+  [ Timo Aaltonen ]
   * Merge from Debian unstable. Remaining Ubuntu changes:
 - Add apport hook
 - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
@@ -26,15 +26,17 @@ xorg (1:7.6+4ubuntu1) natty; urgency=low
   * control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
 universe.
 
-  [Bryce Harrington]
+  [ Bryce Harrington ]
   * apport/source_xorg.py:
 - Include 'xinput list' output for input device issues.
 - For amd64 arch's, include version of ia32-libs package.
-  * scripts/amd64, scripts/i386: Include the -qxl video driver in
-video-all for amd64 and i386, to provide remote graphical
-desktop functionality for KVM.
+  * scripts/vars.amd64, scripts/vars.i386:
+- Include the -qxl video driver in video-all for amd64 and i386, to
+  provide remote graphical desktop functionality for KVM.
+  * scripts/vars.arm, scripts/vars.armeb, scripts/vars.armel:
+- Drop obscure drivers that are likely irrelevant for ARM.
 
- -- Bryce Harrington br...@ubuntu.com  Thu, 31 Mar 2011 23:19:10 -0700
+ -- Bryce Harrington br...@ubuntu.com  Fri, 01 Apr 2011 00:05:38 -0700
 
 xorg (1:7.6+4) unstable; urgency=low
 

commit ca186ff7d0dfdb15c04122067eef75cf846a702c
Author: Bryce Harrington br...@canonical.com
Date:   Fri Apr 1 00:05:10 2011 -0700

Also update the arm and armeb video drivers same as armel

diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index dfef521..1f30685 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,35 +3,14 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS= \
-   xserver-xorg-video-ati, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-mga, \
-   xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
-   xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
-   xserver-xorg-video-trident, \
xserver-xorg-video-vesa, \
 
 
-# xserver-xorg-video-apm,
-# xserver-xorg-video-ark,
-# xserver-xorg-video-glide,
-# xserver-xorg-video-chips,
-# xserver-xorg-video-i128,
-# xserver-xorg-video-i740,
-# xserver-xorg-video-tseng,
-# xserver-xorg-video-voodoo,
-
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics
 
-
 XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 87c6ba7..1f30685 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,34 +3,14 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
-   xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
-   xserver-xorg-video-mga, \
-   xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
-   xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
-   xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
 
 
-# xserver-xorg-video-glide,
-
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics
 
-
 XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom


-- 
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/e1q5yt9-0006cv...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |2 ++
 debian/changelog |5 +++--
 debian/scripts/vars.armel|   22 +-
 3 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit 46b0859f52306530a8ac6d39bedbb32027ad0316
Author: Bryce Harrington br...@canonical.com
Date:   Fri Mar 25 12:22:39 2011 -0700

* apport/source_xorg.py:
  - Include 'xinput list' output for input device issues.
  - For amd64 arch's, include version of ia32-libs package.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 1d5b636..d703a31 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -291,6 +291,8 @@ def attach_xorg_package_versions(report, ui=None):
 xserver-xorg-video-ati,
 xserver-xorg-video-nouveau]:
 report['version.%s' %(package)] = package_versions(package)
+if report['Architecture'] == 'amd64':
+report['version.ia32-libs'] = package_versions('ia32-libs')
 
 def attach_2d_info(report, ui=None):
 attach_file_if_exists(report, '/var/log/plymouth-debug.log', 
'PlymouthDebug')
diff --git a/debian/changelog b/debian/changelog
index f7e84fc..a071dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,9 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
 universe.
 
   [Bryce Harrington]
-  * apport/source_xorg.py: Include 'xinput list' output for input device
-issues.
+  * apport/source_xorg.py:
+- Include 'xinput list' output for input device issues.
+- For amd64 arch's, include version of ia32-libs package.
   * scripts/amd64, scripts/i386: Include the -qxl video driver in
 video-all for amd64 and i386, to provide remote graphical
 desktop functionality for KVM.
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 87c6ba7..1f30685 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,34 +3,14 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
-   xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
-   xserver-xorg-video-mga, \
-   xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
-   xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
-   xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
 
 
-# xserver-xorg-video-glide,
-
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics
 
-
 XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom


-- 
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/e1q3cb3-0006eo...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |1 +
 debian/changelog |4 +++-
 debian/scripts/vars.amd64|1 +
 debian/scripts/vars.armel|1 +
 debian/scripts/vars.i386 |1 +
 debian/scripts/vars.powerpc  |1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1299557bb236c90e6df35717c42f8c51ce0bc16d
Author: Bryce Harrington br...@canonical.com
Date:   Thu Mar 24 11:09:31 2011 -0700

scripts/armel, scripts/amd64, scripts/i386, scripts/powerpc: Include the 
-qxl video driver in video-all

diff --git a/debian/changelog b/debian/changelog
index 4a75202..abbd9e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,10 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
   [Bryce Harrington]
   * apport/source_xorg.py: Include 'xinput list' output for input device
 issues.
+  * scripts/armel, scripts/amd64, scripts/i386, scripts/powerpc:
+Include the -qxl video driver in video-all
 
- -- Bryce Harrington br...@ubuntu.com  Mon, 21 Mar 2011 18:17:28 -0700
+ -- Bryce Harrington br...@ubuntu.com  Thu, 24 Mar 2011 11:06:36 -0700
 
 xorg (1:7.6+4) unstable; urgency=low
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 52bcb61..ecf4bf7 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -15,6 +15,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
+xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 87c6ba7..4d55e29 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 2e96d3b..29a437c 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -17,6 +17,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
+xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 65e45d7..5f4ff23 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -8,6 +8,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nouveau, \
+xserver-xorg-video-qxl, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \

commit d4852414e9960acd4fdcada66130bb080ef0
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 22 14:08:54 2011 -0700

Also list libgl1-mesa-dri versions; this will help indicate if the
experimental dri drivers are installed.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 06f8d03..1d5b636 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -284,6 +284,7 @@ def attach_xorg_package_versions(report, ui=None):
 for package in [
 xserver-xorg,
 libgl1-mesa-glx,
+libgl1-mesa-dri*,
 libdrm2,
 compiz,
 xserver-xorg-video-intel,


-- 
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/e1q2oyg-0004rw...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog|5 +++--
 debian/scripts/vars.amd64   |2 +-
 debian/scripts/vars.armel   |1 -
 debian/scripts/vars.i386|2 +-
 debian/scripts/vars.powerpc |1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c1ba381a47ca78dfdcfbf1d45d7514aa11609ed7
Author: Bryce Harrington br...@canonical.com
Date:   Thu Mar 24 12:28:10 2011 -0700

scripts/amd64, scripts/i386: Include the -qxl video driver in video-all for 
amd64 and i386, to provide remote graphical desktop functionality for KVM.

diff --git a/debian/changelog b/debian/changelog
index abbd9e8..f7e84fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,9 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
   [Bryce Harrington]
   * apport/source_xorg.py: Include 'xinput list' output for input device
 issues.
-  * scripts/armel, scripts/amd64, scripts/i386, scripts/powerpc:
-Include the -qxl video driver in video-all
+  * scripts/amd64, scripts/i386: Include the -qxl video driver in
+video-all for amd64 and i386, to provide remote graphical
+desktop functionality for KVM.
 
  -- Bryce Harrington br...@ubuntu.com  Thu, 24 Mar 2011 11:06:36 -0700
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index ecf4bf7..c4da200 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -15,7 +15,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-xserver-xorg-video-qxl, \
+   xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 4d55e29..87c6ba7 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 29a437c..a255aa2 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -17,7 +17,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-xserver-xorg-video-qxl, \
+   xserver-xorg-video-qxl, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 5f4ff23..65e45d7 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nouveau, \
-xserver-xorg-video-qxl, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \


-- 
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/e1q2qck-0004np...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0a2c6b1801cba1c0ada14e82e908eb1cb47bee84
Author: Bryce Harrington br...@canonical.com
Date:   Mon Mar 21 18:19:54 2011 -0700

Release note

diff --git a/debian/changelog b/debian/changelog
index 314026d..4a75202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
 
+  [Timo Aaltonen]
   * Merge from Debian unstable. Remaining Ubuntu changes:
 - Add apport hook
 - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
@@ -25,7 +26,11 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
   * control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
 universe.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 08 Mar 2011 15:48:47 +0200
+  [Bryce Harrington]
+  * apport/source_xorg.py: Include 'xinput list' output for input device
+issues.
+
+ -- Bryce Harrington br...@ubuntu.com  Mon, 21 Mar 2011 18:17:28 -0700
 
 xorg (1:7.6+4) unstable; 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/e1q25zh-0001a1...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 96064781f07187abffe8c35232beddb0029c205b
Author: Bryce Harrington br...@canonical.com
Date:   Mon Mar 21 15:19:54 2011 -0700

Include `xinput list` output in apport reports.

(I'd like to include lsinput too, but that requires sudo privs, and it's
needed only in a very small proportion of cases, which would be too
irritating to prompt about sudo in all bugs.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a36fd4a..06f8d03 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -384,6 +384,7 @@ def attach_input_device_info(report, ui=None):
 attach_command_output(report, ['locale'], 'locale')
 
 # For input device bugs
+attach_command_output(report, ['xinput', '--list'], 'xinput')
 attach_command_output(report, ['gconftool-2', '-R', 
'/desktop/gnome/peripherals'], 'peripherals')
 
 def attach_nvidia_info(report, ui=None):


-- 
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/e1q1nbq-0006gh...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog   |  133 ++-
 debian/control |   70 ---
 debian/local/Xsession.d/50x11-common_determine-startup |3 
 debian/local/control   |1 
 debian/local/dexconf   |  304 -
 debian/local/dexconf.1 |  246 -
 debian/local/xorg.conf |   96 -
 debian/local/xserver-wrapper.c |1 
 debian/rules   |   21 -
 debian/scripts/vars.amd64  |6 
 debian/scripts/vars.hurd-i386  |2 
 debian/scripts/vars.i386   |6 
 debian/scripts/vars.kfreebsd-amd64 |2 
 debian/scripts/vars.kfreebsd-i386  |2 
 debian/scripts/vars.powerpc|3 
 debian/x11-common.postinst.in  |   78 +++-
 debian/x11-common.postrm.in|   15 
 debian/x11-common.preinst.in   |   16 
 debian/xbase-clients.postinst.in   |   20 -
 debian/xbase-clients.postrm.in |   20 -
 debian/xbase-clients.preinst.in|   20 -
 debian/xserver-xorg.examples   |1 
 debian/xserver-xorg.install|2 
 debian/xserver-xorg.manpages   |1 
 debian/xutils.postinst.in  |   35 -
 debian/xutils.postrm.in|   31 -
 debian/xutils.preinst.in   |   31 -
 xsf-docs/.gitignore|3 
 xsf-docs/COPYING   |   19 +
 xsf-docs/Makefile  |   61 +++
 xsf-docs/faq/general.mdwn  |   58 +++
 xsf-docs/howto/build-mesa.mdwn |  201 +++
 xsf-docs/howto/configure-input.mdwn|  176 +
 xsf-docs/howto/report-bugs.mdwn|   38 ++
 xsf-docs/howto/triage-bugs.mdwn|   95 +
 xsf-docs/howto/use-gdb.mdwn|  141 +++
 xsf-docs/howto/use-xrandr.mdwn |  173 +
 xsf-docs/howtos|1 
 xsf-docs/index.mdwn|   34 +
 xsf-docs/mdwn2html |   63 +++
 xsf-docs/reference/dependencies.mdwn   |  221 
 xsf-docs/reference/squeeze-backports.mdwn  |   65 +++
 xsf-docs/reference/upstream-contacts.mdwn  |   43 ++
 xsf-docs/upstream-features.mdwn|   16 
 xsf-docs/xsf.css   |   94 +
 xsf-docs/xsf.png   |binary
 xsf-docs/xsf.svg   |  234 +
 47 files changed, 1976 insertions(+), 926 deletions(-)

New commits:
commit 1ace9ac414f8b58d11cec396e65cea6e1be3ebc1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Mar 9 16:52:49 2011 +0200

control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in 
universe.

diff --git a/debian/changelog b/debian/changelog
index dd6efa8..314026d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
 (LP: #654353)
   * x11-common: Clean up old configuration file removals from
 {preinst,postinst,postrm}.in.
+  * control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
+universe.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 08 Mar 2011 15:48:47 +0200
 
diff --git a/debian/control b/debian/control
index 0c00feb..74c6a23 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends:
  debhelper (= 7.3.15ubuntu3),
  po-debconf,
 # xsf-docs:
- markdown,
- wkhtmltopdf,
- xauth,
- xvfb,
+# markdown,
+# wkhtmltopdf,
+# xauth,
+# xvfb,
 Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
diff --git a/debian/rules b/debian/rules
index b09638b..25c80b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ include debian/scripts/vars.$(ARCH)
 clean: cleanscripts
dh_testdir
dh_clean debian/local/X debian/po/pothead
-   $(MAKE) -C xsf-docs clean
+#  $(MAKE) -C xsf-docs clean
-rm -rf stampdir
-rm -f debian/po-failsafe/failsafexinit.pot
-debconf-updatepo
@@ -54,11 +54,11 @@ build-stamp: scripts-stamp
xgettext -f debian/po-failsafe/POTFILES.in -d failsafexinit -o 
debian/po-failsafe/failsafexinit.pot -L Shell
 ifneq (,$(filter sparc sparc64,$(DEB_HOST_ARCH)))
# work around 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   13 +++--
 debian/changelog |   10 ++
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 3997f9a4d636468846103ae3b714145cbd0b31e9
Author: Bryce Harrington br...@canonical.com
Date:   Wed Mar 2 11:29:31 2011 -0800

* apport/source_xorg.py:
  - Fix typo in nvidia data collection
  - Only collect gdm logs if gdm appears to be present, so as not to
cause file not found errors when it isn't.
(LP: #722914)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index c9f4265..a36fd4a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -307,11 +307,12 @@ def attach_2d_info(report, ui=None):
 # For font dpi bugs
 attach_command_output(report, ['xdpyinfo'], 'xdpyinfo')
 
-if ui and ui.yesno(Your gdm log files may help developers diagnose the 
bug, but may contain sensitive information.  Do you want to include these logs 
in your bug report?) == True:
-attach_root_command_outputs(report, {
-'GdmLog': 'cat /var/log/gdm/:0.log',
-'GdmLog1': 'cat /var/log/gdm/:0.log.1',
-'GdmLog2': 'cat /var/log/gdm/:0.log.2'})
+if os.path.lexists('/var/log/gdm'):
+if ui and ui.yesno(Your gdm log files may help developers diagnose 
the bug, but may contain sensitive information.  Do you want to include these 
logs in your bug report?) == True:
+attach_root_command_outputs(report, {
+'GdmLog': 'cat /var/log/gdm/:0.log',
+'GdmLog1': 'cat /var/log/gdm/:0.log.1',
+'GdmLog2': 'cat /var/log/gdm/:0.log.2'})
 
 def attach_3d_info(report, ui=None):
 if os.environ.get('DISPLAY'):
@@ -399,7 +400,7 @@ def attach_nvidia_info(report, ui=None):
 attach_file(report, logfile)
 
 if os.path.lexists('/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'):
-if retval(['/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'] == 
0):
+if retval(['/usr/lib/nvidia-current/bin/nvidia-bug-report.sh']) == 
0:
 attach_file_if_exists(report, 
os.path.expanduser('~/nvidia-bug-report.log.gz'),
   'NvidiaBugReportLog')
 
diff --git a/debian/changelog b/debian/changelog
index 8e2135e..960940e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.6~3ubuntu11) natty; urgency=low
+
+  * apport/source_xorg.py:
+- Fix typo in nvidia data collection
+- Only collect gdm logs if gdm appears to be present, so as not to
+  cause file not found errors when it isn't.
+  (LP: #722914)
+
+ -- Bryce Harrington br...@ubuntu.com  Wed, 02 Mar 2011 10:56:02 -0800
+
 xorg (1:7.6~3ubuntu10) natty; urgency=low
 
   * apport/source_xorg.py:


-- 
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/e1px1vf-00044b...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   21 +++--
 debian/changelog |   12 
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 1251be1494cce567c4c91540824ba465e9878666
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 1 17:01:06 2011 -0800

Check for null when checking for upgrades.  Can fail if apt.log is empty or 
unreadable. (LP: #723061)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index da10dc0..585accb 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -247,7 +247,7 @@ def attach_dist_upgrade_status(report, ui=None):
 # TODO: Not sure if this is quite exactly what I want, but close...
 upgraded = command_output_quiet(
 ['head', '-n', '1', '/var/log/dist-upgrade/apt.log'])
-if len(upgraded)  0:
+if upgraded and len(upgraded)  0:
 report['DistUpgraded'] = Yes, recently upgraded %s %(upgraded)
 else:
 report['DistUpgraded'] = Unknown
diff --git a/debian/changelog b/debian/changelog
index a3dafc2..b99fd8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xorg (1:7.6~3ubuntu9) natty; urgency=low
 - Collect update-alternatives info in case of proprietary drivers
 - Generate nvidia-bug-report.log.gz if -nvidia loaded
 - Don't quell errors calling unity_support_test (LP: #710630)
+- Check for null when checking for upgrades.  Can fail if apt.log is
+  empty or unreadable. (LP: #723061)
 
- -- Bryce Harrington br...@ubuntu.com  Tue, 01 Mar 2011 16:52:41 -0800
+ -- Bryce Harrington br...@ubuntu.com  Tue, 01 Mar 2011 16:58:31 -0800
 
 xorg (1:7.6~3ubuntu8) natty; urgency=low
 

commit b96c2a7706d9e189d65c2e78f659ecf01a330b98
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 1 16:54:00 2011 -0800

Don't quell errors calling unity_support_test (LP: #710630)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 975eff1..da10dc0 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -314,7 +314,7 @@ def attach_3d_info(report, ui=None):
 if os.environ.get('DISPLAY'):
 if os.path.lexists('/usr/lib/nux/unity_support_test'):
 try:
-ust = command_output_quiet([
+ust = command_output([
 '/usr/lib/nux/unity_support_test', '-p'])
 ust = 
ust.replace('\x1b','').replace('[0;38;48m','').replace('[1;32;48m','')
 report['UnitySupportTest'] = ust
diff --git a/debian/changelog b/debian/changelog
index 4ea047d..a3dafc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.6~3ubuntu9) natty; urgency=low
 - Collect jockey info in the case of proprietary drivers
 - Collect update-alternatives info in case of proprietary drivers
 - Generate nvidia-bug-report.log.gz if -nvidia loaded
+- Don't quell errors calling unity_support_test (LP: #710630)
 
- -- Bryce Harrington br...@ubuntu.com  Tue, 01 Mar 2011 16:49:31 -0800
+ -- Bryce Harrington br...@ubuntu.com  Tue, 01 Mar 2011 16:52:41 -0800
 
 xorg (1:7.6~3ubuntu8) natty; urgency=low
 

commit 71eeaf9ed377efa967641522ba4d550e59bb68ef
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 1 16:51:35 2011 -0800

* apport/source_xorg.py:
  - Collect jockey info in the case of proprietary drivers
  - Collect update-alternatives info in case of proprietary drivers
  - Generate nvidia-bug-report.log.gz if -nvidia loaded

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 9aca105..975eff1 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -394,12 +394,23 @@ def attach_nvidia_info(report, ui=None):
 if os.path.basename(logfile) != 'README':
 attach_file(report, logfile)
 
+if os.path.lexists('/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'):
+if retval(['/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'] == 
0):
+attach_file_if_exists(report, 
os.path.expanduser('~/nvidia-bug-report.log.gz'),
+  'NvidiaBugReportLog')
+
 if os.environ.get('DISPLAY'):
 # Attach output of nvidia-settings --query if we've got a display
 # to connect to.
 report['nvidia-settings'] = command_output_quiet(
 ['nvidia-settings', '-q', 'all'])
 
+report['JockeyStatus'] = command_output_quiet(
+['jockey-text', '-l'])
+
+report['GlConf'] = command_output_quiet(
+['update-alternatives', '--display', 'gl_conf'])
+
 # File any X crash with -nvidia involved with the -nvidia bugs
 if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in 
report):
 if report.get('SourcePackage','Unknown') in core_x_packages:
@@ -410,6 +421,12 @@ def attach_fglrx_info(report, 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   91 ---
 debian/changelog |   14 ++
 2 files changed, 58 insertions(+), 47 deletions(-)

New commits:
commit 3883d8846cb21d4cc411fa9334a43af510b4ea23
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 1 18:17:13 2011 -0800

* apport/source_xorg.py:
  - Refactor command_output_quiet() to attach_command_output().
attach_command_output() is designed to follow the API style of
apport's attach_file() and attach_root_commands_output(), and is less
susceptible to faults caused by assigning None to elements of the
report[] dictionary.
(LP: #712109)
  - Replace remaining calls to command_output_quiet() with specialized
routine is_process_running().

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 1c0c19a..c9f4265 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -55,6 +55,12 @@ def installed_version(pkg):
 output = script.communicate()[0]
 return output.split('\n')[1].replace(Installed: , )
 
+def is_process_running(proc):
+log = command_output(['pidof', proc])
+if not log or log[:5] == Error or len(log)1:
+return False
+return True
+
 def nonfree_graphics_module(module_list = '/proc/modules'):
 '''
 Check loaded modules to see if a proprietary graphics driver is loaded.
@@ -75,15 +81,6 @@ def attach_command_output(report, command_list, key):
 return
 report[key] = log
 
-def command_output_quiet(command_list):
-'''
-On errors, quell error message and just return empty string
-'''
-log = command_output(command_list)
-if log[:5] == Error:
-return None
-return log
-
 def retval(command_list):
 '''
 Return the command exit code
@@ -105,8 +102,10 @@ def ubuntu_code_name():
 '''
 Return the ubuntu release code name, 'dapper', 'natty', etc.
 '''
-return command_output_quiet(['lsb_release','-sc'])
-
+code_name = command_output(['lsb_release','-sc'])
+if code_name[:5] == Error:
+return None
+return code_name
 
 ##
 #
@@ -329,16 +328,15 @@ def attach_3d_info(report, ui=None):
   os.path.expanduser('~/.drirc'),
   'drirc')
 
-if command_output_quiet(['pidof', 'compiz']):
+if is_process_running('compiz'):
 report['CompositorRunning'] = 'compiz'
-compiz_version = command_output_quiet([
-'compiz', '--version'])
+compiz_version = command_output(['compiz', '--version'])
 if compiz_version:
 version = compiz_version.split(' ')[1]
 version = version[:3]
 compiz_version_string = 'compiz-%s' % version
 report['Tags'] += ' ' + compiz_version_string
-elif command_output_quiet(['pidof', 'kwin']):
+elif is_process_running('kwin'):
 report['CompositorRunning'] = 'kwin'
 else:
 report['CompositorRunning'] = 'None'
diff --git a/debian/changelog b/debian/changelog
index b99fd8d..8e2135e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xorg (1:7.6~3ubuntu10) natty; urgency=low
+
+  * apport/source_xorg.py:
+- Refactor command_output_quiet() to attach_command_output().
+  attach_command_output() is designed to follow the API style of
+  apport's attach_file() and attach_root_commands_output(), and is less
+  susceptible to faults caused by assigning None to elements of the
+  report[] dictionary.
+  (LP: #712109)
+- Replace remaining calls to command_output_quiet() with specialized
+  routine is_process_running().
+
+ -- Bryce Harrington br...@ubuntu.com  Tue, 01 Mar 2011 18:15:59 -0800
+
 xorg (1:7.6~3ubuntu9) natty; urgency=low
 
   * apport/source_xorg.py:

commit 793f2ae64dfb2869724424f38e26a113051feee7
Author: Bryce Harrington br...@canonical.com
Date:   Tue Mar 1 18:04:54 2011 -0800

Switch from use of command_output_quiet() to attach_command_output()

attach_command_output() is designed to follow the API style of
apport's attach_file() and attach_root_commands_output(), and is less
susceptible to faults caused by assigning None to elements of the
report[] dictionary.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 585accb..1c0c19a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -69,6 +69,12 @@ def nonfree_graphics_module(module_list = '/proc/modules'):
 if m == nvidia or m == fglrx:
 return m
 
+def attach_command_output(report, command_list, key):
+log = command_output(command_list)
+if not log or log[:5] == Error:
+return
+report[key] = log
+
 def command_output_quiet(command_list):
 '''
 On errors, quell error message and just return empty string
@@ -236,7 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   12 ++--
 debian/changelog |9 +
 2 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 98ae73a5ba0842f5c236617a5d5d9d06fdec68e7
Author: Bryce Harrington br...@canonical.com
Date:   Thu Feb 24 18:29:51 2011 -0800

apport/source_xorg.py: Fix compiz bug tagging to tag 'compiz-0.9' rather 
than 'compiz-0.9.2' (LP: #724598)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 3a34119..9aca105 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -329,10 +329,10 @@ def attach_3d_info(report, ui=None):
 report['CompositorRunning'] = 'compiz'
 compiz_version = command_output_quiet([
 'compiz', '--version'])
-versions = string.split(compiz_version.replace(' ', '-'), '.')
-versions.pop()
-compiz_version = string.join(versions, '.')
-report['Tags'] += ' ' + compiz_version
+version = compiz_version.split(' ')[1]
+version = version[:3]
+compiz_version_string = 'compiz-%s' % version
+report['Tags'] += ' ' + compiz_version_string
 elif command_output_quiet(['pidof', 'kwin']):
 report['CompositorRunning'] = 'kwin'
 else:
diff --git a/debian/changelog b/debian/changelog
index c958085..7fbc233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6~3ubuntu8) natty; urgency=low
+
+  [Brian Murray]
+  * apport/source_xorg.py: Fix compiz bug tagging to tag 'compiz-0.9'
+rather than 'compiz-0.9.2'
+(LP: #724598)
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 24 Feb 2011 18:27:30 -0800
+
 xorg (1:7.6~3ubuntu7) natty; urgency=low
 
   * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs

commit 43dd2648bb3b86e288fbdaa622fe887c244c3ef6
Author: Bryce Harrington br...@canonical.com
Date:   Tue Feb 22 17:56:16 2011 -0800

Further clarify why nvidia is getting detected

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 987484b..3a34119 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -208,9 +208,9 @@ def check_is_reportable(report, ui=None):
 if os.path.exists('/var/log/nvidia-installer.log'):
 # User has installed nVidia drivers manually at some point.
 # This is likely to have caused problems.
-if ui and not ui.yesno(It appears you may have installed the nVidia 
drivers manually from nvidia.com.  This can cause problems with the 
Ubuntu-supplied drivers.
+if ui and not ui.yesno(It appears you may have installed the nVidia 
drivers manually from nvidia.com at some point in the past.  This can cause 
problems with the Ubuntu-supplied drivers.
 
-If you have not already uninstalled the drivers downloaded from nvidia.com, 
please uninstall them and reinstall the Ubuntu packages before filing a bug 
with Ubuntu.
+If you have not already uninstalled the drivers downloaded from nvidia.com, 
please uninstall them and reinstall the Ubuntu packages before filing a bug 
with Ubuntu.  If you have uninstalled them, then you may want to remove the 
file /var/log/nvidia-installer.log as well.
 
 Have you uninstalled the drivers from nvidia.com?):
 report['UnreportableReason'] = 'The drivers from nvidia.com are 
not supported by Ubuntu.  Please uninstall them and test whether your problem 
still occurs.'


-- 
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/e1psnrw-0006lp...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Steve Langasek]

 debian/changelog |7 +++
 debian/control   |1 +
 2 files changed, 8 insertions(+)

New commits:
commit 5a40ed4761657276f42f41c94b311d002590f711
Author: Steve Langasek steve.langa...@canonical.com
Date:   Mon Feb 21 19:41:13 2011 -0800

releasing version 1:7.6~3ubuntu7

diff --git a/debian/changelog b/debian/changelog
index 0d656fb..c958085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.6~3ubuntu7) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu7) natty; urgency=low
 
   * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
 have their dependency satisfied by it.
 
- -- Steve Langasek steve.langa...@ubuntu.com  Tue, 22 Feb 2011 03:40:03 +
+ -- Steve Langasek steve.langa...@ubuntu.com  Tue, 22 Feb 2011 03:41:05 +
 
 xorg (1:7.6~3ubuntu6) natty; urgency=low
 

commit 814c34e7388a24fb108fb7b76dd71289e534d86e
Author: Steve Langasek steve.langa...@canonical.com
Date:   Mon Feb 21 19:40:24 2011 -0800

Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs have 
their dependency satisfied by it.

diff --git a/debian/changelog b/debian/changelog
index 0569164..0d656fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6~3ubuntu7) UNRELEASED; urgency=low
+
+  * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
+have their dependency satisfied by it.
+
+ -- Steve Langasek steve.langa...@ubuntu.com  Tue, 22 Feb 2011 03:40:03 +
+
 xorg (1:7.6~3ubuntu6) natty; urgency=low
 
   * apport/source_xorg.py:
diff --git a/debian/control b/debian/control
index 330d056..26c5d69 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
 Package: x11-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further


-- 
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/e1prj7y-0008qj...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |2 +-
 debian/changelog |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 4384d2a7c65343aaa0cc0536a126bb94fa29f592
Author: Bryce Harrington br...@canonical.com
Date:   Fri Feb 18 16:11:26 2011 -0800

* apport/source_xorg.py:
  - Fix typo in pci parsing so it correctly gets gpu pci id

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 64e7370..987484b 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -268,7 +268,7 @@ def attach_graphic_card_pci_info(report, ui=None):
 for line in paragraph.split('\n'):
 if ':' not in line:
 continue
-key, value = line.split(':', 1)
+key, value = line.split(': ', 1)
 value = value.strip()
 key = key.strip()
 if VGA compatible controller in key:
diff --git a/debian/changelog b/debian/changelog
index ff31c9e..0569164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6~3ubuntu6) natty; urgency=low
+
+  * apport/source_xorg.py:
+- Fix typo in pci parsing so it correctly gets gpu pci id
+
+ -- Bryce Harrington br...@ubuntu.com  Fri, 18 Feb 2011 16:10:53 -0800
+
 xorg (1:7.6~3ubuntu5) natty; urgency=low
 
   * apport/source_xorg.py:


-- 
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/e1pqaqt-000498...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   27 ++-
 debian/changelog |7 +--
 2 files changed, 11 insertions(+), 23 deletions(-)

New commits:
commit 6ad014fc0dd9fa21d376c594c7dfd8b8fd55c78e
Author: Bryce Harrington br...@canonical.com
Date:   Thu Feb 17 11:45:02 2011 -0800

  - Drop 'glxinfo' since it's been demoted to universe (LP: #714784)
  - Switch to new attach_root_command_outputs() call.  Prevents prompting
for password 3 times for 3 gdm files (thanks Pitti!) (LP: #716595)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a9e3f2a..64e7370 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -78,15 +78,6 @@ def command_output_quiet(command_list):
 return None
 return log
 
-def root_collect_file_contents(path):
-'''
-Returns the contents of given file collected as root user
-'''
-log = root_command_output(['cat', path])
-if log[:5] == Error:
-return Not present
-return log
-
 def retval(command_list):
 '''
 Return the command exit code
@@ -314,9 +305,10 @@ def attach_2d_info(report, ui=None):
 report['xdpyinfo'] = command_output_quiet(['xdpyinfo'])
 
 if ui and ui.yesno(Your gdm log files may help developers diagnose the 
bug, but may contain sensitive information.  Do you want to include these logs 
in your bug report?) == True:
-report['GdmLog']  = root_collect_file_contents('/var/log/gdm/:0.log')
-report['GdmLog1'] = root_collect_file_contents('/var/log/gdm/:0.log.1')
-report['GdmLog2'] = root_collect_file_contents('/var/log/gdm/:0.log.2')
+attach_root_command_outputs(report, {
+'GdmLog': 'cat /var/log/gdm/:0.log',
+'GdmLog1': 'cat /var/log/gdm/:0.log.1',
+'GdmLog2': 'cat /var/log/gdm/:0.log.2'})
 
 def attach_3d_info(report, ui=None):
 if os.environ.get('DISPLAY'):
diff --git a/debian/changelog b/debian/changelog
index 5e27833..ff31c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-xorg (1:7.6~3ubuntu5) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu5) natty; urgency=low
 
   * apport/source_xorg.py:
 - Add 'locale' information (for keyboards)
+- Drop 'glxinfo' since it's been demoted to universe (LP: #714784)
+- Switch to new attach_root_command_outputs() call.  Prevents prompting
+  for password 3 times for 3 gdm files (thanks Pitti!) (LP: #716595)
 
- -- Bryce Harrington br...@ubuntu.com  Wed, 16 Feb 2011 18:37:41 -0800
+ -- Bryce Harrington br...@ubuntu.com  Thu, 17 Feb 2011 11:42:58 -0800
 
 xorg (1:7.6~3ubuntu4) natty; urgency=low
 

commit 1437a88ca77fce683e8a1b93248df1e5058d9995
Author: Bryce Harrington br...@canonical.com
Date:   Thu Feb 17 11:35:57 2011 -0800

Strip out use of glxinfo from apport hook

This tool is no longer provided in 'main' since the split-out of
mesa-utils (and it's not going to be re-added just for this).  Since we
already have alternate ways of gathering the info that actually use,
there isn't much value in conditionally using it if it's present and
omitting it if not, so just drop its use entirely.  For corner cases
where we do actually need the info, the user would probably need to be
told to install it anyway.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 04b69f9..a9e3f2a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -328,8 +328,7 @@ def attach_3d_info(report, ui=None):
 report['UnitySupportTest'] = ust
 except AssertionError:
 report['UnitySupportTest'] = 'FAILED TO RUN'
-
-report['glxinfo'] = command_output_quiet(['glxinfo'])
+
 attach_file_if_exists(report,
   os.path.expanduser('~/.drirc'),
   'drirc')
@@ -348,14 +347,8 @@ def attach_3d_info(report, ui=None):
 report['CompositorRunning'] = 'None'
 
 # Detect software rasterizer
-glxinfo = report.get('glxinfo', '')
 xorglog = report.get('XorgLog', '')
-if len(glxinfo)0:
-if 'renderer string: Software Rasterizer' in glxinfo:
-report['Renderer'] = 'Software'
-else:
-report['Renderer'] = 'Hardware acceleration'
-elif len(xorglog)0:
+if len(xorglog)0:
 if 'reverting to software rendering' in xorglog:
 report['Renderer'] = 'Software'
 elif 'Direct rendering disabled' in xorglog:


-- 
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/e1pq9mp-0001ho...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |1 +
 debian/changelog |   15 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 6b05418b62b692b3ce5ee93448ed5e20153cb062
Author: Bryce Harrington br...@canonical.com
Date:   Wed Feb 16 18:38:17 2011 -0800

* apport/source_xorg.py:
  - Add 'locale' information (for keyboards)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index f17446f..04b69f9 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -391,6 +391,7 @@ def attach_input_device_info(report, ui=None):
 if report.get('SourcePackage','Unknown') in keyboard_packages:
 report['setxkbmap'] = command_output_quiet(['setxkbmap', '-print'])
 report['xkbcomp'] = command_output_quiet(['xkbcomp', ':0', '-w0', 
'-'])
+report['locale'] = command_output_quiet(['locale'])
 
 # For input device bugs
 report['peripherals'] = command_output_quiet(['gconftool-2', '-R', 
'/desktop/gnome/peripherals'])
diff --git a/debian/changelog b/debian/changelog
index 66102b6..5e27833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-xorg (1:7.6~3ubuntu4) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu5) UNRELEASED; urgency=low
+
+  * apport/source_xorg.py:
+- Add 'locale' information (for keyboards)
+
+ -- Bryce Harrington br...@ubuntu.com  Wed, 16 Feb 2011 18:37:41 -0800
+
+xorg (1:7.6~3ubuntu4) natty; urgency=low
 
   * apport/source_xorg.py:
 - Fix misspelling of CompositorRunning
 - report[compiz_version] should just be compiz_version (LP: #716733)
-  
 
- -- Bryce Harrington br...@ubuntu.com  Thu, 10 Feb 2011 19:02:33 -0800
+ -- Bryce Harrington br...@ubuntu.com  Thu, 10 Feb 2011 19:07:11 -0800
 
 xorg (1:7.6~3ubuntu3) natty; urgency=low
 

commit 8d8d9d73ec22983978f2f5d6f7d66f4006128516
Author: Bryce Harrington br...@bryceharrington.org
Date:   Thu Feb 10 19:15:29 2011 -0800

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index f73037c..66102b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 xorg (1:7.6~3ubuntu4) UNRELEASED; urgency=low
 
-  * apport/source_xorg.py: Fix misspelling of CompositorRunning
+  * apport/source_xorg.py:
+- Fix misspelling of CompositorRunning
+- report[compiz_version] should just be compiz_version (LP: #716733)
+  
 
- -- Bryce Harrington br...@ubuntu.com  Thu, 03 Feb 2011 15:24:18 -0800
+ -- Bryce Harrington br...@ubuntu.com  Thu, 10 Feb 2011 19:02:33 -0800
 
 xorg (1:7.6~3ubuntu3) 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/e1pptle-0007cu...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   14 ++
 debian/changelog |   20 +++-
 2 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit a2948c5b35108c1331ef224c2d24d92aa12d56b9
Author: Bryce Harrington br...@canonical.com
Date:   Thu Feb 3 15:24:58 2011 -0800

apport/source_xorg.py: Fix misspelling of CompositorRunning

* apport/source_xorg.py: Fix misspelling of CompositorRunning
* apport/source_xorg.py:
  - Tag bugs with compiz version
  - Trim out colored output from unity_support_test, which causes apport
to choke when reporting compiz bugs.
(LP: #710630)
  - debian/x11-common.postinst.in,
debian/x11-common.postrm.in,

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 4135f44..5ad57ee 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -321,8 +321,14 @@ def attach_2d_info(report, ui=None):
 def attach_3d_info(report, ui=None):
 if os.environ.get('DISPLAY'):
 if os.path.lexists('/usr/lib/nux/unity_support_test'):
-report['UnitySupportTest'] = command_output_quiet([
-'/usr/lib/nux/unity_support_test', '-p'])
+try:
+ust = command_output_quiet([
+'/usr/lib/nux/unity_support_test', '-p'])
+ust = 
ust.replace('\x1b','').replace('[0;38;48m','').replace('[1;32;48m','')
+report['UnitySupportTest'] = ust
+except AssertionError:
+report['UnitySupportTest'] = 'FAILED TO RUN'
+
 report['glxinfo'] = command_output_quiet(['glxinfo'])
 attach_file_if_exists(report,
   os.path.expanduser('~/.drirc'),
@@ -337,9 +343,9 @@ def attach_3d_info(report, ui=None):
 compiz_version = string.join(versions, '.')
 report['Tags'] += ' ' + report[compiz_version]
 elif command_output_quiet(['pidof', 'kwin']):
-report['CompisitorRunning'] = 'kwin'
+report['CompositorRunning'] = 'kwin'
 else:
-report['CompisitorRunning'] = 'None'
+report['CompositorRunning'] = 'None'
 
 # Detect software rasterizer
 glxinfo = report.get('glxinfo', '')
diff --git a/debian/changelog b/debian/changelog
index 57556b9..f73037c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-xorg (1:7.6~3ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu4) UNRELEASED; urgency=low
 
-  * apport/source_xorg.py:  Tag bugs with compiz version
+  * apport/source_xorg.py: Fix misspelling of CompositorRunning
 
- -- Bryce Harrington br...@ubuntu.com  Mon, 31 Jan 2011 18:09:57 -0800
+ -- Bryce Harrington br...@ubuntu.com  Thu, 03 Feb 2011 15:24:18 -0800
+
+xorg (1:7.6~3ubuntu3) natty; urgency=low
+
+  * apport/source_xorg.py:
+- Tag bugs with compiz version
+- Trim out colored output from unity_support_test, which causes apport
+  to choke when reporting compiz bugs.
+  (LP: #710630)
+
+ -- Bryce Harrington br...@ubuntu.com  Wed, 02 Feb 2011 16:03:57 -0800
 
 xorg (1:7.6~3ubuntu1) natty; urgency=low
 
@@ -29,8 +39,8 @@ xorg (1:7.6~3ubuntu1) natty; urgency=low
 of all packages to x11-common's.
 - debian/scripts/vars.*: Don't drop nouveau, wacom, synaptics from *-all
 - debian/xserver-xorg.postinst.in:  Also migrate users from psb → vesa.
-- debian/x11-common.postinst.in: 
-  debian/x11-common.postrm.in:
+- debian/x11-common.postinst.in,
+  debian/x11-common.postrm.in,
   debian/x11-common.preinst.in: Remove obsolete conffiles from xinit.
   * Bump Xserver dependency to 1.10RC1
 


-- 
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/e1pl8ye-u1...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1288bb61e04716c322ce6bac9797c45c09b4f8df
Author: Bryce Harrington br...@canonical.com
Date:   Thu Feb 3 15:26:30 2011 -0800

report[compiz_version] should just be compiz_version actually

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 5ad57ee..f17446f 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -341,7 +341,7 @@ def attach_3d_info(report, ui=None):
 versions = string.split(compiz_version.replace(' ', '-'), '.')
 versions.pop()
 compiz_version = string.join(versions, '.')
-report['Tags'] += ' ' + report[compiz_version]
+report['Tags'] += ' ' + compiz_version
 elif command_output_quiet(['pidof', 'kwin']):
 report['CompositorRunning'] = 'kwin'
 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/e1pl8zq-00015h...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 05d425e7c3a8e52090dd34555b12e2fa2289a60f
Author: Bryce Harrington br...@canonical.com
Date:   Tue Feb 1 09:48:47 2011 -0800

Don't need to tag with the ubuntu release anymore

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a1ac074..4135f44 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -127,7 +127,6 @@ def check_is_supported(report, ui=None):
 distro_codename = ubuntu_code_name()
 report['DistroCodename'] = distro_codename
 report['DistroVariant'] = ubuntu_variant_name()
-report['Tags'] += ' ' + report['DistroCodename']
 report['Tags'] += ' ' + report['DistroVariant']
 
 if not ui:


-- 
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/e1pkmpz-0003dq...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/README.source   |2 
 debian/changelog   |  106 +
 debian/control |   81 
 debian/local/debian-setup-keyboard |2 
 debian/rules   |4 +
 debian/scripts/vars.alpha  |7 +-
 debian/scripts/vars.amd64  |6 +-
 debian/scripts/vars.arm|6 +-
 debian/scripts/vars.armeb  |7 +-
 debian/scripts/vars.armel  |7 +-
 debian/scripts/vars.hppa   |7 +-
 debian/scripts/vars.hurd-i386  |1 
 debian/scripts/vars.i386   |8 ++
 debian/scripts/vars.ia64   |7 +-
 debian/scripts/vars.kfreebsd-amd64 |1 
 debian/scripts/vars.kfreebsd-i386  |1 
 debian/scripts/vars.m32r   |7 +-
 debian/scripts/vars.m68k   |1 
 debian/scripts/vars.mips   |7 +-
 debian/scripts/vars.mipsel |7 +-
 debian/scripts/vars.powerpc|   12 ++--
 debian/scripts/vars.ppc64  |1 
 debian/scripts/vars.sh4|7 +-
 debian/scripts/vars.sparc  |4 +
 debian/scripts/vars.sparc64|   35 
 debian/x11-common.postinst.in  |   77 --
 debian/x11-common.postrm.in|   38 +
 debian/x11-common.preinst.in   |   21 ---
 debian/xorg.links  |1 
 debian/xsfbs/xsfbs.mk  |   35 +++-
 30 files changed, 246 insertions(+), 260 deletions(-)

New commits:
commit b9950f95f61e34a222ff06a893185184c86667b4
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Mon Jan 31 21:44:34 2011 +1100

Release to Natty

diff --git a/debian/changelog b/debian/changelog
index 3718872..a8e8539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6~3ubuntu1) ; urgency=low
+xorg (1:7.6~3ubuntu1) natty; urgency=low
 
   * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
 - Add apport hook

commit 340b4c32d01d77ebc600c16ab13c2397cd9055c0
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Mon Jan 31 21:40:45 2011 +1100

Bump Xserver depends to 1.10RC1+git

diff --git a/debian/changelog b/debian/changelog
index 5436ba6..3718872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ xorg (1:7.6~3ubuntu1) ; urgency=low
 - debian/x11-common.postinst.in: 
   debian/x11-common.postrm.in:
   debian/x11-common.preinst.in: Remove obsolete conffiles from xinit.
+  * Bump Xserver dependency to 1.10RC1
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 31 Jan 2011 
21:29:57 +1100
 
diff --git a/debian/control b/debian/control
index 4f99150..330d056 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Description: X Window System (X.Org) infrastructure
 Package: xserver-xorg
 Architecture: any
 Depends:
- xserver-xorg-core (= 2:1.9.0.901),
+ xserver-xorg-core (= 2:1.9.99.901+git20110131),
  xserver-xorg-video-all | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],

commit e93304834e44bf1ad6c978185a8d4b2ce309
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jan 28 12:49:02 2011 +0100

x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.

Since sarge (I think), no other package has been handling
/etc/X11/Xwrapper.config, so assume we're the only owner, remove the
state files on upgrade.  The checksum is also not needed, we read the
allowed_users value from the file in the config script and preserve it.

diff --git a/debian/changelog b/debian/changelog
index ffa76a9..9aa0a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6~3) UNRELEASED; urgency=low
+
+  * x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
+Since sarge (I think), no other package has been handling
+/etc/X11/Xwrapper.config, so assume we're the only owner, remove the state
+files on upgrade.  The checksum is also not needed, we read the
+allowed_users value from the file in the config script and preserve it.
+Closes: #611271.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 28 Jan 2011 12:40:27 +0100
+
 xorg (1:7.6~2) experimental; urgency=low
 
   * Drop xserver-xorg-video-nv, it's no longer supported.
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index abe2301..323d56c 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -21,35 +21,17 @@ 
XWRAPPER_CONFIG_ROSTER=$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE
 
 #INCLUDE_SHELL_LIB#
 
-# register this package as a (potential) handler of the X server wrapper
-# config file
-if ! fgrep -qsx $THIS_PACKAGE $XWRAPPER_CONFIG_ROSTER; then
-  echo $THIS_PACKAGE  $XWRAPPER_CONFIG_ROSTER
-fi
-
-if ! [ -d $CONFIG_AUX_DIR ]; then
-  mkdir --mode=755 --parents 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |7 +++
 debian/changelog |6 ++
 2 files changed, 13 insertions(+)

New commits:
commit 26cf7852fc355fc7b29c58e9e91f9891ecb90a70
Author: Bryce Harrington br...@canonical.com
Date:   Mon Jan 31 18:10:53 2011 -0800

apport/source_xorg.py:  Tag bugs with compiz version

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 45ef285..a1ac074 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -292,6 +292,7 @@ def attach_xorg_package_versions(report, ui=None):
 xserver-xorg,
 libgl1-mesa-glx,
 libdrm2,
+compiz,
 xserver-xorg-video-intel,
 xserver-xorg-video-ati,
 xserver-xorg-video-nouveau]:
@@ -330,6 +331,12 @@ def attach_3d_info(report, ui=None):
 
 if command_output_quiet(['pidof', 'compiz']):
 report['CompositorRunning'] = 'compiz'
+compiz_version = command_output_quiet([
+'compiz', '--version'])
+versions = string.split(compiz_version.replace(' ', '-'), '.')
+versions.pop()
+compiz_version = string.join(versions, '.')
+report['Tags'] += ' ' + report[compiz_version]
 elif command_output_quiet(['pidof', 'kwin']):
 report['CompisitorRunning'] = 'kwin'
 else:
diff --git a/debian/changelog b/debian/changelog
index a8e8539..57556b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6~3ubuntu2) UNRELEASED; urgency=low
+
+  * apport/source_xorg.py:  Tag bugs with compiz version
+
+ -- Bryce Harrington br...@ubuntu.com  Mon, 31 Jan 2011 18:09:57 -0800
+
 xorg (1:7.6~3ubuntu1) natty; urgency=low
 
   * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:


-- 
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/e1pk5hu-00023n...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/scripts/vars.arm |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 09f7047e32bb00bdb66dacaae8951415ef89b3bd
Author: Bryce Harrington br...@canonical.com
Date:   Fri Jan 28 16:28:07 2011 -0800

Drop some drivers from the arm image that the X team plans to deprecate
soon anyway, to simplify arm image respins.

diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 36121db..44f3f5b 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,14 +3,10 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-rendition, \
@@ -22,12 +18,17 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
 
 
+# xserver-xorg-video-apm,
+# xserver-xorg-video-ark,
 # xserver-xorg-video-glide,
+# xserver-xorg-video-chips,
+# xserver-xorg-video-i128,
+# xserver-xorg-video-i740,
+# xserver-xorg-video-tseng,
+# xserver-xorg-video-voodoo,
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \


-- 
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/e1piygk-0007xx...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |6 +++---
 debian/changelog |8 
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit aeecc3f91b1483fadd66d45b3e8a666e284ea64f
Author: Bryce Harrington br...@canonical.com
Date:   Wed Jan 19 12:43:39 2011 -0800

debian/apport/source_xorg.py: Fix tagging for bugs filed on machines with 
manually-installed -nvidia drivers. (LP: #704848)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a9bfb17..6d670dc 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -167,11 +167,11 @@ def check_is_supported(report, ui=None):
 
 # Regression after a system update
 elif 2 in response:
-report['Tags'] += ' regression-update'
+report['Tags'] += ' ' + 'regression-update'
 response = ui.yesno(Thanks for reporting this regression in 
Ubuntu %s.  Do you know exactly which package and version caused the 
regression? %(distro_codename))
 if response:
 ui.information(Excellent.  Please make sure to list the 
package name and version in the bug report's description.  That is vital 
information for pinpointing the cause of the regression, which will make 
solving this bug go much faster.)
-report['Tags'] += ' needs-reassignment'
+report['Tags'] += ' ' + 'needs-reassignment'
 return True
 else:
 ui.information(Okay, your /var/log/dpkg.log will be attached. 
 Please indicate roughly when you first started noticing the problem.  This 
information will help in narrowing down the suspect package updates.)
@@ -225,7 +225,7 @@ Have you uninstalled the drivers from nvidia.com?):
 report['UnreportableReason'] = 'The drivers from nvidia.com are 
not supported by Ubuntu.  Please uninstall them and test whether your problem 
still occurs.'
 return
 attach_file(report, '/var/log/nvidia-installer.log', 
'nvidia-installer.log')
-tags.append('possible-manual-nvidia-install')
+report['Tags'] += ' ' + 'possible-manual-nvidia-install'
 
 return True
 
diff --git a/debian/changelog b/debian/changelog
index fe60cd5..7105dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5+6ubuntu8) natty; urgency=low
+
+  * debian/apport/source_xorg.py: Fix tagging for bugs filed on machines
+with manually-installed -nvidia drivers.
+(LP: #704848)
+
+ -- Bryce Harrington br...@ubuntu.com  Wed, 19 Jan 2011 12:40:38 -0800
+
 xorg (1:7.5+6ubuntu7) natty; urgency=low
 
   * debian/control: Drop xfonts-{75,100}dpi from Depends: to Suggests:. We


-- 
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/e1pfesj-0004zo...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit a33b2f8c70734d1703578ad91dbee6e6f4a190df
Author: Bryce Harrington br...@bryceharrington.org
Date:   Wed Jan 12 07:59:39 2011 -0800

debian/control: Drop xfonts-{75,100}dpi from Depends: to Suggests:. We 
don't need them for a normal desktop installation, and even xcalc/xterm don't 
need them, but they are quite sizable.

diff --git a/debian/changelog b/debian/changelog
index ece79d7..fe60cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5+6ubuntu7) natty; urgency=low
+
+  * debian/control: Drop xfonts-{75,100}dpi from Depends: to Suggests:. We
+don't need them for a normal desktop installation, and even xcalc/xterm
+don't need them, but they are quite sizable.
+
+ -- Martin Pitt martin.p...@ubuntu.com  Tue, 11 Jan 2011 18:41:09 -0600
+
 xorg (1:7.5+6ubuntu6) natty; urgency=low
 
   * debian/apport/source_xorg.py:
diff --git a/debian/control b/debian/control
index fa14a4a..0b24cb4 100644
--- a/debian/control
+++ b/debian/control
@@ -133,8 +133,6 @@ Depends:
  libgl1-mesa-dri,
  libglu1-mesa,
  xfonts-base (= 1:1.0.0-1),
- xfonts-100dpi (= 1:1.0.0-1),
- xfonts-75dpi (= 1:1.0.0-1),
  x11-apps,
  x11-session-utils,
  x11-utils,
@@ -153,7 +151,9 @@ Depends:
 Recommends:
  xfonts-scalable (= 1:1.0.0-1),
 Provides: x-window-system, x-window-system-core
-Suggests: xorg-docs
+Suggests: xorg-docs,
+ xfonts-100dpi (= 1:1.0.0-1),
+ xfonts-75dpi (= 1:1.0.0-1)
 Description: X.Org X Window System
  This metapackage provides the components for a standalone
  workstation running the X Window System.  It provides the X libraries, an X


-- 
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/e1pd37m-0002uc...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |4 
 1 file changed, 4 insertions(+)

New commits:
commit d4ed0a7ea0fa3dfc849b914b3c6550d903f77333
Author: Bryce Harrington br...@canonical.com
Date:   Mon Jan 3 18:18:52 2011 -0800

Add versions for nvidia and fglrx installations

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 33e432a..a9bfb17 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -376,6 +376,8 @@ def attach_input_device_info(report, ui=None):
 def attach_nvidia_info(report, ui=None):
 # Attach information for upstreaming nvidia binary bugs
 if nonfree_graphics_module() == 'nvidia':
+report['version.nvidia-graphics-drivers'] = 
package_versions(nvidia-graphics-drivers)
+
 for logfile in glob.glob('/proc/driver/nvidia/*'):
 if os.path.isfile(logfile):
 attach_file(report, logfile)
@@ -398,6 +400,8 @@ def attach_nvidia_info(report, ui=None):
 def attach_fglrx_info(report, ui=None):
 if nonfree_graphics_module() == 'fglrx':
 
+report['version.fglrx-installer'] = package_versions(fglrx-installer)
+
 # File any X crash with -fglrx involved with the -fglrx bugs
 if report.get('SourcePackage','Unknown') in core_x_packages:
 if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not 
in report):


-- 
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/e1pzwuz-0002jd...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 3dca85499d6465d47452cdb1278fb0f100e4cd12
Author: Bryce Harrington br...@canonical.com
Date:   Thu Dec 23 10:19:45 2010 -0800

Add compiz debugging information

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a866048..5eabbc1 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -130,6 +130,14 @@ def attach_xorg_package_versions(report):
 xserver-xorg-video-nouveau]:
 report['version.%s' %(package)] = package_versions(package)
 
+def attach_compiz_configuration(report):
+# Plugins
+report['CompizPlugins'] = command_output([
+'gconftool-2', '--get', 
'/apps/compiz-1/general/allscreens/options/active_plugins'])
+
+# User configuration
+report['GconfCompiz'] = command_output(['gconftool-2', '-R', 
'/apps/compiz-1'])
+
 def add_info(report, ui):
 tags = []
 
@@ -182,6 +190,7 @@ Have you uninstalled the drivers from nvidia.com?):
 attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog')
 attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
 
+attach_compiz_configuration(report)
 attach_xorg_package_versions(report)
 attach_hardware(report)
 attach_drm_info(report)


-- 
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/e1pvpm2-00066j...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |  386 ---
 debian/changelog |   16 +
 debian/x11-common.links  |   16 +
 3 files changed, 318 insertions(+), 100 deletions(-)

New commits:
commit 01ac7389e941f9a66cdd6db82b8a606f6c82ab88
Author: Bryce Harrington br...@canonical.com
Date:   Thu Dec 23 18:18:54 2010 -0800

 + Add several more X packages to handle with the xorg apport hook

diff --git a/debian/changelog b/debian/changelog
index 41c5abf..1c3bed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xorg (1:7.5+6ubuntu5) natty; urgency=low
+
+  * debian/apport/source_xorg.py:
++ Add compiz configuration data
++ Detect whether compiz or kwin are actively running
++ Detect software rendering and display in the report
++ Detect the Ubuntu release version and if it is a non-development
+  release, suggest using technical support channels if appropriate.
+  Otherwise, give tags to bug reports so they're not lost in noise.
++ Give reporter some feedback when software rendering is enabled
++ Restructure code for clarity
+  * debian/x11-common.links:
++ Add several more X packages to handle with the xorg apport hook
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 23 Dec 2010 18:16:22 -0800
+
 xorg (1:7.5+6ubuntu4) natty; urgency=low
 
   * debian/local/Failsafe/failsafeXinit:
diff --git a/debian/x11-common.links b/debian/x11-common.links
index 593e2dc..00639a1 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -13,10 +13,19 @@ usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-common.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_fglrx-installer.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_wacom-tools.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-xserver-utils.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-apps.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-common.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-utils.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-xkb-utils.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xdiagnose.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xkbcommon.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xf86-input-evtouch.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xf86-input-wacom.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xf86-video-displaylink.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xinit.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xinput.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xkeyboard-config.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xrandr.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xorg_server.py
@@ -24,22 +33,25 @@ usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-evdev.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-evtouch.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-joystick.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-kbd.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-keyboard.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-mouse.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-mutouch.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-synaptics.py
-usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-wacom.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-vmmouse.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-wacom.py
 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   25 ++---
 debian/changelog |8 
 2 files changed, 22 insertions(+), 11 deletions(-)

New commits:
commit d2ba670bfcfcf27a2c95b11c0ae69fa83073fea8
Author: Bryce Harrington br...@canonical.com
Date:   Thu Dec 23 21:20:36 2010 -0800

Fix up formatting/typos/etc.

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 188609a..33e432a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -107,7 +107,7 @@ def ubuntu_code_name():
 '''
 Return the ubuntu release code name, 'dapper', 'natty', etc.
 '''
-return command_output(['lsb_release','-sc'])
+return command_output_quiet(['lsb_release','-sc'])
 
 
 ##
@@ -147,7 +147,9 @@ def check_is_supported(report, ui=None):
 
 elif status == Supported or status == Current Stable Release:
 response = ui.choice(
-Development is completed for the '%s' version of Ubuntu, so you 
should use technical support channels unless you know for certain it should be 
reported here? %(distro_codename),
+Development is completed for the '%s' version of Ubuntu, so\n
+you should use technical support channels unless you know for\n
+certain it should be reported here? %(distro_codename),
 [
 I don't know,
 Yes, I already know the fix for this problem.,
@@ -158,18 +160,18 @@ def check_is_supported(report, ui=None):
 )
 
 # Fix is known
-if response == 1:
-report['Tag'] += ' ' + 'patch'
+if 1 in response:
+report['Tags'] += ' ' + 'patch'
 ui.information(Thanks for helping improve Ubuntu!  Tip:  If you 
attach the fix to the bug report as a patch, it will be flagged to the 
developers and should get a swifter response.)
 return True
 
 # Regression after a system update
-elif response == 2:
-report['Tag'] += ' regression-update'
+elif 2 in response:
+report['Tags'] += ' regression-update'
 response = ui.yesno(Thanks for reporting this regression in 
Ubuntu %s.  Do you know exactly which package and version caused the 
regression? %(distro_codename))
 if response:
 ui.information(Excellent.  Please make sure to list the 
package name and version in the bug report's description.  That is vital 
information for pinpointing the cause of the regression, which will make 
solving this bug go much faster.)
-report['Tag'] += ' needs-reassignment'
+report['Tags'] += ' needs-reassignment'
 return True
 else:
 ui.information(Okay, your /var/log/dpkg.log will be attached. 
 Please indicate roughly when you first started noticing the problem.  This 
information will help in narrowing down the suspect package updates.)
@@ -177,7 +179,7 @@ def check_is_supported(report, ui=None):
 return True
 
 # Referred by technical support
-elif response == 3:
+elif 3 in response:
 ui.information(Thanks for using technical support channels before 
filing this report.  In your bug report, please restate the issue and include a 
link or transcript of your discussion with them.)
 return True
 
@@ -317,7 +319,9 @@ def attach_2d_info(report, ui=None):
 
 def attach_3d_info(report, ui=None):
 if os.environ.get('DISPLAY'):
-report['UnitySupportTest'] = 
command_output_quiet(['unity_support_test'])
+if os.path.lexists('/usr/lib/nux/unity_support_test'):
+report['UnitySupportTest'] = command_output_quiet([
+'/usr/lib/nux/unity_support_test'])
 report['glxinfo'] = command_output_quiet(['glxinfo'])
 attach_file_if_exists(report,
   os.path.expanduser('~/.drirc'),
@@ -383,7 +387,7 @@ def attach_nvidia_info(report, ui=None):
 if os.environ.get('DISPLAY'):
 # Attach output of nvidia-settings --query if we've got a display
 # to connect to.
-report['nvidia-settings'] = command_output(
+report['nvidia-settings'] = command_output_quiet(
 ['nvidia-settings', '-q', 'all'])
 
 # File any X crash with -nvidia involved with the -nvidia bugs
@@ -408,7 +412,6 @@ def add_info(report, ui):
 if check_is_supported(report, ui) == False:
 return
 
-return
 attach_xorg_package_versions(report, ui)
 attach_dist_upgrade_status(report, ui)
 attach_graphic_card_pci_info(report, ui)
diff --git a/debian/changelog b/debian/changelog
index 1c3bed4..ece79d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5+6ubuntu6) natty; urgency=low
+
+  * debian/apport/source_xorg.py:
++ Fix formatting of some dialogs
++ Suppress some debugging output, fix typos
+
+ -- Bryce 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   59 +++
 debian/changelog |5 ++-
 2 files changed, 35 insertions(+), 29 deletions(-)

New commits:
commit ca6d2cdb644b0e48a40f65080be5d2643f5d3d62
Author: Bryce Harrington br...@canonical.com
Date:   Wed Dec 22 19:31:32 2010 -0800

Fixes from code review and testing

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index e370823..a866048 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -58,8 +58,8 @@ def retval(command_list):
 command_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
 def ubuntu_variant_name():
-if (retval(['which', 'kdesudo'] == 0) and
-retval(['pgrep', '-x', '-u', str(os.getuid()), 'ksmserver'] == 0)):
+if (retval(['which', 'kdesudo']) == 0 and
+retval(['pgrep', '-x', '-u', str(os.getuid()), 'ksmserver']) == 0):
 return kubuntu
 else:
 return ubuntu
@@ -86,9 +86,11 @@ def attach_dist_upgrade_status(report):
 def attach_pci_info(report):
 info = ''
 display_pci = pci_devices(PCI_DISPLAY)
-for paragraph in output.split('\n\n'):
+for paragraph in display_pci.split('\n\n'):
 for line in paragraph.split('\n'):
-key, value = line.split(':',1)
+if ':' not in line:
+continue
+key, value = line.split(':', 1)
 value = value.strip()
 key = key.strip()
 if VGA compatible controller in key:
@@ -100,10 +102,10 @@ def attach_pci_info(report):
 def check_is_reportable(report):
 '''Checks system to see if there is any reason the configuration is not
 valid for filing bug reports'''
-
+
 version_signature = report.get('ProcVersionSignature', '')
-if not version_signature.startswith('Ubuntu '):
-report['UnreportableReason'] = _('The running kernel is not an Ubuntu 
kernel')
+if version_signature and not version_signature.startswith('Ubuntu '):
+report['UnreportableReason'] = 'The running kernel is not an Ubuntu 
kernel: %s' %version_signature
 return False
 
 bios = report.get('dmi.bios.version', '')
@@ -113,12 +115,21 @@ def check_is_reportable(report):
 
 product_name = report.get('dmi.product.name', '')
 if product_name.startswith('VMware '):
-report['UnreportableReason'] = _('VMware is installed.  If you 
upgraded recently be sure to upgrade vmware to a compatible version.')
+report['UnreportableReason'] = 'VMware is installed.  If you upgraded 
recently be sure to upgrade vmware to a compatible version.'
 return False
 
 return True
 
-
+def attach_xorg_package_versions(report):
+for package in [
+xserver-xorg,
+libgl1-mesa-glx,
+libdrm2,
+xserver-xorg-video-intel,
+xserver-xorg-video-ati,
+xserver-xorg-video-nouveau]:
+report['version.%s' %(package)] = package_versions(package)
+
 def add_info(report, ui):
 tags = []
 
@@ -127,15 +138,6 @@ def add_info(report, ui):
 tags.append(report['DistroCodename'])
 tags.append(report['DistroVariant'])
 
-attach_related_packages(report, [
-xserver-xorg,
-libgl1-mesa-glx,
-libdrm2,
-xserver-xorg-video-intel,
-xserver-xorg-video-ati,
-xserver-xorg-video-nouveau
-])
-
 # Verify the bug is valid to be filed
 if check_is_reportable(report) == False:
 return
@@ -143,7 +145,7 @@ def add_info(report, ui):
 if os.path.exists('/var/log/nvidia-installer.log'):
 # User has installed nVidia drivers manually at some point.
 # This is likely to have caused problems.
-if not ui.yesno(It appears you may have installed the nVidia 
drivers manually from nvidia.com.  This can cause problems with the 
Ubuntu-supplied drivers.
+if ui and not ui.yesno(It appears you may have installed the nVidia 
drivers manually from nvidia.com.  This can cause problems with the 
Ubuntu-supplied drivers.
 
 If you have not already uninstalled the drivers downloaded from nvidia.com, 
please uninstall them and reinstall the Ubuntu packages before filing a bug 
with Ubuntu.
 
@@ -167,7 +169,7 @@ Have you uninstalled the drivers from nvidia.com?):
 report['nvidia-settings'] = command_output(
 ['nvidia-settings', '-q', 'all'])

-if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
+if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in 
report):
 nonfree_driver = nonfree_graphics_module()
 if (nonfree_driver == fglrx):
 report['SourcePackage'] = fglrx-installer
@@ -175,10 +177,12 @@ Have you uninstalled the drivers from nvidia.com?):
 elif (nonfree_driver == nvidia):
 report['SourcePackage'] = 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |  151 +--
 debian/changelog |8 +-
 2 files changed, 112 insertions(+), 47 deletions(-)

New commits:
commit 75be134678ff085b471bc803681f066a3ff999f7
Author: Bryce Harrington br...@canonical.com
Date:   Sat Dec 18 01:03:50 2010 -0800

Some apport hook improvements

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index ca89d49..e370823 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -17,6 +17,10 @@ import glob
 import subprocess
 from apport.hookutils import *
 
+keyboard_packages = [
+'xorg', 'xkeyboard-config', 'xserver-xorg-input-keyboard', 
'xserver-xorg-input-evdev'
+]
+
 def installed_version(pkg):
 script = subprocess.Popen(['apt-cache', 'policy', pkg], 
stdout=subprocess.PIPE)
 output = script.communicate()[0]
@@ -36,17 +40,92 @@ def nonfree_graphics_module(module_list = '/proc/modules'):
 if m == nvidia or m == fglrx:
 return m
 
+def command_output_quiet(command_list):
+log = command_output(command_list)
+if log[:5] == Error:
+return None
+return log
+
+def root_collect_file_contents(path):
+'''Returns the contents of given file collected as root user'''
+log = root_command_output(['cat', path])
+if log[:5] == Error:
+return Not present
+return log
+
+def retval(command_list):
+return subprocess.call(
+command_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+def ubuntu_variant_name():
+if (retval(['which', 'kdesudo'] == 0) and
+retval(['pgrep', '-x', '-u', str(os.getuid()), 'ksmserver'] == 0)):
+return kubuntu
+else:
+return ubuntu
+
+def ubuntu_code_name():
+return command_output(['lsb_release','-sc'])
+
+def attach_dkms_info(report):
+if os.path.lexists('/var/lib/dkms'):
+# Gather any dkms make.log files for proprietary drivers
+for logfile in glob.glob(/var/lib/dkms/*/*/build/make.log):
+attach_file(report, logfile, make.log)
+report['DkmsStatus'] = command_output_quiet(['dkms', 'status'])
+
+def attach_dist_upgrade_status(report):
+if os.path.lexists('/var/log/dist-upgrade/apt.log'):
+report['DistUpgraded'] = command_output_quiet(
+['head', '-n', '1', '/var/log/dist-upgrade/apt.log'])
+return True
+else:
+report['DistUpgraded'] = 'Fresh install'
+return False
+
+def attach_pci_info(report):
+info = ''
+display_pci = pci_devices(PCI_DISPLAY)
+for paragraph in output.split('\n\n'):
+for line in paragraph.split('\n'):
+key, value = line.split(':',1)
+value = value.strip()
+key = key.strip()
+if VGA compatible controller in key:
+info += %s\n % (value)
+elif key == Subsystem:
+info +=   %s: %s\n %(key, value)
+report['GraphicsCard'] = info
+
+def check_is_reportable(report):
+'''Checks system to see if there is any reason the configuration is not
+valid for filing bug reports'''
+
+version_signature = report.get('ProcVersionSignature', '')
+if not version_signature.startswith('Ubuntu '):
+report['UnreportableReason'] = _('The running kernel is not an Ubuntu 
kernel')
+return False
+
+bios = report.get('dmi.bios.version', '')
+if bios.startswith('VirtualBox '):
+report['SourcePackage'] = virtualbox-ose
+return False
+
+product_name = report.get('dmi.product.name', '')
+if product_name.startswith('VMware '):
+report['UnreportableReason'] = _('VMware is installed.  If you 
upgraded recently be sure to upgrade vmware to a compatible version.')
+return False
+
+return True
+
+
 def add_info(report, ui):
 tags = []
 
-# Build System Environment
-codename = command_output(['lsb_release','-sc'])
-tags.append(codename)
-
-report['system']  = distro: Ubuntu\n
-report['system'] += codename:+ codename + \n
-report['system'] += architecture:+ 
command_output(['uname','-m']) + \n
-report['system'] += kernel:  + 
command_output(['uname','-r']) + \n
+report['DistroVariant']  = ubuntu_variant_name()
+report['DistroCodename'] = ubuntu_code_name()
+tags.append(report['DistroCodename'])
+tags.append(report['DistroVariant'])
 
 attach_related_packages(report, [
 xserver-xorg,
@@ -58,19 +137,7 @@ def add_info(report, ui):
 ])
 
 # Verify the bug is valid to be filed
-version_signature = report.get('ProcVersionSignature', '')
-if not version_signature.startswith('Ubuntu '):
-report['UnreportableReason'] = _('The running kernel is not an Ubuntu 
kernel')
-return
-
-bios = report.get('dmi.bios.version', '')
-if bios.startswith('VirtualBox '):
-report['SourcePackage'] = 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 0 files changed

New commits:
commit 4985ef0e33b6b1759dc151b68bcc9604ee33573e
Author: Bryce Harrington br...@canonical.com
Date:   Wed Dec 1 19:34:42 2010 -0800

Revert Avoid letting client apps fill up .xsession-errors

This reverts commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca.

diff --git a/debian/changelog b/debian/changelog
index 2c1ed6a..8dd4974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
   * debian/local/Failsafe/failsafeXinit:
 + Fix variable escaping so shows file name for debugging tarball
   (LP: #596819)
-  * debian/local/Xsession:
-+ Limit size of .xsession-errors so client apps don't fill it up
-  (LP: #589275)
 
 xorg (1:7.5+6ubuntu3) maverick; urgency=low
 
diff --git a/debian/local/Xsession b/debian/local/Xsession
index e1a353b..6b071c7 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -80,8 +80,7 @@ if [ `stat -c%s \$ERRFILE\` -gt 50 ]; then
   tail -c 50 $ERRFILE  $T  mv -f $T $ERRFILE || rm -f $T
 fi
 
-# prevent wayward client apps to fill disk with error messages
-exec 21 | head -c 500  $ERRFILE
+exec $ERRFILE 21
 
 echo $PROGNAME: X session started for $LOGNAME at $(date)
 

commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca
Author: Bryce Harrington br...@canonical.com
Date:   Wed Dec 1 19:25:05 2010 -0800

Avoid letting client apps fill up .xsession-errors

diff --git a/debian/changelog b/debian/changelog
index 8dd4974..2c1ed6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
   * debian/local/Failsafe/failsafeXinit:
 + Fix variable escaping so shows file name for debugging tarball
   (LP: #596819)
+  * debian/local/Xsession:
++ Limit size of .xsession-errors so client apps don't fill it up
+  (LP: #589275)
 
 xorg (1:7.5+6ubuntu3) maverick; urgency=low
 
diff --git a/debian/local/Xsession b/debian/local/Xsession
index 6b071c7..e1a353b 100644
--- a/debian/local/Xsession
+++ b/debian/local/Xsession
@@ -80,7 +80,8 @@ if [ `stat -c%s \$ERRFILE\` -gt 50 ]; then
   tail -c 50 $ERRFILE  $T  mv -f $T $ERRFILE || rm -f $T
 fi
 
-exec $ERRFILE 21
+# prevent wayward client apps to fill disk with error messages
+exec 21 | head -c 500  $ERRFILE
 
 echo $PROGNAME: X session started for $LOGNAME at $(date)
 


-- 
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/e1po00u-0007nq...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog |8 ++--
 debian/control   |6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit b3fe2c2306e142604d06de25359ffb6230179dcc
Author: Bryce Harrington br...@canonical.com
Date:   Tue Nov 2 14:22:47 2010 -0700

Committing raof's last changes (appear to have not gotten to git)

diff --git a/debian/changelog b/debian/changelog
index 046b61b..7207b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+xorg (1:7.5+6ubuntu3) maverick; urgency=low
 
+  [ Bryce Harrington ]
   * debian/apport/source_xorg.py:
 + Include .drirc if present
 + Include gconf's /desktop/gnome/peripherals data
@@ -8,7 +9,10 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
 + Add source package apport hook for xorg-server.  Otherwise,
   apport-collect fails when used on bugs against xorg-server package.
 
- -- Bryce Harrington br...@ubuntu.com  Tue, 13 Jul 2010 06:16:10 -0700
+  [ Christopher James Halse Rogers ]
+  * Depend on xserver 1.9RC5, bump video and input ABI's
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 09 Aug 2010 
20:34:00 +1000
 
 xorg (1:7.5+6ubuntu2) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 4499706..fa14a4a 100644
--- a/debian/control
+++ b/debian/control
@@ -85,9 +85,9 @@ Architecture: any
 Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common ( 7), 
x11-common ( 1:7.3+11)
 Replaces: xserver-common ( 7), x11-common ( 1:7.3+11)
 Depends:
- xserver-xorg-core (= 2:1.8),
- xserver-xorg-video-all | xserver-xorg-video-7,
- xserver-xorg-input-all | xserver-xorg-input-9,
+ xserver-xorg-core (= 2:1.8.99.905),
+ xserver-xorg-video-all | xserver-xorg-video-8,
+ xserver-xorg-input-all | xserver-xorg-input-11,
  xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},


-- 
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/e1pdokn-0003cw...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog|6 ++
 debian/local/Failsafe/failsafeXinit |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c1a8f47386b6442b9e3c7ba7690fdb7d6d4ddb88
Author: Bryce Harrington br...@canonical.com
Date:   Tue Nov 2 14:31:58 2010 -0700

Fix variable name escaping for debugging tarball filename

diff --git a/debian/changelog b/debian/changelog
index 7207b4e..8dd4974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+
+  * debian/local/Failsafe/failsafeXinit:
++ Fix variable escaping so shows file name for debugging tarball
+  (LP: #596819)
+
 xorg (1:7.5+6ubuntu3) maverick; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/local/Failsafe/failsafeXinit 
b/debian/local/Failsafe/failsafeXinit
index 7378437..8aff5d7 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -174,7 +174,7 @@ save_config_logs() {
 tar -cf ${xorg_backup_file} ${xorg_backup_dir}
 rm -rf ${xorg_backup_dir}
 
-zenity --info --text $(eval_gettext 'Relevant configuration and log files 
have been saved to:\n')\$xorg_backup_file\n$(gettext 'Bug reports can be 
submitted at http://www.launchpad.net/ubuntu/.\n')
+zenity --info --text $(eval_gettext 'Relevant configuration and log files 
have been saved to:\n')$xorg_backup_file\n$(gettext 'Bug reports can be 
submitted at http://www.launchpad.net/ubuntu/.\n')
 }
 
 # Scan Xorg.0.log for errors


-- 
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/e1pdosl-0004gx...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/changelog|5 -
 debian/x11-common.links |1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6fb4eb490c3612f32904f7210d156bd6efbc30f3
Author: Bryce Harrington br...@bryceharrington.org
Date:   Tue Jul 13 06:18:40 2010 -0700

Add apport hook for xorg-server source package

diff --git a/debian/changelog b/debian/changelog
index 3a08815..046b61b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
 + Include .drirc if present
 + Include gconf's /desktop/gnome/peripherals data
 + Quell DkmsStatus no such file error message
+  * debian/x11-common.links:
++ Add source package apport hook for xorg-server.  Otherwise,
+  apport-collect fails when used on bugs against xorg-server package.
 
- -- Bryce Harrington br...@ubuntu.com  Thu, 01 Jul 2010 19:22:58 -0700
+ -- Bryce Harrington br...@ubuntu.com  Tue, 13 Jul 2010 06:16:10 -0700
 
 xorg (1:7.5+6ubuntu2) maverick; urgency=low
 
diff --git a/debian/x11-common.links b/debian/x11-common.links
index 627b3aa..593e2dc 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -1,6 +1,7 @@
 usr/bin usr/bin/X11
 etc/X11/rgb.txt usr/share/X11/rgb.txt
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/xserver-xorg-core.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xorg-server.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_libdrm.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_libx11.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_libxcb.py


-- 
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/e1oyfo9-0001ge...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |8 +++-
 debian/changelog |9 +
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit fc8d0f70ce343ded9b5cda570297eb4126db5dec
Author: Bryce Harrington br...@bryceharrington.org
Date:   Thu Jul 1 19:24:51 2010 -0700

changelog message

diff --git a/debian/changelog b/debian/changelog
index 3534fcc..3a08815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+
+  * debian/apport/source_xorg.py:
++ Include .drirc if present
++ Include gconf's /desktop/gnome/peripherals data
++ Quell DkmsStatus no such file error message
+
+ -- Bryce Harrington br...@ubuntu.com  Thu, 01 Jul 2010 19:22:58 -0700
+
 xorg (1:7.5+6ubuntu2) maverick; urgency=low
 
   * debian/apport/source_xorg.py:

commit 3079432961ae62cf5de28778b37a3715269bada8
Author: Bryce Harrington br...@bryceharrington.org
Date:   Thu Jul 1 19:19:55 2010 -0700

python is not bash

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index bd1d9df..ca89d49 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -120,7 +120,7 @@ Have you uninstalled the drivers from nvidia.com?):
 # Capture KMS info if available
 attach_drm_info(report)
 
-if [ os.path.lexists('/var/lib/dkms') ]:
+if os.path.lexists('/var/lib/dkms'):
 # Gather any dkms make.log files for proprietary drivers
 for logfile in glob.glob(/var/lib/dkms/*/*/build/make.log):
 attach_file(report, logfile, make.log)

commit 74cb39307586c16defe96f6f3e5066e7612c2c63
Author: Bryce Harrington br...@bryceharrington.org
Date:   Thu Jul 1 19:19:26 2010 -0700

Include gconf details of peripherals

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index e91f027..bd1d9df 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -149,6 +149,9 @@ Have you uninstalled the drivers from nvidia.com?):
 report['setxkbmap'] = command_output(['setxkbmap', '-print'])
 report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-'])
 
+# For input device bugs
+report['peripherals'] = command_output(['gconftool-2', '-R', 
'/desktop/gnome/peripherals'])
+
 response = ui.yesno(Your gdm log files may help developers diagnose the 
bug, but may contain sensitive information.  Do you want to include these logs 
in your bug report?)
 if response == True:
 report['GdmLog'] = root_command_output(['cat', '/var/log/gdm/:0.log'])

commit 55de88bd2642914966d2fea3efbb68ff7cd7fa15
Author: Bryce Harrington br...@bryceharrington.org
Date:   Thu Jul 1 19:19:10 2010 -0700

Include .drirc if present

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 98b5bd6..e91f027 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -141,6 +141,9 @@ Have you uninstalled the drivers from nvidia.com?):
 
 # For 3D/Compiz/Mesa bugs
 report['glxinfo'] = command_output(['glxinfo'])
+attach_file_if_exists(report,
+  os.path.expanduser('~/.drirc'),
+  'drirc')
 
 # For keyboard bugs
 report['setxkbmap'] = command_output(['setxkbmap', '-print'])


-- 
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/e1ouvw8-0005xg...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/apport/source_xorg.py |9 +
 debian/changelog |3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 282656d082e7ed4882cbf1cfc10f9b195c476b86
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Jun 25 13:58:54 2010 +1000

Fix nvidia-settings command to actually attach the interesting information

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a20e438..98b5bd6 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -98,7 +98,7 @@ Have you uninstalled the drivers from nvidia.com?):
 # Attach output of nvidia-settings --query if we've got a display
 # to connect to.
 report['nvidia-settings'] = command_output(['nvidia-settings', 
-'-q'])
+'-q', 'all'])

 
 if report['ProblemType'] == 'Crash' and 'Traceback' not in report:

commit f3a20a37d50703983770f87a2a67027c94b95564
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Jun 23 17:08:04 2010 +1000

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 72fca03..3534fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.5+6ubuntu2) maverick; urgency=low
 + Detect a previous manual install of the nvidia.com drivers, and ask the
   user if they have uninstalled them.
 + Attach the neccesary information for upstreaming nvidia binary bugs.
++ Attach KMS connector information if available.
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 15 Jun 2010 
15:14:16 +1000
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 23 Jun 2010 
17:07:53 +1000
 
 xorg (1:7.5+6ubuntu1) maverick; urgency=low
 

commit 34576eb6f45cbdcccd4cc5b30ea45eecda7eeadb
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Jun 23 17:07:27 2010 +1000

Attach KMS info to bug reports when available

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index d4d3e5c..a20e438 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -116,6 +116,9 @@ Have you uninstalled the drivers from nvidia.com?):
 # Capture hardware
 attach_hardware(report)
 report['PciDisplay'] = pci_devices(PCI_DISPLAY)
+
+# Capture KMS info if available
+attach_drm_info(report)
 
 if [ os.path.lexists('/var/lib/dkms') ]:
 # Gather any dkms make.log files for proprietary drivers

commit 14a7357e06bd66c706ca6a186be78a7268c533cc
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Jun 23 17:06:58 2010 +1000

Add output of nvidia-settings to nvidia bug reports

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index b739865..d4d3e5c 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -94,6 +94,12 @@ Have you uninstalled the drivers from nvidia.com?):
 for logfile in glob.glob('/proc/driver/nvidia/*/*'):
 if os.path.basename(logfile) != 'README':
 attach_file(report, logfile)
+if os.environ.get('DISPLAY'):
+# Attach output of nvidia-settings --query if we've got a display
+# to connect to.
+report['nvidia-settings'] = command_output(['nvidia-settings', 
+'-q'])
+   
 
 if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
 nonfree_driver = nonfree_graphics_module()


-- 
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/e1os20h-fp...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Christopher Halse Rogers]

 debian/apport/source_xorg.py |   22 ++
 debian/changelog |9 +
 2 files changed, 31 insertions(+)

New commits:
commit 6af36d94877b8fc5f87fa687782a32ded61eaf8d
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Tue Jun 15 15:12:44 2010 +1000

apport: Detect a previous manual install of the nvidia.com drivers.
Attach the needed information for upstreaming nvidia bugs

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 4916078..b739865 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -73,6 +73,28 @@ def add_info(report, ui):
 report['UnreportableReason'] = _('VMware is installed.  If you 
upgraded recently be sure to upgrade vmware to a compatible version.')
 return
 
+if os.path.exists('/var/log/nvidia-installer.log'):
+# User has installed nVidia drivers manually at some point.
+# This is likely to have caused problems.
+if not ui.yesno(It appears you may have installed the nVidia 
drivers manually from nvidia.com.  This can cause problems with the 
Ubuntu-supplied drivers.
+
+If you have not already uninstalled the drivers downloaded from nvidia.com, 
please uninstall them and reinstall the Ubuntu packages before filing a bug 
with Ubuntu.
+
+Have you uninstalled the drivers from nvidia.com?):
+report['UnreportableReason'] = 'The drivers from nvidia.com are 
not supported by Ubuntu.  Please uninstall them and test whether your problem 
still occurs.'
+return
+attach_file(report, '/var/log/nvidia-installer.log', 
'nvidia-installer.log')
+tags.append('possible-manual-nvidia-install')
+
+if nonfree_graphics_module() == 'nvidia':
+# Attach information for upstreaming nvidia binary bugs
+for logfile in glob.glob('/proc/driver/nvidia/*'):
+if os.path.isfile(logfile):
+attach_file(report, logfile)
+for logfile in glob.glob('/proc/driver/nvidia/*/*'):
+if os.path.basename(logfile) != 'README':
+attach_file(report, logfile)
+
 if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
 nonfree_driver = nonfree_graphics_module()
 if (nonfree_driver == fglrx):
diff --git a/debian/changelog b/debian/changelog
index 7b6b821..72fca03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.5+6ubuntu2) maverick; urgency=low
+
+  * debian/apport/source_xorg.py:
++ Detect a previous manual install of the nvidia.com drivers, and ask the
+  user if they have uninstalled them.
++ Attach the neccesary information for upstreaming nvidia binary bugs.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 15 Jun 2010 
15:14:16 +1000
+
 xorg (1:7.5+6ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable.


-- 
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/e1oopoc-00046y...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Robert Hooker]

 debian/changelog |3 ++-
 debian/control   |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit dfeb8b43652acf7ca92eee0001a288efba810bcd
Author: Robert Hooker sarv...@ubuntu.com
Date:   Sun Jun 6 21:11:20 2010 -0400

Depend on xserver 1.8, bump video and input ABI's.

diff --git a/debian/changelog b/debian/changelog
index 2df55a7..7b6b821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xorg (1:7.5+6ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable.
+  * Depend on xserver 1.8, bump video and input ABI's.
 
- -- Robert Hooker sarv...@ubuntu.com  Fri, 04 Jun 2010 20:23:22 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Sun, 06 Jun 2010 21:11:01 -0400
 
 xorg (1:7.5+6) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0d586ac..4499706 100644
--- a/debian/control
+++ b/debian/control
@@ -85,9 +85,9 @@ Architecture: any
 Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common ( 7), 
x11-common ( 1:7.3+11)
 Replaces: xserver-common ( 7), x11-common ( 1:7.3+11)
 Depends:
- xserver-xorg-core (= 2:1.7),
- xserver-xorg-video-all | xserver-xorg-video-6,
- xserver-xorg-input-all | xserver-xorg-input-7,
+ xserver-xorg-core (= 2:1.8),
+ xserver-xorg-video-all | xserver-xorg-video-7,
+ xserver-xorg-input-all | xserver-xorg-input-9,
  xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},


-- 
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/e1olqsi-0001uy...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Robert Hooker]

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

New commits:
commit c5113ff67f5116ba2fe3d7d44a9cebedacb569f2
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Jun 4 20:24:15 2010 -0400

Bump changelog for release.

diff --git a/debian/changelog b/debian/changelog
index 14b45c6..2df55a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.5+6ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.5+6ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable.
 
- -- Robert Hooker sarv...@ubuntu.com  Wed, 02 Jun 2010 16:09:13 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 04 Jun 2010 20:23:22 -0400
 
 xorg (1:7.5+6) unstable; urgency=medium
 


-- 
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/e1okhbn-0002qn...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Robert Hooker]

 debian/changelog|   19 +++
 debian/scripts/vars.alpha   |2 +-
 debian/scripts/vars.amd64   |1 -
 debian/scripts/vars.arm |2 +-
 debian/scripts/vars.armeb   |2 +-
 debian/scripts/vars.armel   |2 +-
 debian/scripts/vars.hppa|2 +-
 debian/scripts/vars.i386|6 +++---
 debian/scripts/vars.ia64|2 +-
 debian/scripts/vars.m32r|2 +-
 debian/scripts/vars.m68k|2 +-
 debian/scripts/vars.mips|2 +-
 debian/scripts/vars.mipsel  |2 +-
 debian/scripts/vars.powerpc |3 ++-
 debian/scripts/vars.ppc64   |1 -
 debian/scripts/vars.sh4 |2 +-
 debian/scripts/vars.sparc   |2 +-
 debian/x11-common.init  |2 +-
 18 files changed, 37 insertions(+), 19 deletions(-)

New commits:
commit 68339674792d4da1141b5551a57332cff4ce3f52
Author: Robert Hooker sarv...@ubuntu.com
Date:   Wed Jun 2 16:23:08 2010 -0400

Add changelog entry.

diff --git a/debian/changelog b/debian/changelog
index e7c3e37..14b45c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+6ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.
+
+ -- Robert Hooker sarv...@ubuntu.com  Wed, 02 Jun 2010 16:09:13 -0400
+
 xorg (1:7.5+6) unstable; urgency=medium
 
   * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel

commit 3ca3b8ef615191426cddd5fbbcf113d64996cf36
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 7 13:34:45 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0ce85c9..c9f1086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+6) UNRELEASED; urgency=low
+xorg (1:7.5+6) unstable; urgency=medium
 
   * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel
 modesetting for radeon, and that clashes with this driver.
@@ -9,7 +9,7 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
   * x11-common.init: don't include /usr/{s,}bin in PATH, since we only depend
 on $local_fs [lintian].
 
- -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 17:27:16 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 07 May 2010 13:34:32 +0200
 
 xorg (1:7.5+5) unstable; urgency=low
 

commit 813b1b03ce163596e5a612bc973a493a77bd28fb
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 7 13:34:10 2010 +0200

x11-common.init: don't include /usr/{s,}bin in PATH

We only depend on $local_fs.  Silences lintian error.

diff --git a/debian/changelog b/debian/changelog
index 3933586..0ce85c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
 API, see #569103.
   * Add nouveau to xserver-xorg-video-all on linux x86 and powerpc.  Other
 arches can be added later if needed.
+  * x11-common.init: don't include /usr/{s,}bin in PATH, since we only depend
+on $local_fs [lintian].
 
  -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 17:27:16 +0200
 
diff --git a/debian/x11-common.init b/debian/x11-common.init
index b475699..34835ac 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -10,7 +10,7 @@
 
 set -e
 
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PATH=/bin:/sbin
 SOCKET_DIR=/tmp/.X11-unix
 ICE_DIR=/tmp/.ICE-unix
 

commit 162b805f6eafc30f1ccfa0ab809c53f03cc13608
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 7 13:20:56 2010 +0200

Add nouveau to xserver-xorg-video-all on linux x86 and powerpc.

Other arches can be added later if needed.

diff --git a/debian/changelog b/debian/changelog
index 037b7c0..3933586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
 modesetting for radeon, and that clashes with this driver.
   * Drop v4l from xserver-xorg-video-all.  It depends on the obsolete V4L1
 API, see #569103.
+  * Add nouveau to xserver-xorg-video-all on linux x86 and powerpc.  Other
+arches can be added later if needed.
 
  -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 17:27:16 +0200
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 2a5afad..1c59d2d 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+   xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index eee1fae..6258683 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -14,6 +14,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+   xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
  

xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |   29 +
 debian/control   |2 +-
 debian/local/Xreset  |   34 ++
 debian/local/Xreset.d/README |4 
 debian/rules |2 ++
 debian/x11-common.dirs   |1 +
 debian/x11-common.install|2 ++
 7 files changed, 73 insertions(+), 1 deletion(-)

New commits:
commit 423b289052524eccf2d4d973cbc0984ad4149dd8
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Thu Apr 1 14:32:26 2010 +0300

Release 1:7.5+5ubuntu1

diff --git a/debian/changelog b/debian/changelog
index fb64239..cb93002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+5ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 01 Apr 2010 14:27:16 +0300
+
 xorg (1:7.5+5) unstable; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.

commit b93b220a340ec41e36eb9a4d6a5f7c9fad8aa621
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 14 22:45:14 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index beed34f..54fab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.5+5) UNRELEASED; urgency=low
+xorg (1:7.5+5) unstable; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
   * Bump Standards-Version to 3.8.4, no changes needed.
 
- -- Brice Goglin bgog...@debian.org  Sun, 14 Mar 2010 22:41:20 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 14 Mar 2010 22:45:09 +0100
 
 xorg (1:7.5+4) unstable; urgency=low
 

commit f07e8e0de64aaf4916b7b32c0dd8eafe8b82cf8d
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 14 22:48:17 2010 +0100

Bump Standards-Version to 3.8.4

diff --git a/debian/changelog b/debian/changelog
index 59e409d..beed34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg (1:7.5+5) UNRELEASED; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
+  * Bump Standards-Version to 3.8.4, no changes needed.
 
  -- Brice Goglin bgog...@debian.org  Sun, 14 Mar 2010 22:41:20 +0100
 
diff --git a/debian/control b/debian/control
index 3d22056..731c839 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Brice Goglin bgog...@debian.org
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 7)
 
 Package: x11-common

commit 094b3111bf3374dca6f364dd213941b79d91800b
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 14 22:43:46 2010 +0100

Fix typo in Xsession.d/50x11-common_determine-startup

diff --git a/debian/changelog b/debian/changelog
index 7a58436..59e409d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+5) UNRELEASED; urgency=low
+
+  * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
+
+ -- Brice Goglin bgog...@debian.org  Sun, 14 Mar 2010 22:41:20 +0100
+
 xorg (1:7.5+4) unstable; urgency=low
 
   * Add Xreset and Xreset.d support, closes: #230422.
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup 
b/debian/local/Xsession.d/50x11-common_determine-startup
index 4ed7a32..cd9e4d3 100644
--- a/debian/local/Xsession.d/50x11-common_determine-startup
+++ b/debian/local/Xsession.d/50x11-common_determine-startup
@@ -7,7 +7,7 @@
 # executable, fall back to looking for a user's custom X session script, if
 # allowed by the options file.
 if [ -z $STARTUP ]; then
-  if has_option allow-user-session; then
+  if has_option allow-user-xsession; then
 for STARTUPFILE in $USERXSESSION $ALTUSERXSESSION; do
   if [ -e $STARTUPFILE ]; then
 if [ -x $STARTUPFILE ]; then
@@ -36,7 +36,7 @@ fi
 # If we still have not found a startup program, give up.
 if [ -z $STARTUP ]; then
   ERRMSG=unable to start X session ---
-  if has_option allow-user-session; then
+  if has_option allow-user-xsession; then
 ERRMSG=$ERRMSG no \$USERXSESSION\ file, no \$ALTUSERXSESSION\ file,
   fi
   errormsg $ERRMSG no session managers, no window managers, and no terminal \

commit c3a8249d58deeba4b9d163a768e792a1d044ce8b
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 14 11:15:20 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 442a8d6..7a58436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+4) UNRELEASED; urgency=low
+xorg (1:7.5+4) unstable; urgency=low
 
   * Add Xreset and Xreset.d support, closes: #230422.
   * Improve startup speed of Xsession.d scripts by eliminating all unnecessary
@@ -12,7 +12,7 @@ xorg (1:7.5+4) UNRELEASED; urgency=low
   unlikely (like ~/.Xresources exists) outside, to avoid 

xorg: Changes to 'ubuntu'

[Bryce Harrington]

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

New commits:
commit d8974824161ea155631eb7ee708941ef931f44c1
Author: Bryce Harrington br...@bryceharrington.org
Date:   Tue Mar 9 13:22:56 2010 -0800

prep cl for upload

diff --git a/debian/changelog b/debian/changelog
index 64d1b40..c65e5f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xorg (1:7.5+3ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.5+3ubuntu1) lucid; urgency=low
 
   [Timo Aaltonen]
+  * Merge from debian unstable
   * 50x11-common_determine-startup: Fix a typo in the option name
 (LP: #526532)
 
@@ -8,7 +9,7 @@ xorg (1:7.5+3ubuntu1) UNRELEASED; urgency=low
   * debian/apport/source_xorg.py: Fix proprietary module detection logic to
 not send all crash bugs to -nvidia.
 
- -- Bryce Harrington br...@ubuntu.com  Mon, 08 Mar 2010 19:02:40 -0800
+ -- Bryce Harrington br...@ubuntu.com  Tue, 09 Mar 2010 13:09:08 -0800
 
 xorg (1:7.5+3) unstable; 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/e1np6tx-0004wm...@alioth.debian.org

xorg: Changes to 'ubuntu'

[Bryce Harrington]

 debian/apport/source_xorg.py |   27 ---
 debian/changelog |9 +++--
 2 files changed, 27 insertions(+), 9 deletions(-)

New commits:
commit 1643fb389898dbdbf1e79e1b4fe53e5a417fd161
Author: Bryce Harrington br...@bryceharrington.org
Date:   Mon Mar 8 19:04:27 2010 -0800

Fix fglrx/nvidia detection logic

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 0e109ee..4916078 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -22,6 +22,20 @@ def installed_version(pkg):
 output = script.communicate()[0]
 return output.split('\n')[1].replace(Installed: , )
 
+def nonfree_graphics_module(module_list = '/proc/modules'):
+'''
+Check loaded modules to see if a proprietary graphics driver is loaded.
+Return the first such driver found.
+'''
+try:
+mods = [l.split()[0] for l in open(module_list)]
+except IOError:
+return None
+
+for m in mods:
+if m == nvidia or m == fglrx:
+return m
+
 def add_info(report, ui):
 tags = []
 
@@ -30,9 +44,9 @@ def add_info(report, ui):
 tags.append(codename)
 
 report['system']  = distro: Ubuntu\n
-report['system'] += codename:+ codename
-report['system'] += architecture:+ command_output(['uname','-m'])
-report['system'] += kernel:  + command_output(['uname','-r'])
+report['system'] += codename:+ codename + \n
+report['system'] += architecture:+ 
command_output(['uname','-m']) + \n
+report['system'] += kernel:  + 
command_output(['uname','-r']) + \n
 
 attach_related_packages(report, [
 xserver-xorg,
@@ -60,12 +74,11 @@ def add_info(report, ui):
 return
 
 if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
-matches = command_output(['grep', 'fglrx', '/var/log/kern.log', 
'/proc/modules'])
-if (matches):
+nonfree_driver = nonfree_graphics_module()
+if (nonfree_driver == fglrx):
 report['SourcePackage'] = fglrx-installer
 
-matches = command_output(['grep', 'nvidia', '/var/log/kern.log', 
'/proc/modules'])
-if (matches):
+elif (nonfree_driver == nvidia):
 report['SourcePackage'] = nvidia-graphics-drivers
 
 attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
diff --git a/debian/changelog b/debian/changelog
index 515c48c..64d1b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xorg (1:7.5+3ubuntu1) UNRELEASED; urgency=low
 
+  [Timo Aaltonen]
   * 50x11-common_determine-startup: Fix a typo in the option name
-   (LP: #526532)
+(LP: #526532)
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 04 Mar 2010 16:22:39 +0200
+  [Bryce Harrington]
+  * debian/apport/source_xorg.py: Fix proprietary module detection logic to
+not send all crash bugs to -nvidia.
+
+ -- Bryce Harrington br...@ubuntu.com  Mon, 08 Mar 2010 19:02:40 -0800
 
 xorg (1:7.5+3) unstable; 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/e1nopla-ut...@alioth.debian.org