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

[Loïc Minier]

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

New commits:
commit 7a943acf8b7d1348220a6ca9cbe800ea94ef3374
Author: Loïc Minier 
Date:   Fri Jun 10 18:02:29 2011 +0200

Also build-conflict with libxtst-dev as to make sure it's not present in 
e.g. local debug builds.

diff --git a/debian/changelog b/debian/changelog
index 1ff0743..62883a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu15) oneiric; 
urgency=low
+
+  * Also build-conflict with libxtst-dev as to make sure it's not present in
+e.g. local debug builds.
+
+ -- Loïc Minier   Fri, 10 Jun 2011 18:01:59 +0200
+
 xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu14) oneiric; 
urgency=low
 
   * Drop libxtst-dev build dependency so syndaemon does not use XRecord,
diff --git a/debian/control b/debian/control
index a5343e8..5eabb5b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Build-Depends:
  x11proto-input-dev (>= 2.0.1-1ubuntu1),
  libmtdev-dev,
  libutouch-grail-dev
+Build-Conflicts:
+ libxtst-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qv4ax-0001ps...@vasks.debian.org

Bug#554114: [PATCH] Require x11 for KWD4

[Loïc Minier]

Require x11 for KWD4 as kde/window-decorator-kde4/window.cpp calls
XGetWMProtocols().

Signed-off-by: Loïc Minier 
---
 kde/window-decorator-kde4/CMakeLists.txt |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kde/window-decorator-kde4/CMakeLists.txt 
b/kde/window-decorator-kde4/CMakeLists.txt
index 6e7e95e..e8aa53c 100644
--- a/kde/window-decorator-kde4/CMakeLists.txt
+++ b/kde/window-decorator-kde4/CMakeLists.txt
@@ -17,7 +17,7 @@ if (USE_KDE4)
 
qt4_add_dbus_adaptor (kwd4_SRCS org.kde.KWin.xml decorator.h 
KWD::Decorator kwinadaptor)
 
-   pkg_check_modules (KWD4 REQUIRED xdamage xrender xcomposite xext)
+   pkg_check_modules (KWD4 REQUIRED x11 xdamage xrender xcomposite xext)
 
link_directories(
${KWD4_LIBRARY_DIRS}
-- 
1.7.1




--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/a598a72fa42d51f2a4fdab2df98d2d87fa25b520.1287353240.git.l...@dooz.org

Bug#554114: [PATCH] Indirect link fixes (master branch)

[Loïc Minier]

Hey

 (Corresponding patch for compiz/master)

 Linking behavior was changed in Ubuntu 11.04, and compiz-0.8 now fails
 to build; I'm attaching patches to fix the build.
https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-October/=
000772.html

 I believe this also affect Debian's compiz when building with gold, and
 similar toolchain changes will be done in Debian for next release.
http://wiki.debian.org/ToolChain/DSOLinking

   Thanks for considering for the master branch!

-- 
Loïc Minier



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/cover.1287353240.git.l...@dooz.org

Bug#554114: [PATCH 1/2] Require xcursor for GTK_WINDOW_DECORATOR

[Loïc Minier]

On Sun, Oct 17, 2010, Loïc Minier wrote:
> Require xcursor for GTK_WINDOW_DECORATOR as gtk/window-decorator calls
> XcursorSetTheme().

 Apologies, please ignore this particular patch as the XcursorSetTheme()
 call is added in an Ubuntu patch; the KDE patch is valid though.

-- 
Loïc Minier



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20101017220248.ga9...@bee.dooz.org

Bug#554114: [PATCH 2/2] Require x11 for KDE_WINDOW_DECORATOR

[Loïc Minier]

From: Loïc Minier 

Require x11 for KDE_WINDOW_DECORATOR as kde/window-decorator calls
XGetWMProtocols().

Signed-off-by: Loïc Minier 
---
 configure.ac |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index bb1e46d..5e5de45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,7 @@ if test "x$use_kde" = "xyes"; then
 kdeincs=`kde-config --install include --expandvars 2>/dev/null`
 if test -d "$kdelibs"; then
   PKG_CHECK_MODULES(KDE_WINDOW_DECORATOR,
-   dbus-1 xdamage xcomposite,
+   dbus-1 x11 xdamage xcomposite,
[use_kde=yes], [use_kde=no])
 
   KDE_CFLAGS="$QT_CXXFLAGS -I$kdeincs"
-- 
1.7.1




--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/9402c1d5bc99f30c1852aeb7fff5e3e9e8037e24.1287351854.git.l...@dooz.org

Bug#554114: [PATCH 1/2] Require xcursor for GTK_WINDOW_DECORATOR

[Loïc Minier]

From: Loïc Minier 

Require xcursor for GTK_WINDOW_DECORATOR as gtk/window-decorator calls
XcursorSetTheme().

Signed-off-by: Loïc Minier 
---
 configure.ac |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 18783e5..bb1e46d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,7 @@ AC_ARG_ENABLE(gnome-keybindings,
 if test "x$use_gtk" = "xyes"; then
   PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR,
xrender >= 0.8.4  \
+   xcursor \
gtk+-2.0 >= 2.8.0 \
libwnck-1.0   \
pangocairo,
-- 
1.7.1




--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/c29a5df99daf779b95f13d608f96c6af81bd0dfd.1287351854.git.l...@dooz.org

Bug#554114: [PATCH 0/2] Indirect link fixes

[Loïc Minier]

Hey

 Linking behavior was changed in Ubuntu 11.04, and compiz-0.8 now fails
 to build; I'm attaching patches to fix the build.

https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-October/000772.html

 I believe this also affect Debian's compiz when building with gold, and
 similar toolchain changes will be done in Debian for next release.
http://wiki.debian.org/ToolChain/DSOLinking

   Thanks for considering for the compiz-0.8 branch!

PS: please Cc: me, not subscribed to this list
-- 
Loïc Minier



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/cover.1287351854.git.l...@dooz.org

Bug#550460: Ships /usr/lib/pkgconfig/xproto.pc but is arch: all

[Loïc Minier]

Package: x11proto-core
Version: 7.0.15-1
Severity: wishlist

Hi

 x11proto-core-dev is arch: all but ships an arch-specific pathname
 (/usr/lib/pkgconfig/xproto.pc).

 This is notably a problem when cross-compiling since dpkg-buildpackage
 sets PKG_CONFIG_LIBDIR to
 /usr/$targetgnusystem/lib/pkgconfig/:/usr/share/pkgconfig/ and hence
 doesn't see this .pc file, but it can't be cross-build since it's arch:
 all.

 I guess the .pc file should really be in /usr/share/pkgconfig.

 NB: thanks for Colin Watson for diagnosing this issue.

   Thanks,
-- 
Loïc Minier



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

xserver-xorg-video-dove: Changes to 'upstream-unstable'

[Loïc Minier]

 0 files changed

New commits:
commit bd2f932de752d6b1a1be19a0a447f5624da2c4dc
Author: Loïc Minier 
Date:   Mon Sep 28 14:03:39 2009 +0200

Drop -x bits

diff --git a/COPYING b/COPYING
old mode 100755
new mode 100644
diff --git a/ChangeLog b/ChangeLog
old mode 100755
new mode 100644
diff --git a/Makefile.am b/Makefile.am
old mode 100755
new mode 100644
diff --git a/README b/README
old mode 100755
new mode 100644
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
diff --git a/man/Makefile.am b/man/Makefile.am
old mode 100755
new mode 100644
diff --git a/man/dovefb.man b/man/dovefb.man
old mode 100755
new mode 100644
diff --git a/src/Makefile.am b/src/Makefile.am
old mode 100755
new mode 100644
diff --git a/src/dovefb.c b/src/dovefb.c
old mode 100755
new mode 100644
diff --git a/src/dovefb_xv.c b/src/dovefb_xv.c
old mode 100755
new mode 100644
diff --git a/src/dovefb_xv.c.flip b/src/dovefb_xv.c.flip
old mode 100755
new mode 100644


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

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

[Loïc Minier]

 0 files changed

New commits:
commit a1b31acb0e4eec352ea98fc7a77530788a885321
Author: Loïc Minier 
Date:   Mon Sep 28 14:04:18 2009 +0200

Drop -x bits

diff --git a/debian/changelog b/debian/changelog
old mode 100755
new mode 100644
diff --git a/debian/compat b/debian/compat
old mode 100755
new mode 100644
diff --git a/debian/control b/debian/control
old mode 100755
new mode 100644
diff --git a/debian/copyright b/debian/copyright
old mode 100755
new mode 100644
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
diff --git a/debian/xserver-xorg-video-dove.install 
b/debian/xserver-xorg-video-dove.install
old mode 100755
new mode 100644
diff --git a/debian/xserver-xorg-video-dove.links 
b/debian/xserver-xorg-video-dove.links
old mode 100755
new mode 100644
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
old mode 100755
new mode 100644
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
old mode 100755
new mode 100644

commit bd2f932de752d6b1a1be19a0a447f5624da2c4dc
Author: Loïc Minier 
Date:   Mon Sep 28 14:03:39 2009 +0200

Drop -x bits

diff --git a/COPYING b/COPYING
old mode 100755
new mode 100644
diff --git a/ChangeLog b/ChangeLog
old mode 100755
new mode 100644
diff --git a/Makefile.am b/Makefile.am
old mode 100755
new mode 100644
diff --git a/README b/README
old mode 100755
new mode 100644
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
diff --git a/man/Makefile.am b/man/Makefile.am
old mode 100755
new mode 100644
diff --git a/man/dovefb.man b/man/dovefb.man
old mode 100755
new mode 100644
diff --git a/src/Makefile.am b/src/Makefile.am
old mode 100755
new mode 100644
diff --git a/src/dovefb.c b/src/dovefb.c
old mode 100755
new mode 100644
diff --git a/src/dovefb_xv.c b/src/dovefb_xv.c
old mode 100755
new mode 100644
diff --git a/src/dovefb_xv.c.flip b/src/dovefb_xv.c.flip
old mode 100755
new mode 100644


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit 227880b4c4c7f2f0c6b70c33952b33088311c0aa
Author: Loïc Minier 
Date:   Mon Sep 28 10:54:19 2009 +0200

Release 2:1.6.3-1ubuntu7

diff --git a/debian/changelog b/debian/changelog
index b2a16b8..bbc903c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.6.3-1ubuntu7) UNRELEASED; urgency=low
+xorg-server (2:1.6.3-1ubuntu7) karmic; urgency=low
 
   * Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
 DPMS events.  Cherrypick from upstream.
 (LP: #397839)
 
- -- Loïc Minier   Mon, 28 Sep 2009 10:05:00 +0200
+ -- Loïc Minier   Mon, 28 Sep 2009 10:54:08 +0200
 
 xorg-server (2:1.6.3-1ubuntu6) karmic; urgency=low
 


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 debian/patches/series |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 701cd2fbc4528182ac145b4bc856573f276df573
Author: Loïc Minier 
Date:   Mon Sep 28 10:14:27 2009 +0200

Enable 187_lastdeviceeventtime-no-reset.patch

diff --git a/debian/patches/series b/debian/patches/series
index 6b7d3a4..efe96b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ fedora-pci-primary.diff
 184_virtual_devices_autodetect.patch
 185_dix_badwindow.patch
 186_autoconfig_geode.patch
+187_lastdeviceeventtime-no-reset.patch


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog  |8 +++
 debian/patches/187_lastdeviceeventtime-no-reset.patch |   47 ++
 2 files changed, 55 insertions(+)

New commits:
commit 80a6590ad4f81a7c5a2bb1bd6d8c67c92f651338
Author: Loïc Minier 
Date:   Mon Sep 28 10:05:11 2009 +0200

Cherrypick to avoid resetting IDLETIME on DPMS

Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
DPMS events.  Cherrypick from upstream. (LP: #397839)

diff --git a/debian/changelog b/debian/changelog
index 312ca01..b2a16b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.6.3-1ubuntu7) UNRELEASED; urgency=low
+
+  * Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
+DPMS events.  Cherrypick from upstream.
+(LP: #397839)
+
+ -- Loïc Minier   Mon, 28 Sep 2009 10:05:00 +0200
+
 xorg-server (2:1.6.3-1ubuntu6) karmic; urgency=low
 
   * Add 186_autoconfig_geode.patch:  Add autoconfiguration support for
diff --git a/debian/patches/187_lastdeviceeventtime-no-reset.patch 
b/debian/patches/187_lastdeviceeventtime-no-reset.patch
new file mode 100644
index 000..d152ad7
--- /dev/null
+++ b/debian/patches/187_lastdeviceeventtime-no-reset.patch
@@ -0,0 +1,47 @@
+From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
+From: Richard Hughes 
+Date: Fri, 14 Aug 2009 11:44:35 +0100
+Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions
+
+When we change the DPMS mode, don't play games with the last event time as
+this breaks applications using IDLETIME to turn the backlight off after a
+preset time.
+
+This patch fixes gnome-power-manager and xfce-power-manager
+
+Signed-off-by: Peter Hutterer 
+---
+ Xext/dpms.c |   17 -
+ 1 files changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/Xext/dpms.c b/Xext/dpms.c
+index 21ba923..df63a8b 100644
+--- a/Xext/dpms.c
 b/Xext/dpms.c
+@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
+ if (!DPMSEnabled)
+   return BadMatch;
+ 
+-if (stuff->level == DPMSModeOn) {
+-  lastDeviceEventTime.milliseconds =
+-  GetTimeInMillis();
+-} else if (stuff->level == DPMSModeStandby) {
+-  lastDeviceEventTime.milliseconds =
+-  GetTimeInMillis() -  DPMSStandbyTime;
+-} else if (stuff->level == DPMSModeSuspend) {
+-  lastDeviceEventTime.milliseconds =
+-  GetTimeInMillis() -  DPMSSuspendTime;
+-} else if (stuff->level == DPMSModeOff) {
+-  lastDeviceEventTime.milliseconds =
+-  GetTimeInMillis() -  DPMSOffTime;
+-} else {
++if (stuff->level != DPMSModeOn &&
++stuff->level != DPMSModeStandby &&
++stuff->level != DPMSModeSuspend &&
++stuff->level != DPMSModeOff) {
+   client->errorValue = stuff->level;
+   return BadValue;
+ }
+-- 
+1.6.3.3
+


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

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

[Loïc Minier]

 debian/README.source |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9d4de8a4ae29e5a29fb31edf45592df7af23b831
Author: Loïc Minier 
Date:   Thu Sep 24 15:56:55 2009 +0200

Add debian/README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..6ba1e80
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+This package uses quilt to manage patches; see:
+/usr/share/doc/quilt/README.source


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

xserver-xorg-video-dove: Changes to 'upstream-unstable'

[Loïc Minier]

New branch 'upstream-unstable' available with the following commits:


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

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

[Loïc Minier]

New branch 'ubuntu' available with the following commits:
commit 06eeebfd7f01d9de4851b3457865a711a8f4
Author: Loïc Minier 
Date:   Thu Sep 24 15:41:12 2009 +0200

Add empty series file

commit ca4abe9f422d3668871ea3771bd2167f9d0c8233
Author: Loïc Minier 
Date:   Thu Sep 24 15:39:18 2009 +0200

Install upstream README, even if a bit old

commit 4c6f40508e7b2e7998923d82fa407f8d4fffc4b6
Author: Loïc Minier 
Date:   Thu Sep 24 15:38:31 2009 +0200

Don't install empty upstream ChangeLog

commit 38a4166e1dc73114ce976c04e38ce299524003a7
Author: Loïc Minier 
Date:   Thu Sep 24 15:33:02 2009 +0200

Reset changelog for initial upload to karmic

commit b3ca8115024c81a4fbf5c359f79b1560fd463572
Author: Loïc Minier 
Date:   Thu Sep 24 15:32:27 2009 +0200

Update upstream name

commit f1a154dcb4d4c998f01c1825d1eb47430d6a8337
Merge: 48e9e93cde0819de023265eb960493511ef7030c 
07c1b7118b6cc36a7e937572303181f41d9c2657
Author: Loïc Minier 
Date:   Thu Sep 24 15:31:51 2009 +0200

Merge branch 'upstream-unstable' into ubuntu

commit 07c1b7118b6cc36a7e937572303181f41d9c2657
Author: Loïc Minier 
Date:   Thu Sep 24 15:18:37 2009 +0200

Rename mrvl uses to dovefb driver name

commit 48e9e93cde0819de023265eb960493511ef7030c
Author: Loïc Minier 
Date:   Thu Sep 24 15:11:56 2009 +0200

Drop --disable-static as it is the default

commit 1e41eb84c596520cc432ca2aec010c71ca21b88e
Author: Loïc Minier 
Date:   Thu Sep 24 15:11:08 2009 +0200

Call dh_* with -s in binary-arch

commit 491b7da927f70d4c228b68a50a688bdad2d81709
Author: Loïc Minier 
Date:   Thu Sep 24 15:10:05 2009 +0200

Cleanup rules

commit e4fdcb4640b25c35e746a22995bfa15b3bc8bf81
Merge: 0b18cf4191093a450a87ac3f1796713a9e345958 
58a130d3e5ee198f511a514797018a1f80531db3
Author: Loïc Minier 
Date:   Thu Sep 24 14:52:11 2009 +0200

Update COPYING and copyright

commit 58a130d3e5ee198f511a514797018a1f80531db3
Author: Loïc Minier 
Date:   Thu Sep 24 14:50:16 2009 +0200

Update COPYING as I think is correct

Update COPYING as I think is correct; this needs review from Marvell

commit 0b18cf4191093a450a87ac3f1796713a9e345958
Author: Loïc Minier 
Date:   Thu Sep 24 14:43:54 2009 +0200

Update upstream URL

commit 4b650be43811e1462a6854e5ab882ba4275b4efc
Author: Loïc Minier 
Date:   Thu Sep 24 14:43:49 2009 +0200

Update description

commit f19a5eafe836c8121b268af639f9ba95edddc72d
Author: Loïc Minier 
Date:   Thu Sep 24 14:32:37 2009 +0200

Set Maintainer: to Ubuntu Core Developers

commit 67ec82a2cf40eb793c00c30ec0379622661873d3
Author: Loïc Minier 
Date:   Thu Sep 24 14:32:07 2009 +0200

Bump up Standards-Version to 3.8.3

commit ad6fdea64d107d716613ae9a709ba2eced15db5e
Merge: 65d0c82ceb55506f270efc3f997d2dcf68189ac6 
982dc70cd9af3e69a8b7a5f7715c7622a2309e7e
Author: Loïc Minier 
Date:   Thu Sep 24 14:25:00 2009 +0200

Merge upstream branch into ubuntu; keep debian/

commit 982dc70cd9af3e69a8b7a5f7715c7622a2309e7e
Author: Loïc Minier 
Date:   Thu Sep 24 14:24:36 2009 +0200

Drop debian/ from upstream branch

commit 65d0c82ceb55506f270efc3f997d2dcf68189ac6
Author: Ubuntu System User 
Date:   Mon Aug 31 03:43:17 2009 +0800

ubuntu/dove: update debian/changelog

Signed-off-by: Ubuntu System User 

commit deb6e02f9ab82049d02fdb65575add2c853b88f8
Author: Lea Li 
Date:   Thu Sep 10 12:27:14 2009 +0800

gc600 driver: disable all attributes other than colorkey/autopaint

Signed-off-by: Lea Li 

commit 96491812bf932d35dbdb5d717d89b99086742fca
Author: Lea Li 
Date:   Wed Sep 9 12:33:39 2009 +0800

ubuntu/dove: makefile and debianize

Signed-off-by: Lea Li 

commit 98f7edd51a020c41deeae96d32a8bac4fc1a1e81
Author: Lea Li 
Date:   Wed Sep 9 12:30:10 2009 +0800

ubuntu/dove: initial version

Signed-off-by: Lea Li 


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

Bug#537867: Please avoid setgid utmp

[Loïc Minier]

Package: xterm
Version: 243-1
Severity: wishlist

Hi

 xterm is currently sgid utmp; I would prefer it wouldn't be.  The xterm
 FAQ says:

Why does $LD_LIBRARY_PATH get reset?

   If xterm is running setuid (which is needed on some systems which have
   no wrappers for opening pty's and updating utmp), newer systems
   automatically set or reset environment variables which are considered
   security problems. These include $PATH and $LD_LIBRARY_PATH, since they
   affect the choice of which programs are run if not specified via a full
   pathname.
...
   Modern Unix systems (such as recent Solaris and HPUX versions) do not
   require you to run xterm setuid. Some will result in odd malfunctions
   if you do this.

 In my case HOSTALIASES and LD_LIBRARY_PATH get reset when running
 programs which is inconvenient for key bindings launching apps in xterm
 as I need to start a shell each time to set these vars.

 I don't know whether it's possible to drop this bit in Debian yet, but
 I wish we do.

   Thanks
-- 
Loïc Minier



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

Bug#526678: Passes magic cookie insecurity

[Loïc Minier]

Package: xvfb
Version: 2:1.6.1-1
Severity: normal
File: /usr/bin/xvfb-run
Tags: security

Hi

 xvfb-run does:

# Start Xvfb.
MCOOKIE=$(mcookie)
XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \
  >"$ERRORFILE" 2>&1

 which is insecure as the MCOOKIE value can be seen for a split second
 in the list of processes.

 I think "xauth source -" or a similar construct should be used.

   Bye

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.29-1-686 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xvfb depends on:
ii  libaudit01.7.13-1Dynamic library for security audit
ii  libc62.9-9   GNU C Library: Shared libraries
ii  libdbus-1-3  1.2.12-1simple interprocess messaging syst
ii  libfontenc1  1:1.0.4-3   X11 font encoding library
ii  libgcrypt11  1.4.4-2 LGPL Crypto library - runtime libr
ii  libhal1  0.5.12~git20090406.46dc48-2 Hardware Abstraction Layer - share
ii  libpixman-1- 0.14.0-1pixel-manipulation library for X a
ii  libselinux1  2.0.71-1SELinux shared libraries
ii  libxau6  1:1.0.4-2   X11 authorisation library
ii  libxdmcp61:1.0.2-3   X11 Display Manager Control Protoc
ii  libxfont11:1.4.0-1   X11 font rasterisation library
ii  xserver-comm 2:1.6.1-1   common files used by various X ser

Versions of packages xvfb recommends:
ii  xauth 1:1.0.3-2  X authentication utility
ii  xfonts-base   1:1.0.0-6  standard fonts for X

xvfb suggests no packages.

-- no debconf information

-- 
Loïc Minier



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

libcompizconfig: Changes to 'refs/tags/libcompizconfig-0.8.2-2'

[Loïc Minier]

Tag 'libcompizconfig-0.8.2-2' created by Loïc Minier  at 
2009-04-24 15:16 +

Debian release 0.8.2-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknx19cACgkQ4VUX8isJIMC97wCeN/Qz7mzAE2Y/bGJgkwKRMYLo
1UsAoLasZgK3oVOkn19RnIfQEAF/ugp3
=2H3Z
-END PGP SIGNATURE-

Changes since libcompizconfig-0.8.2-1:
Loïc Minier (8):
  Bdep on libxcursor-dev; closes: #525240, #524943
  Revert "Bdep on libxcursor-dev; closes: #525240, #524943"
  Depend on compiz-core and -abiversion-2009xxyy
  Add Vcs-Git-* control headers
  Fix missing -abiversion in virtual dep
  Let libcompizconfig-dev dep on compiz-dev
  Bump compiz-dev bdep and dep to 0.8.2-6 for FTBFS
  Update changelog for 0.8.2-2

---
 debian/changelog |   13 +
 debian/control   |9 ++---
 debian/rules |4 +++-
 3 files changed, 22 insertions(+), 4 deletions(-)
---


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

libcompizconfig: Changes to 'debian-unstable'

[Loïc Minier]

 debian/changelog |   13 +
 debian/control   |4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit dc3c244e82a624fa325c56a8a22d1491a89393d5
Author: Loïc Minier 
Date:   Fri Apr 24 16:56:34 2009 +0200

Update changelog for 0.8.2-2

diff --git a/debian/changelog b/debian/changelog
index 58e430c..bf7d423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libcompizconfig (0.8.2-2) unstable; urgency=low
+
+  * Let libcompizcore0 depend on compiz-core and
+compiz-core-abiversion-2009xxyy to avoid package mismatches.
+  * Add Vcs-Git-* control headers.
+  * Fix missing -abiversion in virtual dep.
+  * Let libcompizconfig-dev dep on compiz-dev (>= 0.8.2) for the Requires:
+compiz libcompizconfig.pc.
+  * Temporarily bump compiz-dev build-dep and dep to >= 0.8.2-6 to
+workaround FTBFS with current compiz-dev.
+
+ -- Loic Minier   Fri, 24 Apr 2009 15:58:19 +0200
+
 libcompizconfig (0.8.2-1) unstable; urgency=low
 
   * New upstream release.

commit 5da89471a26a6f6bd27256d891ee51af4f248c0d
Author: Loïc Minier 
Date:   Fri Apr 24 17:04:38 2009 +0200

Bump compiz-dev bdep and dep to 0.8.2-6 for FTBFS

Temporarily bump compiz-dev build-dep and dep to >= 0.8.2-6 to
workaround FTBFS with current compiz-dev.

diff --git a/debian/control b/debian/control
index e1cc7ff..79f3fda 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force 
 Uploaders: Sean Finney 
-Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (>= 0.8.2), intltool, libtool, libglib2.0-dev, 
+Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (>= 0.8.2-6), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (>= 0.8.2)
+Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (>= 0.8.2-6)
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide

commit 81e0c00e92b2add71c1992cfade49bca2b9293d3
Author: Loïc Minier 
Date:   Fri Apr 24 17:03:26 2009 +0200

Let libcompizconfig-dev dep on compiz-dev

Let libcompizconfig-dev dep on compiz-dev (>= 0.8.2) for the Requires:
compiz libcompizconfig.pc.

diff --git a/debian/control b/debian/control
index 7c796eb..e1cc7ff 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version})
+Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (>= 0.8.2)
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


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

compiz: Changes to 'refs/tags/compiz-0.8.2-6'

[Loïc Minier]

Tag 'compiz-0.8.2-6' created by Loïc Minier  at 2009-04-24 13:46 
+

Debian release 0.8.2-6
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknxwqkACgkQ4VUX8isJIMDUgQCeKhA5TRSdV2r7WWMXv7bYwIjQ
4sgAn2eocFms6aNC5DvI6hvDGEfdqIVb
=BfUk
-END PGP SIGNATURE-

Changes since compiz-0.8.2-5:
Loïc Minier (10):
  Add libxcursor-dev cdep and dep; closes: #525240
  Add Provides -abiversion-2009xxyy to compiz-core
  compiz-core use Breaks libcompizcore not Conflicts
  compiz-core Breaks libcompizconfig 0.8.0; #523514
  Add missing -- to dh_gencontrol call
  Update bdeps and compiz-dev deps to match (.pc)
  Build-dep on libcairo2-dev instead of libcairo-dev
  Add missing libstartup-notification0-dev bdep
  Use libxrender-dev bdep version for libdecoration
  Update changelog for 0.8.2-6

---
 debian/changelog |   22 ++
 debian/control   |   13 -
 debian/rules |4 +++-
 3 files changed, 33 insertions(+), 6 deletions(-)
---


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

compiz: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit 6ef9b48eb78d28dc921be858d75fea130e1b99b8
Author: Loïc Minier 
Date:   Fri Apr 24 15:17:31 2009 +0200

Update changelog for 0.8.2-6

diff --git a/debian/changelog b/debian/changelog
index 58b7183..471394a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+compiz (0.8.2-6) unstable; urgency=low
+
+  * Add libxcursor-dev build-dep as required by patch
+ubuntu/013-add-cursor-theme-support; also let compiz-dev pull it as it's
+referenced in the .pc file; closes: #525240, #524943.
+  * Add a virtual compiz-core-abiversion-2009xxyy provides to compiz-core to
+allow for strict dependencies of plugins on the compiz-core
+CORE_ABIVERSION they were built with, as read from include/compiz-core.h.
+  * Use the new Breaks feature for the compiz-core -> libcompizconfig0 dep.
+This makes upgrades smoother than Conflicts.
+  * Bump the compiz-core Breaks on libcompizconfig0 to 0.8.0 as the last
+CORE_ABIVERSION bump happened between 0.7.8 and 0.8.0; closes: #523514.
+  * Add a missing libxml2-dev build-dep and update the compiz-dev deps to
+match what compiz.pc requires and use the same versions as the build-deps.
+  * Build-dep on libcairo2-dev instead of libcairo-dev.
+  * Add missing libstartup-notification0-dev (>= 0.7) bdep and version the
+compiz-dev dep to match.
+  * Use the same version in the libdecoration0-dev dep on libxrender-dev as
+in the libxrender-dev bdep.
+
+ -- Loic Minier   Fri, 24 Apr 2009 15:15:24 +0200
+
 compiz (0.8.2-5) unstable; urgency=low
 
   * remove obsolete --enable-gconf-dump configure option

commit f7d3ec944f688379c5a1c834355c822753136ba3
Author: Loïc Minier 
Date:   Fri Apr 24 15:38:42 2009 +0200

Use libxrender-dev bdep version for libdecoration

Use the same version in the libdecoration0-dev dep on libxrender-dev as
in the libxrender-dev bdep.

diff --git a/debian/control b/debian/control
index ce36286..7e9bb80 100644
--- a/debian/control
+++ b/debian/control
@@ -125,7 +125,7 @@ Description: Compiz window decoration library
 Package: libdecoration0-dev
 Section: libdevel
 Architecture: any
-Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libx11-dev, libxrender-dev
+Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libx11-dev, libxrender-dev (>= 1:0.9.1)
 Description: Compiz window decoration library - development files
  The window decoration library is responsible for drawing the window borders
  and title bar of windows managed by Compiz. It is used by window decorators

commit 48e9d1f7f22eaabd83f155d308a50656f4841ee3
Author: Loïc Minier 
Date:   Fri Apr 24 15:36:59 2009 +0200

Add missing libstartup-notification0-dev bdep

Add missing libstartup-notification0-dev (>= 0.7) bdep and version the
compiz-dev dep to match.

diff --git a/debian/control b/debian/control
index b113cbd..ce36286 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: autoconf, automake1.9, autotools-dev,
  libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 
1:0.9.1), 
  libxcursor-dev,
  libxml2-dev, libxslt1-dev,
+ libstartup-notification0-dev (>= 0.7),
  quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8), xsltproc
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/compiz.git
@@ -58,7 +59,7 @@ Description: OpenGL window and compositing manager
 
 Package: compiz-dev
 Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev (>= 
1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>= 1:1.0.3), 
libxinerama-dev, libxrandr-dev (>= 2:1.1.0.2), libxcursor-dev, libice-dev (>= 
1:1.0.1), libsm-dev (>= 1:1.0.1), libstartup-notification0-dev, libxslt1-dev, 
libxml2-dev
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev (>= 
1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>= 1:1.0.3), 
libxinerama-dev, libxrandr-dev (>= 2:1.1.0.2), libxcursor-dev, libice-dev (>= 
1:1.0.1), libsm-dev (>= 1:1.0.1), libstartup-notification0-dev (>= 0.7), 
libxslt1-dev, libxml2-dev
 Description: OpenGL window and compositing manager - development files
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users

commit ef96b65331e2c1e4de19a6c107305958768201d1
Author: Loïc Minier 
Date:   Fri Apr 24 15:34:58 2009 +0200

Build-dep on libcairo2-dev instead of libcairo-dev

diff --git a/debian/control b/debian/control
index 59489a8..b113cbd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @

compizconfig-python: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit 358459967409c56d413d513b0c6a9574ff0dc70e
Author: Loïc Minier 
Date:   Fri Apr 24 15:09:36 2009 +0200

Revert "Depend on compiz-core and -abiversion-2009xxyy"

This reverts commit 77dc770950e09de56e5e449587f3d7375f68e759.

diff --git a/debian/control b/debian/control
index 2adb216..f4f0903 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Homepage: http://www.compiz-fusion.org
 
 Package: python-compizconfig
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
- compiz-core, compiz-core-abiversion-${coreabiversion}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Compizconfig bindings for python
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index 2e0ed30..1e1acee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,6 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in 
config.sub configure \
 
 PYVERS=$(shell pyversions -r)
 
-CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
-
 configure: configure-stamp
 configure-stamp:
dh_testdir
@@ -102,7 +100,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
+   dh_gencontrol
dh_md5sums
dh_builddeb
 


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

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit a78288a7f1174e171bdaeeb45d063350c45e3941
Author: Loïc Minier 
Date:   Fri Apr 24 15:09:21 2009 +0200

Revert "Depend on compiz-core and -abiversion-2009xxyy"

This reverts commit 30988d10854b113092026284d5a4c77b42915785.

diff --git a/debian/control b/debian/control
index d520207..2c515f7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- compiz-core, compiz-core-abiversion-${coreabiversion}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiz Fusion configuration system - gconf backend
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index b6dfef8..69e92c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ else
CFLAGS += -O2
 endif
 
-CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
-
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
depcomp install-sh intltool-extract.in intltool-merge.in \
intltool-update.in ltmain.sh missing mkinstalldirs \
@@ -70,7 +68,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
+   dh_gencontrol
dh_md5sums
dh_builddeb
 


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

compizconfig-python: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit 77dc770950e09de56e5e449587f3d7375f68e759
Author: Loïc Minier 
Date:   Fri Apr 24 14:45:30 2009 +0200

Depend on compiz-core and -abiversion-2009xxyy

Let python-compizconfig depend on compiz-core and
compiz-core-abiversion-2009xxyy to avoid package mismatches.

diff --git a/debian/control b/debian/control
index f4f0903..2adb216 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Homepage: http://www.compiz-fusion.org
 
 Package: python-compizconfig
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
+ compiz-core, compiz-core-abiversion-${coreabiversion}
 Description: Compizconfig bindings for python
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index 1e1acee..2e0ed30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in 
config.sub configure \
 
 PYVERS=$(shell pyversions -r)
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
+
 configure: configure-stamp
 configure-stamp:
dh_testdir
@@ -100,7 +102,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


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

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Loïc Minier]

 debian/control |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 36118dbb6eaedf5fbac53edc1792fd3f9fa586a8
Author: Loïc Minier 
Date:   Fri Apr 24 14:40:25 2009 +0200

Add Vcs-Git-* control headers

diff --git a/debian/control b/debian/control
index 71dad84..d520207 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (>= 0.8.2), intltool, libcompizconfig-dev (>= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.8.1
 Section: x11
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git
+Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.git
 
 Package: compizconfig-backend-gconf
 Architecture: any


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

compiz: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit cfefbc28ce2d4616130341c9cbd3bc6a95b92b1a
Author: Loïc Minier 
Date:   Fri Apr 24 14:32:18 2009 +0200

Add missing -- to dh_gencontrol call

diff --git a/debian/rules b/debian/rules
index 26faff6..13e0c6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,7 @@ binary-arch: build install
dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 0.8.2)'
dh_shlibdeps
dh_installdeb
-   dh_gencontrol -Vcoreabiversion=$(CORE_ABIVERSION)
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


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

libcompizconfig: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit 9cc97e5ce1d09372d971be0e358230e27530dfd0
Author: Loïc Minier 
Date:   Fri Apr 24 14:33:59 2009 +0200

Fix missing -abiversion in virtual dep

diff --git a/debian/control b/debian/control
index 06adc1a..7c796eb 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: libcompizconfig0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- compiz-core, compiz-core-${coreabiversion}
+ compiz-core, compiz-core-abiversion-${coreabiversion}
 Description: Configuration settings library for compiz-fusion
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


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

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit 30988d10854b113092026284d5a4c77b42915785
Author: Loïc Minier 
Date:   Fri Apr 24 14:37:26 2009 +0200

Depend on compiz-core and -abiversion-2009xxyy

Let compizconfig-backend-gconf depend on compiz-core and
compiz-core-abiversion-2009xxyy to avoid package mismatches.

diff --git a/debian/control b/debian/control
index 1e6372d..71dad84 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Section: x11
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ compiz-core, compiz-core-abiversion-${coreabiversion}
 Description: Compiz Fusion configuration system - gconf backend
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index 69e92c1..b6dfef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ else
CFLAGS += -O2
 endif
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
+
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
depcomp install-sh intltool-extract.in intltool-merge.in \
intltool-update.in ltmain.sh missing mkinstalldirs \
@@ -68,7 +70,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


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

Bug#523514: [compiz/debian-unstable] compiz-core Breaks libcompizconfig 0.8.0; #523514

[Loïc Minier]

tag 523514 pending
thanks

Date:   Fri Apr 24 14:03:40 2009 +0200
Author: Loïc Minier 
Commit ID: b36c8cf83f0be89c30b691d12c7caf173e16f7dd
Commit URL: 
http://git.debian.org/?p=pkg-xorg/app/compiz.git;a=commitdiff;h=b36c8cf83f0be89c30b691d12c7caf173e16f7dd
Patch URL: 
http://git.debian.org/?p=pkg-xorg/app/compiz.git;a=commitdiff_plain;h=b36c8cf83f0be89c30b691d12c7caf173e16f7dd

compiz-core Breaks libcompizconfig 0.8.0; #523514

Bump the compiz-core Breaks on libcompizconfig0 to 0.8.0 as the last
CORE_ABIVERSION bump happened between 0.7.8 and 0.8.0; closes: #523514.
  



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

libcompizconfig: Changes to 'debian-unstable'

[Loïc Minier]

 debian/control |5 -
 debian/rules   |4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b9cd4a79696c9d3f511613a3f6733761a6106d16
Author: Loïc Minier 
Date:   Fri Apr 24 14:18:25 2009 +0200

Add Vcs-Git-* control headers

diff --git a/debian/control b/debian/control
index 90b68ff..06adc1a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends: debhelper (>= 5), autoconf, automake1.9, 
autotools-dev, compiz-de
  protobuf-compiler
 Standards-Version: 3.8.1
 Section: libs
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 
 Package: libcompizconfig-dev
 Section: libdevel

commit 4687bd430bd3e6b91c034379c75847ba07c9d613
Author: Loïc Minier 
Date:   Fri Apr 24 14:16:19 2009 +0200

Depend on compiz-core and -abiversion-2009xxyy

Let libcompizcore0 depend on compiz-core and
compiz-core-abiversion-2009xxyy to avoid package mismatches.

diff --git a/debian/control b/debian/control
index 6bc9101..90b68ff 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Description: Configuration settings library for compiz-fusion 
- development file
 Package: libcompizconfig0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ compiz-core, compiz-core-${coreabiversion}
 Description: Configuration settings library for compiz-fusion
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index 4719122..4fb5069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ endif
 version=0.52
 major=0
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
+
 # the following are generated by autoconf and have no way of being deleted
 # gracefully. 
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in config/Makefile.in \
@@ -73,7 +75,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


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

compiz: Changes to 'debian-unstable'

[Loïc Minier]

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

New commits:
commit b36c8cf83f0be89c30b691d12c7caf173e16f7dd
Author: Loïc Minier 
Date:   Fri Apr 24 14:03:40 2009 +0200

compiz-core Breaks libcompizconfig 0.8.0; #523514

Bump the compiz-core Breaks on libcompizconfig0 to 0.8.0 as the last
CORE_ABIVERSION bump happened between 0.7.8 and 0.8.0; closes: #523514.

diff --git a/debian/control b/debian/control
index 1b5f191..5add7d0 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: OpenGL window and compositing manager
 Package: compiz-core
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Breaks: libcompizconfig0 (<< 0.7.6)
+Breaks: libcompizconfig0 (<< 0.8.0)
 Recommends: compiz-plugins (= ${binary:Version})
 Suggests: nvidia-glx (>= 1.0.9625-1)
 Provides: compiz-core-abiversion-${coreabiversion}

commit 98700a1c2d56bf70092769dfb3643b5e3fea3703
Author: Loïc Minier 
Date:   Fri Apr 24 14:02:06 2009 +0200

compiz-core use Breaks libcompizcore not Conflicts

Use the new Breaks feature for the compiz-core -> libcompizconfig0 dep.
This makes upgrades smoother than Conflicts.

diff --git a/debian/control b/debian/control
index 3e835bb..1b5f191 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: OpenGL window and compositing manager
 Package: compiz-core
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Conflicts: libcompizconfig0 (<< 0.7.6)
+Breaks: libcompizconfig0 (<< 0.7.6)
 Recommends: compiz-plugins (= ${binary:Version})
 Suggests: nvidia-glx (>= 1.0.9625-1)
 Provides: compiz-core-abiversion-${coreabiversion}

commit 89535bd02d91cfb6cd3f01b61cff4b2f277621e2
Author: Loïc Minier 
Date:   Fri Apr 24 13:35:31 2009 +0200

Add Provides -abiversion-2009xxyy to compiz-core

Add a virtual compiz-core-abiversion-2009xxyy provides to compiz-core to
allow for strict dependencies of plugins on the compiz-core
CORE_ABIVERSION they were built with, as read from
include/compiz-core.h.

diff --git a/debian/control b/debian/control
index 4e8d1d3..3e835bb 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
 Conflicts: libcompizconfig0 (<< 0.7.6)
 Recommends: compiz-plugins (= ${binary:Version})
 Suggests: nvidia-glx (>= 1.0.9625-1)
+Provides: compiz-core-abiversion-${coreabiversion}
 Description: OpenGL window and compositing manager
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users
diff --git a/debian/rules b/debian/rules
index 35b6260..26faff6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,8 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/compiz-core.h )
+
 INSTALL = /usr/bin/install
 
 confflags += --disable-static \
@@ -126,7 +128,7 @@ binary-arch: build install
dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 0.8.2)'
dh_shlibdeps
dh_installdeb
-   dh_gencontrol
+   dh_gencontrol -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


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

Bug#525240: [compiz/debian-unstable] Add libxcursor-dev cdep and dep; closes: #525240

[Loïc Minier]

tag 525240 pending
thanks

Date:   Fri Apr 24 11:26:21 2009 +0200
Author: Loïc Minier 
Commit ID: ad4e787fbae6bf2c019a1002a187c2830dc74c29
Commit URL: 
http://git.debian.org/?p=pkg-xorg/app/compiz.git;a=commitdiff;h=ad4e787fbae6bf2c019a1002a187c2830dc74c29
Patch URL: 
http://git.debian.org/?p=pkg-xorg/app/compiz.git;a=commitdiff_plain;h=ad4e787fbae6bf2c019a1002a187c2830dc74c29

Add libxcursor-dev cdep and dep; closes: #525240

Add libxcursor-dev build-dep as required by patch
ubuntu/013-add-cursor-theme-support; also let compiz-dev pull it as it's
referenced in the .pc flie; closes: #525240, #524943.
  



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

Bug#525240: [libcompizconfig/debian-unstable] Revert "Bdep on libxcursor-dev; closes: #525240, #524943"

[Loïc Minier]

tag 525240 pending
thanks

Date:   Fri Apr 24 11:20:16 2009 +0200
Author: Loïc Minier 
Commit ID: b7775a547fb615346e5bc7bdb871448e266c5703
Commit URL: (url not available/configured in hook)
Patch URL: (url not available/configured in hook)

Revert "Bdep on libxcursor-dev; closes: #525240, #524943"

This reverts commit ef2ddffd5d15d535a569be2c6c76970150f16409.
  



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

compiz: Changes to 'debian-unstable'

[Loïc Minier]

 debian/control |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ad4e787fbae6bf2c019a1002a187c2830dc74c29
Author: Loïc Minier 
Date:   Fri Apr 24 11:26:21 2009 +0200

Add libxcursor-dev cdep and dep; closes: #525240

Add libxcursor-dev build-dep as required by patch
ubuntu/013-add-cursor-theme-support; also let compiz-dev pull it as it's
referenced in the .pc flie; closes: #525240, #524943.

diff --git a/debian/control b/debian/control
index 7d8752a..4e8d1d3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: autoconf, automake1.9, autotools-dev,
  libsm-dev (>= 1:1.0.1), libtool, libwnck-dev, libxcomposite-dev (>= 1:0.3-2), 
  libxdamage-dev (>=1:1.0.3), libxfixes-dev (>= 1:4.0.1), libxinerama-dev, 
  libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 
1:0.9.1), 
+ libxcursor-dev,
  libxslt1-dev,
  quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8), xsltproc
 Standards-Version: 3.8.1
@@ -56,7 +57,7 @@ Description: OpenGL window and compositing manager
 
 Package: compiz-dev
 Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev, 
libxdamage-dev, libxinerama-dev, libxrandr-dev, libice-dev, libsm-dev, 
libstartup-notification0-dev, libxslt1-dev, libxml2-dev
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev, 
libxdamage-dev, libxinerama-dev, libxrandr-dev, libxcursor-dev, libice-dev, 
libsm-dev, libstartup-notification0-dev, libxslt1-dev, libxml2-dev
 Description: OpenGL window and compositing manager - development files
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users


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

libcompizconfig: Changes to 'debian-unstable'

[Loïc Minier]

 debian/control |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b7775a547fb615346e5bc7bdb871448e266c5703
Author: Loïc Minier 
Date:   Fri Apr 24 11:20:16 2009 +0200

Revert "Bdep on libxcursor-dev; closes: #525240, #524943"

This reverts commit ef2ddffd5d15d535a569be2c6c76970150f16409.

diff --git a/debian/control b/debian/control
index ef67803..6bc9101 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (>= 0.8.2), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
- protobuf-compiler,
- libxcursor-dev
+ protobuf-compiler
 Standards-Version: 3.8.1
 Section: libs
 


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

Bug#525240: [libcompizconfig/debian-unstable] Bdep on libxcursor-dev; closes: #525240, #524943

[Loïc Minier]

tag 525240 pending
thanks

Date:   Fri Apr 24 10:45:18 2009 +0200
Author: Loïc Minier 
Commit ID: ef2ddffd5d15d535a569be2c6c76970150f16409
Commit URL: (url not available/configured in hook)
Patch URL: (url not available/configured in hook)

Bdep on libxcursor-dev; closes: #525240, #524943

  



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

Bug#523514: Reopening: please add a versionned dep of some sort

[Loïc Minier]

reopen 523514 0.8.2-5
stop

Hi

 Please fix the deps of $package to disallow partial upgrades of
 compiz-* if libcompiz needs to be upgraded at the same time.  e.g.
 Breaks: libcompizconfig << 0.8 or vice-versa.

 In my case I have:
 compiz 0.8.2-5
 compiz-core 0.8.2-5
 compiz-fusion-plugins-main 0.8.2-3
 compiz-gnome 0.8.2-5
 compiz-gtk 0.8.2-5
 compiz-plugins 0.8.2-5
 compizconfig-backend-gconf 0.7.6-1
 compizconfig-settings-manager 0.8.2-1
 libcompizconfig0 0.7.6-1
 python-compizconfig 0.7.6-1

 /usr/bin/compiz.real (core) - Error: Plugin 'core' has ABI version
 '20090207', expected ABI version '20080424'.

   thanks!
-- 
Loïc Minier



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

libcompizconfig: Changes to 'debian-unstable'

[Loïc Minier]

 debian/control |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ef2ddffd5d15d535a569be2c6c76970150f16409
Author: Loïc Minier 
Date:   Fri Apr 24 10:45:18 2009 +0200

Bdep on libxcursor-dev; closes: #525240, #524943

diff --git a/debian/control b/debian/control
index 6bc9101..ef67803 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Uploaders: Sean Finney 
 Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (>= 0.8.2), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
- protobuf-compiler
+ protobuf-compiler,
+ libxcursor-dev
 Standards-Version: 3.8.1
 Section: libs
 


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

libxt: Changes to 'debian-unstable'

[Loïc Minier]

 debian/changelog |4 
 debian/rules |7 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 1f0be5cdfcbeafbc551c57ec8fe4372372f4ac86
Author: Loïc Minier 
Date:   Sat Apr 11 20:55:58 2009 +0200

Drop -Wl,-Bsymbolic-functions from LDFLAGS; LP: #343574

diff --git a/debian/changelog b/debian/changelog
index a25bd2f..3bc340d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ libxt (1:1.0.5-4) UNRELEASED; urgency=low
 in the long description.
   * Add upstream URL to debian/copyright.
 
+  [ Loic Minier ]
+  * Drop -Wl,-Bsymbolic-functions from LDFLAGS as it conflicts with the Xt
+inheritance mechanism; LP: #343574.
+
  -- Brice Goglin   Fri, 13 Jun 2008 11:36:24 +0200
 
 libxt (1:1.0.5-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index ef89986..5567cdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+# drop -Wl,-Bsymbolic-functions from LDFLAGS as it conflicts with the Xt
+# inheritance mechanism; LP: #343574
+LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=)
+
 CFLAGS +=  
-DXFILESEARCHPATHDEFAULT=\\\"/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S\\\"
 -include X11/XlibConf.h -D_REENTRANT
 
 build: patch build-stamp
@@ -42,7 +46,8 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 --with-appdefaultdir=/etc/X11/app-defaults \
-CFLAGS="$(CFLAGS)" 
+CFLAGS="$(CFLAGS)" \
+LDFLAGS="$(LDFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 
touch build-stamp


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

xorg: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog|9 +
 debian/xserver-xorg.postinst.in |2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 0fd1a68cb75c7c708332d3a13c5365e0a8a43b75
Author: Loïc Minier 
Date:   Fri Feb 27 08:31:00 2009 +0100

debian/xserver-xorg.postinst.in: Set USE_FBDEV to false by default on lpia 
as well (just like on i386, amd64 etc.); should fix vesa usage on Poulsbo 
systems, it would work fine in the live session but not after install; LP: 
#335308.

diff --git a/debian/changelog b/debian/changelog
index 2e2d968..66db7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.4~5ubuntu13) jaunty; urgency=low
+
+  * debian/xserver-xorg.postinst.in: Set USE_FBDEV to false by default on lpia
+as well (just like on i386, amd64 etc.); should fix vesa usage on Poulsbo
+systems, it would work fine in the live session but not after install;
+LP: #335308.
+
+ -- Loic Minier   Fri, 27 Feb 2009 08:19:27 +0100
+
 xorg (1:7.4~5ubuntu12) jaunty; urgency=low
 
   * control: Reverse the -evdev /-input-all Depends order, hopefully
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 1089279..1b9e95a 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -625,7 +625,7 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
   # use fbcon kernel functions?
 
   case "$ARCH" in
-alpha|hurd-i386|i386|amd64)
+alpha|hurd-i386|i386|amd64|lpia)
   USE_FBDEV=false
   ;;
 *)


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

libdrm: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit 58b7e340e8143f33136bbfe0b541132e3bc458da
Author: Loïc Minier 
Date:   Wed Feb 4 00:09:06 2009 +0100

Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia

Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia as this version of 
the headers now include a compatibility #define which mesa requires.

diff --git a/debian/changelog b/debian/changelog
index 5dd3f01..ea8ec6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.4-0ubuntu6) jaunty; urgency=low
+
+  * Bump dep on linux-libc-dev dep to >= 2.6.28-1.4 on lpia as this version of
+the headers now include a compatibility #define which mesa requires.
+
+ -- Loic Minier   Tue, 03 Feb 2009 23:20:27 +0100
+
 libdrm (2.4.4-0ubuntu5) jaunty; urgency=low
 
   * Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
diff --git a/debian/control b/debian/control
index 1a72c1e..508916c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
 Architecture: any
 Depends: libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>= 
2.6.28-1.1) [lpia]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>= 
2.6.28-2.4) [lpia]
 Replaces: linux-libc-dev (<= 2.6.28-3.4)
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM


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

libdrm: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit dd11e8db011c17a194d62b70b14ac04c6ec6a6d7
Author: Loïc Minier 
Date:   Tue Feb 3 12:44:16 2009 +0100

Split the linux-libc-dev dep on lpia

Split the linux-libc-dev dep on lpia and depend on >= 2.6.28-1.1 on lpia
-- the version differs because it's built from linux-lpia instead of
linux; this is not going to be fixable anytime soon, so we should be
careful to use arch-specific versions for linux-libc-dev deps/bdeps.

diff --git a/debian/changelog b/debian/changelog
index 196acfa..5dd3f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-libdrm (2.4.4-0ubuntu5) UNRELEASED; urgency=low
+libdrm (2.4.4-0ubuntu5) jaunty; urgency=low
 
   * Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
+  * Split the linux-libc-dev dep on lpia and depend on >= 2.6.28-1.1 on lpia
+-- the version differs because it's built from linux-lpia instead of
+linux; this is not going to be fixable anytime soon, so we should be
+careful to use arch-specific versions for linux-libc-dev deps/bdeps.
 
  -- Loic Minier   Sun, 01 Feb 2009 16:25:46 +0100
 
diff --git a/debian/control b/debian/control
index 158fd57..1a72c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Section: libdevel
 Architecture: any
 Depends: libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386 lpia]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386], linux-libc-dev (>= 
2.6.28-1.1) [lpia]
 Replaces: linux-libc-dev (<= 2.6.28-3.4)
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM


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

libdrm: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit bea034222a4b5292eb7204098161e9f4e1cc5b9d
Author: Loïc Minier 
Date:   Sun Feb 1 16:26:23 2009 +0100

Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.

diff --git a/debian/changelog b/debian/changelog
index 23ae9cb..196acfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.4-0ubuntu5) UNRELEASED; urgency=low
+
+  * Revert XS-Original-Vcs-* to Vcs-*, this *is* maintained in Git, sorry.
+
+ -- Loic Minier   Sun, 01 Feb 2009 16:25:46 +0100
+
 libdrm (2.4.4-0ubuntu4) jaunty; urgency=low
 
   * Also depend on linux-libc-dev on [lpia] as linux-libc-dev_2.6.28-1.2_lpia
diff --git a/debian/control b/debian/control
index 631bad9..158fd57 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Thierry Reding , Julien Cristau 
= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt 
(>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
 Standards-Version: 3.7.3
 Section: libs
-XS-Original-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
-XS-Original-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
 
 Package: libdrm-dev
 Section: libdevel

commit 586d28941d1020fcd1250e796e175ee59d1c613b
Author: Loïc Minier 
Date:   Sun Feb 1 16:25:41 2009 +0100

Import 2.4.4-0ubuntu4.

diff --git a/debian/changelog b/debian/changelog
index 9d9084a..23ae9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.4-0ubuntu4) jaunty; urgency=low
+
+  * Also depend on linux-libc-dev on [lpia] as linux-libc-dev_2.6.28-1.2_lpia
+has the drm headers; the avoidance of this dep on other arches just helps
+installability, but because the headers are missing you're unlikely to do
+anything with the lib anyway.  The solution is a linux-ports upload.
+  * Rename Vcs-* to XS-Original-Vcs-*.
+
+ -- Loic Minier   Sat, 31 Jan 2009 23:50:33 +0100
+
 libdrm (2.4.4-0ubuntu3) jaunty; urgency=low
 
   * libdrm-dev Depends on linux-libc-dev only on [amd64 armel i386]
diff --git a/debian/control b/debian/control
index 084f386..631bad9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,15 @@ Uploaders: Thierry Reding , Julien Cristau 
= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt 
(>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
 Standards-Version: 3.7.3
 Section: libs
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
+XS-Original-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+XS-Original-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
 
 Package: libdrm-dev
 Section: libdevel
 Architecture: any
 Depends: libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386]
+ linux-libc-dev (>= 2.6.28-5.15) [amd64 armel i386 lpia]
 Replaces: linux-libc-dev (<= 2.6.28-3.4)
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM


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

xorg: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog|   21 ++---
 debian/x11-common.preinst.in|2 +-
 debian/xserver-xorg.postinst.in |   11 ++-
 debian/xutils.postinst.in   |8 
 4 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit d7496fbf5919c492d80275d55a8024d20343a983
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 22:13:27 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index 3dd7eac..da9935f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.4~5ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.4~5ubuntu1) intrepid; urgency=low
 
   * Fix leftover conflicts in debian/changelog.
   * Merge from debian-experimental.
   * Bump the version check for upgrades to "lt-nl 1:7.4~5ubuntu1" and also
 change psb to vesa in xorg.conf in upgrades.
 
- -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 22:05:20 +0200
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 22:13:23 +0200
 
 xorg (1:7.4~5) UNRELEASED; urgency=low
 

commit 5d170b90094f93e1f0fb2d14610f094bf9ce6f1c
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 22:13:18 2008 +0200

Bump the version check for upgrades to "lt-nl 1:7.4~5ubuntu1" and also 
change psb to vesa in xorg.conf in upgrades.

diff --git a/debian/changelog b/debian/changelog
index 07cbf4f..3dd7eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.4~5ubuntu1) UNRELEASED; urgency=low
 
   * Fix leftover conflicts in debian/changelog.
   * Merge from debian-experimental.
+  * Bump the version check for upgrades to "lt-nl 1:7.4~5ubuntu1" and also
+change psb to vesa in xorg.conf in upgrades.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 22:05:20 +0200
 
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 84a7533..808605d 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -958,14 +958,15 @@ if [ -n "$RECONFIGURE" ]; then
  "configuration"
   fi
   rm -f "$NEW_XORGCONFIG"
-elif dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then
-  # We're upgrading from pre-7.4.  We need to replace i810 with intel, and
-  # via with openchrome.
+elif dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu1"; then
+  # We're upgrading from pre-7.4.  We need to replace i810 with intel,
+  # via with openchrome, and psb with vesa.
   if [ -e "$XORGCONFIG" ]; then
 sed -e'

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

commit ecbb3bdc3a45de9f9d72438dff45549808c00066
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 22:05:32 2008 +0200

Fix leftover conflicts in debian/changelog.

diff --git a/debian/changelog b/debian/changelog
index 46a6a22..45eb3f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.4~4ubuntu3) UNRELEASED; urgency=low
+
+  * Fix leftover conflicts in debian/changelog.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 22:05:20 +0200
+
 xorg (1:7.4~4ubuntu2) intrepid; urgency=low
 
   * Drop i810, nsc, and tga for lpia as well.  (Concerning tga, lpia is of
@@ -184,7 +190,6 @@ xorg (1:7.4~1) experimental; urgency=low
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Mon, 14 Jul 2008 02:34:00 +0200
 
-<<<<<<< HEAD:debian/changelog
 xorg (1:7.4~0ubuntu2) intrepid; urgency=low
 
   * debian/control: Moving displayconfig-gtk to Suggests.  We are
@@ -261,7 +266,7 @@ xorg (1:7.4~0ubuntu1) intrepid; urgency=low
   * vars.*: Drop cyrix, imstt from video-all. Deprecated upstream.
 
  -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 08 Jul 2008 10:03:15 +0300
-===
+
 xorg (1:7.3+18) unstable; urgency=low
 
   [ Debconf translations ]
@@ -272,7 +277,6 @@ xorg (1:7.3+18) unstable; urgency=low
 later if needed.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 05 Oct 2008 20:26:08 +0200
->>>>>>> debian-experimental:debian/changelog
 
 xorg (1:7.3+17) unstable; urgency=low
 

commit 8855ccf3b85df0bfa79bff3efde3125bb3cc2198
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 22:00:21 2008 +0200

Shut up rmdir errors with 2>/dev/null in all maintainer scripts when trying 
to remove dirs; this might confuse debconf.

diff --git a/debian/changelog b/debian/changelog
index 74ecf23..8fb1cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.4

xorg: Changes to 'debian-experimental'

[Loïc Minier]

 debian/changelog|8 
 debian/x11-common.preinst.in|2 +-
 debian/xserver-xorg.postinst.in |4 ++--
 debian/xutils.postinst.in   |8 
 4 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 8855ccf3b85df0bfa79bff3efde3125bb3cc2198
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 22:00:21 2008 +0200

Shut up rmdir errors with 2>/dev/null in all maintainer scripts when trying 
to remove dirs; this might confuse debconf.

diff --git a/debian/changelog b/debian/changelog
index 74ecf23..8fb1cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.4~5) UNRELEASED; urgency=low
 
   * Also upgrade Driver i810 or via lines which have trailing comments.
+  * Shut up rmdir errors with 2>/dev/null in all maintainer scripts when
+trying to remove dirs; this might confuse debconf.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 21:52:39 +0200
 
diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in
index 1a2ffb5..1d651ba 100644
--- a/debian/x11-common.preinst.in
+++ b/debian/x11-common.preinst.in
@@ -25,7 +25,7 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
 
   # We need to remove /usr/X11R6/bin so we can replace it with a symlink
   if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then
-if ! rmdir "/usr/X11R6/bin"; then
+if ! rmdir "/usr/X11R6/bin" 2>/dev/null; then
   run db_fset x11-common/x11r6_bin_not_empty seen false
   run db_input critical x11-common/x11r6_bin_not_empty
   run db_go
diff --git a/debian/xutils.postinst.in b/debian/xutils.postinst.in
index 7d59502..78b3123 100644
--- a/debian/xutils.postinst.in
+++ b/debian/xutils.postinst.in
@@ -21,10 +21,10 @@ configure)
 remove_conffile_commit "/etc/X11/rstart/contexts/x11r6"
 remove_conffile_commit "/etc/X11/rstart/config"
 remove_conffile_commit "/etc/X11/rstart/rstartd.real"
-rmdir /etc/X11/rstart/commands/x11r6/ || true
-rmdir /etc/X11/rstart/commands/ || true
-rmdir /etc/X11/rstart/contexts/ || true
-rmdir /etc/X11/rstart/ || true
+rmdir /etc/X11/rstart/commands/x11r6/ 2>/dev/null || true
+rmdir /etc/X11/rstart/commands/ 2>/dev/null || true
+rmdir /etc/X11/rstart/contexts/ 2>/dev/null || true
+rmdir /etc/X11/rstart/ 2>/dev/null || true
   fi
 esac
 

commit 5e3beb55713f5ed639464a152dd709a97e0d69b2
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 21:57:04 2008 +0200

Also upgrade Driver i810 or via lines which have trailing comments.

diff --git a/debian/changelog b/debian/changelog
index 024c2f2..74ecf23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.4~5) UNRELEASED; urgency=low
+
+  * Also upgrade Driver i810 or via lines which have trailing comments.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 21:52:39 +0200
+
 xorg (1:7.4~4) experimental; urgency=low
 
   [ Loic Minier ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 7d3f507..629291e 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -958,8 +958,8 @@ elif dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then
   if [ -e "$XORGCONFIG" ]; then
 sed -e'

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


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

xorg-server: Changes to 'debian-experimental'

[Loïc Minier]

 debian/changelog |7 +++
 debian/xserver-xorg-core.postinst.in |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 72362062318c15d5e3cbc5a4f6e53e2601a01b00
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 21:50:44 2008 +0200

Shut up rmdir error when trying to remove dirs; this might confuse debconf.

diff --git a/debian/changelog b/debian/changelog
index 76e2ffd..5e7bea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.5.2-2) UNRELEASED; urgency=low
+
+  * Shut up rmdir error when trying to remove dirs; this might confuse
+debconf.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 21:50:15 +0200
+
 xorg-server (2:1.5.2-1) experimental; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index d047bb1..a8cb2a2 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -11,7 +11,7 @@ case "$1" in
   configure)
   if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
 remove_conffile_commit /etc/X11/xserver/SecurityPolicy
-rmdir /etc/X11/xserver || true
+rmdir /etc/X11/xserver 2>/dev/null || true
   fi
 esac
 


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog  |8 
 debian/patches/142_psb_auto.patch |5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3e48d2f756ee013cf086b3668dc9b2655afb92b1
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 18:14:33 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index 0614739..c1830fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.5.2-1ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu4) intrepid; urgency=low
 
   * Update patch 142_psb_auto to only try vesa, not even psb, as this requires
 the psb driver to be loadable, and it's not available anymore (and broken
 anyway).
 
- -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 18:13:37 +0200
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 18:14:28 +0200
 
 xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
 

commit 93eaafeb8d31771d244389675af0560da1baa62c
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 18:14:26 2008 +0200

Update patch 142_psb_auto to only try vesa, not even psb, as this requires 
the psb driver to be loadable, and it's not available anymore (and broken 
anyway).

diff --git a/debian/changelog b/debian/changelog
index f6b972c..0614739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.2-1ubuntu4) UNRELEASED; urgency=low
+
+  * Update patch 142_psb_auto to only try vesa, not even psb, as this requires
+the psb driver to be loadable, and it's not available anymore (and broken
+anyway).
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 18:13:37 +0200
+
 xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
 
   * Shut up rmdir error when trying to remove dirs; this might confuse
diff --git a/debian/patches/142_psb_auto.patch 
b/debian/patches/142_psb_auto.patch
index 685144e..8d23c4f 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -7,7 +7,7 @@ Bryce Harrington  23-Aug-2007
 
 --- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
 +++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
-@@ -166,11 +166,18 @@
+@@ -166,11 +166,17 @@
case 0x102c:driverList[0] = "chips"; break;
case 0x1013:driverList[0] = "cirrus"; break;
case 0x8086:
@@ -21,8 +21,7 @@ Bryce Harrington  23-Aug-2007
 +  case 0x00d1: case 0x7800:
 +  driverList[0] = "i740"; break;
 +  case 0x8108: case 0x8109:
-+  driverList[0] = "psb";
-+  driverList[1] = "vesa";
++  driverList[0] = "vesa"; /* should be psb but broken */
 +  break;
 +  default:
 +  driverList[0] = "intel";


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog |7 +++
 debian/xserver-xorg-core.postinst.in |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 470be858501dc87196d6d298057906ebec44a427
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 17:57:20 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index 07ed881..f6b972c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.5.2-1ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
 
   * Shut up rmdir error when trying to remove dirs; this might confuse
 debconf.
 
- -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 17:56:39 +0200
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 17:57:13 +0200
 
 xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
 

commit f56dc1d069cabd626383eaba994ac814c2f383e7
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 17:57:11 2008 +0200

Shut up rmdir error when trying to remove dirs; this might confuse debconf.

diff --git a/debian/changelog b/debian/changelog
index cae30f0..07ed881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.5.2-1ubuntu3) UNRELEASED; urgency=low
+
+  * Shut up rmdir error when trying to remove dirs; this might confuse
+debconf.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 17:56:39 +0200
+
 xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
 
   * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
diff --git a/debian/xserver-xorg-core.postinst.in 
b/debian/xserver-xorg-core.postinst.in
index d047bb1..a8cb2a2 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -11,7 +11,7 @@ case "$1" in
   configure)
   if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
 remove_conffile_commit /etc/X11/xserver/SecurityPolicy
-rmdir /etc/X11/xserver || true
+rmdir /etc/X11/xserver 2>/dev/null || true
   fi
 esac
 


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog   |9 +
 debian/local/xvfb-run  |2 +-
 debian/patches/123_no_composite_for_xvfb_run.patch |   11 ---
 debian/patches/142_psb_auto.patch  |6 +++---
 debian/patches/series  |1 -
 5 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit f2a834ce8d8f3463f2a62330fb7f820342a60d05
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 15:48:57 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index b5bbd57..cae30f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
 
   * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
   * Apply and drop patch 123_no_composite_for_xvfb_run which was changing

commit 1032a40eeb1c7fd6ab8d3fcaed5c2620ccc86227
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 15:40:09 2008 +0200

Apply and drop patch 123_no_composite_for_xvfb_run which was changing files 
below debian/ (xvfb-run, to disable the Composite extension by default).

diff --git a/debian/changelog b/debian/changelog
index 2ad29e2..b5bbd57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
 
   * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
+  * Apply and drop patch 123_no_composite_for_xvfb_run which was changing
+files below debian/ (xvfb-run, to disable the Composite extension by
+default).
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 15:27:23 +0200
 
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index c85f86a..148da9f 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -16,7 +16,7 @@ SERVERNUM=99
 AUTHFILE=
 ERRORFILE=/dev/null
 STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
+XVFBARGS="-screen 0 640x480x8 -extension Composite"
 LISTENTCP="-nolisten tcp"
 XAUTHPROTO=.
 
diff --git a/debian/patches/123_no_composite_for_xvfb_run.patch 
b/debian/patches/123_no_composite_for_xvfb_run.patch
deleted file mode 100644
index 2a817d3..000
--- a/debian/patches/123_no_composite_for_xvfb_run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 debian/local/xvfb-run  2006-10-13 18:42:49.0 +0200
-+++ xorg-server-1.1.1/debian/local/xvfb-run2006-10-13 18:42:37.0 
+0200
-@@ -16,7 +16,7 @@
- AUTHFILE=
- ERRORFILE=/dev/null
- STARTWAIT=3
--XVFBARGS="-screen 0 640x480x8"
-+XVFBARGS="-screen 0 640x480x8 -extension Composite"
- LISTENTCP="-nolisten tcp"
- XAUTHPROTO=.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7a992a0..2f61cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@
 107_fedora_dont_backfill_bg_none.patch
 110_fedora_no_move_damage.patch
 121_only_switch_vt_when_active.diff
-123_no_composite_for_xvfb_run.patch
 135_rethrow_signals.patch
 136_fedora_force_switchcorekeyboard_for_evdev.patch
 137_add_device_property_support.patch

commit 8a8cabc19ac41f3b22d9a301454a9950e9eb0b6f
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 15:34:42 2008 +0200

Update patch 142_psb_auto to also try psb and vesa for 0x8109.

diff --git a/debian/changelog b/debian/changelog
index 070a6fc..2ad29e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
+
+  * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 15:27:23 +0200
+
 xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
 
   * Merge from debian-experimental.
diff --git a/debian/patches/142_psb_auto.patch 
b/debian/patches/142_psb_auto.patch
index c3a85c5..685144e 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -5,8 +5,8 @@ in style to the savage driver section.
 
 Bryce Harrington  23-Aug-2007
 
 xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c2008-10-14 
23:22:23.0 +0200
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-10-14 
23:23:00.0 +0200
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
 xorg-server/hw/xfree86/common/xf86AutoConfig.c
 @@ -166,11 +166,18 @@
case 0x102c:driverList[0] = "chips"; break;
case 0x1013:driverList[0] = "cirrus"; break;
@@ -20,7 +20,7 @@ Bryce Harrington  23-Aug-2007
 +  {
 +  case 0x00d1: case 0x7800:
 +  driverList[0] = "i740"; break;
-+  case 0x8108:
++  case 0x8108: case 0x8109:
 +  driverList[0] = "psb";
 +  driverList[1] = "vesa";
 +  break;


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

xorg: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog |7 +++
 debian/scripts/vars.lpia |4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 611fc5543ca05406e9f7f3aee817b05c4b5c7cb8
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 12:58:26 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index 3bee288..46a6a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.4~4ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.4~4ubuntu2) intrepid; urgency=low
 
   * Drop i810, nsc, and tga for lpia as well.  (Concerning tga, lpia is of
 course !alpha.)
 
- -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:33:16 +0200
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:58:22 +0200
 
 xorg (1:7.4~4ubuntu1) intrepid; urgency=low
 

commit 49746d8ca4de9a43ce46f3ef88bc0564c800ba99
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 12:43:14 2008 +0200

Reword changelog

diff --git a/debian/changelog b/debian/changelog
index 0cddbd5..3bee288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 xorg (1:7.4~4ubuntu2) UNRELEASED; urgency=low
 
-  * Drop i810 for lpia as well.
-  * Drop nsc for lpia as well.
-  * Drop tga for lpia (which is !alpha) as well.
+  * Drop i810, nsc, and tga for lpia as well.  (Concerning tga, lpia is of
+course !alpha.)
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:33:16 +0200
 

commit d1c7eba4358bbac3b44e1c1fac40862cec8ffd5a
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 12:42:02 2008 +0200

Drop tga for lpia (which is !alpha) as well.

diff --git a/debian/changelog b/debian/changelog
index 2a0de68..0cddbd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.4~4ubuntu2) UNRELEASED; urgency=low
 
   * Drop i810 for lpia as well.
   * Drop nsc for lpia as well.
+  * Drop tga for lpia (which is !alpha) as well.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:33:16 +0200
 
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index 9bd91df..012ba9c 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -23,7 +23,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
-   xserver-xorg-video-tga, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \

commit fcfa2ce7efb0df36593c8a36f16fee901076abc3
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 12:41:17 2008 +0200

Drop nsc for lpia as well.

diff --git a/debian/changelog b/debian/changelog
index 3970807..2a0de68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg (1:7.4~4ubuntu2) UNRELEASED; urgency=low
 
   * Drop i810 for lpia as well.
+  * Drop nsc for lpia as well.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:33:16 +0200
 
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index a395665..9bd91df 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-   xserver-xorg-video-nsc, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \

commit e5219d5f645683394c3c747cbd53edbc9e70de14
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 12:33:49 2008 +0200

Drop i810 for lpia as well.

diff --git a/debian/changelog b/debian/changelog
index f567134..3970807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.4~4ubuntu2) UNRELEASED; urgency=low
+
+  * Drop i810 for lpia as well.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 12:33:16 +0200
+
 xorg (1:7.4~4ubuntu1) intrepid; urgency=low
 
   * Merge from debian-experimental.
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index f1c844b..a395665 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -11,7 +11,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
xserver-xorg-video-i740, \
-   xserver-xorg-video-intel | xserver-xorg-video-i810, \
+   xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit 49fab4eb4285761f1b7ff5c0499cad2ba4a00043
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Wed Oct 15 01:28:46 2008 +0200

Let xserver-xorg-core conflict with xserver-xorg-video-psb << 
0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.

diff --git a/debian/changelog b/debian/changelog
index 1cc08a0..070a6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
   * Merge from debian-experimental.
   * Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
   * Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
+  * Let xserver-xorg-core conflict with xserver-xorg-video-psb
+<< 0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Tue, 14 Oct 2008 23:03:06 +0200
 
diff --git a/debian/control b/debian/control
index 7270d96..e18295d 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
 Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
  xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0, 
xserver-xorg-input,
  xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2, xserver-xorg-input-2
+ xserver-xorg-video-2, xserver-xorg-input-2,
+ xserver-xorg-video-psb (<< 0.15.0-0ubuntu1~804um5)
 Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
  xserver-common (<< 7)
 Breaks: xserver-xorg-input-synaptics (<= 0.15.2-0ubuntu3), 
xserver-xorg-input-evdev (<= 1:2.0.99+git20080912-0ubuntu2)


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

xorg-server: Changes to 'ubuntu'

[Loïc Minier]

 ChangeLog |  152 ++
 configure.ac  |4 
 debian/changelog  |   46 +++-
 debian/control|   23 +-
 debian/copyright  |  234 ++
 debian/local/xvfb-run |6 
 debian/patches/100_xserver_exa_force_greedy.patch |   16 -
 debian/patches/142_psb_auto.patch |   12 -
 debian/rules  |   11 -
 debian/xserver-common.install |2 
 debian/xserver-xorg-core.install  |1 
 debian/xserver-xorg-core.postinst.in  |   22 ++
 debian/xserver-xorg-core.postrm.in|   13 +
 debian/xserver-xorg-core.preinst.in   |   21 +
 hw/xfree86/ddc/interpret_edid.c   |   41 +++
 15 files changed, 353 insertions(+), 251 deletions(-)

New commits:
commit 7b731e0384113ab8151e651e80ef736808cfb549
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Tue Oct 14 23:26:14 2008 +0200

Refresh patch 100_xserver_exa_force_greedy to apply cleanly.

diff --git a/debian/changelog b/debian/changelog
index 85d0f5d..1cc08a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
 
   * Merge from debian-experimental.
   * Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
+  * Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Tue, 14 Oct 2008 23:03:06 +0200
 
diff --git a/debian/patches/100_xserver_exa_force_greedy.patch 
b/debian/patches/100_xserver_exa_force_greedy.patch
index a9aac7c..24dd770 100644
--- a/debian/patches/100_xserver_exa_force_greedy.patch
+++ b/debian/patches/100_xserver_exa_force_greedy.patch
@@ -1,8 +1,6 @@
-Index: xorg-server/exa/exa.c
-===
 xorg-server.orig/exa/exa.c 2008-06-18 10:28:15.0 +0300
-+++ xorg-server/exa/exa.c  2008-06-18 12:07:25.0 +0300
-@@ -837,6 +837,11 @@
+--- xorg-server.orig/exa/exa.c 2008-10-14 23:24:44.0 +0200
 xorg-server/exa/exa.c  2008-10-14 23:25:52.0 +0200
+@@ -882,6 +882,11 @@
  dixSetPrivate(&pScreen->devPrivates, exaScreenPrivateKey, pExaScr);
  
  pExaScr->migration = ExaMigrationAlways;
@@ -14,11 +12,9 @@ Index: xorg-server/exa/exa.c
  
  exaDDXDriverInit(pScreen);
  
-Index: xorg-server/exa/exa.h
-===
 xorg-server.orig/exa/exa.h 2008-06-18 10:28:16.0 +0300
-+++ xorg-server/exa/exa.h  2008-06-18 12:07:25.0 +0300
-@@ -735,6 +735,13 @@
+--- xorg-server.orig/exa/exa.h 2008-10-14 23:24:44.0 +0200
 xorg-server/exa/exa.h  2008-10-14 23:25:52.0 +0200
+@@ -737,6 +737,13 @@
  #define EXA_TWO_BITBLT_DIRECTIONS (1 << 2)
  
  /**

commit ec1d55bc7640c28e022dade8d0dcfde6886690f3
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Tue Oct 14 23:25:47 2008 +0200

Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.

diff --git a/debian/changelog b/debian/changelog
index 0e79a53..85d0f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
 
   * Merge from debian-experimental.
+  * Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
 
  -- Loic Minier <[EMAIL PROTECTED]>  Tue, 14 Oct 2008 23:03:06 +0200
 
diff --git a/debian/patches/142_psb_auto.patch 
b/debian/patches/142_psb_auto.patch
index 4e097d6..c3a85c5 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -5,11 +5,9 @@ in style to the savage driver section.
 
 Bryce Harrington  23-Aug-2007
 
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
-===
 xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c2008-09-26 
22:33:11.0 +0300
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-09-26 
22:33:11.0 +0300
-@@ -166,11 +166,16 @@
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c2008-10-14 
23:22:23.0 +0200
 xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-10-14 
23:23:00.0 +0200
+@@ -166,11 +166,18 @@
case 0x102c:driverList[0] = "chips"; break;
case 0x1013:driverList[0] = "cirrus"; break;
case 0x8086:
@@ -23,7 +21,9 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
 +  case 0x00d1: case 0x7800:
 +  driverList[0] = "i740"; break;
 +  case 0x8108:
-+  driverList[0] = "psb"; break;
++  driverList[0

xorg: Changes to 'ubuntu'

[Loïc Minier]

 debian/changelog |9 +
 debian/scripts/vars.lpia |2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 386473ff0251ff894aac11201bff521c24c8b5b5
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Fri Oct 10 20:53:08 2008 +0200

Drop xserver-xorg-video-openchrome | xserver-xorg-video-via and 
xserver-xorg-video-geode from video-all on lpia as they don't exist on lpia; 
they would build, but it's not clear whether anyone is interested in using lpia 
on devices with this video hardware.

diff --git a/debian/changelog b/debian/changelog
index 6a72546..c37bf78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.4~2ubuntu7) intrepid; urgency=low
+
+  * Drop xserver-xorg-video-openchrome | xserver-xorg-video-via and
+xserver-xorg-video-geode from video-all on lpia as they don't exist on
+lpia; they would build, but it's not clear whether anyone is interested in
+using lpia on devices with this video hardware.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Fri, 10 Oct 2008 20:51:47 +0200
+
 xorg (1:7.4~2ubuntu6) intrepid; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index b32d94e..f1c844b 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-geode, \
xserver-xorg-video-i128, \
xserver-xorg-video-i740, \
xserver-xorg-video-intel | xserver-xorg-video-i810, \
@@ -29,7 +28,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-openchrome | xserver-xorg-video-via, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
xserver-xorg-video-v4l"


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

xorg: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit 156bdd349e88f83fd1dd0850f8abb659a6f4db9a
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Tue Sep 30 19:26:00 2008 +0200

Release

diff --git a/debian/changelog b/debian/changelog
index 32dc210..ad43d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~2ubuntu5) UNRELEASED; urgency=low
+xorg (1:7.4~2ubuntu5) intrepid; urgency=low
 
   [ Bryce Harrington ]
   * local/Failsafe/failsafeXinit:
@@ -9,7 +9,7 @@ xorg (1:7.4~2ubuntu5) UNRELEASED; urgency=low
   * Drop xserver-xorg-video-psb for now as it's broken with intrepid's kernel
 and vesa should be preferred; LP: #274833.
 
- -- Bryce Harrington <[EMAIL PROTECTED]>  Fri, 19 Sep 2008 21:42:43 -0700
+ -- Loic Minier <[EMAIL PROTECTED]>  Tue, 30 Sep 2008 19:25:54 +0200
 
 xorg (1:7.4~2ubuntu4) intrepid; urgency=low
 


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

xorg: Changes to 'ubuntu'

[Loïc Minier]

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

New commits:
commit b59580ddd0b54274a52698c361685e9890fb3c6e
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Tue Sep 30 19:05:15 2008 +0200

Drop xserver-xorg-video-psb for now as it's broken with intrepid's kernel 
and vesa should be preferred; LP: #274833.

diff --git a/debian/changelog b/debian/changelog
index 17103e6..32dc210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xorg (1:7.4~2ubuntu5) UNRELEASED; urgency=low
 
+  [ Bryce Harrington ]
   * local/Failsafe/failsafeXinit:
 - Add option to run Ubuntu in low-graphics mode one time
 - Add default radio button settings
 
+  [ Loic Minier ]
+  * Drop xserver-xorg-video-psb for now as it's broken with intrepid's kernel
+and vesa should be preferred; LP: #274833.
+
  -- Bryce Harrington <[EMAIL PROTECTED]>  Fri, 19 Sep 2008 21:42:43 -0700
 
 xorg (1:7.4~2ubuntu4) intrepid; urgency=low
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 1233328..fe0e8f6 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -17,7 +17,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-psb, \
xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index 610868f..eb1ad55 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -17,7 +17,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-psb, \
xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \


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

xorg: Changes to 'debian-experimental'

[Loïc Minier]

 debian/changelog   |6 ++
 debian/local/xserver-wrapper.c |   10 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 0858ed28863d49b856203983b071545d4d7d7cf8
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Mon Sep 8 12:54:38 2008 +0200

Allow consider alternate tty devices as consoles

Allow /dev/console, /dev/tty or all other char devices with major 5
and minor < 64 for the onConsole() check.

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 6003606..760f8eb 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -159,8 +159,11 @@ onConsole()
 return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-  ((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
-  (s.st_rdev & 0xff) < 64) {
+s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
+  (s.st_rdev & 0xff) < 64) ||
+(((s.st_rdev >> 8) & 0xff) == ALT_TTY_MAJOR_DEV &&
+  (s.st_rdev & 0xff) < 64)
+)) {
 return TRUE;
   }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

commit 33ff7d1f414d9f6d53696d10e54280606804011c
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Mon Sep 8 12:46:45 2008 +0200

Add ALT_TTY_MAJOR_DEV (alternate TTY devices)

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 875ef8d..6003606 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -108,6 +108,7 @@
 
 #if defined(__linux__)
 #define TTY_MAJOR_DEV 4
+#define ALT_TTY_MAJOR_DEV 5
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include 
 #endif

commit 29578cee8d15a92f70b87c301bb6b7f2c4fe4c67
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Mon Sep 8 12:45:33 2008 +0200

Rename VT_MAJOR_DEV to more accurate TTY_MAJOR_DEV

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 08e3140..875ef8d 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -107,7 +107,7 @@
 #endif
 
 #if defined(__linux__)
-#define VT_MAJOR_DEV 4
+#define TTY_MAJOR_DEV 4
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include 
 #endif
@@ -158,7 +158,7 @@ onConsole()
 return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-  ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV &&
+  ((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
   (s.st_rdev & 0xff) < 64) {
 return TRUE;
   }


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

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

[Loïc Minier]

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

New commits:
commit 1fa2058a234aaeb0d1b10f7d763e05464aa0b179
Author: Loïc Minier <[EMAIL PROTECTED]>
Date:   Sat Sep 27 16:15:48 2008 +0200

Also build for lpia; LP: #275158.

diff --git a/debian/changelog b/debian/changelog
index 5c66ced..beb6088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfree86-driver-synaptics (0.15.2-0ubuntu3) intrepid; urgency=low
+
+  * Also build for lpia; LP: #275158.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Sat, 27 Sep 2008 16:11:42 +0200
+
 xfree86-driver-synaptics (0.15.2-0ubuntu2) intrepid; urgency=low
 
   [ Alberto Milone ]
diff --git a/debian/control b/debian/control
index 6d92e3d..1a4384b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synapti
 Homepage: http://web.telia.com/~u89404340/touchpad/index.html
 
 Package: xserver-xorg-input-synaptics
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel 
powerpc sparc
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel 
powerpc sparc
 Depends: ${shlibs:Depends}, ${xserver:Depends}, libxi6
 Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics
 Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics


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

Re: Bug#490151: elisa freezes system (completely!)

[Loïc Minier]

reassign 490151 xserver-xorg-video-intel
stop

Hi,

On Thu, Jul 10, 2008, [EMAIL PROTECTED] wrote:
> Elisa freezes my system completely when running.
> I used Elisa a few times. Sometimes it works normally and plays my videos 
> without crashing, but sometimes, the video (and the system) freezes, and 
> one time Elisa even froze in the menu (while browsing trough the video 
> folders).
> 
> The system freezes completely. There is no restarting of the X-server 
> possible (tried CTRL+ALT+Backspace), not even the magic systemkey-request 
> reacts. By remote: No login via ssh is possible, the system even cannot be 
> pinged. It's completely gone, and I have to make a cold reset.
> 
> Elisa gets its music data via samba, but the videos are on the local harddisk.
> 
> After the reboot, no information can be found in any of the log files.
> 
> Video driver is intel

 elisa is an user space program; if your system freezes, it's a kernel
 level issue which might be caused by kernel or Xorg drivers for your
 graphics hardware.

 I'm reassigning to the intel Xorg video driver with priority important;
 I suggest you test whether other GL apps crash your system.

   Cheers,
-- 
Loïc Minier


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

Re: Bug#469396: totem crashes on play

[Loïc Minier]

reassign 469396 xserver-xorg-video-intel
severity 469396 important
stop

On Wed, Mar 05, 2008, Chris Hansen wrote:
> > > If I use Metacity instead of Compiz, totem works perfectly.
> >  This is an issue of your xorg driver; what's your xorg driver?
> I'm using xserver-xorg-video-intel.

 Thanks, reassigning.

-- 
Loïc Minier


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

Bug#456943: Weird colored output issues

[Loïc Minier]

On Sun, Dec 23, 2007, Thomas Dickey wrote:
> At the moment, I can't think of anything except the less-elegant solution
> of inserting newlines into the text to make it wrap as expected.  (It's
> less elegant since redirecting the text to a file will have the newlines,
> and also because then grep would have to know the terminal width).

 I think grep checks whether its output file descriptor is a tty to
 enable escape sequences.  I'll reassign to grep and suggest this;
 thanks!

-- 
Loïc Minier

Bug#456943: Weird colored output issues

[Loïc Minier]

Hi,

On Fri, Dec 21, 2007, Thomas Dickey wrote:
> I'd suggest you reassign this to gnome-terminal (but since it applies
> to each of the other terminals I mentioned, that would require some
> additional work).

 Thanks for your thorough analysis!  I can only imagine you're correct
 in pointing out that gnome-terminal and friends are not honoring the
 rules of VT10x standards, and I'll clone the bugs against the
 implementations you mentionned.  My top interest in the bug is to have
 grep --color display properly (instead of mangling the output in
 standards-compliant terms); do you think a more reasonnable sequence
 could be used by grep instead so that I can recommend a proper
 implementation when reassigning to grep?

   Thanks!
-- 
Loïc Minier

Bug#456943: Weird colored output issues

[Loïc Minier]

Package: xterm
Version: 229-1
Severity: normal

Hi,

 Got a surprizing issue with grep colored output today; it seems that if
 coloring starts around the end of the line, the last char is chopped.

 e.g.:
 echo " 
  1234" | grep --color=auto '[1-9]'
 (80 spaces and 1234)

 displays ... nothing.

 If I add more spaces or remove some, I see most of 1234 in red,
 but it's sometimes chopped at the end of the line.

 gnome-terminal works fine with the same test cases.

   Bye,

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-686 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xterm depends on:
ii  libc6 2.7-4  GNU C Library: Shared libraries
ii  libfontconfig12.5.0-2generic font configuration library
ii  libice6   2:1.0.4-1  X11 Inter-Client Exchange library
ii  libncurses5   5.6+20071124-1 Shared libraries for terminal hand
ii  libsm62:1.0.3-1+b1   X11 Session Management library
ii  libx11-6  2:1.0.3-7  X11 client-side library
ii  libxaw7   2:1.0.4-1  X11 Athena Widget library
ii  libxext6  1:1.0.3-2  X11 miscellaneous extension librar
ii  libxft2   2.1.12-2   FreeType-based font drawing librar
ii  libxmu6   1:1.0.3-1  X11 miscellaneous utility library
ii  libxt61:1.0.5-3  X11 toolkit intrinsics library
ii  xbitmaps  1.0.1-2Base X bitmaps

Versions of packages xterm recommends:
ii  xutils1:7.3+8X Window System utility programs m

-- no debconf information

-- 
Loïc Minier

Re: Bug#452897: /etc/X11/X points to /bin/true on a clean sid install.

[Loïc Minier]

On Sun, Nov 25, 2007, Diego Escalante Urrelo wrote:
> Installing a base Etch system (just the base, no X or fancy stuff),
> migrating to Sid, and then apt-get installing xorg will install X
> succesfully but will make it useless because of /etc/X11/X pointing
> to /bin/true. GDM will fail showing an empty log. X will exit without
> any output ('true' is not really verbose). xinit and startx will fail
> with misterious errors like "server error" or "connection timed out".
> 
> Calling Xorg directly on the console works fine. The problem can be
> fixed by linking /etc/X11/X to /usr/bin/Xorg.

 FYI, https://bugs.launchpad.net/bugs/163806

-- 
Loïc Minier


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

Re: Bug#433117: Rapid scrolling between desktop panels while running Totem crashes gdm with "gdm_slave_xioerror_handler: Fatal X error"

[Loïc Minier]

reassign 433117 x11-common
stop

 I'm reassigning this bug to the X server which is crashing; I'm not
 sure the backtrace is specific to your display driver (VIA), so I'll
 let Xorg folks reassign to the proper package if necessary.

-- 
Loïc Minier


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

Re: Bug#425464: totem-xine: Totem crashes when trying to play video

[Loïc Minier]

On Tue, May 22, 2007, Michel Dänzer wrote:
> As of xf86-video-intel 2.0, the driver defaults to using all the
> available aperture space, so the VideoRam directive can only decrease
> the amount of available memory but never increase it.

 Perhaps the BIOS is setting a too low maximum here?

-- 
Loïc Minier


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

Bug#419581: xvfb-run: Should depend on xbase-clients: xauth command not found

[Loïc Minier]

Hi Kurt,

 We had an IRC conversation on this topic with jcristau this morning,
 and he explained that he thinks the Recommends is enough or even too
 much already because Xvfb is a significant amount of functionality
 provided by the xvfb package.

 My personal opinion is that a lot of use cases for depending on xvfb
 are build-deps, but I was told during that conversation that Xvfb can
 be used in embedded environments where the deps should be as small as
 possible.

 While thinking at the root of the problem (the build-deps did not
 follow a recommends), I wonder whether you'll let APT honor recommends
 when it does so by default, or whether you'll configure it specially
 not to so?

   Bye,
-- 
Loïc Minier

Bug#314598: Please add a Recommends on xfonts-base

[Loïc Minier]

Hi,

 I don't understand the rationale for wontfixing this bug: there's a
 good proposal to add a Recommends on the default font.  Recommends are
 meant exactly for these cases, and running a Xvfb with a remote font
 server is quite uncommon (even more than remote font servers in
 general).

   Bye,
-- 
Loïc Minier
"For subalterns, saying something intelligent is as risky as saying something
 stupid."

Bug#409157: Unreproducible segfault on strace

[Loïc Minier]

Package: xserver-xorg-core
Version: 2:1.1.1-15
Severity: normal
Tags: unreproducible

Hi,

 This morning, "startx" wouldn't start my GNOME session, the X server
 left with the gray root window and the cross pointer.

 While diagnosing this from another tty, I saw that Xsession had spawned
 a dbus-launch which had spawned a dbus-daemon and a x-session-manager
 process (x-session-manager points to gnome-session).

 I started a strace on the PID of gnome-session, and this crashed my
 Xorg server with the following backtrace found in Xorg.log.old:
Backtrace:
0: /usr/bin/X11/X(xf86SigHandler+0x84) [0x80c4354]
1: [0xb7fa6420]
2: /usr/lib/xorg/modules/libfb.so(fbOddTile+0x114) [0xb77d1774]
3: /usr/lib/xorg/modules/libfb.so(fbTile+0x8c) [0xb77d183c]
4: /usr/lib/xorg/modules/libfb.so(fbFillRegionTiled+0x1a6) [0xb77d2136]
5: /usr/lib/xorg/modules/libfb.so(fbPaintWindow+0x108) [0xb77d23b8]
6: /usr/bin/X11/X [0x815474f]
7: /usr/lib/xorg/modules/libxaa.so(XAAPaintWindow+0x156) [0xb776ed96]
8: /usr/bin/X11/X(miWindowExposures+0xf6) [0x810a286]
9: /usr/lib/xorg/modules/extensions/libdri.so(DRIWindowExposures+0x89) 
[0xb7cd5819]
10: /usr/bin/X11/X(miHandleValidateExposures+0x77) [0x8121b17]
11: /usr/bin/X11/X [0x80d1151]
12: /usr/lib/xorg/modules/libxaa.so [0xb77583f3]
13: /usr/lib/xorg/modules/libramdac.so [0xb77a1fa6]
14: /usr/bin/X11/X [0x80e4ea0]
15: /usr/bin/X11/X [0x80e5109]
16: /usr/bin/X11/X [0x8151901]
17: /usr/bin/X11/X(Dispatch+0x19b) [0x8086cab]
18: /usr/bin/X11/X(main+0x489) [0x806e699]
19: /lib/tls/i686/cmov/libc.so.6(__libc_start_main+0xc8) [0xb7da8ea8]
20: /usr/bin/X11/X(FontFileCompleteXLFD+0xa9) [0x806d9d1]

Fatal server error:
Caught signal 11.  Server aborting

 Unfortunately, the problem is not reproducible for me.

 I'm using the proprietary ATI driver.

   Bye,

-- 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 2006-10-08 19:15 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1597964 2007-01-09 20:13 /usr/bin/Xorg

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

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: ATI Technologies Inc M56GL [ATI Mobility 
FireGL V5200]

/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 3629 2007-01-03 14:36 /etc/X11/xorg.conf

Contents of /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"
Load"i2c"
Load"bitmap"
Load"ddc"
Load"dri"
Load"extmod"
Load"freetype"
Load"glx"
Load"int10"
Load"type1"
Load"vbe"
EndSection

Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "kbd"
Option  "CoreKeyboard"
Option  "XkbRules"  "xorg"
Option  "XkbModel"  "pc105"
Option  "XkbLayout" "fr"
Option  "XkbVariant""latin9"
EndSection

Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
Option  "CorePointer"
Option  "Device""/dev/input/mice"
Option  "Protocol"  "ExplorerPS/2"
Option  "Emulat

Re: Bug#406315: totem-mozilla + vlc freeze my powerbook

[Loïc Minier]

reassign 406315 xserver-xorg-video-nv
stop

On Wed, Jan 10, 2007, Djoume SALVETTI wrote:
> [EMAIL PROTECTED]:~$ lspci |grep VGA
> :00:10.0 VGA compatible controller: nVidia Corporation NV34M [GeForce FX 
> Go5200] (rev a1)
> [EMAIL PROTECTED]:~$ grep Driver /etc/X11/xorg.conf
> Driver  "kbd"
>   Driver  "mouse"
>   Driver  "nv" 
> [EMAIL PROTECTED]:~$ dpkg -l|grep xorg-video-nv
>  ii  xserver-xorg-video-nv  1.2.0-3X.Org X server -- NV display driver
[...]
> Maybe this bug should be reassign to xserver-xorg-video-nv?

 Yep, bye.

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Re: gnome: Nothing to do with GNOME

[Loïc Minier]

reopen 405179
reassign 405179 xserver-xorg-video-nv
stop

On Tue, Jan 09, 2007, Vincent Lönngren wrote:
> But it is a bug - it's just not a bug in GNOME. I'm not sure if it's in
> the X driver (nv) or the framebuffer (nvidiafb)

 Oh ok, I thought you fixed the problem on your side already.
 Reassigning to your X driver.

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Bug#374640: gedit: freeze when XIM is used to input Japanese

[Loïc Minier]

reassign 374640 gedit
forwarded 374640 http://bugzilla.gnome.org/show_bug.cgi?id=376750
tags 374640 + upstream confirmed patch
stop

Hi again,

On Sat, Nov 25, 2006, Osamu Aoki wrote:
> Let's put this bug back to gedit if Loïc Minier agrees.

 Well, I suck.  It's really a gedit bug, my apologies.

 Gedit reverses the order in which key press event handlers are called
 *and* might generate events twice.  The upstream bug has a patch, could
 you please check it fixes the problem?

 I still believe Gdk has some serious problems if it lets applications
 send crap to X11, but that's obviously harder to fix.  :-/

   Bye,
-- 
Loïc Minier <[EMAIL PROTECTED]>
10 SIN
20 GO TO ROBOT HELL -- Temple of Robotology

Bug#374640: gedit: freeze when XIM is used to input Japanese

[Loïc Minier]

On Sat, Nov 25, 2006, Osamu Aoki wrote:
> Let's put this bug back to gedit if Loïc Minier agrees.

 No, it's either gtk, or x11, but not gedit.  Perhaps it's only visible
 with gtksourceview or gedit + gtksourceview, but the bug is quite
 certainly not in these packages.  You may reassign to gdk/gtk if you
 like.

 Perhaps the difference in behavior comes from the handling of focus.
 I can imagine some events are not handled by the same widget, or that
 more events are generated in one case than the other, or perhaps in a
 different order.

 Did anyone xtrace the thing?

-- 
Loïc Minier <[EMAIL PROTECTED]>
10 SIN
20 GO TO ROBOT HELL -- Temple of Robotology

Bug#374640: gedit: freeze when XIM is used to input Japanese

[Loïc Minier]

On Sat, Nov 25, 2006, Hongzheng Wang wrote:
> I'm waiting for the Gedit 2.16.  I hope this strange problem can disappear
> when the new version of Gedit comes.

 This is unlikely to change with a newer Gedit.  Gedit uses Gtk (which
 internally uses Gdk) to handle the lowlevel keyboard handling, window
 drawing etc. (i.e. talking to X); it's not directly aware of XIM, Gdk
 is.

-- 
Loïc Minier <[EMAIL PROTECTED]>
10 SIN
20 GO TO ROBOT HELL -- Temple of Robotology

Bug#374640: gedit: freeze when XIM is used to input Japanese

[Loïc Minier]

On Fri, Nov 24, 2006, Osamu Aoki wrote:
> Goto-san and I tried your patch and it did not fix freeze. I upload GDB
> full logs to:
>  http://people.debian.org/~osamu/public as gedit-logs.tar.gz

 (s/public/pub)

> I used LANG=en_US.UTF-8 LD_LIBRARY_PATH=/usr/lib/debug to ensure English
> message and debug library.

 You tried *both* patches, right?

> I am not sure this is really X problem.  gcin (another chinese method)
> packager told me that he has no problem with using xim mechanism for
> gcin.  He claimed that difference of code base may be a cause.

 Yeah, that's what I suggested as well.

 Perhaps you can try adding debugging print statement to SCIM to log
 what happens on particular Xevent?  I think there's also a X event
 proxy in Debian to snoop what happens in X connections, perhaps it's
 xtrace.

 xspecs might have some information on XIM.

-- 
Loïc Minier <[EMAIL PROTECTED]>
10 SIN
20 GO TO ROBOT HELL -- Temple of Robotology

Bug#397624: Color changes on redraw

[Loïc Minier]

On Fri, Nov 10, 2006, Loïc Minier wrote:
>  It's metacity; Julien Cristau gets the bug too, but he might be under
>  metacity as well, Julien?

 Oh well, I'm commenting after the battle.  Thanks Julien!

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#397624: Color changes on redraw

[Loïc Minier]

On Thu, Nov 09, 2006, Thomas Dickey wrote:
> I have another report on #222 which sounds similar - but to compare, it
> might be helpful to know which window manager you're using (in case it's
> not the same bug ;-).

 It's metacity; Julien Cristau gets the bug too, but he might be under
 metacity as well, Julien?

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#397624: Color changes on redraw

[Loïc Minier]

Package: xterm
Version: 222-1
Severity: normal

Hi,

 xterm was blinking on start during the period where the package wasn't
 sourcing /etc/X11/app-defaults/XTerm-color due to
 /etc/X11/Xresources/x11-common gone missing.  During this period of
 time, I noticed something which looks like a bug which I can reproduce
 easily:
 1) comment out in /etc/X11/app-defaults/XTerm-color:
!*VT100*foreground: gray90
!*VT100*background: black
 2) set reverseVideo, e.g. with your .Xdefaults-$hostname:
XTerm.VT100.reverseVideo: true
 3) start a program not filling the terminal with data:
xterm -e sleep 100
 4) switch workspace

 after 3), I get a black xterm window, which honors my settings since I
 asked for reversevideo, but after step 4) which probably triggers a
 redraw, I get a white xterm window.

 This looks like xterm is honoring reverseVideo on startup, but not on
 redraws.

 When *VT100*foreground and *VT100*background are set in
 /etc/X11/app-defaults/XTerm-color, I don't see the bug, presumably
 because these vars are honored on redraw.

 When my terminal was filled with chars at least once, I don't see the
 bug anymore, for example if I launch "xterm -e sh", I get the bug, if I
 type "clear", I don't get the bug anymore.

Bye,

-- System Information:
Debian Release: 4.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)

Versions of packages xterm depends on:
ii  libc62.3.6.ds1-8 GNU C Library: Shared libraries
ii  libfontconfig1   2.4.1-2 generic font configuration library
ii  libice6  1:1.0.1-2   X11 Inter-Client Exchange library
ii  libncurses5  5.5-5   Shared libraries for terminal hand
ii  libsm6   1:1.0.1-3   X11 Session Management library
ii  libx11-6 2:1.0.3-2   X11 client-side library
ii  libxaw7  1:1.0.2-4   X11 Athena Widget library
ii  libxext6 1:1.0.1-2   X11 miscellaneous extension librar
ii  libxft2  2.1.8.2-8   FreeType-based font drawing librar
ii  libxmu6  1:1.0.2-2   X11 miscellaneous utility library
ii  libxt6   1:1.0.2-2   X11 toolkit intrinsics library
ii  xbitmaps 1.0.1-2 Base X bitmaps

Versions of packages xterm recommends:
ii  xutils  1:7.1.ds.3-1 X Window System utility programs

-- no debconf information

-- 
Loïc Minier <[EMAIL PROTECTED]>

Re: Processed: Re: Bug#396125: installation-report: PowerBook G4 installed fine

[Loïc Minier]

reassign 396125 xserver-xorg-core
stop

On Tue, Oct 31, 2006, Debian Bug Tracking System wrote:
> > reassign 396125 xorg-xserver-core
> Bug#396125: installation-report: PowerBook G4 installed fine
> Warning: Unknown package 'xorg-xserver-core'
> Bug reassigned from package `installation-reports' to `xorg-xserver-core'.

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Re: gnome-applets: close the bug please

[Loïc Minier]

reassign 394536  xkb-data 0.9-3
close 394536 xkb-data 0.9-4
stop

On Sun, Oct 22, 2006, Carlos Moffat wrote:
> This bug has gone away after yesterday's upload of xkb-data 0.9-4.

 Thanks,

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Bug#392833: XAA and RenderAccel causes visual glitches

[Loïc Minier]

Package: xserver-xorg-video-ati
Version: 1:6.6.2-2
Severity: normal
Tags: patch

Hi,

 I'm pushing gtk2-engines 2.8 to testing, and it exposes a bug with the
 ati driver when using XAA and RenderAccel is on.  Here's a full log
 with various pointers:

<https://launchpad.net/distros/ubuntu/+source/xserver-xorg-video-ati/+bug/34435/>
 see also:

<https://launchpad.net/distros/ubuntu/+source/xserver-xorg-video-ati/+bug/38198>

 Xorg fixed this in an upstream commit:

<http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=commitdiff_plain;h=84e574986f61c4f250d6ecb938bab20847618906;hp=487376cce72ef8f19b4e3dc742b53500bed7c480>

 I'm attaching a patch to the Debian source for your convenience.  It
 would be nice if you could apply it.  (I may NMU if you desire, please
 state so.)

Bye,

-- System Information:
Debian Release: Debian unstable (sid)
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages xserver-xorg-video-ati depends on:
ii  libc62.3.6.ds1-6 GNU C Library: Shared libraries
ii  xserver-xorg-core2:1.1.1-9   X.Org X server -- core server

xserver-xorg-video-ati recommends no packages.

-- no debconf information

-- 
Loïc Minier <[EMAIL PROTECTED]>
--- xserver-xorg-video-ati-6.6.2/debian/patches/series
+++ xserver-xorg-video-ati-6.6.2/debian/patches/series
@@ -1,0 +2 @@
+02_ati_xaa_fallback_render_repeat.patch
--- xserver-xorg-video-ati-6.6.2/debian/changelog
+++ xserver-xorg-video-ati-6.6.2/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-ati (1:6.6.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New patch, 02_ati_xaa_fallback_render_repeat; from upstream git
+http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git
+commit 7d9e2b450f0fa42553156f57572a6dab70a0ea13; fixes render glitches
+when using RenderAccel and XAA.
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Fri, 13 Oct 2006 20:53:11 +0200
+
 xserver-xorg-video-ati (1:6.6.2-2) unstable; urgency=low
 
   [ Drew Parsons ]
--- 
xserver-xorg-video-ati-6.6.2.orig/debian/patches/02_ati_xaa_fallback_render_repeat.patch
+++ 
xserver-xorg-video-ati-6.6.2/debian/patches/02_ati_xaa_fallback_render_repeat.patch
@@ -0,0 +1,26 @@
+Index: xserver-xorg-video-ati-6.6.2/src/radeon_render.c
+===
+--- xserver-xorg-video-ati-6.6.2.orig/src/radeon_render.c  2006-10-13 
20:52:27.0 +0200
 xserver-xorg-video-ati-6.6.2/src/radeon_render.c   2006-10-13 
20:52:41.0 +0200
+@@ -392,6 +392,10 @@
+ #endif
+ ACCEL_PREAMBLE();
+ 
++/* render repeat is broken - fix in stable tree by falling back */
++if (flags & XAA_RENDER_REPEAT)
++  return FALSE;
++
+ if ((width > 2048) || (height > 2048))
+   return FALSE;
+ 
+@@ -725,6 +729,10 @@
+ #endif
+ ACCEL_PREAMBLE();
+ 
++/* render repeat is broken - fix in stable tree by falling back */
++if (flags & XAA_RENDER_REPEAT)
++  return FALSE;
++
+ if ((width > 2048) || (height > 2048))
+   return FALSE;
+ 

Bug#389808: Breaks debsums

[Loïc Minier]

Package: xfonts-scalable
Version: 1:1.0.0-4
Severity: normal

Hi,

 This package fail in debsums:
/usr/share/fonts/X11/Type1/fonts.dirFAILED
/usr/share/fonts/X11/Type1/fonts.scale  FAILED

 This is probably because some postinst updates these files.  If you
 use dh_md5sums, I suggest you exclude the files via -X.


   Thanks,

 (BTW, this is also annoying when reporting bugs against the package:
debsums: checksum mismatch xfonts-scalable file 
/usr/share/fonts/X11/Type1/fonts.dir
debsums: checksum mismatch xfonts-scalable file 
/usr/share/fonts/X11/Type1/fonts.scale
)


-- System Information:
Debian Release: Debian unstable (sid)
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-2-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages xfonts-scalable depends on:
ii  xfonts-utils  1:1.0.0-6  X Window System font utility progr

xfonts-scalable recommends no packages.

-- no debconf information

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#385976: strange (and annoying) delay on startup

[Loïc Minier]

On Tue, Sep 12, 2006, Robert Millan wrote:
> >  My opinion is that whoever creates the environment variable which lists
> >  the socket should make sure the socket is available before spreading
> >  the news,
> It did, and at that time the socket was present.  It's just that the socket
> is not there anymore.

 If everyone would have done so, the current code wouldn't have to
 special case the absence of the socket as a "try again" error.  My
 suggestion is to return a hard error instead and fix the applications
 to wait for the socket to exist before they publish the environement
 variable.

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#385976: Proposed patch

[Loïc Minier]

reassign 385976 xtrans
tag 385976 + patch
stop

Hi,

 Please find a proposed patch attached (both the patch for the Debian
 package and the actual patch file are attached).  (Reassigning to
 xtrans because it's what the patch is against.)

   Bye,
-- 
Loïc Minier <[EMAIL PROTECTED]>
diff -urN xtrans-1.0.1.orig/Xtranssock.c xtrans-1.0.1/Xtranssock.c
--- xtrans-1.0.1.orig/Xtranssock.c  2006-06-16 00:53:55.0 +0200
+++ xtrans-1.0.1/Xtranssock.c   2006-09-12 19:14:13.0 +0200
@@ -2041,8 +2041,13 @@
errno = olderrno;

/*
-* If the error was ENOENT, the server may be starting up
-* and we should try again.
+* If the error was ENOENT, the server may be starting up; we used
+* to suggest to try again in this case with
+* TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
+* processes still referencing stale sockets in their environment.
+* Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
+* is suggested that higher level stacks handle retries on their
+* level when they face a slow starting server.
 *
 * If the error was EWOULDBLOCK or EINPROGRESS then the socket
 * was non-blocking and we should poll using select
@@ -2051,7 +2056,9 @@
 * should try again.
 */
 
-   if (olderrno == ENOENT || olderrno == EINTR)
+   if (olderrno == ENOENT)
+   return TRANS_CONNECT_FAILED;
+   else if (olderrno == EINTR)
return TRANS_TRY_CONNECT_AGAIN;
else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)
return TRANS_IN_PROGRESS;
--- xtrans-1.0.1/debian/patches/series
+++ xtrans-1.0.1/debian/patches/series
@@ -2,0 +3 @@
+03_unix-sock-fail-fast.diff -p1
--- xtrans-1.0.1/debian/changelog
+++ xtrans-1.0.1/debian/changelog
@@ -1,3 +1,11 @@
+xtrans (1.0.1-3) unstable; urgency=low
+
+  * New patch, 03_unix-sock-fail-fast, to fail immediately in case a UNIX
+socket doesn't exist; higher level stacks should retry the connection with
+the server if they face slow starting servers. (Closes: #385976)
+
+ -- Loic Minier <[EMAIL PROTECTED]>  Tue, 12 Sep 2006 19:14:20 +0200
+
 xtrans (1.0.1-2) unstable; urgency=low
 
   [ Andres Salomon ]
--- xtrans-1.0.1.orig/Xtranssock.c
+++ xtrans-1.0.1/Xtranssock.c
@@ -2041,8 +2041,13 @@
errno = olderrno;

/*
-* If the error was ENOENT, the server may be starting up
-* and we should try again.
+* If the error was ENOENT, the server may be starting up; we used
+* to suggest to try again in this case with
+* TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
+* processes still referencing stale sockets in their environment.
+* Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
+* is suggested that higher level stacks handle retries on their
+* level when they face a slow starting server.
 *
 * If the error was EWOULDBLOCK or EINPROGRESS then the socket
 * was non-blocking and we should poll using select
@@ -2051,7 +2056,9 @@
 * should try again.
 */
 
-   if (olderrno == ENOENT || olderrno == EINTR)
+   if (olderrno == ENOENT)
+   return TRANS_CONNECT_FAILED;
+   else if (olderrno == EINTR)
return TRANS_TRY_CONNECT_AGAIN;
else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)
return TRANS_IN_PROGRESS;
--- xtrans-1.0.1.orig/debian/patches/03_unix-sock-fail-fast.diff
+++ xtrans-1.0.1/debian/patches/03_unix-sock-fail-fast.diff
@@ -0,0 +1,30 @@
+diff -urN xtrans-1.0.1.orig/Xtranssock.c xtrans-1.0.1/Xtranssock.c
+--- xtrans-1.0.1.orig/Xtranssock.c 2006-06-16 00:53:55.0 +0200
 xtrans-1.0.1/Xtranssock.c  2006-09-12 19:14:13.0 +0200
+@@ -2041,8 +2041,13 @@
+   errno = olderrno;
+   
+   /*
+-   * If the error was ENOENT, the server may be starting up
+-   * and we should try again.
++   * If the error was ENOENT, the server may be starting up; we used
++   * to suggest to try again in this case with
++   * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
++   * processes still referencing stale sockets in their environment.
++   * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
++   * is suggested that higher level stacks handle retries on their
++   * level when they face a slow starting server.
+*
+* If the error was EWOULDBLOCK or EINPROGRESS then the socket
+* was non-blocking and we should poll using select
+@@ -2051,7 +2056,9 @@
+

Re: Bug#385976: strange (and annoying) delay on startup

[Loïc Minier]

On Mon, Sep 11, 2006, Robert Millan wrote:
> Thanks for the ellaboration.  This sounds like a strange race, though.  It
> would require the user to launch the client before the server has finished its
> startup, which AFAICT can only be done from a shell that doesn't belong to
> this server session.

 I think the race is possible, otherwise there wouldn't be a special
 case for it in the code.  But perhaps it's possible to avoid the race
 at a higher level.

> Is this hack required for the initial X client?  If this is so, waiting 5s is
> not a good solution to workaround lack of syncronisation anyway.

 The 5 second wait is coded in a generic fashion when the underlying
 transport said connection is to be retried.  The problem is not the 5
 second wait, but the fact that the transport said to retry, while it's
 clear that the socket isn't there -- and won't appear.  It's hard to
 tell whether the socket might appear, but I think this question is for
 higher level stacks.

 My opinion is that whoever creates the environment variable which lists
 the socket should make sure the socket is available before spreading
 the news, and we should return to a hard failure when the socket
 doesn't exist.  I think Xtrans preserves errno appropriately to the
 higher level stacks, so it might be enough to check whether errno ==
 ENOENT at a higher level.

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Re: Bug#385976: strange (and annoying) delay on startup

[Loïc Minier]

reassign 385976 libice6
retitle  385976 SocketUNIXConnect shouldn't return TRANS_TRY_CONNECT_AGAIN when 
the socket file doesn't exist
severity 385976 minor
stop

Hi,

On Sun, Sep 10, 2006, Robert Millan wrote:
> Interesting... it turns out my shell's $SESSION_MANAGER is pointing to
> a socket that belonged to an older X session.  As to why this happens,
> my shell was spawned by a screen session that's much older than my X
> server (when I have to restart X I just detach from screen, and later
> reattach).
> 
> However, that doesn't explain the delay.  You can tell the socket is
> not there inmediately.

 This is presumably a bug in libICE (Inter-Client Exchange library), or
 even in xtrans.
   When libICE fails connecting (in ConnectToPeer), and gets
 TRANS_TRY_CONNECT_AGAIN, it will retry the connection 5 times with a 1
 second sleep() between retries.

 The "local" Xtrans transport can either be implemented in Xtranslcl
 which never returns TRANS_TRY_CONNECT_AGAIN, but returns
 TRANS_CONNECT_FAILED, or in Xtranssock.  Hence, here it's obviously in
 Xtranssock that the code is.

 Looking at the code, when connect() fails with ENOENT ("No such file or
 directory"), SocketUNIXConnect returns TRANS_TRY_CONNECT_AGAIN, and a
 comment says (Xtranssock.c:2048):
 * If the error was ENOENT, the server may be starting up
 * and we should try again.
 (This is the typical error code you get when the UNIX socket file
 doesn't exist.)


 I'm reassigning to libice6.  From what I read, the connection string
 seems correct, so it should fail fast when it notices the socket is
 missing; perhaps another workaround can be found for slow starting
 servers?

 Or perhaps the semantics should be extended to permit both behaviors,
 for example programs such as "gnome-session" would typically want to
 wait for the socket, while other clients, such as clients launched by
 gnome-session or later during the session by the user, might not
 consider that the "server is starting up".


   Bye,

PS: note to self:
 Connection is made via TRANS(Connect), with the literal connection
 string from the env, in my case local/bee:/tmp/.ICE-unix/0, and is
 parsed in TRANS(ParseAddress).  You can check this by using:
SESSION_MANAGER=local/bee:/tmp/.ICE-unix/0 gcalctool
SESSION_MANAGER=local/:0 gcalctool
SESSION_MANAGER=/:0 gcalctool
-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Upgrade path for xfonts-basae-transcoded

[Loïc Minier]

Hi,

 I just noticed that my system has xfonts-base-transcoded locally
 installed, but it isn't in the archive anymore.

 However, other packages still Suggest or Recommend
 xfonts-base-transcoded.

 Is it appropriate to file a bug on one of the Xorg source packages?  Or
 perhaps this particular package has no replacement in Xorg?  If I
 should, on which source should I report the bug?

   Bye,
PS: not subscribed to debian-x@, please Cc: me
-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Bug#381978: debian-installer: etch d-i installs an antique mouse cursor

[Loïc Minier]

reassign 381978 meta-gnome2 1:2.14.2
close 381978 1:2.14.2.1
stop

 Reassigning #381978 to meta-gnome2, this will be fixed when meta-gnome2
 enters testing.

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#381978: debian-installer: etch d-i installs an antique mouse cursor

[Loïc Minier]

Hi,

On Tue, Aug 08, 2006, Frans Pop wrote:
> reassign 381978 xserver-xorg-core

 Frans, what let's you think that xserver-xorg-core is the culprit?

 I think there was a period of time where the "industrial" cursor theme
 wasn't in the archive, when it was moved from gtk2-engines-industrial
 to industrial-cursor-theme.

 Do you think it could be the GNOME cursor?

 Submitter, is this fixed if you install industrial-cursor-theme and
 create a new user?

   Bye,
-- 
Loïc Minier <[EMAIL PROTECTED]>

Re: gnome-control-center: setting background image causes weirdness

[Loïc Minier]

reassign 350961 xserver-xorg
stop

On dim, fév 12, 2006, Julien Valroff wrote:
> I noticed the same problem on my workstation which uses an Nvidia
> graphic card with the free nv driver.
> This happened after Xorg upgrade to 6.9 version in Etch.
> I compiled proprietary driver from nvidia-kernel-source and the problem
> disappears.
> I thus think this bug is an Xorg 6.9 issue and can be moved to
> xserver-xorg package.

 Thanks, reassigning appropriately.

-- 
Loïc Minier <[EMAIL PROTECTED]>
Current Earth status:   NOT DESTROYED

Bug#331205: Please ship a x11.pc for pkg-config

[Loïc Minier]

Package: xserver-xorg
Version: 7.0
Severity: normal

Hi,

 This is just a cross-reference with #326199 where gdk.pc depends on a
 x11.pc in the experimental version of gdk.

 x11.pc should appear with the modular tree in version 7.0.

   Cheers,
-- 
Loïc Minier <[EMAIL PROTECTED]>

Re: gnome-desktop-enviroment broken dependency

[Loïc Minier]

Hi,

On Tuesday, September 13, 2005 7:37 PM, Paolo Pantaleo
<[EMAIL PROTECTED]> wrote:
> I send this to the lists since bugs system said that there is no
> mantainer for this package (hoping doing right)

 This is solved in version 1:2.10.2.3 of meta-gnome2, see #328185, don't
 file a new bug.

   Bye,

-- 
Loïc Minier <[EMAIL PROTECTED]>


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

Bug#285222: [FAQ] URL broken in new section #debianplans

[Loïc Minier]

Package: xfree86-common
Version: 4.3.0.dfsg.1-9
Severity: minor

  Hi,

 The <http://www.freedesktop.org/XOrg/CvsPage> reference in the new FAQ
 entry "What are Debian's plans with respect to X.Org and XFree86?", is
 broken.  I could not find this page in the freedesktop.org wiki.

   Regards,


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages xfree86-common depends on:
ii  debconf   1.4.41 Debian configuration management sy
ii  debianutils   2.11.0 Miscellaneous utilities specific t

-- debconf information excluded
-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#276345: copy-paste troubles with the first line of a less

[Loïc Minier]

Thomas Dickey <[EMAIL PROTECTED]> - Sat, Oct 23, 2004:

>   Talking about something that
> appears when less is run (is this using xterm's alternate screen?  Probably). 
> The alternate screen buffer is only as large as the terminal window.  The
> normal (with scrollback) is much larger.  So bugs that hit a boundary are more
> likely to happen with the alternate screen buffer.  (I don't use the alternate
> screen much, so it's mainly other people who would notice a problem with it).

 That's interesting.  I hope I'll find a way to reproduce the problem
 soon.

   Thanks,

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#276345: copy-paste troubles with the first line of a less

[Loïc Minier]

Thomas Dickey <[EMAIL PROTECTED]> - Fri, Oct 22, 2004:

> On Fri, Oct 22, 2004 at 08:20:04PM +0200, Vincent Lefevre wrote:
> > On 2004-10-13 16:34:42 +0200, Loïc Minier wrote:
> > >  [...]
> > FYI, I reported this bug to Thomas on 2002-03-08.

 Vincent Lefevre reported on 2002-03-08, and I reported on 2004-10-13,
 and you're quoting:

> It might only be a similar bug.  Here are two that are in the same general
> area:
>   Patch #183 - 2003/12/26 - XFree86 4.3.99.903
>  Patch #167 - 2002/8/24 - XFree86 4.2.0

 I don't how this couls relate to the first of the second patch, I still
 get the problem randomly anyway.  Are you suggesting you might reverse
 these patches?  Or do you want someone to look at the patches and check
 wether they introduced new bugs?

   Regards,

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#275157: xfonts-base could Suggests: xfonts-base-transcoded

[Loïc Minier]

Branden Robinson <[EMAIL PROTECTED]> - Mon, Oct 18, 2004:

> >  I wish xfonts-base would suggest xfonts-base-transcoded to ease its
> >  discovery.
> >  The same applies to xfonts-100dpi and xfonts-75dpi of course.
> Why aren't the references in each package's extended description
> sufficient?

 It would permit the package management program to offer the choice
 instead of forcing the user to search manually for the name of the
 package (after reading the complete description carefully).

 Strictly speaking, this is not a bug, I just wish it would be easier to
 see the fonts.
   Usually, xfonts-* are pulled in when you install an X server and you
 suddenly see dozens of packages that are going to get installed; most
 users will respect the choices of their package manager and just have a
 look to check nothing is overkill for them or wether something is
 suggested that they could miss.

 So I see the Suggests: as a hint for the package manager to offer the
 packages to the user when he installs a X server.  Alternatively, a
 Enhances: on the *-transcoded size could provide the same suggestion,
 but I think package manager are not suggesting package B when B
 enhances A and you install A.

   Regards,

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#276345: copy-paste troubles with the first line of a less

[Loïc Minier]

Package: xterm
Version: 4.3.0.dfsg.1-8
Severity: normal

 Hi,

 It's been some months now that I repeatedly get a strange problem with
 a less in xterm:  if I select the first line of the xterm window, being
 the first line of the less dump too, I am pasting some sort of buffered
 data too, coming from previous lines of output.

 Say I have done a "grep -r foo bar | less", and copy-paste the first
 line of the xterm ("bar/xyz.c: ..."), I get what I've selected plus
 some preprended text ("blahblahbar/xyz.c: ...").  This happens when I
 select one or multiple lines or one or multiple words including the
 upper left word in the less in xterm.  It DOESN'T happen when I select
 character-wise (single-clicking instead of double- or triple-clicking).

 I can't reproduce deterministically but once I get it, it always happen
 with the same display.  Restarting the less usually clears things up.

 I think I already got the problem with vim a while ago, but I'm not
 copy-pasting so much from vim, either to it.

 I believe it's a but in the copy-paste word selection of xterm wich
 doesn't check if the characters selected are displayed and goes out of
 bound, but I can believe it is caused by improper terminal handling by
 less.


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED]

Versions of packages xterm depends on:
ii  libc6 2.3.2.ds1-17   GNU C Library: Shared libraries an
ii  libexpat1 1.95.6-8   XML parsing C library - runtime li
ii  libfontconfig12.2.3-1generic font configuration library
ii  libfreetype6  2.1.7-2.2  FreeType 2 font engine, shared lib
ii  libice6   4.3.0.dfsg.1-8 Inter-Client Exchange library
ii  libncurses5   5.4-4  Shared libraries for terminal hand
ii  libsm64.3.0.dfsg.1-8 X Window System Session Management
ii  libxaw7   4.3.0.dfsg.1-8 X Athena widget set library
ii  libxext6  4.3.0.dfsg.1-8 X Window System miscellaneous exte
ii  libxft2   2.1.2-6FreeType-based font drawing librar
ii  libxmu6   4.3.0.dfsg.1-8 X Window System miscellaneous util
ii  libxpm4   4.3.0.dfsg.1-8 X pixmap library
ii  libxrender1   0.8.3-7X Rendering Extension client libra
ii  libxt64.3.0.dfsg.1-8 X Toolkit Intrinsics
ii  xlibs 4.3.0.dfsg.1-8 X Window System client libraries m
ii  xlibs-data4.3.0.dfsg.1-8 X Window System client data

-- no debconf information


   Regards,

-- 
Loïc Minier <[EMAIL PROTECTED]>

Bug#275157: xfonts-base could Suggests: xfonts-base-transcoded

[Loïc Minier]

Package: xfonts-base
Version: 4.3.0.dfsg.1-8
Severity: wishlist

 Hi,

 I wish xfonts-base would suggest xfonts-base-transcoded to ease its
 discovery.

 The same applies to xfonts-100dpi and xfonts-75dpi of course.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-1-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED]

Versions of packages xfonts-base depends on:
ii  xutils4.3.0.dfsg.1-8 X Window System utility programs

-- no debconf information

    Regards,

-- 
Loïc Minier <[EMAIL PROTECTED]>