Bug#490013: More info regargin xkb-data and 'ro' layouts

2008-07-27 Thread Andrei Popescu
Package: xkb-data
Version: 1.3-1
Followup-For: Bug #490013


Hello, I am seeing a somewhat different issue, but my guess is this is 
related

$ setxkbmap -v 10 ro std
Setting verbose level to 10
locale is C
Warning! Multiple definitions of keyboard layout
 Using command line, ignoring X server
Applied rules from xorg:
model:  pc105
layout: ro
variant:std
Trying to build keymap using the following components:
keycodes:   xfree86+aliases(qwertz)
types:  complete
compat: complete
symbols:pc+ro(std_cedilla)
geometry:   pc(pc105)

Please note symbols: shows std_cedilla and indeed the layout is the 
one using cedillas.

$ setxkbmap -v 10 ro,de std
Setting verbose level to 10
locale is C
Warning! Multiple definitions of keyboard layout
 Using command line, ignoring X server
Warning! Multiple definitions of layout variant
 Using command line, ignoring X server
Applied rules from xorg:
model:  pc105
layout: ro,de
variant:std
Trying to build keymap using the following components:
keycodes:   xfree86+aliases(qwertz)
types:  complete
compat: complete
symbols:pc+ro+de:2
geometry:   pc(pc105)

Now I get the correct std variant!

It looks to me like some kind of regression introduced by the patch to 
change the default Romanian layout. It would be very important for the 
Romanian community to fix this before the release. In case you need some 
quick testing you can also Cc debian-l10n-romanian.

Regards,
Andrei

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.25-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- no debconf information



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



Bug#490013: More info regargin xkb-data and 'ro' layouts

2008-07-27 Thread Julien Cristau
On Sun, Jul 27, 2008 at 10:28:38 +0300, Andrei Popescu wrote:

 $ setxkbmap -v 10 ro std
 Setting verbose level to 10
 locale is C
 Warning! Multiple definitions of keyboard layout
  Using command line, ignoring X server
 Applied rules from xorg:
 model:  pc105
 layout: ro
 variant:std
 Trying to build keymap using the following components:
 keycodes:   xfree86+aliases(qwertz)
 types:  complete
 compat: complete
 symbols:pc+ro(std_cedilla)
 geometry:   pc(pc105)
 
 Please note symbols: shows std_cedilla and indeed the layout is the 
 one using cedillas.
 
That's because /usr/share/X11/xkb/rules/xorg has:
! model layout  variant =   symbols
  * ro  de  =   pc+ro(winkeys)
  * ro  us  =   pc+ro(std_comma)
  * ro  std =   pc+ro(std_cedilla)
  * ro  academic=   pc+ro(std_comma)

So layout ro and variant std is mapped to symbols pc+ro(std_cedilla).

Cheers,
Julien



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



xserver-xorg-video-intel: Changes to 'debian-unstable'

2008-07-27 Thread Julien Cristau
 debian/changelog |5 
 debian/rules |4 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  104 +-
 debian/xsfbs/xsfbs.sh|  387 +--
 5 files changed, 230 insertions(+), 420 deletions(-)

New commits:
commit e697338f99f5a6e9879001a2aea60c25d8a85d0d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 27 11:48:35 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3cb06e4..5f28072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.3.2-2+lenny1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.3.2-2+lenny1) unstable; urgency=low
 
   * Cherry-pick patches from the 2.4.0 release:
 - Add support for Intel 4 series chipsets
@@ -15,7 +15,7 @@ xserver-xorg-video-intel (2:2.3.2-2+lenny1) UNRELEASED; 
urgency=low
 - Thinkpad R60e TV quirk via DMI info
   * Fix debian/rules build/patch dependencies.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 27 Jul 2008 01:49:09 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 27 Jul 2008 11:44:09 +0200
 
 xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high
 

commit f06cafb9d07368f16c658f75bb7b6e27f3cc7849
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 27 11:26:41 2008 +0200

Fix debian/rules build/patch dependencies.

diff --git a/debian/changelog b/debian/changelog
index 1367e9b..3cb06e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-intel (2:2.3.2-2+lenny1) UNRELEASED; 
urgency=low
 - Only initialize integrated TV encoder for mobile chips
 - Add no LVDS quirk for Transtec Senyo 610 mini PC
 - Thinkpad R60e TV quirk via DMI info
+  * Fix debian/rules build/patch dependencies.
 
  -- Julien Cristau [EMAIL PROTECTED]  Sun, 27 Jul 2008 01:49:09 +0200
 
diff --git a/debian/rules b/debian/rules
index fdaddeb..7a1b171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,8 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
 
test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)

commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jul 17 15:44:45 2008 +0200

xsfbs.mk: make 'log' a separate target

'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
-   mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
$@
 
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+   mkdir -p $(STAMP_DIR)/log
+
 # Apply all patches to the upstream source.
 .PHONY: patch
 stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n Unapplying patches...; \
if $(QUILT) applied /dev/null 2/dev/null; then \

commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Jul 16 18:42:14 2008 +0200

xsfbs.mk: update the list of releases, and drop some unused code

we haven't had a separate source tree since modularization.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 
's/^.://')
 BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat 
/etc/mailname 2/dev/null))}})
 
 # Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings woody or sarge in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
 # version number.  Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo 
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g') : .*[^0-9.].* /dev/null 
21; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo 
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g') : .*[^0-9.].* 
/dev/null 21; then echo yes; fi)
 
 # Set up parameters for the Debian build environment.
 

Processing of xserver-xorg-video-intel_2.3.2-2+lenny1_i386.changes

2008-07-27 Thread Archive Administrator
xserver-xorg-video-intel_2.3.2-2+lenny1_i386.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-intel_2.3.2-2+lenny1.dsc
  xserver-xorg-video-intel_2.3.2-2+lenny1.diff.gz
  xserver-xorg-video-i810_2.3.2-2+lenny1_all.deb
  xserver-xorg-video-intel_2.3.2-2+lenny1_i386.deb
  xserver-xorg-video-intel-dbg_2.3.2-2+lenny1_i386.deb

Greetings,

Your Debian queue daemon


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



xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.3.2-2+lenny1'

2008-07-27 Thread Julien Cristau
Tag 'xserver-xorg-video-intel-2_2.3.2-2+lenny1' created by Julien Cristau 
[EMAIL PROTECTED] at 2008-07-27 10:00 +

Tagging upload of xserver-xorg-video-intel 2:2.3.2-2+lenny1 to unstable.

Changes since xserver-xorg-video-intel-2_2.3.2-2:
Brice Goglin (1):
  Update xsfbs/quilt patching rules to be compatible with the

David Nusinow (1):
  Kill the manifest code.

Jesse Barnes (5):
  Add pipe a force enable quirk for Lenovo T60
  Add pipea force enable quirk for HP Pavilion ze4944ea
  Improve FBC size checking
  Don't disable pipe A on 855 chips
  Add no LVDS quirk for Transtec Senyo 610 mini PC

Julien Cristau (15):
  xsfbs.mk: make 'serverabi' depend on 'install'
  Remove xsfbs-autoreconf.mk
  Remove the .pc directory properly
  xsfbs.sh: add remove_conffile_lookup
  xsfbs.sh: use 'local' now that policy allows it
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  xsfbs.mk: make 'log' a separate target
  The phase shift its are now reserved.
  update changelog for cherry-picked patches
  add bug closers for the pipe a force enable quirks
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-unstable
  Fix debian/rules build/patch dependencies.
  Prepare changelog for upload

Roland Test-tools Bär (1):
  i810: Remove an effectively unused variable (only used in an incorrect 
free())

Stefan Dirsch (1):
  Add pipea force enable quirk for another 855GM machine.

Zhenyu Wang (5):
  Add support for Intel 4 series chipsets.
  Give asus and eeepc backlight method higher priority
  Fix official name for GM45 chipset
  Only initialize integrated TV encoder for mobile chips
  Thinkpad R60e TV quirk via DMI info

---
 debian/changelog |   19 +
 debian/rules |4 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  104 +-
 debian/xsfbs/xsfbs.sh|  387 +--
 src/common.h |   34 ++-
 src/i810_driver.c|   20 +-
 src/i810_reg.h   |5 
 src/i830_display.c   |   20 +-
 src/i830_driver.c|   59 -
 src/i830_lvds.c  |   10 -
 src/i830_memory.c|   13 -
 src/i830_quirks.c|   25 ++
 src/i830_video.c |2 
 src/i965_render.c|2 
 src/i965_video.c |2 
 src/xvmc/I810XvMC.c  |2 
 17 files changed, 394 insertions(+), 464 deletions(-)
---


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



xserver-xorg-video-intel_2.3.2-2+lenny1_i386.changes ACCEPTED

2008-07-27 Thread Debian Installer

Accepted:
xserver-xorg-video-i810_2.3.2-2+lenny1_all.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-i810_2.3.2-2+lenny1_all.deb
xserver-xorg-video-intel-dbg_2.3.2-2+lenny1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel-dbg_2.3.2-2+lenny1_i386.deb
xserver-xorg-video-intel_2.3.2-2+lenny1.diff.gz
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny1.diff.gz
xserver-xorg-video-intel_2.3.2-2+lenny1.dsc
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny1.dsc
xserver-xorg-video-intel_2.3.2-2+lenny1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.3.2-2+lenny1_i386.deb


Override entries for your package:
xserver-xorg-video-i810_2.3.2-2+lenny1_all.deb - optional oldlibs
xserver-xorg-video-intel-dbg_2.3.2-2+lenny1_i386.deb - extra x11
xserver-xorg-video-intel_2.3.2-2+lenny1.dsc - source x11
xserver-xorg-video-intel_2.3.2-2+lenny1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 482819 487672 


Thank you for your contribution to Debian.


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



Re: xorg-server unblock request

2008-07-27 Thread Luk Claes
Julien Cristau wrote:
 Hi,
 
 I'd like to request an unblock hint for xorg-server:
 unblock xorg-server/2:1.4.2-2
 
 This version fixes some parallel build issues in the packaging, and
 cherry-picks 3 bug fixes from upstream.

unblocked

 There'll be at least one further upload before release, we have some
 pending debconf translation updates for xprint.

ok

Cheers

Luk


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



Processing of xserver-xorg-video-intel_2.4.0-1_i386.changes

2008-07-27 Thread Archive Administrator
xserver-xorg-video-intel_2.4.0-1_i386.changes uploaded successfully to localhost
along with the files:
  xserver-xorg-video-intel_2.4.0-1.dsc
  xserver-xorg-video-intel_2.4.0.orig.tar.gz
  xserver-xorg-video-intel_2.4.0-1.diff.gz
  xserver-xorg-video-i810_2.4.0-1_all.deb
  xserver-xorg-video-intel_2.4.0-1_i386.deb
  xserver-xorg-video-intel-dbg_2.4.0-1_i386.deb

Greetings,

Your Debian queue daemon


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



xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.4.0-1'

2008-07-27 Thread Julien Cristau
Tag 'xserver-xorg-video-intel-2_2.4.0-1' created by Julien Cristau [EMAIL 
PROTECTED] at 2008-07-27 11:20 +

Tagging upload of xserver-xorg-video-intel 2:2.4.0-1 to experimental.

Changes since xserver-xorg-video-intel-2_2.3.2-2+lenny1:
Alan Coopersmith (1):
  Define DEFFILEMODE for OS'es that don't have it

Bryce Harrington (4):
  Quirks from Ubuntu/Dell
  More quirks from ubuntu/dell
  More Pipe A force quirks
  Two more Dell quirks

Carl Worth (7):
  Enumerate all possible cc_state objects
  Enumerate all possible src,mask sampler state pairs
  Enumerate all possible wm_state objects
  Associate one sf_state object with each sf_kernel
  Move VERTEX_BUFFERS setup from prepare_composite to composite
  Allow for multiple vertex buffers (though only use one for now)
  Use up to 256 separate vertex buffers

Dave Airlie (1):
  intel: fix drm check.

David Schleef (1):
  Bug #15219: Fix default overlay CSC factors, and use BT709 if available.

Eric Anholt (55):
  Disable a bunch of clock gating disables on IGD_GM, which doesn't need 
them.
  Revert Use mprotect on unbound AGP memory to attempt to catch use while 
unbound.
  Fix 965+ rendering issues with DRI disabled.
  Add a total field to intel_idle output (set when any unit is busy).
  Add SDVO TV-out registers.
  Add WIP SDVO TV-out support.
  SDVO: Handle RGB outputs that are really TV outputs, and select a TV 
format.
  SDVO: Fix mixups with input and output channels.
  SDVO: Use the TV reference clock for SDVO TV outputs.
  SDVO: Fix lols TV mode list handling.
  SDVO: Set adjusted_mode in mode_fixup from the preferred input timings 
for TV.
  SDVO: Rename output_dtd variable to input_dtd, which is its new job.
  Add dolt to speed up compile time and reduce insanity.
  Keep static copies of the 965 render programs in video memory.
  Add copyright information for recent editors of this file.
  Statically allocate the sampler default color, which we never change.
  Fix compiler warning from 24-bit lvds change.
  Fix the offset to sampler default color, and a compiler warning.
  Rename some variables in i965_render.c for clarity.
  Make the VS unit state static for 965 render.
  Move the 965 static variables local to the function they're used in.
  Move the binding table for 965 to the state structure.
  Move the vertex buffer to the state structure as well.
  Abstract surface setup into a separate function.
  Update dolt from git, fixing fallback to libtool.
  Make the binding table and surface state be arrays to reduce syncing.
  Bug #15807: Fix use of the ring while VT-switched, hit by fast user 
switching.
  Add i915 support to intel_idle.
  Formatting fixes for intel_idle.
  Just remove the mprotect kludge.
  Replace a couple of wait-for-ring-idles with a single function to do so.
  Move DSPARB setup into a separate function, and save/restore it at VT 
switch.
  Remove duplicated i830_stop_ring()/SetHWOperatingState() in EnterVT().
  Move the remaining two lines of SetHWOperatingState to the caller.
  Remove gratuitous wait_ring_idle after I830Sync.  Syncing implies that.
  Move BIOS scratch register setup to EnterVT instead of PreInit.
  Initialize clock gating from EnterVT and save/restore it appropriately.
  Remove SVG_WORK_CONTROL init.
  Move debug clock printout from ErrorF to X_INFO.
  Set up/restore PWRCTXA from enter/leavevt not server start/exit.
  Add DisplayPort registers.
  Initial HDMI work.  Not currently hooked up at startup.
  The phase shift its are now reserved, and add HDMI clock limits.
  Add pixel multiplier support for HDMI
  Set the sync active bits like we're supposed to, matching the BIOS.
  Get HDMI output working.
  Fix hdmi POSTING_READ to use the register number instead of the register 
value.
  Automatically detect the presence of HDMI.
  Fix a crash in i830_sdvo_init error paths by setting up dev_priv earlier.
  Fix DSPARB setting on 845/865, which have only the AEND field and 96 
entries.
  Get prototype for i830_bios_get_tv().
  Fix uninitialized-use warning in i830_debug.c ring dumping.
  Fix distcheck.
  Remove VGA regs from debug output.
  Add little hotplug detector app.

Hong Liu (6):
  SDVO: Fix DDC bus selection based on output priority list.
  Bug #14935: Fix i9xx reference clock for spread spectrum.
  fix possible segfault in I830FreeScreen
  Fix DSPARB change on 965G
  Set SDVO sync polarity to default on 965
  Fix SDVO HDMI output.

Jesse Barnes (26):
  Initial panel fitting changes
  Merge branch 'master' into pfit
  Fixup backlight control and panel fitting property names
  Merge branch 'master' into pfit
  Use combo backlight control rather than pure legacy
  Fix LVDS regression
   

xserver-xorg-video-intel: Changes to 'upstream-experimental'

2008-07-27 Thread Julien Cristau
Rebased ref, commits from common ancestor:
commit f3b72c59e5000bcdb07cbdf080e09c55b9826eff
Author: Zhenyu Wang [EMAIL PROTECTED]
Date:   Wed Jul 23 16:02:02 2008 +0800

Bump version 2.4.0

diff --git a/configure.ac b/configure.ac
index 2dabd4f..6694773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-2.2.0,
+2.4.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 xf86-video-intel)
 

commit 5c447fa50ecd4fe7f971b1e6deb8908e98afa61b
Author: Zhenyu Wang [EMAIL PROTECTED]
Date:   Wed Jul 23 15:10:07 2008 +0800

shut up gcc warning
(cherry picked from commit 6ac352f146bafe3b4bb5832340eb0ccb730565d2)

diff --git a/src/i965_render.c b/src/i965_render.c
index 1cbfe24..8360be4 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -862,7 +862,7 @@ i965_set_picture_surface_state(ScrnInfoPtr pScrn, struct 
brw_surface_state *ss,
 memset(local_ss, 0, sizeof(local_ss));
 local_ss.ss0.surface_type = BRW_SURFACE_2D;
 if (is_dst) {
-   uint32_t dst_format;
+   uint32_t dst_format = 0;
Bool ret = TRUE;
 
ret = i965_get_dest_format(pPicture, dst_format);

commit e6d0586db95cab1cdf2f8485a1a1a895f18118e4
Author: Zhenyu Wang [EMAIL PROTECTED]
Date:   Wed Jul 23 15:07:48 2008 +0800

Fix distcheck for clean doltcompile
(cherry picked from commit 075cf7fce57da4e51acafb3bfd3d61ba1a8096d5)

diff --git a/Makefile.am b/Makefile.am
index 8cbe4a9..b2398a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,4 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
 
 EXTRA_DIST = README
+DISTCLEANFILES = doltcompile

commit fe9fba38e9c4bdb1b242760b9e565852f717de09
Author: Zhenyu Wang [EMAIL PROTECTED]
Date:   Wed Jul 23 11:16:14 2008 +0800

Fix HDMI output number

Output 33 is confusing.
(cherry picked from commit 29d982c6bf873c6685bd0e395a8b0e5e3b1063e0)

diff --git a/src/i830_hdmi.c b/src/i830_hdmi.c
index b738463..58d1c49 100644
--- a/src/i830_hdmi.c
+++ b/src/i830_hdmi.c
@@ -229,5 +229,5 @@ i830_hdmi_init(ScrnInfoPtr pScrn, int output_reg)
 
 xf86DrvMsg(pScrn-scrnIndex, X_INFO,
   HDMI output %d detected\n,
-  1 + (output_reg - SDVOB));
+  (output_reg == SDVOB) ? 1 : 2);
 }

commit 3f5c9bd512907238a2fd6746a41d8703aefe39e9
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Thu Mar 6 13:59:06 2008 -0800

Add little hotplug detector app.
(cherry picked from commit b60bbbfd7b7dcf31726ad615a493f34f17cc6309)

diff --git a/src/reg_dumper/hotplug.c b/src/reg_dumper/hotplug.c
new file mode 100644
index 000..68fe584
--- /dev/null
+++ b/src/reg_dumper/hotplug.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the Software),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *Eric Anholt [EMAIL PROTECTED]
+ *
+ */
+
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include stdarg.h
+#include pciaccess.h
+#include err.h
+#include unistd.h
+
+#include reg_dumper.h
+#include ../i810_reg.h
+
+struct idle_flags {
+uint32_t instdone_flag;
+char *name;
+unsigned int count;
+};
+
+int main(int argc, char **argv)
+{
+struct pci_device *dev;
+I830Rec i830;
+I830Ptr pI830 = i830;
+ScrnInfoRec scrn;
+int err, mmio_bar;
+void *mmio;
+int i;
+
+err = pci_system_init();
+if (err != 0) {
+   fprintf(stderr, Couldn't initialize PCI system: %s\n, strerror(err));
+   exit(1);
+}
+
+/* Grab the graphics card */
+dev = pci_device_find_by_slot(0, 0, 2, 0);
+if (dev == NULL)
+   errx(1, Couldn't find graphics card);
+
+err = pci_device_probe(dev);
+if (err != 0) {
+   fprintf(stderr, Couldn't probe graphics card: %s\n, strerror(err));
+   exit(1);
+}
+
+if (dev-vendor_id != 0x8086)
+   errx(1, Graphics card is non-intel);
+
+i830.PciInfo = i830.pci_info_rec;

xserver-xorg-video-intel: Changes to 'debian-experimental'

2008-07-27 Thread Julien Cristau
 .gitignore |1 
 ChangeLog  | 1405 +-
 Makefile.am|1 
 Makefile.in|  689 -
 acinclude.m4   |  140 
 aclocal.m4 | 8290 
 compile|  142 
 config.guess   | 1526 --
 config.h.in|  102 
 config.sub | 1658 --
 configure  |24646 -
 configure.ac   |3 
 debian/changelog   |   31 
 debian/control |2 
 debian/patches/01_gen_pci_ids.diff |2 
 debian/rules   |   24 
 debian/xsfbs/xsfbs-autoreconf.mk   |  150 
 debian/xsfbs/xsfbs.mk  |  104 
 debian/xsfbs/xsfbs.sh  |  387 
 depcomp|  589 
 install-sh |  519 
 ltmain.sh  | 6964 --
 man/Makefile.in|  455 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.am|   13 
 src/Makefile.in|  937 -
 src/bios_reader/Makefile.in|  479 
 src/ch7017/Makefile.in |  517 
 src/ch7xxx/Makefile.in |  518 
 src/common.h   |   36 
 src/exa_wm.g4i |   16 
 src/exa_wm_projective.g4i  |2 
 src/exa_wm_src_sample_planar.g4a   |   65 
 src/exa_wm_src_sample_planar.g4b   |4 
 src/exa_wm_write.g4a   |   10 
 src/exa_wm_write.g4b   |   10 
 src/exa_wm_yuv_rgb.g4a |   98 
 src/exa_wm_yuv_rgb.g4b |   12 
 src/i810_driver.c  |   20 
 src/i810_reg.h |   76 
 src/i830.h |   20 
 src/i830_bios.c|   99 
 src/i830_bios.h|   93 
 src/i830_debug.c   |  604 
 src/i830_display.c |  161 
 src/i830_driver.c  |  133 
 src/i830_exa.c |2 
 src/i830_hdmi.c|  233 
 src/i830_hwmc.c|5 
 src/i830_hwmc.h|7 
 src/i830_lvds.c|   13 
 src/i830_memory.c  |   26 
 src/i830_quirks.c  |   25 
 src/i830_sdvo.c|  782 +
 src/i830_sdvo.h|2 
 src/i830_sdvo_regs.h   |  232 
 src/i830_tv.c  |5 
 src/i830_video.c   |  144 
 src/i830_video.h   |2 
 src/i915_hwmc.c|   35 
 src/i915_hwmc.h|1 
 src/i915_video.c   |   10 
 src/i965_render.c  | 1316 +
 src/i965_video.c   |  189 
 src/ivch/Makefile.in   |  516 
 src/reg_dumper/.gitignore  |1 
 src/reg_dumper/Makefile.am |9 
 src/reg_dumper/Makefile.in |  522 
 src/reg_dumper/hotplug.c   |  151 
 src/reg_dumper/idle.c  |   60 
 src/reg_dumper/reg_dumper.h|2 
 src/sil164/Makefile.in |  517 
 src/tfp410/Makefile.in |  517 
 src/xvmc/I810XvMC.c|2 
 src/xvmc/Makefile.am   |1 
 src/xvmc/Makefile.in   |  580 
 src/xvmc/i915_structs.h|   81 
 src/xvmc/i915_xvmc.c   | 1399 +-
 src/xvmc/intel_xvmc.c  |   89 
 src/xvmc/intel_xvmc.h  |   14 
 src/xvmc/intel_xvmc_dump.c |  149 
 82 files changed, 6278 insertions(+), 53642 deletions(-)

New commits:
commit 6c42aa96946c8fff1876f27d132a9f2111704e16
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 27 13:18:44 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 2432541..d6b4f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.4.0-1) experimental; urgency=low
 
   * New upstream release.
   * Refresh patch 01_gen_pci_ids.diff.
@@ -8,7 +8,7 @@ xserver-xorg-video-intel (2:2.4.0-1) UNRELEASED; urgency=low
 xutils-dev.
   * Drop the debian revision from the libxvmc-dev build-dep.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 27 Jul 2008 03:31:06 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 27 Jul 2008 13:18:42 +0200
 
 xserver-xorg-video-intel (2:2.3.2-3) experimental; urgency=low
 

commit 53c12cac12794da1a8a712bbc9d8ed4dc422b682
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jul 27 13:18:36 2008 +0200

Drop the debian revision from the libxvmc-dev build-dep.

diff --git a/debian/changelog b/debian/changelog
index ff7d12b..2432541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-intel (2:2.4.0-1) 

xserver-xorg-video-intel_2.4.0-1_i386.changes ACCEPTED

2008-07-27 Thread Debian Installer

Accepted:
xserver-xorg-video-i810_2.4.0-1_all.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-i810_2.4.0-1_all.deb
xserver-xorg-video-intel-dbg_2.4.0-1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel-dbg_2.4.0-1_i386.deb
xserver-xorg-video-intel_2.4.0-1.diff.gz
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.4.0-1.diff.gz
xserver-xorg-video-intel_2.4.0-1.dsc
  to pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.4.0-1.dsc
xserver-xorg-video-intel_2.4.0-1_i386.deb
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.4.0-1_i386.deb
xserver-xorg-video-intel_2.4.0.orig.tar.gz
  to 
pool/main/x/xserver-xorg-video-intel/xserver-xorg-video-intel_2.4.0.orig.tar.gz


Override entries for your package:
xserver-xorg-video-i810_2.4.0-1_all.deb - optional oldlibs
xserver-xorg-video-intel-dbg_2.4.0-1_i386.deb - extra x11
xserver-xorg-video-intel_2.4.0-1.dsc - source x11
xserver-xorg-video-intel_2.4.0-1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]


Thank you for your contribution to Debian.


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



Bug#483989: xserver-xorg-video-savage: system freeze while starting X

2008-07-27 Thread Stefan Lippers-Hollmann
Hi

On Samstag, 26. Juli 2008, you wrote:
 On Sun, Jun  1, 2008 at 20:45:54 +0200, Stefan Lippers-Hollmann wrote:
 
  Hi
  
  On Sonntag, 1. Juni 2008, you wrote:
  [...]
   Is the machine completely dead with the plain 2.2.1 driver? Can you
   ping? ssh? catch the log?
  
  Yes, it is completely dead, open ssh connections trying to gather last bits
  from tail -f /var/log/messages stall immediately (unfortunately the 
  notebook has no serial connectors for a serial console), pings get no 
  answer - a hard poweroff is the only recovery.
   
 Hi,

In the mean time I've been setting up netconsole, which (I can only start 
it just before invoking kdm, as the ethernet driver (tulip) doesn't really 
like netconsole) only shows the following:

netconsole: network logging started
[drm] Initialized drm 1.1.0 20060810
mtrr: no more MTRRs available
[drm] Initialized savage 2.4.1 20050313 on minor 0
mtrr: no more MTRRs available
mtrr: base(0xf200) is not aligned on a size(0x500) boundary
agpgart: Found an AGP 2.0 compliant device at :00:00.0.
agpgart: Putting AGP V2 device at :00:00.0 into 0x mode
agpgart: Putting AGP V2 device at :01:00.0 into 0x mode

Then, as soon as the X server tries to start, the system locks up 
immediately with a black screen and the fan humming at full speed.

 could you try to find out where the hang occurs?  You can put some calls
 to ErrorF() at various points in the driver, and add Option Log sync
 in the ServerFlags section of xorg.conf.

I'll try this today, thanks for your hints

 If we don't manage to track this down soon, I'd be tempted to revert to
 an earlier version of the savage driver for lenny.

The current version with 02_temporary_revert_pciaccess.diff applied and the
following commits reverted
a01c9d12938f977a4310e0547866f01517059a3e
69eca3b8340966874ee3ffdc0d0a3f73de7a816a
908b155161ebb6cd506f43a3987e4d146ef5b330
88141fd21214c501cafed73b1bba084b8a2bb929
fd2a598e64a522c028a20444379fa200a5724e62
works reliably for me since early june, (the earlier version did as well, 
of course).

Just now, I managed to start X with xserver-xorg-video-savage 1:2.2.1-1 
(without any changes) once (Xorg.0.log_2.2.1-1-working.log.gz attached), it 
failed/ crashed for the following reboots though (attached as 
Xorg.0.log_2.2.1-1-crashed.log.gz).

 (II) SAVAGE(0): [agp] agpTextures handle = 0xec10
 (II) SAVAGE(0): [drm] aperture handle = 0xf200
 (II) SAVAGE(0): [drm] Enabling ShadowStatus for DRI.
-(II) SAVAGE(0): [drm] Status handle = 0x09d62000
-(II) SAVAGE(0): [drm] Status page mapped at 0xb19c7000
+(II) SAVAGE(0): [drm] Status handle = 0x0e6ae000
+(II) SAVAGE(0): [drm] Status page mapped at 0xb1833000
 (II) SAVAGE(0): [dri] visual configs initialized
 (**) SAVAGE(0): DRI is enabled
 (--) SAVAGE(0): Chose mode 118 at 60Hz.
-(II) SAVAGE(0): virtualX:1024,virtualY:768
-[...]

 Cheers,
 Julien

Regards
Stefan Lippers-Hollmann


Xorg.0.log_2.2.1-1-crashed.log.gz
Description: GNU Zip compressed data


Xorg.0.log_2.2.1-1-working.log.gz
Description: GNU Zip compressed data


xorg.conf.gz
Description: GNU Zip compressed data


signature.asc
Description: This is a digitally signed message part.


Bug#480360: New Ford models sneak previews

2008-07-27 Thread Galves

Kevin Federline comes up ahead when Britney is forced to pay $2 a month for 
kids support http://www.clcpotenza.it/hotnews.html



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



Bug#492457: Regression: Dual head screen size detection broken after upgrade

2008-07-27 Thread Tobias Diedrich
Alex Deucher wrote:

 This is probably due to a change in default xrandr mode selection
 policy in the two xserver versions you are using.
 
 
  (However fluxbox still thinks the desktop is 1600x1200, for example when
  maximizing windows, but I suspect this is a fluxbox bug?)
 
 
 Since you are using a clone mode, fluxbox is getting it's geometry
 from the 1600x1200 screen.

Well, it's not exatcly clone mode if the second screen is set up
using xrandr --output VGA-0 --auto --right-of DVI-0? :)

First I tried disabling the bogus connector using 'Option
monitor-DVI-0 bogus' and 'Option Ignore true' in the
corresponding Monitor section, but that didn't work (X would refuse
to start with 'no usable screens').

Right now I'm using 'Option  DefaultConnectorTable yes',
which works for me as far as the connectors are concerned.

However the default resolution of the secondary Monitor is now
1280x1024 instead of 1600x1200.  So I still have to run xrandr in my
.xsession to change to native panel resolution even though I'm
saying 'Option PreferredMode 1600x1200' in the xorg.conf:

IMHO randr should use the native resolution for both monitors by
default.

Also, the ConnectorTable option seems to be undocumented?
At least it's not mention in the radeon(4) manpage (however it does
mention the DefaultConnectorTable option).

|Section ServerLayout
|   Identifier X.org Configured
|   Screen  0  Screen0 0 0
|   InputDeviceMouse0 CorePointer
|   InputDeviceKeyboard0 CoreKeyboard
|EndSection
|
|Section Files
|   RgbPath  /etc/X11/rgb
|   ModulePath   /usr/lib/xorg/modules
|   FontPath /usr/share/fonts/X11/misc
|   FontPath /usr/share/fonts/X11/cyrillic
|   FontPath /usr/share/fonts/X11/100dpi/:unscaled
|   FontPath /usr/share/fonts/X11/75dpi/:unscaled
|   FontPath /usr/share/fonts/X11/Type1
|   FontPath /usr/share/fonts/X11/100dpi
|   FontPath /usr/share/fonts/X11/75dpi
|   FontPath /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
|EndSection
|
|Section Module
|   Load  xtrap
|   Load  extmod
|   Load  glx
|   Load  record
|   Load  dri
|   Load  dbe
|   Load  GLcore
|EndSection
|
|Section InputDevice
|   Identifier  Keyboard0
|   Driver  kbd
|EndSection
|
|Section InputDevice
|   Identifier  Mouse0
|   Driver  mouse
|   Option  Protocol auto
|   Option  Device /dev/input/mice
|   Option  ZAxisMapping 4 5 6 7
|EndSection
|
|Section Monitor
|   #DisplaySize  410   310 # mm
|   Identifier   syncmaster
|   Option PreferredMode  1680x1050
|   Option Position 0 0
|   Option  DPMS
|EndSection
|
|Section Monitor
|   Identifier   flatron
|   Option PreferredMode  1600x1200
|   Option Position 1680 0
|   Option  DPMS
|EndSection
|
|Section Monitor
|   Identifier   bogus
|   Option  Enable false
|EndSection
|
|
|Section Device
|### Available Driver options are:-
|### Values: i: integer, f: float, bool: True/False,
|### string: String, freq: f Hz/kHz/MHz
|### [arg]: arg optional
|#Option NoAccel  # [bool]
|#Option SWcursor # [bool]
|#Option Dac6Bit  # [bool]
|#Option Dac8Bit  # [bool]
|#Option BusType  # [str]
|#Option CPPIOMode# [bool]
|#Option CPusecTimeout# i
|#Option AGPMode  # i
|#Option AGPFastWrite # [bool]
|#Option AGPSize  # i
|#Option GARTSize # i
|#Option RingSize # i
|#Option BufferSize   # i
|#Option EnableDepthMoves # [bool]
|#Option EnablePageFlip   # [bool]
|#Option NoBackBuffer # [bool]
|#Option DMAForXv # [bool]
|#Option FBTexPercent # i
|#Option DepthBits# i
|#Option PCIAPERSize  # i
|#Option AccelDFS # [bool]
|#Option DDCMode  # [bool]
|#Option IgnoreEDID   # [bool]
|#Option DisplayPriority  # [str]
|#Option PanelSize# [str]
|#Option ForceMinDotClock # freq
|#Option ColorTiling  # [bool]
|#Option VideoKey # i
|#Option RageTheatreCrystal   # i
|#Option RageTheatreTunerPort # i
|#Option RageTheatreCompositePort # i
|#Option RageTheatreSVideoPort# i
|#Option TunerType# i
|#Option RageTheatreMicrocPath# str
|

Bug#492457: Regression: Dual head screen size detection broken after upgrade

2008-07-27 Thread Julien Cristau
On Sun, Jul 27, 2008 at 15:12:58 +0200, Tobias Diedrich wrote:

 Alex Deucher wrote:
 
  This is probably due to a change in default xrandr mode selection
  policy in the two xserver versions you are using.
  
  
   (However fluxbox still thinks the desktop is 1600x1200, for example when
   maximizing windows, but I suspect this is a fluxbox bug?)
  
  
  Since you are using a clone mode, fluxbox is getting it's geometry
  from the 1600x1200 screen.
 
 Well, it's not exatcly clone mode if the second screen is set up
 using xrandr --output VGA-0 --auto --right-of DVI-0? :)
 
Fluxbox doesn't respond to screen geometry changes, so it needs to be
restarted to update its view of the geometry (for example using the
'Restart' entry in the menu).

Cheers,
Julien



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



Processed: retitle 491871 to [965GM EXA] display corruption with xulrunner 1.9

2008-07-27 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 # Automatically generated email from bts, devscripts version 2.10.34
 retitle 491871 [965GM EXA] display corruption with xulrunner 1.9
Bug#491871: [exa] display corruption with xulrunner 1.9
Changed Bug title to `[965GM EXA] display corruption with xulrunner 1.9' from 
`[exa] display corruption with xulrunner 1.9'.


End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


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



Bug#448460: marked as done (xorg does not support multiple PCI bus's on Sun whih driver glint with kernel 2.6)

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:51:46 +0200
with message-id [EMAIL PROTECTED]
and subject line pci-rework landed in xserver 1.5
has caused the Debian Bug report #388329,
regarding xorg does not support multiple PCI bus's on Sun whih driver glint 
with kernel 2.6
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 [EMAIL PROTECTED]
immediately.)


-- 
388329: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=388329
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg
Version: 7.1.0-19

When configure the xwindow system whith Sun E250 on Display controller:
Texas Instruments TVP4020 [Permedia 2]. This because xorg does not
support multiple PCI bus's on Sun whih driver glint with kernel 2.6.


The result of lspci is:
000:80:00.0 Host bridge: Sun Microsystems Computer Corp. Psycho PCI Bus
Module :80:01.0 Display controller: Texas Instruments TVP4020
[Permedia 2] (rev 11) 0001:00:00.0 Host bridge: Sun Microsystems
Computer Corp. Psycho PCI Bus Module 0001:00:01.0 Bridge: Sun
Microsystems Computer Corp. EBUS (rev 01)
0001:00:01.1 Ethernet controller: Sun Microsystems Computer Corp. Happy
Meal (rev 01) 0001:00:03.0 SCSI storage controller: LSI Logic / Symbios
Logic 53c875 (rev 14)
0001:00:03.1 SCSI storage controller: LSI Logic / Symbios Logic 53c875
(rev 14)


The xorg.conf is:
# /etc/X11/xorg.conf (xorg 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 /etc/X11/xorg.conf manual
page.
# (Type man /etc/X11/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 Files
FontPath/usr/share/fonts/X11/misc
FontPath/usr/X11R6/lib/X11/fonts/misc
FontPath/usr/share/fonts/X11/cyrillic
FontPath/usr/X11R6/lib/X11/fonts/cyrillic
FontPath/usr/share/fonts/X11/100dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/100dpi/:unscaled
FontPath/usr/share/fonts/X11/75dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/75dpi/:unscaled
FontPath/usr/share/fonts/X11/Type1
FontPath/usr/X11R6/lib/X11/fonts/Type1
FontPath/usr/share/fonts/X11/100dpi
FontPath/usr/X11R6/lib/X11/fonts/100dpi
FontPath/usr/share/fonts/X11/75dpi
FontPath/usr/X11R6/lib/X11/fonts/75dpi
# path to defoma fonts
FontPath
/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
EndSection
Section Module
Loadbitmap
Loadddc
Loaddri
Loadextmod
Loadfreetype
Loadglx
Loadint10
Loadtype1
Loadvbe
EndSection
Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  type5
Option  XkbLayout us
EndSection
Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/input/mice
Option  Protocol  IMPS/2
Option  Emulate3Buttons   false
EndSection
Section Device
Identifier  TVP4020
Driver  glint
VendorName  Texas Instruments
BoardName   TVP4020 [Permedia 2]
Chipset ti_pm2
Option  UseFBDev  True
Option  BlockWrite  True
VideoRam8192
#BusID   PCI:80:01:00
Option  no_accel
EndSection
Section Monitor
Identifier  Generic Monitor
Option  DPMS
HorizSync   28-64
VertRefresh 43-60
EndSection
Section Screen
Identifier  Default Screen
Device  TVP4020
Monitor Generic Monitor
DefaultDepth24
SubSection Display
Depth   1
Modes   1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   4
Modes   1024x768 800x600 640x480
EndSubSection
SubSection Display
Depth   8

Bug#426961: marked as done (xserver-xorg-core: PCI bus scan failures on ppc64 (IBM power4))

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:51:46 +0200
with message-id [EMAIL PROTECTED]
and subject line pci-rework landed in xserver 1.5
has caused the Debian Bug report #388329,
regarding xserver-xorg-core: PCI bus scan failures on ppc64 (IBM power4)
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 [EMAIL PROTECTED]
immediately.)


-- 
388329: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=388329
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg-core
Version: 2:1.3.0.0.dfsg-5
Severity: important

After getting Linux going on these Power4 (7029-6E3) boxes, I was just about
to roll out a dozen images (for starters) when I hit a big problem:

lspci -vvv
0001:02:00.0 VGA compatible controller: Matrox Graphics, Inc. MGA
G400/G450 (rev 85) (prog-if 00 [VGA])
Subsystem: IBM Unknown device 0233

lspci -vvvn
0001:02:00.0 0300: 102b:0525 (rev 85) (prog-if 00 [VGA])
Subsystem: 1014:0233

/var/log/Xorg.0.log
(II) MGA: driver for Matrox chipsets: mga2064w, mga1064sg, mga2164w,
mga2164w AGP, mgag100, mgag100 PCI, mgag200, mgag200 PCI,
mgag200 SE A PCI, mgag200 SE B PCI, mgag400, mgag550
(II) Primary Device is: PCI 00:01:0
(EE) No devices detected.

Xorg -scanpci
Probing for PCI devices (Bus:Device:Function)

(0:1:0) unknown card (0x1014/0x00e1) using an unknown chip (DeviceId
0x00e0) from IBM
(0:2:0) IBM EADS-X PCI-X to PCI-X Bridge
(0:2:2) IBM EADS-X PCI-X to PCI-X Bridge
(0:2:4) IBM EADS-X PCI-X to PCI-X Bridge
(0:2:6) IBM EADS-X PCI-X to PCI-X Bridge
(0:3:0) Symphony Labs W83C553
(0:3:1) Symphony Labs SL82c105
(33:1:0) unknown card (0x1014/0x01ff) using a Intel Corporation
82557/8/9 [Ethernet Pro 100]
(65:1:0) unknown card (0x1014/0x0266) using a Mylex Corporation
AcceleRAID 600/500/400/Sapphire support Device

/var/log/syslog (dmesg)
matroxfb: Matrox G450 detected
fb0: MATROX frame buffer device

kernel
 2.6.18-4-powerpc64 #1 SMP

It does not look like X is finding the bus at all :(
I guess that explains why even the VESA driver doesn't find
any devices to use.

using Xorg -scanpci -isolateDevice PCI:x:y:z returns the
same info for any of x, y, and z


-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/etc/X11/X target does not match checksum in /var/lib/x11/X.md5sum.

X server symlink status:
lrwxrwxrwx 1 root root 13 May 31 16:40 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 2048500 May 16 14:14 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
0001:02:00.0 VGA compatible controller: Matrox Graphics, Inc. MGA G400/G450 
(rev 85)

/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 2305 May 31 17:23 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (xorg 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 Files
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  pc104
Option  XkbLayout us
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/input/mice
Option  Protocol  ImPS/2
Option  Emulate3Buttons   true
EndSection

Section Device
Identifier  Matrox Graphics, Inc. MGA G400/G450
Driver  vesa
#Driver mga
#BusID  PCI:1:2:0
#ChipSetmgag400
#Option UseFBDev  true
EndSection

Section Monitor
Identifier  Generic Monitor
Option  DPMS
HorizSync   28-80
VertRefresh 43-60
EndSection

Section Screen
Identifier  Default Screen
Device  Matrox Graphics, Inc. MGA G400/G450
Monitor Generic Monitor

Bug#388329: marked as done (xserver-xorg: Xserver doesn't detect video card on multidomain PCI machine as E250)

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:51:46 +0200
with message-id [EMAIL PROTECTED]
and subject line pci-rework landed in xserver 1.5
has caused the Debian Bug report #388329,
regarding xserver-xorg: Xserver doesn't detect video card on multidomain PCI 
machine as E250
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 [EMAIL PROTECTED]
immediately.)


-- 
388329: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=388329
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg
Version: 1:7.0.23
Severity: important

If I run Xserver with -configure on my Sun E250  (Raptor GFX Permedia II) this 
doesn't detect video
card. If I compile latest Xfree86 it works fine. Poroblem is that Debian
packed Xorg doesn't contain multidomain PCI patch.


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: sparc (sparc64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-rc6
Locale: LANG=cs_CZ, LC_CTYPE=cs_CZ (charmap=ISO-8859-2)

Versions of packages xserver-xorg depends on:
ii  debconf   1.5.4  Debian configuration management sy
ii  x11-common1:7.0.23   X Window System (X.Org) infrastruc
ii  xbase-clients 1:7.1.ds-3 miscellaneous X clients
ii  xkb-data  0.8-12 X Keyboard Extension (XKB) configu
ii  xserver-xorg-core 2:1.0.2-10 X.Org X server -- core server
ii  xserver-xorg-input-kb 1:1.0.1.3-2X.Org X server -- keyboard input d
ii  xserver-xorg-input-mo 1:1.0.4-3  X.Org X server -- mouse input driv
ii  xserver-xorg-video-ap 1:1.0.1.5-2X.Org X server -- APM display driv
ii  xserver-xorg-video-ar 1:0.5.0.5-2X.Org X server -- ark display driv
ii  xserver-xorg-video-at 1:6.5.8.0-1X.Org X server -- ATI display driv
ii  xserver-xorg-video-ch 1:1.0.1.3-3X.Org X server -- Chips display dr
ii  xserver-xorg-video-ci 1:1.0.0.5-2X.Org X server -- Cirrus display d
ii  xserver-xorg-video-du 1:0.1.0.5-2X.Org X server -- dummy display dr
ii  xserver-xorg-video-fb 1:0.1.0.5-2X.Org X server -- fbdev display dr
ii  xserver-xorg-video-gl 1:1.0.1.3-3X.Org X server -- Glint display dr
ii  xserver-xorg-video-i1 1:1.1.0.5-2X.Org X server -- i128 display dri
ii  xserver-xorg-video-i7 1:1.0.0.5-2X.Org X server -- i740 display dri
ii  xserver-xorg-video-im 1:1.0.0.5-2X.Org X server -- IMSTT display dr
ii  xserver-xorg-video-mg 1:1.2.1.3.dfsg.1-2 X.Org X server -- MGA display driv
ii  xserver-xorg-video-ne 1:1.0.0.5-2X.Org X server -- Neomagic display
ii  xserver-xorg-video-nv 1:1.0.1.5-2X.Org X server -- NV display drive
ii  xserver-xorg-video-re 1:4.0.1.3.dfsg.1-2 X.Org X server -- Rendition displa
ii  xserver-xorg-video-s3 1:1.8.6.5-2X.Org X server -- S3 ViRGE display
ii  xserver-xorg-video-sa 1:2.0.2.3-4X.Org X server -- Savage display d
ii  xserver-xorg-video-si 1:1.3.1.5-3X.Org X server -- SiliconMotion di
ii  xserver-xorg-video-td 1:1.1.1.3-3X.Org X server -- tdfx display dri
ii  xserver-xorg-video-tr 1:1.0.1.2-2X.Org X server -- Trident display 
ii  xserver-xorg-video-v4 0.0.1.5-1  X.Org X server -- Video 4 Linux di
ii  xserver-xorg-video-ve 1:1.0.1.3-2X.Org X server -- VESA display dri
ii  xserver-xorg-video-vg 1:4.0.0.5-2X.Org X server -- VGA display driv
ii  xserver-xorg-video-vm 1:10.11.1.3-2  X.Org X server -- VMware display d

Versions of packages xserver-xorg recommends:
ii  discover1 1.7.18 hardware identification system
ii  laptop-detect 0.12.1 attempt to detect a laptop
pn  mdetect   none (no description available)
pn  xresprobe none (no description available)

-- debconf information:
* xserver-xorg/multiple_possible_x-drivers:
  xserver-xorg/config/monitor/use_sync_ranges: true
* xserver-xorg/config/inputdevice/mouse/port: /dev/input/mice
* xserver-xorg/config/doublequote_in_string_error:
* xserver-xorg/config/monitor/screen-size: 15 inches (380 mm)
* shared/default-x-server: xserver-xorg
* xserver-xorg/autodetect_monitor: false
* xserver-xorg/config/inputdevice/mouse/protocol: ImPS/2
* shared/no_known_x-server:
* xserver-xorg/config/display/default_depth: 16
* xserver-xorg/config/display/modes: 800x600, 640x480
* xserver-xorg/config/device/bus_id_error:
* xserver-xorg/config/monitor/vert-refresh: 43-75
* xserver-xorg/config/inputdevice/keyboard/options:
* 

Bug#492598: xserver-xorg-video-openchrome: system freeze with vesafb

2008-07-27 Thread Stefan Bauer

Package: xserver-xorg-video-openchrome
Version: 1:0.0.902+svn570-1
Severity: normal


I setup vesafb through grub to use the vesafb with vga=771 (800x600 
8bit) which works perfect.


I use the latest xserver-xorg-video-openchrome driver from testing. it 
works perfect as long as i dont switch back to the framebuffer 
console. During the bootup, framebuffer console works perfect. If i 
move back to the console, the screen begins to display strange colors 
and a few lines and i cant work anymore (i dont see the framebuffer 
console nor am i able to do an input (keyboard or mouse) so it seems 
the system freezes completely. is this a known problem?


i will provide logs and do further testing if needed.

Debian testing 2.6.26
X.org Configuration: http://www.plzk.de/xorg-openchrome.txt
latest X.org Log:http://www.plzk.de/xorg-log.txt
KernelRingBuffer:http://www.plzk.de/dmesg.txt


regards


--
stefan



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



Bug#492598: xserver-xorg-video-openchrome: system freeze with vesafb

2008-07-27 Thread Stefan Bauer

Package: xserver-xorg-video-openchrome
Version: 1:0.0.902+svn570-1
Severity: normal

Please see the Xorg.0.log.old here[1]. There are some other errors at 
the end of file which did not occur unless i switch to the console.


[1] http://www.plzk.de/xorg-log-old.txt

regards

stefan



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



xorg-server: Changes to 'refs/tags/xorg-server-2_1.4.99.906-1'

2008-07-27 Thread Julien Cristau
Tag 'xorg-server-2_1.4.99.906-1' created by Julien Cristau [EMAIL PROTECTED] 
at 2008-07-27 16:36 +

Tagging upload of xorg-server 2:1.4.99.906-1 to experimental.

Changes since xorg-server-2_1.4.99.905-1:
Aaron Plattner (1):
  Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.

Adam Jackson (3):
  Don't try to load DRI2 if built without it.
  Fix GLX in Xvfb and kdrive.
  xserver 1.4.99.906

Alan Hourihane (1):
  Set driverPriv immediately on CreatePixmap.

Ander Conselvan de Oliveira (2):
  Fix incorrect test regarding keyboard map.
  Fix incorrect test regarding keyboard map.

Brice Goglin (1):
  update changelog for cherry-picked patches

Dave Airlie (4):
  cursor: don't dereference NULL pointer is devPrivates not yet set.
  modes: check the crtc is valid before using its desired modes.
  dri2: bump libdrm numbers as 2.3.1 is released without ttm interface
  modes: fix initial xorg.conf mode selection.

Dodji Seketeli (1):
  [Xephyr] Fix #15839

Eamon Walsh (1):
  Fix warning: passing argument 1 of `modeIsPresent' from incompatible 
pointer type.

Julien Cristau (21):
  autoconfig: don't call closedir() when opendir() failed
  Export xkbfile.h in the SDK
  Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-experimental
  enable parallel=n in DEB_BUILD_OPTIONS
  xsfbs.mk: make 'log' a separate target
  Merge git.debian.org:/git/pkg-xorg/xsfbs into debian-experimental
  GLX: zero the buffer used in __glXDisp_GetVisualConfigs
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-unstable
  Prepare changelog for upload
  adjust identification confflags
  Merge branch 'server-1.5-branch' of 
git://anongit.freedesktop.org/git/xorg/xserver into debian-experimental
  update changelogs
  Switch to running autoreconf at build time
  Reformat the SGI Free Software License B
  Merge tag 'xorg-server-2_1.4.2-2' into debian-experimental
  add one more closer
  Prepare changelog for upload

Kristian Høgsberg (2):
  Fix embarrasing GLXPixmap leak.
  Need to unref pixmaps backing pbuffers too.

Peter Hutterer (9):
  xfree86: append, not prepent, new input devices to xf86InputDevs.
  xfree86: don't free the config-file related information in DIDR. #15645
  dix: NULL out WindowTable after freeing all the windows.
  Xi: don't attempt to send to a NULL window.
  kdrive: don't post motion event if there was no motion. #16179
  Revert kdrive: don't post motion event if there was no motion. #16179
  kdrive: don't post motion event if there was no motion. #16179
  xfree86: append, not prepent, new input devices to xf86InputDevs.
  xkb: don't send core events for extension devices on SlowKey timeout.

Pierre-Loup A. Griffais (1):
  Don't return BadAlloc when trying to set a PictureFilter with no 
parameters when a filter with parameters was previously set.

Roland Scheidegger (1):
  glx: copy msaa visual capabilities

Sascha Hlusiak (1):
  xfree86: AllowEmptyInput is now enabled by default if hotplugging is 
enabled.

Simon Thum (1):
  input: change dxremaind, dyremaind to floats for better acceleration #9156

---
 ChangeLog   |  291 
 Makefile.in |  962 
 XTrap/Makefile.in   |  645 
 Xext/Makefile.in|  907 
 Xi/Makefile.in  |  759 
 Xi/exevents.c   |2 
 aclocal.m4  | 8357 -
 afb/Makefile.in |  758 
 cfb/Makefile.in | 1058 
 cfb32/Makefile.in   | 1012 
 compile |  142 
 composite/Makefile.in   |  651 
 config.guess| 1526 
 config.sub  | 1658 
 config/Makefile.in  |  687 
 configure   |41845 
--
 configure.ac|6 
 damageext/Makefile.in   |  645 
 dbe/Makefile.in |  681 
 debian/changelog|   36 

xorg-server: Changes to 'upstream-experimental'

2008-07-27 Thread Julien Cristau
 Xi/exevents.c|2 
 configure.ac |6 -
 dix/getevents.c  |5 -
 dix/main.c   |3 
 exa/exa.c|   14 +--
 glx/glxcmds.c|   19 ++--
 glx/glxext.c |9 ++
 hw/kdrive/ephyr/Makefile.am  |2 
 hw/kdrive/ephyr/XF86dri.c|   10 ++
 hw/kdrive/ephyr/ephyrhostglx.c   |   11 ++
 hw/kdrive/ephyr/ephyrhostvideo.c |   10 ++
 hw/kdrive/ephyr/hostx.c  |   12 ++
 hw/kdrive/fake/Makefile.am   |2 
 hw/kdrive/fbdev/Makefile.am  |2 
 hw/kdrive/sdl/Makefile.am|2 
 hw/kdrive/src/kinput.c   |   16 ++-
 hw/kdrive/vesa/Makefile.am   |2 
 hw/vfb/Makefile.am   |1 
 hw/xfree86/common/xf86AutoConfig.c   |  141 +--
 hw/xfree86/common/xf86Config.c   |   14 +--
 hw/xfree86/common/xf86Helper.c   |   14 ++-
 hw/xfree86/common/xf86Init.c |   60 +++---
 hw/xfree86/common/xf86RandR.c|   21 +
 hw/xfree86/common/xf86Xinput.c   |   18 +++-
 hw/xfree86/doc/man/xorg.conf.man.pre |3 
 hw/xfree86/modes/xf86Crtc.c  |   59 +-
 hw/xfree86/modes/xf86Cursors.c   |   10 +-
 include/Makefile.am  |3 
 include/inputstr.h   |2 
 render/filter.c  |2 
 xkb/xkbAccessX.c |4 
 31 files changed, 323 insertions(+), 156 deletions(-)

New commits:
commit c0c73e9236cffece7c8049515b03facb41f12f0e
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Jul 23 14:16:47 2008 -0400

xserver 1.4.99.906

You know, Mesa 7.1 could release any day now and that'd be just fine.

diff --git a/configure.ac b/configure.ac
index a9b1651..2a8ef8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=23 July 2008
+AC_INIT([xorg-server], 1.4.99.906, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -418,7 +419,6 @@ VENDOR_MAN_VERSION=Version ${PACKAGE_VERSION}
 
 VENDOR_NAME=The X.Org Foundation
 VENDOR_NAME_SHORT=X.Org
-RELEASE_DATE=5 September 2007
 VENDOR_WEB=http://wiki.x.org;
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], 
m4_defn([AC_HELP_STRING]))])

commit e909a396194e64119d04fc6ecb68ddc4265a3e49
Author: Pierre-Loup A. Griffais [EMAIL PROTECTED]
Date:   Tue Jul 22 17:34:37 2008 -0700

Don't return BadAlloc when trying to set a PictureFilter with no parameters 
when a filter with parameters was previously set.

Signed-off-by: Aaron Plattner [EMAIL PROTECTED]
(cherry picked from commit bc3c03a3f3c091026310f0e8d55321cec570a0c5)

diff --git a/render/filter.c b/render/filter.c
index 092313f..aa3eb1a 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -301,7 +301,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, 
xFixed *params, int
 if (nparams != pPicture-filter_nparams)
 {
new_params = xalloc (nparams * sizeof (xFixed));
-   if (!new_params)
+   if (!new_params  nparams)
return BadAlloc;
xfree (pPicture-filter_params);
pPicture-filter_params = new_params;

commit c217cb96dccb39ffd689086b6d833a1963dfb661
Author: Dodji Seketeli [EMAIL PROTECTED]
Date:   Wed Jul 23 01:00:26 2008 +0200

[Xephyr] Fix #15839

Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
(cherry picked from commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b)

diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index e656ff5..63e630c 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -45,6 +45,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include kdrive-config.h
 #endif
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
 
 #ifdef XEPHYR_DRI
 
diff --git a/hw/kdrive/ephyr/ephyrhostglx.c b/hw/kdrive/ephyr/ephyrhostglx.c
index f5db5be..1eec4e0 100644
--- a/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/hw/kdrive/ephyr/ephyrhostglx.c
@@ -31,6 +31,17 @@
 #include kdrive-config.h
 #endif
 
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad 

xorg-server: Changes to 'debian-experimental'

2008-07-27 Thread Julien Cristau
 ChangeLog   |  291 
 Makefile.in |  962 
 XTrap/Makefile.in   |  645 
 Xext/Makefile.in|  907 
 Xi/Makefile.in  |  759 
 Xi/exevents.c   |2 
 aclocal.m4  | 8357 -
 afb/Makefile.in |  758 
 cfb/Makefile.in | 1058 
 cfb32/Makefile.in   | 1012 
 compile |  142 
 composite/Makefile.in   |  651 
 config.guess| 1526 
 config.sub  | 1658 
 config/Makefile.in  |  687 
 configure   |41845 
--
 configure.ac|6 
 damageext/Makefile.in   |  645 
 dbe/Makefile.in |  681 
 debian/changelog|   33 
 debian/control  |1 
 debian/copyright|  368 
 debian/rules|   28 
 debian/xsfbs/xsfbs.mk   |   11 
 depcomp |  589 
 dix/Makefile.in | 1067 
 dix/getevents.c |5 
 dix/main.c  |3 
 doc/Makefile.in |  658 
 exa/Makefile.in |  697 
 exa/exa.c   |   14 
 fb/Makefile.in  | 1235 
 glx/Makefile.in |  772 
 glx/glxcmds.c   |   19 
 glx/glxext.c|9 
 hw/Makefile.in  |  711 
 hw/dmx/Makefile.in  |  997 
 hw/dmx/config/Makefile.in   |  874 
 hw/dmx/doc/Makefile.in  |  837 
 hw/dmx/examples/Makefile.in | 1087 
 hw/dmx/glxProxy/Makefile.in |  701 
 hw/dmx/input/Makefile.in|  737 
 hw/kdrive/Makefile.in   |  713 
 hw/kdrive/ati/Makefile.in   |  756 
 hw/kdrive/chips/Makefile.in |  716 
 hw/kdrive/ephyr/Makefile.am |2 
 hw/kdrive/ephyr/Makefile.in |  929 
 hw/kdrive/ephyr/XF86dri.c   |   10 
 hw/kdrive/ephyr/ephyrhostglx.c  |   11 
 hw/kdrive/ephyr/ephyrhostvideo.c|   10 
 hw/kdrive/ephyr/hostx.c |   12 
 hw/kdrive/epson/Makefile.in |  715 
 hw/kdrive/fake/Makefile.am  |2 
 hw/kdrive/fake/Makefile.in  |  710 
 hw/kdrive/fbdev/Makefile.am |2 
 hw/kdrive/fbdev/Makefile.in |  703 
 hw/kdrive/i810/Makefile.in  |  720 
 hw/kdrive/linux/Makefile.in |  678 
 hw/kdrive/mach64/Makefile.in|  718 
 hw/kdrive/mga/Makefile.in   |  719 
 hw/kdrive/neomagic/Makefile.in  |  722 
 hw/kdrive/nvidia/Makefile.in|  719 
 hw/kdrive/pm2/Makefile.in   |  716 
 hw/kdrive/r128/Makefile.in  |  716 
 hw/kdrive/sdl/Makefile.am   |2 
 hw/kdrive/sdl/Makefile.in   |  677 
 hw/kdrive/sis300/Makefile.in|  724 
 hw/kdrive/smi/Makefile.in   |  722 
 

Processing of xorg-server_1.4.99.906-1_i386.changes

2008-07-27 Thread Archive Administrator
xorg-server_1.4.99.906-1_i386.changes uploaded successfully to localhost
along with the files:
  xorg-server_1.4.99.906-1.dsc
  xorg-server_1.4.99.906.orig.tar.gz
  xorg-server_1.4.99.906-1.diff.gz
  xserver-xorg-core_1.4.99.906-1_i386.deb
  xserver-xorg-dev_1.4.99.906-1_i386.deb
  xdmx_1.4.99.906-1_i386.deb
  xdmx-tools_1.4.99.906-1_i386.deb
  xnest_1.4.99.906-1_i386.deb
  xvfb_1.4.99.906-1_i386.deb
  xserver-xephyr_1.4.99.906-1_i386.deb
  xserver-xfbdev_1.4.99.906-1_i386.deb
  xserver-xorg-core-dbg_1.4.99.906-1_i386.deb

Greetings,

Your Debian queue daemon


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



Bug#491569: marked as done (xserver-xephyr: broken on 64-bit)

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:02:05 +
with message-id [EMAIL PROTECTED]
and subject line Bug#491569: fixed in xorg-server 2:1.4.99.906-1
has caused the Debian Bug report #491569,
regarding xserver-xephyr: broken on 64-bit
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 [EMAIL PROTECTED]
immediately.)


-- 
491569: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491569
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xephyr
Version: 2:1.4.99.905-1
Severity: grave
Justification: renders package unusable
Forwarded: http://bugs.freedesktop.org/show_bug.cgi?id=15839

Just so we don't forget to revert the bad commit or otherwise fix this
at some point…

Cheers,
Julien


---End Message---
---BeginMessage---
Source: xorg-server
Source-Version: 2:1.4.99.906-1

We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive:

xdmx-tools_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xdmx-tools_1.4.99.906-1_i386.deb
xdmx_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xdmx_1.4.99.906-1_i386.deb
xnest_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xnest_1.4.99.906-1_i386.deb
xorg-server_1.4.99.906-1.diff.gz
  to pool/main/x/xorg-server/xorg-server_1.4.99.906-1.diff.gz
xorg-server_1.4.99.906-1.dsc
  to pool/main/x/xorg-server/xorg-server_1.4.99.906-1.dsc
xorg-server_1.4.99.906.orig.tar.gz
  to pool/main/x/xorg-server/xorg-server_1.4.99.906.orig.tar.gz
xserver-xephyr_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xephyr_1.4.99.906-1_i386.deb
xserver-xfbdev_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xfbdev_1.4.99.906-1_i386.deb
xserver-xorg-core-dbg_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core-dbg_1.4.99.906-1_i386.deb
xserver-xorg-core_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core_1.4.99.906-1_i386.deb
xserver-xorg-dev_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-dev_1.4.99.906-1_i386.deb
xvfb_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xvfb_1.4.99.906-1_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau [EMAIL PROTECTED] (supplier of updated xorg-server package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Sun, 27 Jul 2008 18:30:45 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb 
xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg
Architecture: source i386
Version: 2:1.4.99.906-1
Distribution: experimental
Urgency: low
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Changed-By: Julien Cristau [EMAIL PROTECTED]
Description: 
 xdmx   - distributed multihead X server
 xdmx-tools - Distributed Multihead X tools
 xnest  - Nested X server
 xserver-xephyr - nested X server
 xserver-xfbdev - Linux framebuffer device tiny X server
 xserver-xorg-core - Xorg X server - core server
 xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols)
 xserver-xorg-dev - Xorg X server - development files
 xvfb   - Virtual Framebuffer 'fake' X server
Closes: 488987 490258 491569 491651
Changes: 
 xorg-server (2:1.4.99.906-1) experimental; urgency=low
 .
   * debian/rules: drop useless handling of nostrip in DEB_BUILD_OPTIONS (this
 is taken care of by dh_strip); make the rules files and xsfbs.mk
 parallel-safe, and enable parallel=n using example code from Debian
 Policy.
   * debian/rules: put the source package name and version in builderstring
 instead of osvendor, add builder email as well; don't explicitly set
 osname, configure sets it to $(uname -srm) by default.
   * New upstream release candidate.
 - fixes 64-bit Xephyr (closes: #491569)
 - work around the DIX losing physical monitor dimensions for randr 1.1
   drivers, in particular nvidia (closes: #488987)
 - make sure RANDR reports refresh as 0 if pixel clock is 0 (closes:
   #490258)
 - doesn't try to load dri2 when it's not built (closes: #491651)
   * Switch to running autoreconf at build time, and build-depend on automake,
 libtool and xutils-dev.
   * Reformat the SGI 

Bug#490258: marked as done (Failure in gdk when initializing randr12 with -vesa 2.0 driver)

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:02:05 +
with message-id [EMAIL PROTECTED]
and subject line Bug#490258: fixed in xorg-server 2:1.4.99.906-1
has caused the Debian Bug report #490258,
regarding Failure in gdk when initializing randr12 with -vesa 2.0 driver
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 [EMAIL PROTECTED]
immediately.)


-- 
490258: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=490258
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg-video-vesa
Version: 1:2.0.0-1

We're seeing this problem in Ubuntu after updating to -vesa 2.0.0 and
xserver 1.4.99.905.

The problem exhibits itself during login to a GNOME session when using
the -vesa video driver, and GDK-based applications such as gdm-greeter
fail to startup.  When using other drivers (such as -nv) everything
works fine.  We can also boot into a plain X session manually when using
-vesa, and run gdm apps in gdb.  The backtraces from various crashes
show commonality in that they're occurring during xrandr screen
initialization.  Not all gnome apps crash immediately; for instance
gnome-terminal crashes only after using its menus.

For example, in gnome-panel, the following is returning 0:

monitors [i] = gdk_screen_get_n_monitors (screen);

this then is unchecked and creates a NULL pointer in the next line:

geometries [i] = g_new0 (GdkRectangle, monitors [i]);

the NULL pointer then causes havok later on in panel_multiscreen_width
(or other routines):

return geometries [n_screen][monitor].width;

It segfaults at that point.

Tracing back, the problem seems to be starting from inside
XRRGetOutputInfo() when making the _XReply() call to the server.  For
whatever reason, the data structure it's getting back from the xserver
is coming back without a crtc:

  _XReply (dpy, (xReply *) rep, OutputInfoExtra  2, xFalse)

  rep.nCrtcs == 1
  rep.crtc == 0

I'm not certain if 0 is a valid value for rep.crtc or not, but that
seems to be what's causing the crashes.  If it is a valid value, then
gdk ought to be checking for it in init_randr12.

The Ubuntu bug is:
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-vesa/+bug/246585

Bryce

# 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  pc105
Option  XkbLayout us
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  vmmouse
EndSection

Section Device
Identifier  Configured Video Device
Driver  vesa
EndSection

Section Monitor
Identifier  Configured Monitor
EndSection

Section Screen
Identifier  Default Screen
Monitor Configured Monitor
Device  Configured Video Device
EndSection

Section ServerLayout
Identifier  Default Layout
Screen  Default Screen
EndSection


(WW) Failed to open protocol names file /etc/X11/xserver/protocol.txt
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 release.
Before reporting bugs in pre-release versions please check the
latest version in the X.Org Foundation git repository.
See http://wiki.x.org/wiki/GitPage for git access instructions.

X.Org X Server 1.4.99.905 (1.5.0 RC 5)
Release Date: 5 September 2007
X Protocol Version 11, Revision 0
Build Operating System: Linux Ubuntu (xorg-server 2:1.4.99.905-0ubuntu2)
Current Operating System: Linux dorset 2.6.26-3-generic #1 SMP Wed Jul 2 
21:54:36 UTC 2008 x86_64
Build Date: 07 July 2008  10:54:27AM
 
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, 

Bug#480656: McCain drops out of running

2008-07-27 Thread Hipple

Bill Gates diagnosed with colon cancer and given 3 more months to live 
http://www.ferrariclubpesaro.it/hotnews.html



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



Bug#491651: marked as done (Failed to load module dri2)

2008-07-27 Thread Debian Bug Tracking System

Your message dated Sun, 27 Jul 2008 17:02:05 +
with message-id [EMAIL PROTECTED]
and subject line Bug#491651: fixed in xorg-server 2:1.4.99.906-1
has caused the Debian Bug report #491651,
regarding Failed to load module dri2
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 [EMAIL PROTECTED]
immediately.)


-- 
491651: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491651
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
---BeginMessage---
Package: xserver-xorg-core
Version: 2:1.4.99.905-1
Severity: normal


X does not start for lack of /usr/lib/xorg/modules/extensions/libdri2.so
file.
I suggest that it should be included in the xserver-xorg-core package.

-
Hiroyuki Yamamoto



-- /etc/X11/xorg.conf:

# /etc/X11/xorg.conf (xorg 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 /etc/X11/xorg.conf manual page.
# (Type man /etc/X11/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 Files
FontPath/usr/share/fonts/X11/misc
FontPath/usr/X11R6/lib/X11/fonts/misc
#   FontPath/usr/share/fonts/X11/cyrillic
#   FontPath/usr/X11R6/lib/X11/fonts/cyrillic
FontPath/usr/share/fonts/X11/100dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/100dpi/:unscaled
FontPath/usr/share/fonts/X11/75dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/75dpi/:unscaled
FontPath/usr/share/fonts/X11/Type1
FontPath/usr/X11R6/lib/X11/fonts/Type1
FontPath/usr/share/fonts/X11/100dpi
FontPath/usr/X11R6/lib/X11/fonts/100dpi
FontPath/usr/share/fonts/X11/75dpi
FontPath/usr/X11R6/lib/X11/fonts/75dpi
# path to defoma fonts
FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
EndSection

Section Module
Loadbitmap
Loaddbe
Loadddc
#   Loaddri
Loadextmod
Loadfreetype
Loadglx
Loadint10
#   Loadrecord
#   Loadv4l
Loadvbe
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  jp106
Option  XkbLayout jp
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/psaux
Option  Protocol  ImPS/2
Option  Emulate3Buttons   true
EndSection

Section Device
Identifier  Generic Video Card
Driver  nv
EndSection

Section Monitor
Identifier  Generic Monitor
Option  DPMS
HorizSync   64.0-80.0
VertRefresh 60.0-75.0
EndSection

Section Screen
Identifier  Default Screen
Device  Generic Video Card
Monitor Generic Monitor
DefaultDepth24
SubSection Display
Depth   1
Modes   1280x1024
EndSubSection
SubSection Display
Depth   4
Modes   1280x1024
EndSubSection
SubSection Display
Depth   8
Modes   1280x1024
EndSubSection
SubSection Display
Depth   15
Modes   1280x1024
EndSubSection
SubSection Display
Depth   16
Modes   1280x1024
EndSubSection
SubSection Display
Depth   24
Modes   1280x1024
EndSubSection
EndSection

Section ServerLayout
Identifier  Default Layout
Screen  Default Screen
InputDevice Generic Keyboard
InputDevice Configured Mouse
EndSection

Section DRI
Mode0666
EndSection


-- /var/log/Xorg.0.log:

_XSERVTransSocketOpenCOTSServer: Unable to open socket for inet6

xorg-server_1.4.99.906-1_i386.changes ACCEPTED

2008-07-27 Thread Debian Installer

Accepted:
xdmx-tools_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xdmx-tools_1.4.99.906-1_i386.deb
xdmx_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xdmx_1.4.99.906-1_i386.deb
xnest_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xnest_1.4.99.906-1_i386.deb
xorg-server_1.4.99.906-1.diff.gz
  to pool/main/x/xorg-server/xorg-server_1.4.99.906-1.diff.gz
xorg-server_1.4.99.906-1.dsc
  to pool/main/x/xorg-server/xorg-server_1.4.99.906-1.dsc
xorg-server_1.4.99.906.orig.tar.gz
  to pool/main/x/xorg-server/xorg-server_1.4.99.906.orig.tar.gz
xserver-xephyr_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xephyr_1.4.99.906-1_i386.deb
xserver-xfbdev_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xfbdev_1.4.99.906-1_i386.deb
xserver-xorg-core-dbg_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core-dbg_1.4.99.906-1_i386.deb
xserver-xorg-core_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core_1.4.99.906-1_i386.deb
xserver-xorg-dev_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-dev_1.4.99.906-1_i386.deb
xvfb_1.4.99.906-1_i386.deb
  to pool/main/x/xorg-server/xvfb_1.4.99.906-1_i386.deb


Override entries for your package:
xdmx-tools_1.4.99.906-1_i386.deb - optional x11
xdmx_1.4.99.906-1_i386.deb - optional x11
xnest_1.4.99.906-1_i386.deb - optional x11
xorg-server_1.4.99.906-1.dsc - source x11
xserver-xephyr_1.4.99.906-1_i386.deb - optional x11
xserver-xfbdev_1.4.99.906-1_i386.deb - optional x11
xserver-xorg-core-dbg_1.4.99.906-1_i386.deb - extra x11
xserver-xorg-core_1.4.99.906-1_i386.deb - optional x11
xserver-xorg-dev_1.4.99.906-1_i386.deb - optional x11
xvfb_1.4.99.906-1_i386.deb - optional x11

Announcing to [EMAIL PROTECTED]
Closing bugs: 488987 490258 491569 491651 


Thank you for your contribution to Debian.


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



Bug#490013: More info regargin xkb-data and 'ro' layouts

2008-07-27 Thread Andrei Popescu
[Cc'ing Igor and Eddy, as I'm not sure they are subscribed to this bug]

On Sun,27.Jul.08, 10:47:54, Julien Cristau wrote:
 On Sun, Jul 27, 2008 at 10:28:38 +0300, Andrei Popescu wrote:
 
  $ setxkbmap -v 10 ro std
  Setting verbose level to 10
  locale is C
  Warning! Multiple definitions of keyboard layout
   Using command line, ignoring X server
  Applied rules from xorg:
  model:  pc105
  layout: ro
  variant:std
  Trying to build keymap using the following components:
  keycodes:   xfree86+aliases(qwertz)
  types:  complete
  compat: complete
  symbols:pc+ro(std_cedilla)
  geometry:   pc(pc105)
  
  Please note symbols: shows std_cedilla and indeed the layout is the 
  one using cedillas.
  
 That's because /usr/share/X11/xkb/rules/xorg has:
 ! model layout  variant =   symbols
   * ro  de  =   pc+ro(winkeys)
   * ro  us  =   pc+ro(std_comma)
   * ro  std =   pc+ro(std_cedilla)
   * ro  academic=   
 pc+ro(std_comma)
 
 So layout ro and variant std is mapped to symbols pc+ro(std_cedilla).

Ok, here's a patch which makes sense IMO:


--- xorg.orig   2008-07-27 23:45:44.0 +0300
+++ xorg.new2008-07-27 23:57:04.0 +0300
@@ -183,9 +183,10 @@
   *ogham   is434laptop =   
pc+ie(ogam_is434)
   *ori basic   =   pc+in(ori)
   *ro  de  =   pc+ro(winkeys)
-  *ro  us  =   pc+ro(std_comma)
-  *ro  std =   pc+ro(std_cedilla)
-  *ro  academic=   pc+ro(std_comma)
+  *ro  us  =   pc+ro(std)
+  *ro  academic=   pc+ro(std)
+  *ro  std_comma   =   pc+ro(std)
+  *ro  comma   =   pc+ro(basic)
   *ru  os  =   pc+ru(os_legacy)
   *sapmi   basic   =   pc+no(smi)
   *sapmi   nodeadkeys  =   
pc+no(smi_nodeadkeys)


Bonus, old names academic, comma and std_comma are now mapped to 
the correct variants.

Regards,
Andrei
-- 
If you can't explain it simply, you don't understand it well enough.
(Albert Einstein)


signature.asc
Description: Digital signature


Bug#464580: xserver-xorg-video-intel: X crashes with DRI disabled on 945G chipset

2008-07-27 Thread Brice Goglin
Ferry Toth wrote:
 Brice,

 Yes it appears enabling Option Rotate left in my minimal default
 xorg.conf again is sufficient to make the problems reoccur.

 I installed the 2 -dbg packages but have no idea how to catch a
 backtrace. Sorry.

http://wiki.debian.org/XStrikeForce/XserverDebugging might help

Brice




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



Processed: Re: Bug#489868: xserver-xorg-video-intel: resolution on the external monitor limited to the one of the build-in LCD

2008-07-27 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 reassign 489868 xserver-xorg-core
Bug#489868: xserver-xorg-video-intel: resolution on the external monitor 
limited to the one of the build-in LCD
Bug reassigned from package `xserver-xorg-video-intel' to `xserver-xorg-core'.

 found 489868 2:1.4.2-1
Bug#489868: xserver-xorg-video-intel: resolution on the external monitor 
limited to the one of the build-in LCD
Bug marked as found in version 2:1.4.2-1.

 thank you
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


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



Bug#489868: xserver-xorg-video-intel: resolution on the external monitor limited to the one of the build-in LCD

2008-07-27 Thread Brice Goglin
reassign 489868 xserver-xorg-core
found 489868 2:1.4.2-1
thank you


Thomas Hahn wrote:
 I downgraded xserver-xorg-core to 2:1.4.1~git20080131-4
 and the external display gets priority (as requested).
 So you are right about xserver-xorg-core.
   

Is it better with xserver-xorg-core 2:1.4.2-2 (and maybe intel 2:2.3.2-3
from experimental) ?

Brice




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