xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog |8
src/i830_quirks.c |3 ---
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit a4e5f5a17028f58872d1ab70356525965788
Author: Julien Cristau
Date: Thu Jan 22 03:49:11 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0bc4e6c..c6ed098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny6) unstable; urgency=high
+
+ * Remove the Cappuccino SlimPRO SP625F quirk added in -2+lenny5.
+There are machines with the same subdevice ids and an LVDS output
+(closes: #512595). Thanks, Kushal Koolwal!
+
+ -- Julien Cristau Thu, 22 Jan 2009 03:49:01 +0100
+
xserver-xorg-video-intel (2:2.3.2-2+lenny5) unstable; urgency=low
* Cherry-pick some more patches from upstream git:
commit be77a9b0d5dde069f0143cad24a8a7fe47d4aed6
Author: Zhenyu Wang
Date: Tue Dec 9 19:19:58 2008 +0800
Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk
It breaks bug #18462 on IBM 855GM with same subdevice ids.
(cherry picked from commit 0fe61b0b7e3bbe8ced1b0ad2be72c438d200c64b)
diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 4f8a921..4fdae17 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -220,9 +220,6 @@ static i830_quirk i830_quirk_list[] = {
{ PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
{ PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds },
-/* Cappuccino SlimPRO SP625F, bz #11368 */
-{ PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds },
-
/* Apple Mac mini has no lvds, but macbook pro does */
{ PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.3.2-2+lenny6'
Tag 'xserver-xorg-video-intel-2_2.3.2-2+lenny6' created by Julien Cristau at 2009-01-22 09:38 + Tagging upload of xserver-xorg-video-intel 2:2.3.2-2+lenny6 to unstable. Changes since xserver-xorg-video-intel-2_2.3.2-2+lenny5: Julien Cristau (1): Prepare changelog for upload Zhenyu Wang (1): Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk --- debian/changelog |8 src/i830_quirks.c |3 --- 2 files changed, 8 insertions(+), 3 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Processing of xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.changes
xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.changes uploaded successfully to localhost along with the files: xserver-xorg-video-intel_2.3.2-2+lenny6.dsc xserver-xorg-video-intel_2.3.2-2+lenny6.diff.gz xserver-xorg-video-i810_2.3.2-2+lenny6_all.deb xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.deb xserver-xorg-video-intel-dbg_2.3.2-2+lenny6_amd64.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#512614: xset dpms rejects reasonable values as illegal
Package: x11-xserver-utils Version: 7.3+5 SUMMARY: xset blanking delays occur in series not parallel xset dpms 30 60 90 means a total of 180 sec before monitor off thus xset dpms 90 60 30 should also be legal -- but it is not Hi! $ xset dpms sets the delay before X turns your monitor to standby mode, to suspend mode, and then off. Pretty simple. Seems to work fine too. Sample output: $ xset dpms 30 60 90 $ while true; do echo "`date +%T` `xset -q | grep Monitor`"; sleep 10; done 00:59:01 Monitor is On 00:59:11 Monitor is On 00:59:21 Monitor is On 00:59:31 Monitor is in Standby 00:59:41 Monitor is in Standby 00:59:51 Monitor is in Standby 01:00:01 Monitor is in Standby 01:00:11 Monitor is in Standby 01:00:21 Monitor is in Standby 01:00:31 Monitor is in Suspend 01:00:41 Monitor is in Suspend 01:00:51 Monitor is in Suspend 01:01:01 Monitor is in Suspend 01:01:11 Monitor is in Suspend 01:01:21 Monitor is in Suspend 01:01:31 Monitor is in Suspend 01:01:41 Monitor is in Suspend 01:01:51 Monitor is in Suspend 01:02:01 Monitor is Off 01:02:11 Monitor is Off 01:02:21 Monitor is Off 01:02:31 Monitor is On ^C $ Note that it took exactly 30 seconds to reach standby, 60 seconds AFTER THAT to reach suspend, and then ANOTHER ADDITIONAL 90 seconds before the monitor turned off. Great, I get it, now I know how to ask for what I really want. So! Suppose we want X to wait three minutes before standby and then 30 seconds each before suspend and off? $ xset dpms 180 30 30 illegal combination of values standby time of 180 is greater than suspend time of 30 Oh no! OK, this is not of earth-shattering importance, but on the other hand it should be really easy to fix. Thanks! -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.changes ACCEPTED
Accepted: xserver-xorg-video-i810_2.3.2-2+lenny6_all.deb to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-i810_2.3.2-2+lenny6_all.deb xserver-xorg-video-intel-dbg_2.3.2-2+lenny6_amd64.deb to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel-dbg_2.3.2-2+lenny6_amd64.deb xserver-xorg-video-intel_2.3.2-2+lenny6.diff.gz to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny6.diff.gz xserver-xorg-video-intel_2.3.2-2+lenny6.dsc to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny6.dsc xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.deb to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.deb Override entries for your package: xserver-xorg-video-i810_2.3.2-2+lenny6_all.deb - optional oldlibs xserver-xorg-video-intel-dbg_2.3.2-2+lenny6_amd64.deb - extra x11 xserver-xorg-video-intel_2.3.2-2+lenny6.dsc - source x11 xserver-xorg-video-intel_2.3.2-2+lenny6_amd64.deb - optional x11 Announcing to debian-devel-chan...@lists.debian.org Closing bugs: 512595 Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#512595: marked as done (xserver-xorg-video-intel: LVDS screen goes blank on starting X server)
Your message dated Thu, 22 Jan 2009 10:02:06 + with message-id and subject line Bug#512595: fixed in xserver-xorg-video-intel 2:2.3.2-2+lenny6 has caused the Debian Bug report #512595, regarding xserver-xorg-video-intel: LVDS screen goes blank on starting X server to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 512595: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512595 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: xserver-xorg-video-intel Version: 2:2.3.2-2+lenny5 Severity: important My graphic chipset is: 00:02.0 VGA compatible controller: Intel Corporation 82852/855GM Integrated Graphics Device (rev 02) I primarily use a VGA monitor as my primary display device. Everything works fine with it. But as soon as I attached a secondary display device (a LVDS flat panel) the screen on LVDS goes blank as soon as X servers gets started (gdm kicks in). The VGA display is fine. Also as soon as I hit Alt-F1 to switch to first console, the display on LVDS comes back. I also noticed that this problem does not exits on 2.3.2-2+lenny4. Something got changed between 2.3.2-2+lenny4 and 2.3.2-2+lenny5 (the current one which I am using). So if I copy the intel_drv.so from 2.3.2-2+lenny4 package to my /usr/lib/xorg/modules/drivers/ directory and restart my X, the screen on LVDS is restored properly. -- Package-specific info: Contents of /var/lib/x11/X.roster: xserver-xorg /var/lib/x11/X.md5sum does not exist. X server symlink status: lrwxrwxrwx 1 root root 13 2008-04-23 10:34 /etc/X11/X -> /usr/bin/Xorg -rwxr-xr-x 1 root root 1718484 2009-01-08 19:11 /usr/bin/Xorg Contents of /var/lib/x11/xorg.conf.roster: xserver-xorg VGA-compatible devices on PCI bus: 00:02.0 VGA compatible controller: Intel Corporation 82852/855GM Integrated Graphics Device (rev 02) /etc/X11/xorg.conf unchanged from checksum in /var/lib/x11/xorg.conf.md5sum. Xorg X server configuration file status: -rw-r--r-- 1 root root 1077 2008-04-23 10:34 /etc/X11/xorg.conf Contents of /etc/X11/xorg.conf: # xorg.conf (X.Org X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the xorg.conf manual page. # (Type "man xorg.conf" at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg Section "InputDevice" Identifier "Generic Keyboard" Driver "kbd" Option "XkbRules" "xorg" Option "XkbModel" "pc104" Option "XkbLayout" "us" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" EndSection Section "Device" Identifier "Configured Video Device" EndSection Section "Monitor" Identifier "Configured Monitor" EndSection Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" EndSection Xorg X server log files on system: -rw-r--r-- 1 root root 31409 2009-01-21 17:47 /var/log/Xorg.0.log Contents of most recent Xorg X server log file /var/log/Xorg.0.log: X.Org X Server 1.4.2 Release Date: 11 June 2008 X Protocol Version 11, Revision 0 Build Operating System: Linux Debian (xorg-server 2:1.4.2-10) Current Operating System: Linux sysuser-xp 2.6.24-1-686 #1 SMP Sat Apr 19 00:37:55 UTC 2008 i686 Build Date: 09 January 2009 02:57:16AM Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Module Loader present Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: "/var/log/Xorg.0.log", Time: Wed Jan 21 17:47:47 2009 (==) Using config file: "/etc/X11/xorg.conf" (==) No Layout section. Using the first Screen section. (**) |-->Screen "Default Screen" (0) (**) | |-->Monitor "Configured Monitor" (==) No device specified for screen "Default Screen". Using the first device section listed. (**) | |-->Device "Configured Video Device" (==) |-->Input Device "Configured Mouse" (==) |-->Input Device "Generic Keyboard" (==) The core pointer device wasn't
Bug#511987: xserver-xorg-input-evtouch: patch to support LEO 8800
Hi Brett, On Thu, Jan 15, 2009 at 07:04:41PM -0700, Brett Wuth wrote: > Package: xserver-xorg-input-evtouch > Version: 0.8.7-3 > Severity: normal > Tags: patch your patches do not apply anymore to the new evtouch source (0.8.8) currently in git. Could you refresh them to apply? Also, would you mind Cc-ing the upstream developer when resubmitting (you can find his address in the sources of course)? Thanks -- mattia :wq! -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-keyboard: Changes to 'refs/tags/xserver-xorg-input-keyboard-1_1.3.2-2'
Tag 'xserver-xorg-input-keyboard-1_1.3.2-2' created by Julien Cristau at 2009-01-22 13:12 + Tagging upload of xserver-xorg-input-keyboard 1:1.3.2-2 to experimental. Changes since xserver-xorg-input-keyboard-1_1.3.2-1: Julien Cristau (1): Build against xserver 1.6 rc1. --- debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-keyboard: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit c14bee656f0347e61cab0307dc53baa96a4a8fb3 Author: Julien Cristau Date: Thu Jan 22 14:08:48 2009 +0100 Build against xserver 1.6 rc1. diff --git a/debian/changelog b/debian/changelog index 25ef63e..cf5a5f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-keyboard (1:1.3.2-2) experimental; urgency=low + + * Build against xserver 1.6 rc1. + + -- Julien Cristau Thu, 22 Jan 2009 14:08:28 +0100 + xserver-xorg-input-keyboard (1:1.3.2-1) experimental; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index d148b48..5e2e394 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Drew Parsons = 5), pkg-config, - xserver-xorg-dev (>= 2:1.4.99.905), + xserver-xorg-dev (>= 2:1.5.99.901), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Processing of xserver-xorg-input-keyboard_1.3.2-2_amd64.changes
xserver-xorg-input-keyboard_1.3.2-2_amd64.changes uploaded successfully to localhost along with the files: xserver-xorg-input-keyboard_1.3.2-2.dsc xserver-xorg-input-keyboard_1.3.2-2.diff.gz xserver-xorg-input-kbd_1.3.2-2_amd64.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-keyboard_1.3.2-2_amd64.changes ACCEPTED
Accepted: xserver-xorg-input-kbd_1.3.2-2_amd64.deb to pool/main/x/xserver-xorg-input-keyboard/xserver-xorg-input-kbd_1.3.2-2_amd64.deb xserver-xorg-input-keyboard_1.3.2-2.diff.gz to pool/main/x/xserver-xorg-input-keyboard/xserver-xorg-input-keyboard_1.3.2-2.diff.gz xserver-xorg-input-keyboard_1.3.2-2.dsc to pool/main/x/xserver-xorg-input-keyboard/xserver-xorg-input-keyboard_1.3.2-2.dsc Override entries for your package: xserver-xorg-input-kbd_1.3.2-2_amd64.deb - optional x11 xserver-xorg-input-keyboard_1.3.2-2.dsc - source x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evdev: Changes to 'ubuntu'
ChangeLog | 110 +++
configure.ac|2
debian/changelog| 49 ++--
debian/control | 23 -
debian/copyright| 126
debian/patches/100_dont_check_abi.patch | 14 ---
debian/patches/series |1
man/evdev.man |2
src/emuMB.c |5 +
src/evdev.c | 28 +++
src/evdev.h | 32 ++--
11 files changed, 311 insertions(+), 81 deletions(-)
New commits:
commit 56826701ad181dba4fdacc157ca53454ed12f20b
Author: Timo Aaltonen
Date: Thu Jan 22 15:22:25 2009 +0200
Update the changelog for release.
diff --git a/debian/changelog b/debian/changelog
index 7ead9a0..1fc9ae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.1.1-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.1-1ubuntu1) jaunty; urgency=low
* Merge with Debian experimental, remaining changes:
- Don't install the fdi file, hal in ubuntu already ships one.
* Drop 100_dont_check_abi.patch, since the new xserver has a higher
INPUT_ABI already.
- -- Timo Aaltonen Thu, 22 Jan 2009 15:18:05 +0200
+ -- Timo Aaltonen Thu, 22 Jan 2009 15:22:17 +0200
xserver-xorg-input-evdev (1:2.1.1-1) experimental; urgency=low
commit 3c5429c64b98ec0f70ead374555399cc60b99ad5
Author: Timo Aaltonen
Date: Thu Jan 22 15:19:39 2009 +0200
Drop 100_dont_check_abi.patch
the xserver has a higher ABI already
diff --git a/debian/changelog b/debian/changelog
index b4f4867..7ead9a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-input-evdev (1:2.1.1-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge with Debian experimental, remaining changes:
+- Don't install the fdi file, hal in ubuntu already ships one.
+ * Drop 100_dont_check_abi.patch, since the new xserver has a higher
+INPUT_ABI already.
+
+ -- Timo Aaltonen Thu, 22 Jan 2009 15:18:05 +0200
+
xserver-xorg-input-evdev (1:2.1.1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/patches/100_dont_check_abi.patch
b/debian/patches/100_dont_check_abi.patch
deleted file mode 100644
index 1192318..000
--- a/debian/patches/100_dont_check_abi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-input-evdev/src/evdev.h
-===
xserver-xorg-input-evdev.orig/src/evdev.h 2008-09-12 15:58:54.0
+0300
-+++ xserver-xorg-input-evdev/src/evdev.h 2008-09-12 16:00:35.0
+0300
-@@ -41,9 +41,7 @@
-
- #define EVDEV_MAXBUTTONS 32
-
--#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
- #define HAVE_PROPERTIES 1
--#endif
-
- #define LONG_BITS (sizeof(long) * 8)
- #define NBITS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6b682cf..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-100_dont_check_abi.patch
commit 24c195433c69374ed687794320928f490feca498
Author: Julien Cristau
Date: Wed Jan 21 21:59:31 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 757d9cc..a629d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.1.1-1) experimental; urgency=low
* New upstream release.
* Update debian/copyright from upstream's COPYING.
* Build against xserver 1.6 rc1.
- -- Julien Cristau Wed, 03 Dec 2008 00:09:44 +0100
+ -- Julien Cristau Wed, 21 Jan 2009 21:58:47 +0100
xserver-xorg-input-evdev (1:2.1.0-1) experimental; urgency=low
commit fcffce9f8fb86efebdadc965aa767bab93d7d740
Author: Julien Cristau
Date: Wed Jan 21 21:58:40 2009 +0100
Build against xserver 1.6 rc1.
diff --git a/debian/changelog b/debian/changelog
index 69250b6..757d9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream's COPYING.
+ * Build against xserver 1.6 rc1.
-- Julien Cristau Wed, 03 Dec 2008 00:09:44 +0100
diff --git a/debian/control b/debian/control
index d05e52f..910bf2b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.4.99.906),
+ xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
@@ -23,7 +23,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
Package: xserver-xorg-input-evdev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:D
xorg-server: Changes to 'ubuntu'
debian/changelog | 57 +--
debian/control | 14 -
debian/serverminver |2 -
debian/xserver-xorg-core.install |1
4 files changed, 51 insertions(+), 23 deletions(-)
New commits:
commit 85a5d049b1e25e29a53313fd6728148bd26cff59
Author: Timo Aaltonen
Date: Thu Jan 22 15:40:46 2009 +0200
Include xorg-server.conf for dbus support.
diff --git a/debian/changelog b/debian/changelog
index 49c9c6e..0fd24ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.99.901-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge with Debian experimental.
+ * debian/xserver-xorg-core.install: Include xorg-server.conf for dbus
+support.
+
+ -- Timo Aaltonen Thu, 22 Jan 2009 15:37:40 +0200
+
xorg-server (2:1.5.99.901-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index c88d80f..401a272 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -13,3 +13,4 @@ usr/bin/cvt
usr/bin/gtf
usr/share/man/man1/cvt.1
usr/share/man/man1/gtf.1
+config/xorg-server.conf etc/dbus-1/system.d
commit afd95c193a70d202a92aaa73be6917bd37fe9336
Author: Julien Cristau
Date: Wed Jan 21 20:59:37 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 161afb5..e42954b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.5.99.901-1) experimental; urgency=low
* New upstream release candidate.
+ adds autodetection of sbus devices (closes: #483942).
@@ -47,7 +47,7 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
- x11proto-randr-dev (>= 1.2.99.3)
- add x11proto-dri2-dev
- -- Timo Aaltonen Mon, 08 Dec 2008 08:39:38 +0200
+ -- Julien Cristau Wed, 21 Jan 2009 20:59:34 +0100
xorg-server (2:1.5.3-1) experimental; urgency=low
commit 7bb3c9dc847b8282420b39eb472f98ab471217c5
Author: Julien Cristau
Date: Wed Jan 21 20:59:27 2009 +0100
debian/serverminver: Bump to 2:1.5.99.901.
diff --git a/debian/changelog b/debian/changelog
index d1bd026..161afb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,7 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
13_debian_add_xkbpath_env_variable.diff
- Disabled for now, needs to be reimplemented or dropped.
* debian/{input,video}abiver: Bump the input (4) and videoabiver (5).
- * debian/serverminver: Bump to 2:1.5.99.3.
+ * debian/serverminver: Bump to 2:1.5.99.901.
[ Julien Cristau ]
* Ditch the GLX Public License and the CID Font Code Public License from
diff --git a/debian/serverminver b/debian/serverminver
index 8b40438..033aaa4 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.5.99.3
+2:1.5.99.901
commit 37a49ac259696ed322b0692cd9e329057df346fd
Author: Yves-Alexis Perez
Date: Fri Jan 16 10:14:22 2009 +0100
debian/control: update deps for xserver-xorg-dev
- libpixman-1-dev (>= 0.13.2-1)
- x11proto-core-dev (>= 7.0.14)
- x11proto-input-dev (>= 1.5.0)
- x11proto-xext-dev (>= 7.0.4)
- x11proto-randr-dev (>= 1.2.99.3)
- add x11proto-dri2-dev
Signed-off-by: Julien Cristau
diff --git a/debian/changelog b/debian/changelog
index a1140e7..d1bd026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,15 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
under the GLXPL has been relicensed to the SGI Free Software License B 2.0.
This finally closes: #211765.
+ [ Yves-Alexis Perez ]
+ * debian/control: update deps for xserver-xorg-dev:
+- libpixman-1-dev (>= 0.13.2-1)
+- x11proto-core-dev (>= 7.0.14)
+- x11proto-input-dev (>= 1.5.0)
+- x11proto-xext-dev (>= 7.0.4)
+- x11proto-randr-dev (>= 1.2.99.3)
+- add x11proto-dri2-dev
+
-- Timo Aaltonen Mon, 08 Dec 2008 08:39:38 +0200
xorg-server (2:1.5.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 8451723..ee7fa1a 100644
--- a/debian/control
+++ b/debian/control
@@ -77,13 +77,14 @@ Description: Xorg X server - core server
Package: xserver-xorg-dev
Architecture: any
Depends: ${misc:Depends},
- libpixman-1-dev,
- x11proto-core-dev,
- x11proto-input-dev (>= 1.4),
- x11proto-xext-dev,
+ libpixman-1-dev (>= 0.13.2-1),
+ x11proto-core-dev (>= 7.0.14),
+ x11proto-input-dev (>= 1.5.0),
+ x11proto-xext-dev (>= 7.0.4),
x11proto-video-dev,
- x11proto-randr-dev (>= 1.2),
+ x11proto-randr-dev (>= 1.2.99.3),
x11proto-render-dev (>= 2:0.9.3),
+ x11proto-dri2-dev,
x11proto-fonts-dev,
libpciaccess-dev
Description: Xorg X server - development files
commit a7af98436ad6d44f146670883af1252675c33af3
Author: Yves-Alexis Perez
Date: Fri Jan 16 10:05:27 2009 +0100
Wrap xserver-xorg-dev deps one per line
Signed-off-by: J
xorg-server: Changes to 'ubuntu'
debian/changelog |3 +-- debian/rules |3 +++ debian/xserver-xorg-core.install |1 - 3 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 9ea385310b8acd993107bb5bd85dee503ba49db2 Author: Timo Aaltonen Date: Thu Jan 22 17:36:51 2009 +0200 update the changelog to reflect the previous change. diff --git a/debian/changelog b/debian/changelog index 0fd24ad..ad95bef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ xorg-server (2:1.5.99.901-1ubuntu1) UNRELEASED; urgency=low * Merge with Debian experimental. - * debian/xserver-xorg-core.install: Include xorg-server.conf for dbus -support. + * debian/rules: Include xorg-server.conf for dbus support. -- Timo Aaltonen Thu, 22 Jan 2009 15:37:40 +0200 commit b7df58cc273fa9749da2dfadd9ddaede927e1335 Author: Timo Aaltonen Date: Thu Jan 22 17:34:21 2009 +0200 Handle xorg-server.conf installation in debian/rules. diff --git a/debian/rules b/debian/rules index d5fde22..20f149f 100755 --- a/debian/rules +++ b/debian/rules @@ -171,6 +171,9 @@ binary-arch: build install $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script + $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-core/etc/dbus-1/system.d + $(INSTALL) -m644 $(CURDIR)/config/xorg-server.conf \ + $(CURDIR)/debian/xserver-xorg-core/etc/dbus-1/system.d/xorg-server.conf dh_installdebconf -s dh_installman -s dh_link -s diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install index 401a272..c88d80f 100644 --- a/debian/xserver-xorg-core.install +++ b/debian/xserver-xorg-core.install @@ -13,4 +13,3 @@ usr/bin/cvt usr/bin/gtf usr/share/man/man1/cvt.1 usr/share/man/man1/gtf.1 -config/xorg-server.conf etc/dbus-1/system.d -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-input: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 9f2a548a36a22cf737b2a656af841f5ae9c7faee Author: Timo Aaltonen Date: Thu Jan 22 17:48:38 2009 +0200 Update the changelog. commit 3fc652c1c0103fed8c0c841de5d584e6978b68d2 Merge: 6482c39e84cf34bc4e64af70fe1ffd93c2e8907a eb62b09673db50ddcb8a3dc40a34eb1bf30003ed Author: Timo Aaltonen Date: Thu Jan 22 16:20:42 2009 +0200 Merge branch 'debian-experimental' into ubuntu Conflicts: debian/changelog debian/control debian/rules commit 6482c39e84cf34bc4e64af70fe1ffd93c2e8907a Author: Timo Aaltonen Date: Wed Dec 3 19:12:04 2008 +0200 Initial ubuntu commit. commit b302fa2a312ec0f8a938d84a6c6c6a50e6c7695f Author: Timo Aaltonen Date: Wed Dec 3 17:15:30 2008 +0200 Update the changelog go back to 1.5. commit 784030618d9e43fa06821ca58c68f57169fe0920 Merge: 6a952ce665947c30063fbca0950f879110de8f0a b356263346b7586ffcbb9a794862c8cfadeab8a4 Author: Timo Aaltonen Date: Wed Dec 3 17:09:25 2008 +0200 Merge commit 'origin/debian-experimental' into debian-experimental commit 6a952ce665947c30063fbca0950f879110de8f0a Merge: d38e79ca3ddd6031ca4a335eb2faf99294a6731f 3e7b663e7d5a40a115eba3cabfc173549ff89357 Author: Timo Aaltonen Date: Wed Dec 3 17:09:00 2008 +0200 Merge commit 'inputproto-1.9.99.4' into debian-experimental commit b356263346b7586ffcbb9a794862c8cfadeab8a4 Author: Julien Cristau Date: Sat Aug 16 05:28:52 2008 +0200 debian/rules: allow parallel builds, and don't try to apply patches commit ae5f299b08886458686807ccef5aafa2b620de74 Merge: 7cf2c3d8516bac88bb3bcb76b8a7d1b5425e9c00 86e7669f5d912824e341ea487a6257ec5433eb90 Author: Julien Cristau Date: Sat Aug 16 05:23:22 2008 +0200 Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-experimental commit 7cf2c3d8516bac88bb3bcb76b8a7d1b5425e9c00 Author: Timo Aaltonen Date: Fri Aug 15 15:40:47 2008 +0300 Switch to running autoreconf at build time build-depend on automake, libtool and xutils-dev commit 09dd1bf4e9a3574696d6ea0d6c5788f96daeef6b Merge: 8543d101a767f170bee4fc9d60b1fa27473f86da 3e7b663e7d5a40a115eba3cabfc173549ff89357 Author: Timo Aaltonen Date: Fri Aug 15 14:49:10 2008 +0300 Merge tag 'inputproto-1.9.99.4' into debian-experimental commit 3e7b663e7d5a40a115eba3cabfc173549ff89357 Author: Peter Hutterer Date: Fri Aug 15 15:01:16 2008 +0930 inputproto 1.9.99.4 Backported device properties. commit fabe087cebb11c6a2600e57c6f7a52fda2efea29 Author: Peter Hutterer Date: Fri Aug 15 14:50:23 2008 +0930 Protect against C++ includes. commit c2d47b04c55cf72aef6c13a9e2cc4b41abfca673 Author: Peter Hutterer Date: Fri Aug 15 14:21:24 2008 +0930 Remove RCS tags, typo fix. commit 7c9620d8232e5c05115746055a832363a528ac2d Author: Peter Hutterer Date: Wed Aug 13 10:00:12 2008 +0930 Back out Device Properties from XI 2, push into XI 1.5. commit 54465c743354dd138f4ccacc196198e36c2ecdba Author: Alan Hourihane Date: Tue Jul 29 14:15:04 2008 +0100 bump to 1.99.9.3 commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5 Author: Peter Hutterer Date: Tue Jul 29 08:58:53 2008 +0930 Add DeviceControlChanged define. This value is used for the devchange field in the DevicePresenceNotify event when a device's control has been modified. commit 0d300ce64c277f4f7c7fe5fd6dca1ed768880af1 Author: Alan Hourihane Date: Mon Jul 21 10:33:47 2008 +0100 Bump to 1.9.99.2 for inputproto commit fe74239e93e6562ba6c268b50d6cfb36d2426bef Author: Peter Hutterer Date: Sun Jul 13 20:49:51 2008 +0930 Add #defines for XI_PROP_ENABLED, XI_PROP_MODE These two props are expected to be supported by the server. commit 5f686651087ac9d1a15b4d8aa631f2d7f2096871 Author: Peter Hutterer Date: Wed Jul 9 18:28:26 2008 +0930 Set IEVENTS back to 18, got set to 8 inadvertantly. commit bbbe35b3513510afb524e02b8227826dbd5ea87e Author: Peter Hutterer Date: Mon Jul 7 15:38:50 2008 +0930 Add XI device property requests and replies. New requests: ListDeviceProperties ... list all props of a device QueryDeviceProperty ... query meta-information about a property ChangeDeviceProperty ... change the content of a property DeleteDeviceProperty ... delete a property GetDeviceProperty... retrieve a property New event: DevicePropertyChangedNotify ... the given property on the device has changed commit 9f1f3ef7a36fddacf30ecf867ddad90253103b6a Author: Peter Hutterer Date: Wed May 28 17:13:49 2008 +0930 Bump to 1.9.99.1. commit 834c9ba8b4a1746a5d87d793f7c40bb882712656 Author: Peter Hutterer Date: Mon May 12 17:30:30 2008 +0930 Remove a leftover typedef, the code that requires it has since been removed. Was part of the FakeDeviceData request, this request does not exist anymore. commit c6df1392e52b5edf3f25e0198c06a3a1ae3c0356 Merge: f6e41306f76de966884d4b72c5fb5e5d6d534ce4
libxi: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit c9c95455a963241b1d2c87c472b931612c772eef Author: Timo Aaltonen Date: Thu Jan 22 17:49:28 2009 +0200 Release commit 46326153f50b14e4c81fe07ae99d01e4085923cf Author: Timo Aaltonen Date: Thu Jan 22 17:29:18 2009 +0200 Initial ubuntu commit deleted src/config.h.in while at it. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#511830: 2.6.1 just released does not fix the problem for me
FYI. --eric -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xkb-data: Changes to 'ubuntu'
ChangeLog | 48 NEWS|3 configure.in|2 debian/changelog| 50 debian/compat.dir | 28 debian/control |4 debian/geometry.dir | 99 debian/keycodes.dir | 82 debian/keymap.dir | 354 - debian/patches/100_abnt2_jp106.diff | 54 debian/patches/send-upstream/001_keypad_comma.diff | 15 debian/patches/send-upstream/003_missing_inet_keys.diff | 15 debian/patches/series |2 debian/rules| 68 debian/semantics.dir|4 debian/symbols.dir | 758 debian/types.dir| 18 debian/xkb-data-legacy.install |1 geometry/pc | 165 intltool-extract.in | 516 -- intltool-merge.in | 1315 --- intltool-update.in | 1063 - keycodes/evdev |8 po/ChangeLog|4 po/Makefile.am |9 po/Makefile.in.in | 218 - po/bg.po| 1879 -- po/ca.po| 1340 +++ po/cs.po| 1342 +++ po/da.po| 2965 +++- po/eo.po| 2624 ++ po/fr.po| 1885 ++ po/hu.po| 1730 - po/nl.po| 1346 +++ po/sv.po| 1841 + po/uk.po| 1817 - po/vi.po| 1344 +++ po/xkeyboard-config.pot | 2623 -- rules/base.lists.part |2 rules/base.o_s.part |6 rules/base.xml.in | 57 rules/sgi | 73 rules/sun | 55 rules/sun.xml.in| 932 - symbols/capslock|9 symbols/cs | 261 - symbols/cz | 39 symbols/gr | 46 symbols/group | 18 symbols/inet| 10 symbols/is |2 51 files changed, 12785 insertions(+), 16364 deletions(-) New commits: commit c576f3fd8b5417ea009075c632f7a8c63ca13cc1 Author: Timo Aaltonen Date: Thu Jan 22 18:33:06 2009 +0200 Release diff --git a/debian/changelog b/debian/changelog index 97dd7de..74e5ac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xkeyboard-config (1.4-1ubuntu1) UNRELEASED; urgency=low +xkeyboard-config (1.4-1ubuntu1) jaunty; urgency=low * Merge from Debian experimental, remaining changes: - 100_abnt2_jp106.diff: Fix ABNT2 keys. Patch modified to apply. - send-upstream/003_missing_inet_keys.diff: Add missing KeySyms to enable missing XF86Battery hotkey. (LP: 281134) - -- Timo Aaltonen Thu, 22 Jan 2009 18:18:34 +0200 + -- Timo Aaltonen Thu, 22 Jan 2009 18:33:01 +0200 xkeyboard-config (1.4-1) unstable; urgency=low commit d9fcac6e18cbd7599048e32ea6f86be65774b438 Author: Timo Aaltonen Date: Thu Jan 22 18:26:22 2009 +0200 Add a missing patch. diff --git a/debian/changelog b/debian/changelog index aa170fb..97dd7de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xkeyboard-config (1.4-1ubuntu1) UNRELEASED; urgency=low * Merge from Debian experimental, remaining changes: - 100_abnt2_jp106.diff: Fix ABNT2 keys. Patch modified to apply. +- send-upstream/003_missing_inet_keys.diff: Add missing KeySyms to + enable missing XF86Battery hotkey. (LP: 281134) -- Timo Aaltonen Thu, 22 Jan 2009 18:18:34 +0200 diff --git a/debian/patches
Bug#512706: xserver-xorg-core: [dix] Could not init font path element /usr/share/fonts/X11/100dpi
Package: xserver-xorg-core Version: 2:1.5.99.901-1 Severity: important After update to xserver 1.6RC1 I don't have fonts anymore: [dix] Could not init font path element /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType, removing from list! [dix] Could not init font path element /usr/share/fonts/X11/100dpi, removing from list! [dix] Could not init font path element /usr/share/fonts/X11/misc, removing from list! [dix] Could not init font path element /usr/share/fonts/X11/artwiz, removing from list! Regards, Vedran -- Package-specific info: Contents of /var/lib/x11/X.roster: xserver-xorg /var/lib/x11/X.md5sum does not exist. X server symlink status: lrwxrwxrwx 1 root root 13 2008-06-13 17:33 /etc/X11/X -> /usr/bin/Xorg -rwxr-xr-x 1 root root 1868112 2009-01-21 21:04 /usr/bin/Xorg Contents of /var/lib/x11/xorg.conf.roster: xserver-xorg VGA-compatible devices on PCI bus: 00:02.0 VGA compatible controller: Intel Corporation Mobile GME965/GLE960 Integrated Graphics Controller (rev 0c) /etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum. Xorg X server configuration file status: -rw-r--r-- 1 root root 2870 2009-01-22 23:58 /etc/X11/xorg.conf Contents of /etc/X11/xorg.conf: Section "Files" FontPath"/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" FontPath"/usr/share/fonts/X11/100dpi" # FontPath"/usr/share/fonts/X11/75dpi" FontPath"/usr/share/fonts/X11/misc" FontPath"/usr/share/fonts/X11/artwiz" EndSection Section "Module" Load"synaptics" Load"bitmap" EndSection #Section "Extensions" #Option "Composite" "Enable" #Option "RENDER" "true" #Option "DAMAGE" "true" #EndSection Section "ServerFlags" #Option "NoTrapSignals" #Option "DontZap" #Option "Dont Zoom" #Option "DisableVidModeExtension" #Option "AllowNonLocalXvidtune" #Option "DisableModInDev" #Option "AllowNonLocalModInDev" Option "BlankTime" "300" Option "StanbyTime""600" Option "SuspendTime" "900" #Option "OffTime" "1800" EndSection Section "InputDevice" Identifier "Generic Keyboard" Driver "kbd" Option "XkbRules" "xorg" Option "XkbModel" "pc105" Option "XkbLayout" "hr" EndSection Section "InputDevice" Identifier"Synaptics Touchpad" Driver"synaptics" Option"AlwaysCore""1" Option"Device""/dev/psaux" Option"Protocol" "auto-dev" # Option"MaxDoubleTapTime" "400" # Option"SendCoreEvents" "true" Option"HorizEdgeScroll" "on" Option"VertEdgeScroll" "on" Option"VertTwoFingerScroll" "on" Option"HorizTwoFingerScroll" "on" Option"CornerCoasting" "on" # Option"PalmDetect" "on" Option"CircularScrolling" "on" Option"CircScrollTrigger" "3" Option"TouchpadOff" "0" Option"TapButton1" "1" Option"TapButton2" "2" Option"TapButton3" "3" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" EndSection Section "Device" Identifier "intel" Driver "intel" Option "LCD" "External DVI" Option "LVDS" "Integrated LCD" Option "ConnectedMonitor" "LCD,LVDS" EndSection Section "Monitor" Identifier "Integrated LCD" EndSection Section "Monitor" Identifier "External LCD" Option "RightOf" "Integrated LCD" EndSection Section "Screen" Identifier "Default Screen" # Monitor "Integrated LCD" DefaultDepth24 SubSection "Display" Depth 24 Virtual 3000 2000 EndSubSection EndSection Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" InputDevice "Generic Keyboard" InputDevice "Synaptics Touchpad" "CorePointer" InputDevice "Configured Mouse" Option "AllowEmptyInput" "on" EndSection Section "DRI" Group "video" Mode 0660 EndSection Xorg X server log files on system: -rw-r--r-- 1 root root 22375 2008-08-13 15:10 /var/log/Xorg.2.log -rw-r--r-- 1 root root 22217 2009-01-15 10:30 /var/log/Xorg.1.log -rw-r--r-- 1 root root 23964 2009-01-22 23:59 /var/log/Xorg.0.log Contents of most recent Xorg X server log file /var/log/Xorg.0.log: This is a pre-release version of the X server from The X.Org Foundation. It is not supported in any way. Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/. Select the "xorg" product for bugs you find in this
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 62 ++-
debian/changelog | 11 +++
2 files changed, 66 insertions(+), 7 deletions(-)
New commits:
commit 475fb3dc3fa7b2017af204b29432ee35e6c670db
Author: Bryce Harrington
Date: Thu Jan 22 17:01:17 2009 -0800
Drop use of intel_reg_dumper since it requires root access.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 1e02e52..6a8eabf 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -127,12 +127,6 @@ def add_info(report):
except OSError:
pass
-try:
-script = subprocess.Popen(['intel_reg_dumper'], stdout=subprocess.PIPE)
-report['intel_reg_dumper'] = script.communicate()[0]
-except OSError:
-pass
-
## DEBUGING ##
if __name__ == '__main__':
report = {}
diff --git a/debian/changelog b/debian/changelog
index e52d901..84da422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.4~5ubuntu11) UNRELEASED; urgency=low
+
+ * apport/source_xorg.py:
+- Adding system environment items recommended at
+ http://intellinuxgraphics.org/how_to_report_bug.html
+- Add lshal
+- Add debug test code
+- Drop use of intel_reg_dumper since it requires root (LP: #311560)
+
+ -- Bryce Harrington Thu, 22 Jan 2009 17:00:31 -0800
+
xorg (1:7.4~5ubuntu10) jaunty; urgency=low
* apport/source_xorg.py: Fix arg list to prevent error
commit d652421b5a8092a789fcef07177a8a344dbd72b3
Author: Bryce Harrington
Date: Sat Jan 17 03:43:41 2009 -0800
Adding system environment items recommended at
http://intellinuxgraphics.org/how_to_report_bug.html
Add lshal
Add debug test code
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index c0136d3..1e02e52 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -12,10 +12,53 @@ option) any later version. See
http://www.gnu.org/copyleft/gpl.html for
the full text of the license.
'''
+# TODO:
+# - Create some general purpose routines (see source_network-manager.py)
+# - Parse files to generate system_environment more concisely
+# - Trim lshal output to just required info
+
import os.path
import subprocess
+def installed_version(pkg):
+script = subprocess.Popen(['apt-cache', 'policy', pkg],
stdout=subprocess.PIPE)
+output = script.communicate()[0]
+return output.split('\n')[1].replace("Installed: ", "")
+
def add_info(report):
+# Build System Environment
+report['system'] = " distro: Ubuntu\n"
+try:
+script = subprocess.Popen(['uname', '-m'], stdout=subprocess.PIPE)
+report['system'] += " architecture: " + script.communicate()[0]
+except OSError:
+pass
+try:
+script = subprocess.Popen(['uname', '-r'], stdout=subprocess.PIPE)
+report['system'] += " kernel: " + script.communicate()[0]
+except OSError:
+pass
+try:
+report['system'] += " xserver-xorg: " +
installed_version('xserver-xorg') + "\n"
+except OSError:
+pass
+try:
+report['system'] += " mesa: " +
installed_version('libgl1-mesa-glx') + "\n"
+except OSError:
+pass
+try:
+report['system'] += " libdrm: " +
installed_version('libdrm2') + "\n"
+except OSError:
+pass
+try:
+report['system'] += " -intel: " +
installed_version('xserver-xorg-video-intel') + "\n"
+except OSError:
+pass
+try:
+report['system'] += " -ati: " +
installed_version('xserver-xorg-video-ati') + "\n"
+except OSError:
+pass
+
try:
report['XorgConf'] = open('/etc/X11/xorg.conf').read()
except IOError:
@@ -43,6 +86,12 @@ def add_info(report):
pass
try:
+script = subprocess.Popen(['lshal'], stdout=subprocess.PIPE)
+report['LsHal'] = script.communicate()[0]
+except OSError:
+pass
+
+try:
script = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
report['LsMod'] = script.communicate()[0]
except OSError:
@@ -84,4 +133,9 @@ def add_info(report):
except OSError:
pass
-
+## DEBUGING ##
+if __name__ == '__main__':
+report = {}
+add_info(report)
+for key in report:
+print '[%s]\n%s' % (key, report[key])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
