xorg: Changes to 'debian-unstable'

2017-05-03 Thread Julien Cristau 
 debian/changelog |9 +
 debian/control   |1 +
 2 files changed, 10 insertions(+)

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

xserver-xorg now Recommends xserver-xorg-legacy

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

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

xorg: Changes to 'debian-unstable'

2016-11-23 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

Upload to unstable

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

xorg: Changes to 'debian-unstable'

2016-11-23 Thread Julien Cristau 
 debian/changelog   |8 
 debian/x11-common.postinst |3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

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

Call db_purge without arguments in postinst

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

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

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

xorg: Changes to 'debian-unstable'

2016-11-22 Thread Emilio Pozuelo Monfort 
 debian/changelog   |   10 --
 debian/compat  |2 +-
 debian/control |4 ++--
 debian/rules   |2 +-
 debian/x11-common.postinst |1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit e122d268b5033a475692182f9ae46e729f956628
Author: Emilio Pozuelo Monfort 
Date:   Wed Nov 23 00:02:33 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 0dab095..8c53b1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+17) UNRELEASED; urgency=medium
+xorg (1:7.7+17) unstable; urgency=medium
 
   [ Andreas Boll ]
   * control: Drop -freedreno from -video-all, the default 2D-driver will
@@ -9,7 +9,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8. No changes.
   * Bump debhelper compat to 10. Drop --parallel flag, enabled by default.
 
- -- Andreas Boll   Thu, 17 Nov 2016 14:01:37 +0100
+ -- Emilio Pozuelo Monfort   Wed, 23 Nov 2016 00:02:26 +0100
 
 xorg (1:7.7+16) unstable; urgency=medium
 

commit 20a1465b05f5c00472baeaf9f3b3f2e13c508d69
Author: Emilio Pozuelo Monfort 
Date:   Wed Nov 23 00:01:01 2016 +0100

Bump debhelper compat to 10

diff --git a/debian/changelog b/debian/changelog
index 5590e7f..0dab095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium
   [ Emilio Pozuelo Monfort ]
   * debian/x11-common.postinst: call `set -e'.
   * Bump Standards-Version to 3.9.8. No changes.
+  * Bump debhelper compat to 10. Drop --parallel flag, enabled by default.
 
  -- Andreas Boll   Thu, 17 Nov 2016 14:01:37 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 0115d9d..9ea3b2f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force 
 Standards-Version: 3.9.8
 Build-Depends:
  dpkg (>= 1.16.1),
- debhelper (>= 9),
+ debhelper (>= 10),
  po-debconf,
 # xsf-docs:
  asciidoc,
diff --git a/debian/rules b/debian/rules
index 9d9d9b4..c662a6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-   dh $@ --parallel
+   dh $@
 
 override_dh_auto_clean:
$(MAKE) -C xsf-docs clean

commit c14fc5e45c3818a62d369b3257efc402b63b9907
Author: Emilio Pozuelo Monfort 
Date:   Wed Nov 23 00:00:11 2016 +0100

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index edcc4c8..5590e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium
 
   [ Emilio Pozuelo Monfort ]
   * debian/x11-common.postinst: call `set -e'.
+  * Bump Standards-Version to 3.9.8. No changes.
 
  -- Andreas Boll   Thu, 17 Nov 2016 14:01:37 +0100
 
diff --git a/debian/control b/debian/control
index f0d7186..0115d9d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Build-Depends:
  dpkg (>= 1.16.1),
  debhelper (>= 9),

commit 11d044eb922bac4ef60e3e9bbdc90913d972f583
Author: Emilio Pozuelo Monfort 
Date:   Tue Nov 22 23:58:37 2016 +0100

debian/x11-common.postinst: call set -e

diff --git a/debian/changelog b/debian/changelog
index ffbd811..edcc4c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xorg (1:7.7+17) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * control: Drop -freedreno from -video-all, the default 2D-driver will
 be -modesetting.
 
+  [ Emilio Pozuelo Monfort ]
+  * debian/x11-common.postinst: call `set -e'.
+
  -- Andreas Boll   Thu, 17 Nov 2016 14:01:37 +0100
 
 xorg (1:7.7+16) unstable; urgency=medium
diff --git a/debian/x11-common.postinst b/debian/x11-common.postinst
index aa36a8e..2230165 100644
--- a/debian/x11-common.postinst
+++ b/debian/x11-common.postinst
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [ -f /usr/share/debconf/confmodule ]; then
   . /usr/share/debconf/confmodule

xorg: Changes to 'debian-unstable'

2016-11-17 Thread Andreas Boll 
 debian/changelog |7 +++
 debian/control   |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 81723d157ee16bbe96bf5fd2db6fc59a5d4bf499
Author: Andreas Boll 
Date:   Thu Nov 17 14:02:04 2016 +0100

control: Drop -freedreno from -video-all, the default 2D-driver will be 
-modesetting.

diff --git a/debian/changelog b/debian/changelog
index b21f7cb..ffbd811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+17) UNRELEASED; urgency=medium
+
+  * control: Drop -freedreno from -video-all, the default 2D-driver will
+be -modesetting.
+
+ -- Andreas Boll   Thu, 17 Nov 2016 14:01:37 +0100
+
 xorg (1:7.7+16) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 080af84..f0d7186 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,6 @@ Depends:
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [arm64 armel armhf],
  xserver-xorg-video-dummy [s390x],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],

xorg: Changes to 'debian-unstable'

2016-07-14 Thread Cyril Brulebois 
 debian/changelog |   10 --
 debian/control   |1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

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

Release to unstable

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

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

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

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

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

xorg: Changes to 'debian-unstable'

2016-06-16 Thread Julien Cristau 
 debian/changelog |5 +
 debian/control   |1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

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

Drop xserver-xorg-input-void from s390x.

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

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

xorg: Changes to 'debian-unstable'

2016-06-09 Thread Timo Aaltonen 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

fix x-x-i-all dep on synaptics

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

xorg: Changes to 'debian-unstable'

2016-06-09 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

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

diff --git a/debian/changelog b/debian/changelog
index f499df0..2e03710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+16) UNRELEASED; urgency=medium
+
+  * control: Drop -evdev and -synaptics from x-x-input-all Depends for
+linux.
+
+ -- Timo Aaltonen   Thu, 09 Jun 2016 14:10:30 +0300
+
 xorg (1:7.7+15) unstable; urgency=medium
 
   * Make x-x-input-all depend on x-x-input-libinput. Closes: #821760.
diff --git a/debian/control b/debian/control
index 388e49f..68cde96 100644
--- a/debian/control
+++ b/debian/control
@@ -72,11 +72,10 @@ Description: X.Org X server -- output driver metapackage
 Package: xserver-xorg-input-all
 Architecture: any
 Depends:
- xserver-xorg-input-evdev [linux-any],
  xserver-xorg-input-kbd [!linux-any],
  xserver-xorg-input-libinput [linux-any],
  xserver-xorg-input-mouse [!linux-any],
- xserver-xorg-input-synaptics [!s390x],
+ xserver-xorg-input-synaptics [hurd-any kfreebsd-any !s390x],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
  xserver-xorg-input-void [s390x],
  ${misc:Depends},

xorg: Changes to 'debian-unstable'

2016-04-23 Thread Emilio Pozuelo Monfort 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5752e226895ba1af8379186025f626ac57651d0
Author: Emilio Pozuelo Monfort 
Date:   Sat Apr 23 12:09:52 2016 +0200

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index fb2c22d..f499df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.7+15) UNRELEASED; urgency=medium
+xorg (1:7.7+15) unstable; urgency=medium
 
   * Make x-x-input-all depend on x-x-input-libinput. Closes: #821760.
 
- -- Emilio Pozuelo Monfort   Wed, 20 Apr 2016 19:32:45 +0200
+ -- Emilio Pozuelo Monfort   Sat, 23 Apr 2016 12:09:18 +0200
 
 xorg (1:7.7+14) unstable; urgency=medium

xorg: Changes to 'debian-unstable'

2016-04-20 Thread Emilio Pozuelo Monfort 
 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit e72c0bce0b8464fd7052ece5bc7adf77e63781ca
Author: Emilio Pozuelo Monfort 
Date:   Wed Apr 20 19:33:37 2016 +0200

Make x-x-input-all depend on x-x-input-libinput

diff --git a/debian/changelog b/debian/changelog
index f7cb255..fb2c22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+15) UNRELEASED; urgency=medium
+
+  * Make x-x-input-all depend on x-x-input-libinput. Closes: #821760.
+
+ -- Emilio Pozuelo Monfort   Wed, 20 Apr 2016 19:32:45 +0200
+
 xorg (1:7.7+14) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index ebf144f..388e49f 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,7 @@ Architecture: any
 Depends:
  xserver-xorg-input-evdev [linux-any],
  xserver-xorg-input-kbd [!linux-any],
+ xserver-xorg-input-libinput [linux-any],
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!s390x],
  xserver-xorg-input-vmmouse [amd64 i386 x32],

xorg: Changes to 'debian-unstable'

2016-03-08 Thread Timo Aaltonen 
 debian/changelog |8 
 debian/control   |1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a2f0fb6981009dd063a34922987271ac43ff3777
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:07:58 2016 +0200

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f91f6fc..f7cb255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+14) UNRELEASED; urgency=medium
+xorg (1:7.7+14) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * control: Demote -intel to -video-all Recommends, allowing to uninstall
@@ -7,7 +7,7 @@ xorg (1:7.7+14) UNRELEASED; urgency=medium
   [ Andreas Boll ]
   * Add xserver-xorg-video-freedreno to -video-all on arm64.
 
- -- Timo Aaltonen   Wed, 27 Jan 2016 13:41:35 +0200
+ -- Timo Aaltonen   Tue, 08 Mar 2016 15:07:40 +0200
 
 xorg (1:7.7+13) unstable; urgency=medium
 

commit af937437e6e6a6f34ee247ad2f3aefbd91d7444e
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:07:25 2016 +0200

Instead of dropping -intel from -video-all demote it to Recommends.

diff --git a/debian/changelog b/debian/changelog
index d8e0dab..f91f6fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 xorg (1:7.7+14) UNRELEASED; urgency=medium
 
   [ Timo Aaltonen ]
-  * control: Drop -intel from -video-all, the default 2D-driver will be
--modesetting.
+  * control: Demote -intel to -video-all Recommends, allowing to uninstall
+it if necessary.
 
   [ Andreas Boll ]
   * Add xserver-xorg-video-freedreno to -video-all on arm64.
diff --git a/debian/control b/debian/control
index b7146e4..ebf144f 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Depends:
  xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],
  ${misc:Depends},
 Recommends:
+ xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-qxl [amd64 i386 x32],
 Replaces: xserver-xorg-driver-all
 Conflicts: xserver-xorg-driver-all

xorg: Changes to 'debian-unstable'

2016-02-17 Thread Andreas Boll 
 debian/changelog |4 
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 43580683e7f3c61319cebd6cf28b0397880db0d2
Author: Andreas Boll 
Date:   Wed Feb 17 19:19:58 2016 +0100

Add xserver-xorg-video-freedreno to -video-all on arm64.

diff --git a/debian/changelog b/debian/changelog
index 2c7f38f..d8e0dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xorg (1:7.7+14) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * control: Drop -intel from -video-all, the default 2D-driver will be
 -modesetting.
 
+  [ Andreas Boll ]
+  * Add xserver-xorg-video-freedreno to -video-all on arm64.
+
  -- Timo Aaltonen   Wed, 27 Jan 2016 13:41:35 +0200
 
 xorg (1:7.7+13) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f05a04e..b7146e4 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Depends:
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [armel armhf],
+ xserver-xorg-video-freedreno [arm64 armel armhf],
  xserver-xorg-video-dummy [s390x],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],

xorg: Changes to 'debian-unstable'

2016-01-27 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 406cc54ed90e22a8cd29f653f1a8c5c22184d630
Author: Timo Aaltonen 
Date:   Wed Jan 27 13:43:12 2016 +0200

control: Drop -intel from -video-all, the default 2D-driver will be 
-modesetting.

diff --git a/debian/changelog b/debian/changelog
index 7c25b6d..2c7f38f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+14) UNRELEASED; urgency=medium
+
+  * control: Drop -intel from -video-all, the default 2D-driver will be
+-modesetting.
+
+ -- Timo Aaltonen   Wed, 27 Jan 2016 13:41:35 +0200
+
 xorg (1:7.7+13) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 7de60f2..f05a04e 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,6 @@ Depends:
  xserver-xorg-video-fbdev [!s390x],
  xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
- xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
  xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],

xorg: Changes to 'debian-unstable'

2016-01-26 Thread Timo Aaltonen 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

fix -amdgpu archs to match -ati

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

Re: xorg: Changes to 'debian-unstable'

2016-01-26 Thread Timo Aaltonen 
26.01.2016, 04:18, Michel Dänzer kirjoitti:
> On 25.01.2016 16:48, Timo Aaltonen wrote:
>> 21.01.2016, 04:49, Michel Dänzer kirjoitti:
>>> On 21.01.2016 06:55, Timo Aaltonen wrote:

 @@ -50,6 +50,7 @@ Description: X.Org X server
  Package: xserver-xorg-video-all
  Architecture: any
  Depends:
 + xserver-xorg-video-amdgpu [amd64 i386 kfreebsd-any x32],
   xserver-xorg-video-ati [!hurd-any !s390x],
>>>
>>> Any particular reason for using a different set of architectures than
>>> for xserver-xorg-video-ati?
>>
>> I think the architectures for -ati are wrong (?) but didn't want to
>> change it in the same commit. Copied the arch list from -intel. Can
>> discrete AMD GPU's be used on other archs too?
> 
> Sure. There tend to be various issues on big endian architectures, but
> at least little endian ones should generally work fine.

Alright, good to know. I've fixed it now.


-- 
t

xorg: Changes to 'debian-unstable'

2016-01-26 Thread Andreas Boll 
 debian/changelog |1 +
 debian/control   |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

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

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

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

Remove kfreebsd from -amdgpu

-amdgpu is not yet supported on kfreebsd.

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

xorg: Changes to 'debian-unstable'

2016-01-26 Thread Timo Aaltonen 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

release to unstable

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

Re: xorg: Changes to 'debian-unstable'

2016-01-25 Thread Timo Aaltonen 
21.01.2016, 04:49, Michel Dänzer kirjoitti:
> On 21.01.2016 06:55, Timo Aaltonen wrote:
>>
>> @@ -50,6 +50,7 @@ Description: X.Org X server
>>  Package: xserver-xorg-video-all
>>  Architecture: any
>>  Depends:
>> + xserver-xorg-video-amdgpu [amd64 i386 kfreebsd-any x32],
>>   xserver-xorg-video-ati [!hurd-any !s390x],
> 
> Any particular reason for using a different set of architectures than
> for xserver-xorg-video-ati?

I think the architectures for -ati are wrong (?) but didn't want to
change it in the same commit. Copied the arch list from -intel. Can
discrete AMD GPU's be used on other archs too?


-- 
t

Re: xorg: Changes to 'debian-unstable'

2016-01-25 Thread Michel Dänzer 
On 25.01.2016 16:48, Timo Aaltonen wrote:
> 21.01.2016, 04:49, Michel Dänzer kirjoitti:
>> On 21.01.2016 06:55, Timo Aaltonen wrote:
>>>
>>> @@ -50,6 +50,7 @@ Description: X.Org X server
>>>  Package: xserver-xorg-video-all
>>>  Architecture: any
>>>  Depends:
>>> + xserver-xorg-video-amdgpu [amd64 i386 kfreebsd-any x32],
>>>   xserver-xorg-video-ati [!hurd-any !s390x],
>>
>> Any particular reason for using a different set of architectures than
>> for xserver-xorg-video-ati?
> 
> I think the architectures for -ati are wrong (?) but didn't want to
> change it in the same commit. Copied the arch list from -intel. Can
> discrete AMD GPU's be used on other archs too?

Sure. There tend to be various issues on big endian architectures, but
at least little endian ones should generally work fine.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer

Re: xorg: Changes to 'debian-unstable'

2016-01-20 Thread Michel Dänzer 
On 21.01.2016 06:55, Timo Aaltonen wrote:
> 
> @@ -50,6 +50,7 @@ Description: X.Org X server
>  Package: xserver-xorg-video-all
>  Architecture: any
>  Depends:
> + xserver-xorg-video-amdgpu [amd64 i386 kfreebsd-any x32],
>   xserver-xorg-video-ati [!hurd-any !s390x],

Any particular reason for using a different set of architectures than
for xserver-xorg-video-ati?


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer

xorg: Changes to 'debian-unstable'

2016-01-20 Thread Timo Aaltonen 
 debian/changelog |4 
 debian/control   |1 +
 2 files changed, 5 insertions(+)

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

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

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

xorg: Changes to 'debian-unstable'

2015-10-18 Thread Andreas Boll 
 debian/README.source   |   24 -
 debian/changelog   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 5 files changed, 1 insertion(+), 963 deletions(-)

New commits:
commit f2441a8995bfb0699537ec3c44a0b7b4db7417f7
Author: Andreas Boll 
Date:   Sun Oct 18 20:28:10 2015 +0200

Delete obsolete debian/xsfbs.

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
index e38c23a..7f59c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg (1:7.7+13) UNRELEASED; urgency=medium
 - makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
   Thanks, Eduard Sanou!
   * rules: Remove unused variable ARCH.
+  * Delete obsolete debian/xsfbs.
 
  -- Andreas Boll   Tue, 13 Oct 2015 11:04:42 +0200
 
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
-   exit 0
-fi
-
-if [ "x$1" != x--upstream-version ]; then
-   exit 1
-fi
-
-version="$2"
-filename="$3"
-
-if [ -z "$version" ] || ! [ -f "$filename" ]; then
-   exit 1
-fi
-
-dir="$(pwd)"
-tempdir="$(mktemp -d)"
-
-cd "$tempdir"
-tar xf "$dir/$filename"
-cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
-
-tar czf "$dir/$filename" *
-cd "$dir"
-rm -rf "$tempdir"
-echo "Done pruning upstream tarball"
-
-exit 0
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
deleted file mode 100755
index 3c59c20..000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/usr/bin/make -f
-
-# Debian X Strike Force Build System (XSFBS): Make portion
-
-# Copyright 1996 Stephen Early
-# Copyright 1997 Mark Eichin
-# Copyright 1998-2005, 2007 Branden Robinson
-# Copyright 2005 David Nusinow
-#
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
-
-# Originally by Stephen Early 
-# Modified by Mark W. Eichin 
-# Modified by Adam Heath 
-# Modified by Branden Robinson 
-# Modified by Fabio Massimo Di Nitto 
-# Modified by David Nusinow 
-# Acknowledgements to Manoj Srivastava.
-
-# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
-export DH_OPTIONS
-
-# force quilt to not use ~/.quiltrc and to use debian/patches
-QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
-
-# Set up parameters for the upstream build environment.
-
-# Determine (source) package name from Debian changelog.
-SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \
-| grep '^Source:' | awk '{print $$2}')
-
-# Determine package version from Debian changelog.
-SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \
-| grep '^Version:' | awk '{print $$2}')
-
-# Determine upstream version number.
-UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//')
-
-# Determine the source version without the epoch for make-orig-tar-gz
-NO_EPOCH_VER:=$(shell echo

xorg: Changes to 'debian-unstable'

2015-10-13 Thread Andreas Boll 
 debian/changelog  |9 +
 debian/rules  |2 --
 xsf-docs/Makefile |2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit e42da817e61e711b3e559c0b98d52057d3882ff2
Author: Andreas Boll 
Date:   Tue Oct 13 11:15:55 2015 +0200

rules: Remove unused variable ARCH.

Unused since 77979396b7aaea897efe64213f8fb0f3a105708f

diff --git a/debian/changelog b/debian/changelog
index 1ec5dc2..e38c23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg (1:7.7+13) UNRELEASED; urgency=medium
   * Merge xsf-docs up to 13946cb commit:
 - makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
   Thanks, Eduard Sanou!
+  * rules: Remove unused variable ARCH.
 
  -- Andreas Boll   Tue, 13 Oct 2015 11:04:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 1e7c76e..9d9d9b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
 %:
dh $@ --parallel
 

commit 8d3a0c80be2cd169955cc93407822e3e6e90ec47
Author: Andreas Boll 
Date:   Tue Oct 13 11:11:23 2015 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 3039d0c..1ec5dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+13) UNRELEASED; urgency=medium
+
+  * Merge xsf-docs up to 13946cb commit:
+- makefile: Set TZ=UTC before calling asciidoc (Closes: #795985).
+  Thanks, Eduard Sanou!
+
+ -- Andreas Boll   Tue, 13 Oct 2015 11:04:42 +0200
+
 xorg (1:7.7+12) unstable; urgency=medium
 
   * Team upload.

commit 13946cb1c242fb81037189e706350cd0c55903bb
Author: Eduard Sanou 
Date:   Tue Oct 13 10:59:27 2015 +0200

makefile: Set TZ=UTC before calling asciidoc

Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.

diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index cbd375c..04d1560 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -6,7 +6,7 @@ html_files = $(patsubst %.txt,%.html,$(txt_files))
 
 pdf_files = $(patsubst %.txt,%.pdf,$(txt_files))
 
-TXT_TO_HTML  = asciidoc -a linkcss
+TXT_TO_HTML  = TZ=UTC asciidoc -a linkcss
 HTML_TO_PDF  = wkhtmltopdf
 CSS_FILE = xsf.css
 ADOC_CSS_FILE= asciidoc-xhtml11.css

xorg: Changes to 'debian-unstable'

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

xorg: Changes to 'debian-unstable'

2015-05-11 Thread Julien Cristau 
 debian/changelog   |6 ++
 debian/scripts/vars.alpha  |1 -
 debian/scripts/vars.amd64  |1 -
 debian/scripts/vars.arm|1 -
 debian/scripts/vars.armeb  |1 -
 debian/scripts/vars.armel  |1 -
 debian/scripts/vars.hurd-i386  |1 -
 debian/scripts/vars.i386   |1 -
 debian/scripts/vars.ia64   |1 -
 debian/scripts/vars.kfreebsd-amd64 |1 -
 debian/scripts/vars.kfreebsd-i386  |1 -
 debian/scripts/vars.m32r   |1 -
 debian/scripts/vars.m68k   |1 -
 debian/scripts/vars.mips   |1 -
 debian/scripts/vars.mipsel |1 -
 debian/scripts/vars.sh4|1 -
 debian/scripts/vars.sparc  |1 -
 debian/scripts/vars.sparc64|1 -
 18 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit e4cc7aff8eaa25b81b4083dfd63fe26e639f68f7
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 11 14:28:04 2015 +0200

Remove the siliconmotion driver from xserver-xorg-video-all.

diff --git a/debian/changelog b/debian/changelog
index 32b80bd..b00736c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+9) UNRELEASED; urgency=medium
+
+  * Remove the siliconmotion driver from xserver-xorg-video-all.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 11 May 2015 14:27:50 +0200
+
 xorg (1:7.7+8) unstable; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index a08b7ec..4ebf9fb 100644
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -10,7 +10,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 416dfc9..6d20b41 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index f415229..b8796b8 100644
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -10,7 +10,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index f415229..b8796b8 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -10,7 +10,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index f415229..b8796b8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -10,7 +10,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 48dc47f..6c3a764 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
xserver-xorg-video-vesa, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 39ea952..e99350c 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 4395278..0da2b7d 100644
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -10,7 +10,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\

xorg: Changes to 'debian-unstable'

2015-05-11 Thread Julien Cristau 
 debian/changelog |6 --
 debian/compat|2 +-
 debian/control   |3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0c2c921da49018cac0fb1d533449a819e79e753c
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 11 14:57:37 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1172418..552666a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.7+9) UNRELEASED; urgency=medium
+xorg (1:7.7+9) unstable; urgency=medium
 
   * Remove the siliconmotion driver from xserver-xorg-video-all.
   * Remove Cyril and Drew from Uploaders.
   * Bump debhelper compat level to 9.
 
- -- Julien Cristau jcris...@debian.org  Mon, 11 May 2015 14:27:50 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 11 May 2015 14:53:51 +0200
 
 xorg (1:7.7+8) unstable; urgency=medium
 

commit 044fd16091ef7f145679c96c6c80ef468919b93e
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 11 14:53:47 2015 +0200

Bump debhelper compat level to 9.

diff --git a/debian/changelog b/debian/changelog
index 2ad069a..1172418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.7+9) UNRELEASED; urgency=medium
 
   * Remove the siliconmotion driver from xserver-xorg-video-all.
   * Remove Cyril and Drew from Uploaders.
+  * Bump debhelper compat level to 9.
 
  -- Julien Cristau jcris...@debian.org  Mon, 11 May 2015 14:27:50 +0200
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 18d7551..5fa71fe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Standards-Version: 3.9.5
 Build-Depends:
  dpkg (= 1.16.1),
- debhelper (= 7),
+ debhelper (= 9),
  po-debconf,
 # xsf-docs:
  asciidoc,

commit 9c29a14a8347f32596d1a21d81341a1c2eebeaa1
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 11 14:50:01 2015 +0200

Remove Cyril and Drew from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index b00736c..2ad069a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg (1:7.7+9) UNRELEASED; urgency=medium
 
   * Remove the siliconmotion driver from xserver-xorg-video-all.
+  * Remove Cyril and Drew from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Mon, 11 May 2015 14:27:50 +0200
 
diff --git a/debian/control b/debian/control
index 893bc57..18d7551 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xorg
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
 Standards-Version: 3.9.5
 Build-Depends:
  dpkg (= 1.16.1),


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

xorg: Changes to 'debian-unstable'

2015-05-02 Thread Julien Cristau 
 debian/changelog |4 ++--
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9e3acdb8f0c2ea8fc2e7df5fd1a1c62a096b3b39
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 2 19:12:26 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8692a77..32b80bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+8) UNRELEASED; urgency=medium
+xorg (1:7.7+8) unstable; urgency=medium
 
   [ Laurent Bigonville ]
   * debian/x11-common.init: Add Short-Description field (Closes: #510087)
@@ -12,7 +12,7 @@ xorg (1:7.7+8) UNRELEASED; urgency=medium
   * Remove creation of /etc/X11/X symlink, but keep existing.
   * Do not chdir to /etc/X11 if the symlink has an absolute path.
 
- -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:57:17 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 02 May 2015 19:12:00 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
 

commit 2cfb5dcd015416006197b7f427a45fec010591ce
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 2 19:11:36 2015 +0200

Cosmetic git url change

diff --git a/debian/control b/debian/control
index b1e1ff7..893bc57 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  po-debconf,
 # xsf-docs:
  asciidoc,
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/debian/xorg
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/debian/xorg
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/debian/xorg.git
 
 Package: x11-common


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

xorg: Changes to 'debian-unstable'

2015-02-09 Thread Maarten Bernardus Lankhorst 
 debian/changelog|6 
 debian/local/xserver-wrapper.c  |   38 ++---
 debian/xserver-xorg.postinst.in |   60 
 debian/xserver-xorg.preinst.in  |   32 -
 debian/xserver-xorg.prerm.in|   33 --
 5 files changed, 27 insertions(+), 142 deletions(-)

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

Cope with /etc/X11/X not existing.

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

diff --git a/debian/changelog b/debian/changelog
index b09fa77..8692a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/x11-common.init: Add Short-Description field (Closes: #510087)
   * debian/x11-common.init: Call restorecon after creating the socket
 directories to ensure the SELinux context if properly set (Closes: #677831)
   * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
   * debian/control: Use canonical Vcs-* URL
 
+  [ Maarten Lankhorst ]
+  * Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
+  * Remove creation of /etc/X11/X symlink, but keep existing.
+  * Do not chdir to /etc/X11 if the symlink has an absolute path.
+
  -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:57:17 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index d4a6ab8..08e02e3 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -251,32 +251,36 @@ main(int argc, char **argv)
X_WRAPPER_CONFIG_FILE); */
   }
 
-  if (lstat(X_SERVER_SYMLINK, statbuf)) {
+  i = lstat(X_SERVER_SYMLINK, statbuf);
+  if (i  0  errno != ENOENT) {
 (void) fprintf(stderr, X: cannot stat %s (%s), aborting.\n,
X_SERVER_SYMLINK, strerror(errno));
 exit(1);
   }
 
-  i = readlink(X_SERVER_SYMLINK, xserver, 1024);
-
   if (i  0) {
-(void) fprintf(stderr, X: cannot read %s symbolic link (%s), aborting.\n,
-   X_SERVER_SYMLINK, strerror(errno));
-exit(1);
-  }
+strcpy(xserver, /usr/bin/Xorg);
+  } else {
+i = readlink(X_SERVER_SYMLINK, xserver, 1024);
 
-  xserver[i] = '\0'; /* readlink() does not null-terminate the string */
+if (i  0) {
+  (void) fprintf(stderr, X: cannot read %s symbolic link (%s), 
aborting.\n,
+ X_SERVER_SYMLINK, strerror(errno));
+  exit(1);
+}
+xserver[i] = '\0'; /* readlink() does not null-terminate the string */
 
-  if ((strcmp(xserver, /usr/bin/X11/X) == 0) ||
-  (strcmp(xserver, /usr/X11R6/bin/X) == 0) ||
-  (strcmp(xserver, /usr/bin/X) == 0)) {
-(void) fprintf(stderr, X: %s points back to X wrapper executable, 
-   aborting.\n, X_SERVER_SYMLINK);
-exit(1);
+if ((strcmp(xserver, /usr/bin/X11/X) == 0) ||
+(strcmp(xserver, /usr/X11R6/bin/X) == 0) ||
+(strcmp(xserver, /usr/bin/X) == 0)) {
+  (void) fprintf(stderr, X: %s points back to X wrapper executable, 
+ aborting.\n, X_SERVER_SYMLINK);
+  exit(1);
+}
   }
 
-  if (access(X_SERVER_SYMLINK, X_OK)) { /* access() uses real uid */
-(void) fprintf(stderr, %s is not executable\n, X_SERVER_SYMLINK);
+  if (access(xserver, X_OK)) { /* access() uses real uid */
+(void) fprintf(stderr, %s is not executable\n, val);
 exit(1);
   }
 
@@ -333,7 +337,7 @@ main(int argc, char **argv)
  * change to the directory where the X server symlink is so that a relative
  * symlink will work and execute the X server
  */
-if (chdir(X_SERVER_SYMLINK_DIR)) {
+if (xserver[0] != '/'  chdir(X_SERVER_SYMLINK_DIR)) {
   (void) fprintf(stderr, X: cannot chdir() to %s (%s), aborting.\n,
  X_SERVER_SYMLINK_DIR, strerror(errno));
   exit(1);
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
deleted file mode 100644
index 3cc91c0..000
--- a/debian/xserver-xorg.postinst.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Debian xserver-xorg package post-installation script
-# Copyright 1998-2004 Branden Robinson.
-# Copyright 2004-2005 Canonical Ltd.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or http://www.gnu.org/copyleft/gpl.txt.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-THIS_PACKAGE=xserver-xorg
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ -e /etc/default/xorg ]; then
-  . /etc/default/xorg
-fi
-
-debug_echo () {
-  # Syntax: debug_echo message ...
-  if [ -n $DEBUG_XORG_DEBCONF ] || [ $DEBCONF_DEBUG =

xorg: Changes to 'debian-unstable'

2014-09-24 Thread Laurent Bigonville 
 debian/changelog   |8 
 debian/x11-common.init |2 ++
 2 files changed, 10 insertions(+)

New commits:
commit 9c66995099d6dbb10b81030cddc78e3f85605c5c
Author: Laurent Bigonville bi...@bigon.be
Date:   Wed Sep 24 12:25:38 2014 +0200

debian/x11-common.init: Call restorecon after creating the socket 
directories to ensure the SELinux context if properly set (Closes: #677831)

diff --git a/debian/changelog b/debian/changelog
index 74add54..e232aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 
   * debian/x11-common.init: Add Short-Description field (Closes: #510087)
+  * debian/x11-common.init: Call restorecon after creating the socket
+directories to ensure the SELinux context if properly set (Closes: #677831)
 
- -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 10:52:41 +0200
+ -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:18:09 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
 
diff --git a/debian/x11-common.init b/debian/x11-common.init
index e8394e8..102fd22 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -62,6 +62,7 @@ set_up_dir () {
   0 0 * directory)
 # as it is owned by root, cannot be replaced with a symlink:
 chmod 01777 $DIR
+do_restorecon $DIR
 break
 ;;
   * directory)

commit c0bac80bf2a637ea08fc82878998987648fe925d
Author: Laurent Bigonville bi...@bigon.be
Date:   Wed Sep 24 10:53:10 2014 +0200

debian/x11-common.init: Add Short-Description field (Closes: #510087)

diff --git a/debian/changelog b/debian/changelog
index 34162f6..74add54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+8) UNRELEASED; urgency=medium
+
+  * debian/x11-common.init: Add Short-Description field (Closes: #510087)
+
+ -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 10:52:41 +0200
+
 xorg (1:7.7+7) unstable; urgency=medium
 
   * Add minimal ppc64el support (closes: #742731).  Thanks, Breno Leitao!
diff --git a/debian/x11-common.init b/debian/x11-common.init
index 014594b..e8394e8 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -6,6 +6,7 @@
 # Required-Stop: $remote_fs
 # Default-Start: S
 # Default-Stop:
+# Short-Description: set up the X server and ICE socket directories
 ### END INIT INFO
 
 set -e


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

xorg: Changes to 'debian-unstable'

2014-09-24 Thread Laurent Bigonville 
 debian/x11-common.init |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 91794aec60f978a149e81e070139f0532ca24df3
Author: Laurent Bigonville bi...@bigon.be
Date:   Wed Sep 24 12:35:17 2014 +0200

Move the call to restorecon after the loop

Move the call to restorecon after the loop so we are sure this is always
executed

diff --git a/debian/x11-common.init b/debian/x11-common.init
index 102fd22..63c3c30 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -62,7 +62,6 @@ set_up_dir () {
   0 0 * directory)
 # as it is owned by root, cannot be replaced with a symlink:
 chmod 01777 $DIR
-do_restorecon $DIR
 break
 ;;
   * directory)
@@ -76,6 +75,7 @@ set_up_dir () {
 ;;
 esac
   done
+  do_restorecon $DIR
 
   return 0
 }


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

xorg: Changes to 'debian-unstable'

2014-09-24 Thread Laurent Bigonville 
 debian/changelog |4 +++-
 debian/control   |6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 984f5646d0a505341a47a7f134cb0d014fd3ab0b
Author: Laurent Bigonville bi...@bigon.be
Date:   Wed Sep 24 12:57:37 2014 +0200

debian/control: Use canonical Vcs-* URL

diff --git a/debian/changelog b/debian/changelog
index 457d18a..b09fa77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.7+8) UNRELEASED; urgency=medium
   * debian/x11-common.init: Call restorecon after creating the socket
 directories to ensure the SELinux context if properly set (Closes: #677831)
   * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
+  * debian/control: Use canonical Vcs-* URL
 
- -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:55:09 +0200
+ -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:57:17 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0784201..b1e1ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
  po-debconf,
 # xsf-docs:
  asciidoc,
-Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/debian/xorg
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/debian/xorg.git
 
 Package: x11-common
 Architecture: all

commit 84cf2439ba2da1bcdf8eabd4f621ccd4092fb392
Author: Laurent Bigonville bi...@bigon.be
Date:   Wed Sep 24 12:55:31 2014 +0200

debian/control: Bump Standards-Version to 3.9.5 (no further changes)

diff --git a/debian/changelog b/debian/changelog
index e232aec..457d18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xorg (1:7.7+8) UNRELEASED; urgency=medium
   * debian/x11-common.init: Add Short-Description field (Closes: #510087)
   * debian/x11-common.init: Call restorecon after creating the socket
 directories to ensure the SELinux context if properly set (Closes: #677831)
+  * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
 
- -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:18:09 +0200
+ -- Laurent Bigonville bi...@debian.org  Wed, 24 Sep 2014 12:55:09 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index dfc2b55..0784201 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Build-Depends:
  dpkg (= 1.16.1),
  debhelper (= 7),


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

xorg: Changes to 'debian-unstable'

2014-03-31 Thread Julien Cristau 
 debian/changelog|8 ++
 debian/scripts/vars.ppc64el |8 ++
 debian/x11-common.postinst.in   |7 --
 debian/xserver-xorg.postinst.in |  115 
 debian/xserver-xorg.postrm.in   |8 --
 debian/xserver-xorg.preinst.in  |8 --
 6 files changed, 16 insertions(+), 138 deletions(-)

New commits:
commit 766eeba91e6554bd54773305c2c9c4d3ae90a3a5
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 23:04:14 2014 +0200

Remove support for upgrades from pre-squeeze versions from maintainer 
scripts.

diff --git a/debian/changelog b/debian/changelog
index 4677f90..b746ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.7+7) UNRELEASED; urgency=medium
 
   * Add minimal ppc64el support (closes: #742731).  Thanks, Breno Leitao!
+  * Remove support for upgrades from pre-squeeze versions from maintainer
+scripts.
 
  -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 22:53:43 +0200
 
diff --git a/debian/x11-common.postinst.in b/debian/x11-common.postinst.in
index acafc39..7d2e10c 100644
--- a/debian/x11-common.postinst.in
+++ b/debian/x11-common.postinst.in
@@ -71,13 +71,6 @@ if dpkg --compare-versions $2 lt-nl 1:7.6~3; then
   rmdir $CONFIG_AUX_DIR 2/dev/null || :
 fi
 
-if dpkg --compare-versions $2 lt-nl 1:7.4+2; then
-  db_unregister x11-common/xwrapper/nice_value || :
-  db_unregister x11-common/xwrapper/nice_value/error || :
-  db_unregister x11-common/upgrade_issues || :
-  db_unregister x11-common/x11r6_bin_not_empty || :
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index e595e94..3cc91c0 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -8,9 +8,6 @@
 
 set -e
 
-# source debconf library
-. /usr/share/debconf/confmodule
-
 THIS_PACKAGE=xserver-xorg
 THIS_SCRIPT=postinst
 
@@ -20,12 +17,6 @@ if [ -e /etc/default/xorg ]; then
   . /etc/default/xorg
 fi
 
-# the error-out function
-bomb () {
-  echo $PROGNAME: error: $* | fold -s -w ${COLUMNS:-80} 2
-  exit 1
-}
-
 debug_echo () {
   # Syntax: debug_echo message ...
   if [ -n $DEBUG_XORG_DEBCONF ] || [ $DEBCONF_DEBUG = user ] \
@@ -64,112 +55,6 @@ elif [ `readlink $SERVER_SYMLINK` = /bin/true ]; then
   ln -s $THIS_SERVER $SERVER_SYMLINK
 fi
 
-if [ -n $UPGRADE ]; then
-if dpkg --compare-versions $2 le 1:7.3+5; then
-# Clean up our old crap
-for QUESTION in shared/default-x-server \
-xserver-xorg/autodetect_mouse \
-xserver-xorg/autodetect_monitor \
-xserver-xorg/autodetect_video_card \
-xserver-xorg/config/device/identifier \
-xserver-xorg/config/monitor/selection-method \
-xserver-xorg/config/monitor/screen-size \
-xserver-xorg/config/monitor/mode-list \
-xserver-xorg/config/monitor/default-identifier \
-xserver-xorg/config/monitor/horiz-sync \
-xserver-xorg/config/monitor/vert-refresh \
-xserver-xorg/config/monitor/range_input_error \
-xserver-xorg/config/display/modes \
-xserver-xorg/config/device/video_ram \
-xserver-xorg/config/display/default_depth \
-xserver-xorg/config/inputdevice/mouse/port \
-xserver-xorg/config/inputdevice/mouse/protocol \
-
xserver-xorg/config/inputdevice/mouse/emulate3buttons \
-xserver-xorg/config/modules \
-xserver-xorg/config/monitor/default-identifier \
-xserver-xorg/config/monitor/identifier \
-xserver-xorg/config/write_files_section \
-xserver-xorg/multiple_possible_x-drivers; do
-  db_unregister $QUESTION || true
-done
-fi
-if dpkg --compare-versions $2 lt-nl 1:7.4; then
-  for QUESTION in \
-xserver-xorg/config/null_string_error \
-xserver-xorg/config/doublequote_in_string_error \
-xserver-xorg/config/nonnumeric_string_error \
-xserver-xorg/config/device/use_fbdev \
-xserver-xorg/config/device/driver \
-xserver-xorg/config/inputdevice/keyboard/rules \
-xserver-xorg/config/inputdevice/keyboard/model \
-xserver-xorg/config/inputdevice/keyboard/layout \
-xserver-xorg/config/inputdevice/keyboard/variant \
-xserver-xorg/config/inputdevice/keyboard/options \
-xserver-xorg/autodetect_keyboard; do
-   db_unregister $QUESTION || true
-  done
-fi
-if dpkg --compare-versions $2 lt-nl 1:7.4+2; then
-  db_unregister xserver-xorg/config/device/bus_id || true
-  db_unregister xserver-xorg/config/device/bus_id_error || true
-  rm -f

xorg: Changes to 'debian-unstable'

2014-03-31 Thread Julien Cristau 
 debian/scripts/vars.ppc64 |   19 ---
 1 file changed, 19 deletions(-)

New commits:
commit 0e4ae1524d8c8ee0315d78fc12a02e57265ad57f
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 23:08:30 2014 +0200

Remove cruft from ppc64 driver lists file

diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index 4ecd3b4..cc5e98e 100644
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -1,4 +1,3 @@
-
 # This file is NOT a shell script.
 #
 # This file gets included by both debian/rules (make) AND the scripts in
@@ -11,23 +10,5 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident
 
-   
-
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics
-
-# , xserver-xorg-input-wacom
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-XWSC_SPECIAL_DEPENDS=xserver-xorg, \
-   xlibmesa-dri, \
-   
-XWSD_SPECIAL_DEPENDS=xlibosmesa4-dbg, \
-   xlibosmesa-dev, \
-   
-XLIBMESA_GL_SPECIAL_DEPENDS=xlibmesa-dri, \
-   
-


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

xorg: Changes to 'debian-unstable'

2014-03-31 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/control   |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 315e579829d77d4fc14283330cdea6038e4ea4e7
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 23:13:03 2014 +0200

Drop hal dependency from xserver-xorg on kfreebsd now that we use devd

Closes: #710197

diff --git a/debian/changelog b/debian/changelog
index b746ebd..80e64b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg (1:7.7+7) UNRELEASED; urgency=medium
   * Add minimal ppc64el support (closes: #742731).  Thanks, Breno Leitao!
   * Remove support for upgrades from pre-squeeze versions from maintainer
 scripts.
+  * Drop hal dependency from xserver-xorg on kfreebsd now that we use devd
+(closes: #710197)
 
  -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 22:53:43 +0200
 
diff --git a/debian/control b/debian/control
index 224668b..539ed11 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Depends:
  xserver-xorg-video-all | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],
- hal (= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
  xkb-data (= 1.4),


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

xorg: Changes to 'debian-unstable'

2014-03-31 Thread Julien Cristau 
 debian/changelog   |2 ++
 debian/scripts/vars.powerpcspe |   24 
 debian/scripts/vars.x32|1 +
 3 files changed, 27 insertions(+)

New commits:
commit 2c69d69d8212328b54fa58f872c3022f4338667d
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 23:29:59 2014 +0200

Add x32 support by symlinking the amd64 driver lists (closes: #700010)

diff --git a/debian/changelog b/debian/changelog
index 025d3a1..27db901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg (1:7.7+7) UNRELEASED; urgency=medium
   * Drop hal dependency from xserver-xorg on kfreebsd now that we use devd
 (closes: #710197)
   * Add powerpcspe support by copying powerpc driver lists (closes: #583288)
+  * Add x32 support by symlinking the amd64 driver lists (closes: #700010)
 
  -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 22:53:43 +0200
 
diff --git a/debian/scripts/vars.x32 b/debian/scripts/vars.x32
new file mode 12
index 000..5cad171
--- /dev/null
+++ b/debian/scripts/vars.x32
@@ -0,0 +1 @@
+vars.amd64
\ No newline at end of file

commit ccbec2b08268113ee8985c1876bacb7dc8e2cd68
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 23:28:28 2014 +0200

Add powerpcspe support by copying powerpc driver lists (closes: #583288)

diff --git a/debian/changelog b/debian/changelog
index 80e64b2..025d3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg (1:7.7+7) UNRELEASED; urgency=medium
 scripts.
   * Drop hal dependency from xserver-xorg on kfreebsd now that we use devd
 (closes: #710197)
+  * Add powerpcspe support by copying powerpc driver lists (closes: #583288)
 
  -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 22:53:43 +0200
 
diff --git a/debian/scripts/vars.powerpcspe b/debian/scripts/vars.powerpcspe
new file mode 100644
index 000..fb34f2b
--- /dev/null
+++ b/debian/scripts/vars.powerpcspe
@@ -0,0 +1,24 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
+   xserver-xorg-video-fbdev, \
+   xserver-xorg-video-mga, \
+   xserver-xorg-video-nouveau, \
+   xserver-xorg-video-savage, \
+   xserver-xorg-video-sisusb, \
+   xserver-xorg-video-tdfx, \
+   xserver-xorg-video-trident, \
+
+
+
+XSERVER_XORG_VIDEO_RECOMMENDS=
+
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
+   xserver-xorg-input-synaptics
+
+
+XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom


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

xorg: Changes to 'debian-unstable'

2014-02-12 Thread Julien Cristau 
 debian/changelog  |5 +++--
 debian/scripts/vars.amd64 |6 +++---
 debian/scripts/vars.i386  |6 --
 3 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 23db9a1b7ed86631ee645b8d86b5eb595f85b124
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 13 08:30:37 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e3d41c1..52448f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg (1:7.7+6) UNRELEASED; urgency=medium
+xorg (1:7.7+6) unstable; urgency=medium
 
   * Move x11-xfs-utils from Depends to Suggests (closes: #736556).
   * Remove openchrome driver from hurd-i386's xserver-xorg-video-all (closes:
 #706889).
   * Move xserver-xorg-video-qxl from Depends to Recommends [amd64, i386].
 
- -- Julien Cristau jcris...@debian.org  Sat, 25 Jan 2014 11:11:57 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 13 Feb 2014 08:30:32 +0100
 
 xorg (1:7.7+5) unstable; urgency=medium
 

commit 8634ab583c2fd10f470f5a1fc165f4fecc5b0eb7
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 13 08:30:06 2014 +0100

Move xserver-xorg-video-qxl from Depends to Recommends [amd64, i386].

diff --git a/debian/changelog b/debian/changelog
index 809a253..e3d41c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg (1:7.7+6) UNRELEASED; urgency=medium
   * Move x11-xfs-utils from Depends to Suggests (closes: #736556).
   * Remove openchrome driver from hurd-i386's xserver-xorg-video-all (closes:
 #706889).
+  * Move xserver-xorg-video-qxl from Depends to Recommends [amd64, i386].
 
  -- Julien Cristau jcris...@debian.org  Sat, 25 Jan 2014 11:11:57 +0100
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index b321199..416dfc9 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-   xserver-xorg-video-qxl, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
@@ -24,8 +23,9 @@ XSERVER_XORG_VIDEO_DEPENDS= \
 
 
 
-XSERVER_XORG_VIDEO_RECOMMENDS=
-
+XSERVER_XORG_VIDEO_RECOMMENDS=\
+   xserver-xorg-video-qxl, \
+
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-vmmouse, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 9bbd637..39ea952 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-   xserver-xorg-video-qxl, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sisusb, \
@@ -24,7 +23,10 @@ XSERVER_XORG_VIDEO_DEPENDS= \
 
 
 
-XSERVER_XORG_VIDEO_RECOMMENDS=xserver-xorg-video-geode
+XSERVER_XORG_VIDEO_RECOMMENDS= \
+   xserver-xorg-video-geode, \
+   xserver-xorg-video-qxl, \
+
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \


-- 
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/e1wdqqr-0004wn...@moszumanska.debian.org

xorg: Changes to 'debian-unstable'

2014-02-09 Thread Julien Cristau 
 debian/changelog  |2 ++
 debian/scripts/vars.hurd-i386 |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 98318a9771e22d6b7959a13bd7336ed26e8b54d7
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 9 22:49:34 2014 +0100

Remove openchrome driver from hurd-i386's xserver-xorg-video-all

Closes: #706889

diff --git a/debian/changelog b/debian/changelog
index a7f23ad..809a253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.7+6) UNRELEASED; urgency=medium
 
   * Move x11-xfs-utils from Depends to Suggests (closes: #736556).
+  * Remove openchrome driver from hurd-i386's xserver-xorg-video-all (closes:
+#706889).
 
  -- Julien Cristau jcris...@debian.org  Sat, 25 Jan 2014 11:11:57 +0100
 
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 74c0a4d..48dc47f 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-   xserver-xorg-video-openchrome, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-tdfx, \


-- 
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/e1wccg7-0001ey...@moszumanska.debian.org

xorg: Changes to 'debian-unstable'

2014-01-25 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |   11 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 74731f405485cedee012e1c9b8574f595b844468
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 25 11:12:24 2014 +0100

Move x11-xfs-utils from Depends to Suggests (closes: #736556).

diff --git a/debian/changelog b/debian/changelog
index 1abe9aa..a7f23ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+6) UNRELEASED; urgency=medium
+
+  * Move x11-xfs-utils from Depends to Suggests (closes: #736556).
+
+ -- Julien Cristau jcris...@debian.org  Sat, 25 Jan 2014 11:11:57 +0100
+
 xorg (1:7.7+5) unstable; urgency=medium
 
   * Add minimal arm64 support (using fbdev/evdev drivers); closes: #731766.
diff --git a/debian/control b/debian/control
index dfa7aa4..224668b 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,6 @@ Depends:
  x11-apps,
  x11-session-utils,
  x11-utils,
- x11-xfs-utils,
  x11-xkb-utils,
  x11-xserver-utils,
  xauth,
@@ -99,7 +98,9 @@ Depends:
  xterm | x-terminal-emulator,
  ${misc:Depends},
 Provides: x-window-system, x-window-system-core
-Suggests: xorg-docs
+Suggests:
+ xorg-docs,
+ x11-xfs-utils,
 Description: X.Org X Window System
  This metapackage provides the components for a standalone
  workstation running the X Window System.  It provides the X libraries, an X
@@ -190,12 +191,13 @@ Depends:
  x11-apps,
  x11-session-utils,
  x11-utils,
- x11-xfs-utils,
  x11-xkb-utils,
  x11-xserver-utils,
  xauth,
  xinit,
  ${misc:Depends},
+Suggests:
+ x11-xfs-utils,
 Description: miscellaneous X clients - metapackage
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a
@@ -212,12 +214,13 @@ Package: xutils
 Section: x11
 Architecture: all
 Depends:
- x11-xfs-utils,
  x11-utils,
  x11-xserver-utils,
  x11-session-utils,
  xfonts-utils,
  ${misc:Depends},
+Suggests:
+ x11-xfs-utils,
 Description: X Window System utility programs metapackage
  xutils provides a set of utility programs shipped with the X Window System.
  Many of these programs are useful even on a system that does not have any X


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w70e8-00056e...@moszumanska.debian.org

xorg: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 debian/changelog  |7 +++
 debian/scripts/vars.arm64 |9 +
 2 files changed, 16 insertions(+)

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

Upload to unstable

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

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

Add minimal arm64 support (using fbdev/evdev drivers)

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


-- 
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/e1vvtfb-00058q...@moszumanska.debian.org

xorg: Changes to 'debian-unstable'

2013-09-30 Thread Julien Cristau 
 debian/changelog   |   32 
 debian/scripts/vars.alpha  |   12 +---
 debian/scripts/vars.amd64  |2 +-
 debian/scripts/vars.arm|   11 +--
 debian/scripts/vars.armeb  |   11 +--
 debian/scripts/vars.armel  |6 ++
 debian/scripts/vars.hppa   |3 ---
 debian/scripts/vars.hurd-i386  |   12 ++--
 debian/scripts/vars.i386   |2 +-
 debian/scripts/vars.ia64   |   10 +-
 debian/scripts/vars.kfreebsd-amd64 |   12 ++--
 debian/scripts/vars.kfreebsd-i386  |   12 ++--
 debian/scripts/vars.m32r   |   11 +--
 debian/scripts/vars.m68k   |   11 +--
 debian/scripts/vars.mips   |   12 +---
 debian/scripts/vars.mipsel |   11 +--
 debian/scripts/vars.powerpc|2 +-
 debian/scripts/vars.ppc64  |2 +-
 debian/scripts/vars.sh4|   12 +---
 debian/scripts/vars.sparc  |   12 +---
 debian/scripts/vars.sparc64|   12 +---
 21 files changed, 55 insertions(+), 155 deletions(-)

New commits:
commit 3d8373a67966ad2b4b169b233a8545d8bad306e9
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 30 19:55:53 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index b6baca7..e24c718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.7+4) UNRELEASED; urgency=low
+xorg (1:7.7+4) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Remove unmaintained drivers from xserver-xorg-video-all:
 - xserver-xorg-video-apm
 - xserver-xorg-video-ark
@@ -20,7 +21,14 @@ xorg (1:7.7+4) UNRELEASED; urgency=low
 - xserver-xorg-video-tseng
 - xserver-xorg-video-voodoo
 
- -- Julien Cristau jcris...@debian.org  Mon, 30 Sep 2013 19:36:18 +0200
+  [ Michael Stapelberg ]
+  * report-bugs: tell people to file bugs upstream
+
+  [ Maarten Lankhorst ]
+  * Add xserver-xorg-video-modesetting on amd64 armhf i386.
+  * Add xserver-xorg-video-qxl on amd64 i386.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 30 Sep 2013 19:55:41 +0200
 
 xorg (1:7.7+3) unstable; urgency=low
 

commit e7289b45a2abf6648533f8a73f933d89b5fdb5c9
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 30 19:53:39 2013 +0200

Remove unmaintained drivers from xserver-xorg-video-all:

  - xserver-xorg-video-apm
  - xserver-xorg-video-ark
  - xserver-xorg-video-chips
  - xserver-xorg-video-i128
  - xserver-xorg-video-i740
  - xserver-xorg-video-newport
  - xserver-xorg-video-rendition
  - xserver-xorg-video-s3
  - xserver-xorg-video-s3virge
  - xserver-xorg-video-sis
  - xserver-xorg-video-suncg14
  - xserver-xorg-video-suncg3
  - xserver-xorg-video-suncg6
  - xserver-xorg-video-sunleo
  - xserver-xorg-video-suntcx
  - xserver-xorg-video-tga
  - xserver-xorg-video-tseng
  - xserver-xorg-video-voodoo

Reverts some partial changes from Maarten which were not done
consistently across archs and weren't documented in changelog.

diff --git a/debian/changelog b/debian/changelog
index 7c91643..b6baca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xorg (1:7.7+4) UNRELEASED; urgency=low
+
+  * Remove unmaintained drivers from xserver-xorg-video-all:
+- xserver-xorg-video-apm
+- xserver-xorg-video-ark
+- xserver-xorg-video-chips
+- xserver-xorg-video-i128
+- xserver-xorg-video-i740
+- xserver-xorg-video-newport
+- xserver-xorg-video-rendition
+- xserver-xorg-video-s3
+- xserver-xorg-video-s3virge
+- xserver-xorg-video-sis
+- xserver-xorg-video-suncg14
+- xserver-xorg-video-suncg3
+- xserver-xorg-video-suncg6
+- xserver-xorg-video-sunleo
+- xserver-xorg-video-suntcx
+- xserver-xorg-video-tga
+- xserver-xorg-video-tseng
+- xserver-xorg-video-voodoo
+
+ -- Julien Cristau jcris...@debian.org  Mon, 30 Sep 2013 19:36:18 +0200
+
 xorg (1:7.7+3) unstable; urgency=low
 
   * Add xserver-xorg-input-vmmouse to -all on i386 and amd64 (closes:
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 3662d71..a08b7ec 100644
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -3,28 +3,18 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS=\
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
xserver-xorg-video-savage,

xorg: Changes to 'debian-unstable'

2013-09-25 Thread Maarten Lankhorst 
 debian/scripts/vars.amd64   |   17 ++---
 debian/scripts/vars.armel   |7 ---
 debian/scripts/vars.armhf   |1 +
 debian/scripts/vars.i386|   15 ---
 debian/scripts/vars.powerpc |5 +
 debian/scripts/vars.ppc64   |5 +
 6 files changed, 13 insertions(+), 37 deletions(-)

New commits:
commit f9b7ebd8084d46dd3230c69286cb524a4be65096
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Sep 25 17:40:51 2013 +0200

add modesetting for armhf

diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index ae27e54..3c97ea4 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,6 +5,7 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
+   xserver-xorg-video-modesetting, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-vesa, \
 

commit 358d144ba6da20b9d06281502e1523ffb046c942
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Sep 25 17:36:14 2013 +0200

update i386, amd64, powerpc, powerpc4, armel list of drivers.

diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index ed4600b..afd4526 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,31 +3,26 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
+   xserver-xorg-video-qxl, \
+   xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
-   xserver-xorg-video-vmware
+   xserver-xorg-video-vmware, \
+
 
 
 XSERVER_XORG_VIDEO_RECOMMENDS=
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 87c6ba7..445fffd 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -13,18 +13,11 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
 
 
 # xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index ec8d7ed..03d7bd1 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,31 +3,24 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
+   xserver-xorg-video-qxl, \
+   xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
-   xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
 
 
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 65e45d7..5141fba 100644
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -8,12 +8,9 @@

xorg: Changes to 'debian-unstable'

2013-09-25 Thread Maarten Lankhorst 
 debian/scripts/vars.alpha  |1 -
 debian/scripts/vars.amd64  |1 -
 debian/scripts/vars.arm|1 -
 debian/scripts/vars.armeb  |1 -
 debian/scripts/vars.armel  |1 -
 debian/scripts/vars.hppa   |1 -
 debian/scripts/vars.hurd-i386  |1 -
 debian/scripts/vars.i386   |1 -
 debian/scripts/vars.ia64   |1 -
 debian/scripts/vars.kfreebsd-amd64 |1 -
 debian/scripts/vars.kfreebsd-i386  |1 -
 debian/scripts/vars.m32r   |1 -
 debian/scripts/vars.m68k   |1 -
 debian/scripts/vars.mips   |1 -
 debian/scripts/vars.mipsel |1 -
 debian/scripts/vars.powerpc|1 -
 debian/scripts/vars.ppc64  |1 -
 debian/scripts/vars.sh4|1 -
 debian/scripts/vars.sparc  |1 -
 debian/scripts/vars.sparc64|1 -
 20 files changed, 20 deletions(-)

New commits:
commit 48594daf437f3285642bdfcce13a838233e3c2f3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Sep 26 01:24:37 2013 +0200

remove xserver-xorg-video-chips

diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index adfe8fe..3662d71 100644
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index afd4526..35566f0 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -5,7 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 87c6ba7..7266e99 100644
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 87c6ba7..7266e99 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 445fffd..95b630d 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index 506b340..f8b8ef5 100644
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -4,7 +4,6 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 0e88246..be39725 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -5,7 +5,6 @@
 
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-i128, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 03d7bd1..855d113 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -5,7 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 393155d..af5e5e7 100644
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \

xorg: Changes to 'debian-unstable'

2013-08-21 Thread Michael Stapelberg 
 xsf-docs/howto/report-bugs.txt |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit d2fb6f569f078699e206798bd07e31951c9dbc24
Author: Michael Stapelberg stapelb...@debian.org
Date:   Wed Aug 21 20:24:27 2013 +0200

report-bugs: tell people to file bugs upstream

Reviewed-By: Julien Cristau jcris...@debian.org

diff --git a/xsf-docs/howto/report-bugs.txt b/xsf-docs/howto/report-bugs.txt
index 7ffa33c..718a1d1 100644
--- a/xsf-docs/howto/report-bugs.txt
+++ b/xsf-docs/howto/report-bugs.txt
@@ -3,6 +3,17 @@ How to report bugs
 Cyril Brulebois k...@debian.org
 
 
+Report it upstream
+--
+
+In most cases, it is preferrable to report the bug upstream at
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+See https://01.org/linuxgraphics/documentation/how-report-bugs-0 for a good
+introduction on how to write useful bug reports. While the document is targeted
+at Intel graphics hardware, it is a good guideline for other vendor’s hardware
+as well.
+
 Simple as reportbug
 ---
 


-- 
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/e1vcd60-0003w0...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2013-05-06 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da860b791ddb7032edbde6f5f9d5cf222f1c6e83
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 6 19:27:10 2013 +0200

Add bug closure

diff --git a/debian/changelog b/debian/changelog
index a88a4d8..7c91643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xorg (1:7.7+3) unstable; urgency=low
 
-  * Add xserver-xorg-input-vmmouse to -all on i386 and amd64.  Thanks, Jakob
-Bornecrantz!
+  * Add xserver-xorg-input-vmmouse to -all on i386 and amd64 (closes:
+#705637).  Thanks, Jakob Bornecrantz!
 
  -- Julien Cristau jcris...@debian.org  Sun, 05 May 2013 08:59:38 +0200
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uzpmi-00064n...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2013-05-05 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1edd42a769659613b1aba584a46fb4349e193559
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 5 09:04:08 2013 +0200

Upload to sid

diff --git a/debian/changelog b/debian/changelog
index f51ab81..a88a4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+3) UNRELEASED; urgency=low
+xorg (1:7.7+3) unstable; urgency=low
 
   * Add xserver-xorg-input-vmmouse to -all on i386 and amd64.  Thanks, Jakob
 Bornecrantz!
 
- -- Julien Cristau jcris...@debian.org  Wed, 17 Apr 2013 20:55:18 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 05 May 2013 08:59:38 +0200
 
 xorg (1:7.7+2) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uyt0p-0006ro...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2013-04-17 Thread Julien Cristau 
 debian/changelog  |7 +++
 debian/scripts/vars.amd64 |4 +++-
 debian/scripts/vars.i386  |4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 6e05ab9af116de3e52cffcd1609b02c1892789bf
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 17 21:03:02 2013 +0200

Add xserver-xorg-input-vmmouse to -all on i386 and amd64.

Thanks, Jakob Bornecrantz!

diff --git a/debian/changelog b/debian/changelog
index da6f94c..f51ab81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+3) UNRELEASED; urgency=low
+
+  * Add xserver-xorg-input-vmmouse to -all on i386 and amd64.  Thanks, Jakob
+Bornecrantz!
+
+ -- Julien Cristau jcris...@debian.org  Wed, 17 Apr 2013 20:55:18 +0200
+
 xorg (1:7.7+2) unstable; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 9912a14..ed4600b 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -34,7 +34,9 @@ XSERVER_XORG_VIDEO_RECOMMENDS=
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
-   xserver-xorg-input-synaptics
+   xserver-xorg-input-vmmouse, \
+   xserver-xorg-input-synaptics, \
+
 
 
 XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 0870f4f..ec8d7ed 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -36,7 +36,9 @@ XSERVER_XORG_VIDEO_RECOMMENDS=xserver-xorg-video-geode
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
-   xserver-xorg-input-synaptics
+   xserver-xorg-input-vmmouse, \
+   xserver-xorg-input-synaptics, \
+
 
 
 XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom


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

xorg: Changes to 'debian-unstable'

2013-02-23 Thread Julien Cristau 
 debian/changelog |5 +
 debian/scripts/vars.ia64 |   17 -
 2 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 01c0267d93f85263b2d0138037d0df8f6c290b38
Author: Julien Cristau jcris...@debian.org
Date:   Sat Feb 23 10:23:27 2013 +0100

Undo ia64 xserver-xorg-video-all dependency change from 1:7.6+13

closes: #700447

diff --git a/debian/changelog b/debian/changelog
index 752dc9b..8c634d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 xorg (1:7.7+2) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * Update debian/copyright to refer to new address:
 - Fixes lintian old-fsf-address-in-copyright-file
 
+  [ Julien Cristau ]
+  * Undo ia64 xserver-xorg-video-all dependency change from 1:7.6+13
+(closes: #700447).
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
14:42:58 +0200
 
 xorg (1:7.7+1) unstable; urgency=low
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index ce2e154..393155d 100644
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -3,11 +3,26 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS= \
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
+   xserver-xorg-video-ark, \
xserver-xorg-video-ati, \
+   xserver-xorg-video-chips, \
+   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
+   xserver-xorg-video-i128, \
+   xserver-xorg-video-i740, \
+   xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+   xserver-xorg-video-rendition, \
+   xserver-xorg-video-s3, \
+   xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
+   xserver-xorg-video-siliconmotion, \
+   xserver-xorg-video-sis, \
+   xserver-xorg-video-tdfx, \
+   xserver-xorg-video-trident, \
+   xserver-xorg-video-tseng, \
+   xserver-xorg-video-vesa, \
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \


-- 
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/e1u9bkb-0005m0...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2013-02-23 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 740727c6caa163f158f2ecd33846e0b131fbc7a0
Author: Julien Cristau jcris...@debian.org
Date:   Sat Feb 23 12:39:41 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8c634d2..da6f94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+2) UNRELEASED; urgency=low
+xorg (1:7.7+2) unstable; urgency=low
 
   [ Maarten Lankhorst ]
   * Update debian/copyright to refer to new address:
@@ -8,7 +8,7 @@ xorg (1:7.7+2) UNRELEASED; urgency=low
   * Undo ia64 xserver-xorg-video-all dependency change from 1:7.6+13
 (closes: #700447).
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
14:42:58 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 23 Feb 2013 12:39:32 +0100
 
 xorg (1:7.7+1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u9eej-0004rm...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2012-07-03 Thread Maarten Lankhorst 
 debian/changelog |7 +++
 debian/copyright |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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

Update debian/copyright to refer to new address

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

diff --git a/debian/changelog b/debian/changelog
index 7062904..752dc9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+2) UNRELEASED; urgency=low
+
+  * Update debian/copyright to refer to new address:
+- Fixes lintian old-fsf-address-in-copyright-file
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
14:42:58 +0200
+
 xorg (1:7.7+1) unstable; urgency=low
 
   * Merge xsf-docs up to 6b4a944090 commit:
diff --git a/debian/copyright b/debian/copyright
index 572288a..6b29ddc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,8 +71,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License with
 the Debian operating system, in /usr/share/common-licenses/GPL;  if
-not, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA 02111-1307 USA
+not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
 
 

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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sm2tn-0003gk...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2012-06-25 Thread Cyril Brulebois 
 debian/changelog |   12 
 xsf-docs/faq/general.txt |5 +
 xsf-docs/howto/build-mesa.txt|8 ++--
 xsf-docs/howto/use-gdb.txt   |5 -
 xsf-docs/index.txt   |2 +-
 xsf-docs/reference/dependencies.txt  |   18 ++
 xsf-docs/reference/squeeze-backports.txt |   10 --
 7 files changed, 46 insertions(+), 14 deletions(-)

New commits:
commit e7cfecc2ba6a1c5da3312cccaab384128a5260d1
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 25 22:33:01 2012 +0200

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index bda4a0b..eb33042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg (1:7.7+1) UNRELEASED; urgency=low
+
+  * Merge xsf-docs up to 6b4a944090 commit:
+- index: Improve wording.
+- faq/general: Add a reference to how to build mesa.
+- howto/build-mesa: Update the section about nouveau.
+- howto/use-gdb: Mention new gdm3 setting (thanks to Joss).
+- reference/dependencies: Add how to handle transitions.
+- reference/squeeze-backports: Update for current situation.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 25 Jun 2012 22:29:22 +0200
+
 xorg (1:7.6+13) unstable; urgency=high
 
   [ Julien Cristau ]

commit 6b4a944090829d8477dc4dad2af5583b1c7d9bf5
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 25 22:26:55 2012 +0200

Document -core for latest gdm3.

diff --git a/xsf-docs/howto/use-gdb.txt b/xsf-docs/howto/use-gdb.txt
index 8de06f0..dce7d02 100644
--- a/xsf-docs/howto/use-gdb.txt
+++ b/xsf-docs/howto/use-gdb.txt
@@ -56,7 +56,10 @@ Actual gdb work
 Getting a core file
 ~~~
 
- * Using `gdm3`: The idea is to tweak the daemon’s
+ * Using `gdm3` 3.4.1 and above: uncomment `Enable = true` in the
+   `[debug]` section of the `/etc/gdm3/daemon.conf` file.
+
+ * Using an older `gdm3` package: The idea is to tweak the daemon’s
`LocalXserverCommand` setting, adding the `-core` option. As of
`gdm3 2.30`, the defaults can be found in
`/usr/share/gdm/gdm.schemas`. Sample `/etc/gdm3/daemon.conf`

commit c256d67ce9d3c828a7f998dd6232db669247b4a0
Author: Cyril Brulebois k...@debian.org
Date:   Tue Aug 30 09:07:52 2011 +0200

dependencies: Mention how to request a transition page.

diff --git a/xsf-docs/reference/dependencies.txt 
b/xsf-docs/reference/dependencies.txt
index 8e32cf1..4cdf7a9 100644
--- a/xsf-docs/reference/dependencies.txt
+++ b/xsf-docs/reference/dependencies.txt
@@ -226,6 +226,24 @@ can be used as an example.
 
 
 
+Handling a transition
+-
+
+When a new major version of the server comes up, it can be updated
+following its `README.source`. Usually, drivers can be rebuilt using
+binNMUs. Be sure `xorg-server` is marked as `Installed` on all
+buildds, or set a `dep-wait`.
+
+On the release team side, a transition page can be asked for, to track
+fully rebuilt drivers. For the input 12→13 and video 10→11
+transitions, the settings are:
+
+ * Affected: `.build-depends ~ /xserver-xorg-dev/`
+ * Good: `.depends ~ /xorg-input-abi-13/ | .depends ~ /xorg-video-abi-11/`
+ * Bad: `.depends ~ /xorg-input-abi-12/ | .depends ~ /xorg-video-abi-10/`
+
+
+
 Staying tuned
 -
 

commit 195f1f51562592732464226894883339fddf32ca
Author: Cyril Brulebois k...@debian.org
Date:   Tue Aug 30 00:05:44 2011 +0200

faq: Mention how to gather intel about 3D.

diff --git a/xsf-docs/faq/general.txt b/xsf-docs/faq/general.txt
index 015c6af..b0554e5 100644
--- a/xsf-docs/faq/general.txt
+++ b/xsf-docs/faq/general.txt
@@ -30,6 +30,11 @@ All drivers
preferences, through the `-dpi` X server command line option (see
++Xserver++’s manual page), or through ++xrandr++’s `--dpi` option.
 
+ * _How do I get some info about 3D support?_ +
+   Look at the link:../howto/build-mesa.html[instructions to build mesa],
+   there are a few commands to learn about 3D support, the current driver,
+   etc.
+
 Ati driver
 ~~
 

commit 3121efb27aa2c84a04f0d159ef867b15aef86ddb
Author: Cyril Brulebois k...@debian.org
Date:   Tue Aug 30 00:02:08 2011 +0200

build-mesa: libdrm-dev is available in squeeze-backports.

diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index 6840179..ade3771 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -87,8 +87,8 @@ $ sudo apt-get build-dep mesa
 
 
 If you’re on `squeeze` you may need to install a few more packages:
-newer `libdrm-dev` (*FIXME:* talk about picking it from `wheezy`? or
-about a local installation?), as well as `libxmu-dev`, `libxi-dev`.
+newer `libdrm-dev` (it is available in `squeeze-backports`),
+as well as `libxmu-dev`, `libxi-dev`.
 
 Make sure you have some disc space available, since the git repository
 is over 120MB, and since the mesa directory is over 500MB after a

commit 28e8d6f2c8194791aa1d679e728f9fdd853945af
Author: Cyril

xorg: Changes to 'debian-unstable'

2012-06-25 Thread Cyril Brulebois 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a046e45b48e6774af1694c57a88fc951ee5f6cd0
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jun 25 22:40:17 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index eb33042..7062904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+1) UNRELEASED; urgency=low
+xorg (1:7.7+1) unstable; urgency=low
 
   * Merge xsf-docs up to 6b4a944090 commit:
 - index: Improve wording.
@@ -8,7 +8,7 @@ xorg (1:7.7+1) UNRELEASED; urgency=low
 - reference/dependencies: Add how to handle transitions.
 - reference/squeeze-backports: Update for current situation.
 
- -- Cyril Brulebois k...@debian.org  Mon, 25 Jun 2012 22:29:22 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 25 Jun 2012 22:40:14 +0200
 
 xorg (1:7.6+13) unstable; urgency=high
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sjgjs-0006lv...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2012-05-11 Thread Cyril Brulebois 
 debian/changelog |   11 +--
 debian/scripts/vars.ia64 |   17 +
 2 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 45268ff01f37195caa8e536a88aee1de9abc8dc4
Author: Cyril Brulebois k...@debian.org
Date:   Fri May 11 12:24:27 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 13c35f6..bda4a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+13) UNRELEASED; urgency=high
+xorg (1:7.6+13) unstable; urgency=high
 
   [ Julien Cristau ]
   * Drop debian/scripts/debconf-updatepo, it looks like we're not using it
@@ -19,7 +19,7 @@ xorg (1:7.6+13) UNRELEASED; urgency=high
 in X server 1.12.
   * Set urgency to “high” for the ongoing xorg transition.
 
- -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 19:16:19 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 11 May 2012 12:24:22 +0200
 
 xorg (1:7.6+12) unstable; urgency=high
 

commit 2e31f1447864cff03a0d0e9595815241e4077fdf
Author: Cyril Brulebois k...@debian.org
Date:   Fri May 11 12:24:21 2012 +0200

Set urgency to “high” for the ongoing xorg transition.

diff --git a/debian/changelog b/debian/changelog
index 1db9f86..13c35f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+13) UNRELEASED; urgency=low
+xorg (1:7.6+13) UNRELEASED; urgency=high
 
   [ Julien Cristau ]
   * Drop debian/scripts/debconf-updatepo, it looks like we're not using it
@@ -17,6 +17,7 @@ xorg (1:7.6+13) UNRELEASED; urgency=low
   * Drop some videos drivers from the xserver-xorg-video-all meta package
 on ia64, they were dropped following the domain I/O support code removal
 in X server 1.12.
+  * Set urgency to “high” for the ongoing xorg transition.
 
  -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 19:16:19 +0100
 

commit cc4b9d8b361143be1942c9bbf118f5955a45c3a1
Author: Cyril Brulebois k...@debian.org
Date:   Fri May 11 12:23:23 2012 +0200

Drop some videos drivers from the xserver-xorg-video-all meta package on 
ia64.

They were dropped following the domain I/O support code removal in X
server 1.12. For reference: #671386, #671839, #671840.

diff --git a/debian/changelog b/debian/changelog
index 2fd4c0c..1db9f86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg (1:7.6+13) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Drop debian/scripts/debconf-updatepo, it looks like we're not using it
 anymore.
   * Update debian/copyright to
@@ -12,6 +13,11 @@ xorg (1:7.6+13) UNRELEASED; urgency=low
 bits make sense, so leave them in for now.
 Closes: #630830.
 
+  [ Cyril Brulebois ]
+  * Drop some videos drivers from the xserver-xorg-video-all meta package
+on ia64, they were dropped following the domain I/O support code removal
+in X server 1.12.
+
  -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 19:16:19 +0100
 
 xorg (1:7.6+12) unstable; urgency=high
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 393155d..ce2e154 100644
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -3,26 +3,11 @@
 #
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
-   xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS= \
xserver-xorg-video-ati, \
-   xserver-xorg-video-chips, \
-   xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-i128, \
-   xserver-xorg-video-i740, \
-   xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
-   xserver-xorg-video-rendition, \
-   xserver-xorg-video-s3, \
-   xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
-   xserver-xorg-video-siliconmotion, \
-   xserver-xorg-video-sis, \
-   xserver-xorg-video-tdfx, \
-   xserver-xorg-video-trident, \
-   xserver-xorg-video-tseng, \
-   xserver-xorg-video-vesa, \
 
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \


-- 
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/e1ssn5z-0005n7...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2012-03-03 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

Upload to unstable

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


-- 
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/e1s3tec-0001rr...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2012-03-03 Thread Julien Cristau 
 debian/changelog|   16 +++
 debian/copyright|   59 +--
 debian/scripts/debconf-updatepo |  197 
 3 files changed, 62 insertions(+), 210 deletions(-)

New commits:
commit 2839fa6f4314574ec28ca33d212f2411be13ded4
Author: Julien Cristau jcris...@debian.org
Date:   Sat Mar 3 19:30:23 2012 +0100

Update debian/copyright

Update debian/copyright to
- add missing copyright statements
- add missing license notes
- not pretend the Debian and Ubuntu packages have different copyright
  status; parts of the package are copyright Canonical, others are
  copyright by various Debian folks.
Still unclear if the Copyright Software in the Public Interest, Inc.
bits make sense, so leave them in for now.
Closes: #630830.

diff --git a/debian/changelog b/debian/changelog
index fd0d9ca..2fd4c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,15 @@ xorg (1:7.6+13) UNRELEASED; urgency=low
 
   * Drop debian/scripts/debconf-updatepo, it looks like we're not using it
 anymore.
+  * Update debian/copyright to
+- add missing copyright statements
+- add missing license notes
+- not pretend the Debian and Ubuntu packages have different copyright
+  status; parts of the package are copyright Canonical, others are
+  copyright by various Debian folks.
+Still unclear if the Copyright Software in the Public Interest, Inc.
+bits make sense, so leave them in for now.
+Closes: #630830.
 
  -- Julien Cristau jcris...@debian.org  Sat, 03 Mar 2012 19:16:19 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 54fc777..572288a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,6 @@
 Source Package: xorg
-Debian/Ubuntu package author(s): Branden Robinson, Fabio M. Di Nitto, Daniel
- Stone.
-
-Canonical Ltd. copyright(s)/license(s):
-
-Unless otherwise noted, all modifications and additions to X.Org found in
-this Ubuntu package bear the following copyright and license terms:
+Debian/Ubuntu package authors: Branden Robinson, Fabio M. Di Nitto, Daniel
+   Stone and others
 
 Copyright 2004-2005 Canonical Ltd.
 
@@ -32,12 +27,6 @@ used in advertising or otherwise to promote the sale, use or 
other dealings
 in this Software without prior written authorization from Canonical Ltd.
 
 ---
-
-Debian copyright(s)/license(s):
-
-Unless otherwise noted, all modifications and additions to X.Org found in
-this Debian package bear the following copyright and license terms:
-
 Copyright 1996-2002 Software in the Public Interest, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -62,3 +51,47 @@ Except as contained in this notice, the name of Software in 
the Public
 Interest, Inc. shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from Software in the Public Interest, Inc.
+
+
+Copyright 1998-2007 Branden Robinson bran...@debian.org.
+Copyright 2000, 2003, 2004 Progeny Linux Systems, Inc.
+Copyright 1996 Stephen Early
+Copyright 1997 Mark Eichin
+Copyright 2005 David Nusinow
+
+This is free software; you may redistribute it and/or modify
+it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2,
+or (at your option) any later version.
+
+This is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+the Debian operating system, in /usr/share/common-licenses/GPL;  if
+not, write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA
+
+
+© 2010-2011 Cyril Brulebois k...@debian.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the Software), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR

xorg: Changes to 'debian-unstable'

2012-03-02 Thread Julien Cristau 
 debian/changelog   |   11 +
 debian/x11-common.init |   90 -
 2 files changed, 71 insertions(+), 30 deletions(-)

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

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

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

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


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

xorg: Changes to 'debian-unstable'

2012-01-28 Thread Josselin Mouette 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1ae75a70edfd55acd885b9f6195428cd535ddb2d
Author: Josselin Mouette j...@debian.org
Date:   Sat Jan 28 12:43:24 2012 +0100

Release 1:7.6+11 to unstable.

diff --git a/debian/changelog b/debian/changelog
index 20397c5..53edbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xorg (1:7.6+11) UNRELEASED; urgency=low
+xorg (1:7.6+11) unstable; urgency=low
 
+  * Team upload.
   * debian/local/Xsession.d/35x11-common_xhost-local: add a new script 
 to the default X session. It will give access to the running X 
 server to the logged on user. This is useful for gdm3 which does not 
 give access to $XAUTHORITY outside the session, but can also be of 
 use for other display managers. Closes: #586685.
 
- -- Josselin Mouette j...@debian.org  Thu, 24 Nov 2011 22:52:19 +0100
+ -- Josselin Mouette j...@debian.org  Sat, 28 Jan 2012 12:42:38 +0100
 
 xorg (1:7.6+10) unstable; urgency=high
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rr6ut-00053l...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau 
 debian/changelog   |   10 ++
 debian/control |1 +
 debian/local/xserver-wrapper.c |   16 +++-
 debian/rules   |9 -
 4 files changed, 26 insertions(+), 10 deletions(-)

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

Build the X wrapper with hardening enabled.

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

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

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

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

commit acc6eda78b98d8a7af554bc578f5fdc21ec934bb
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:02:12 2011 +0100

xserver-wrapper: revert change to allow devices with major 5 as consoles.

This includes things like /dev/tty and /dev/ptmx, which are
world-readable (closes: #652249).  Thanks to vladz for the report.

diff --git a/debian/changelog b/debian/changelog
index 47f..ac28258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
 
   * xserver-wrapper: when we drop privileges, don't forget to also reset
 effective group id, since we're installed setgid root.
+  * xserver-wrapper: revert change to allow devices with major 5 as consoles.
+This includes things like /dev/tty and /dev/ptmx, which are
+world-readable (closes: #652249).  Thanks to vladz for the report.
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/local/xserver-wrapper.c

xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau 
 debian/changelog |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

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

Upload to unstable

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


-- 
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/e1rbkbg-0005so...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau 
 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ce089c330c2be530802a09c929ef749b294c2b
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 16 00:23:40 2011 +0100

Add CVE ref to 1:7.6+10 changelog

diff --git a/debian/changelog b/debian/changelog
index 07109a2..20397c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg (1:7.6+10) unstable; urgency=high
 - revert change to allow devices with major 5 as consoles.  This includes
   things like /dev/tty and /dev/ptmx, which are world-readable (closes:
   #652249).  Thanks to vladz for the report.
+  Reference: CVE-2011-4613.
 - use major() and minor() macros instead of manually extracting them
   * Build the X wrapper with hardening enabled.
 


-- 
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/e1rbkel-00076f...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-11-24 Thread Josselin Mouette 
 debian/changelog |   11 +++
 debian/local/Xsession.5  |7 +++
 debian/local/Xsession.d/35x11-common_xhost-local |   10 ++
 3 files changed, 28 insertions(+)

New commits:
commit 9b1d91483680a3e9282bffb0aca4a08bd533e36e
Author: Josselin Mouette j...@debian.org
Date:   Thu Nov 24 22:58:20 2011 +0100

debian/local/Xsession.d/35x11-common_xhost-local: add a new script  to the 
default X session. It will give access to the running X  server to the logged 
on user. This is useful for gdm3 which does not  give access to $XAUTHORITY 
outside the session, but can also be of  use for other display managers. 
Closes: #586685.

diff --git a/debian/changelog b/debian/changelog
index f2198f9..320064e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6+10) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
+  * debian/local/Xsession.d/35x11-common_xhost-local: add a new script 
+to the default X session. It will give access to the running X 
+server to the logged on user. This is useful for gdm3 which does not 
+give access to $XAUTHORITY outside the session, but can also be of 
+use for other display managers. Closes: #586685.
+
+ -- Josselin Mouette j...@debian.org  Thu, 24 Nov 2011 22:52:19 +0100
+
 xorg (1:7.6+9) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index 74d6911..2e954bb 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -186,6 +186,13 @@ the user's
 .I $HOME/.Xresources
 file is merged in the same way.
 .TP
+.I /etc/X11/Xsession.d/35x11\-common_xhost\-local
+Give access to the X server to the same user on the local host.
+If the
+.I xhost
+command is available, it will use it to allow any process of the same 
+user running on the local host to access the X server.
+.TP
 .I /etc/X11/Xsession.d/40x11\-common_xsessionrc
 Source global environment variables.
 This script will source anything in 
diff --git a/debian/local/Xsession.d/35x11-common_xhost-local 
b/debian/local/Xsession.d/35x11-common_xhost-local
new file mode 100644
index 000..d127a6c
--- /dev/null
+++ b/debian/local/Xsession.d/35x11-common_xhost-local
@@ -0,0 +1,10 @@
+# This file is sourced by Xsession(5), not executed.
+
+# If xhost (from x11-xserver-utils) is installed, use it to give access 
+# to the X server to any process from the same user on the local host.
+# Unlike other uses of xhost, this is safe since the kernel can check 
+# the actual owner of the calling process.
+
+if type xhost /dev/null 21; then
+  xhost +si:localuser:$(id -un) || :
+fi


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rthja-0008vv...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-09-24 Thread Cyril Brulebois 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b30bcf426b34f7fe048b3fd87deef22e2d960e21
Author: Cyril Brulebois k...@debian.org
Date:   Sat Sep 24 11:09:04 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 22f9b19..f2198f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xorg (1:7.6+9) UNRELEASED; urgency=low
+xorg (1:7.6+9) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
 (closes: #637902).  Thanks, Aurélien Jarno!
   * Bump xserver-xorg-core dependency to 1.11.
 
- -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:16:17 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 24 Sep 2011 11:08:54 +0200
 
 xorg (1:7.6+8) unstable; urgency=high
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r7olz-0003s6...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-09-08 Thread Julien Cristau 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9eb70d982a6d1d757c53085701eb12a7f700b5c7
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 8 21:24:54 2011 +0200

Bump xserver-xorg-core dependency to 1.11.

diff --git a/debian/changelog b/debian/changelog
index 2cedd60..22f9b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.6+9) UNRELEASED; urgency=low
 
   * Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
 (closes: #637902).  Thanks, Aurélien Jarno!
+  * Bump xserver-xorg-core dependency to 1.11.
 
  -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:16:17 +0200
 
diff --git a/debian/control b/debian/control
index 20d09b4..b825221 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: X Window System (X.Org) infrastructure
 Package: xserver-xorg
 Architecture: any
 Depends:
- xserver-xorg-core (= 2:1.9.0.901),
+ xserver-xorg-core (= 2:1.11),
  xserver-xorg-video-all | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r1kec-0008vf...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-08-15 Thread Julien Cristau 
 debian/changelog  |7 +++
 debian/scripts/vars.s390x |8 
 2 files changed, 15 insertions(+)

New commits:
commit 31daee6d5acf73478e5203c7d3542146201bd2b9
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 15 20:17:45 2011 +0200

Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x (closes: 
#637902).

Thanks, Aurélien Jarno!

diff --git a/debian/changelog b/debian/changelog
index 2fbbd56..2cedd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+9) UNRELEASED; urgency=low
+
+  * Copy debian/scripts/vars.s390 to debian/scripts/vars.s390x
+(closes: #637902).  Thanks, Aurélien Jarno!
+
+ -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:16:17 +0200
+
 xorg (1:7.6+8) unstable; urgency=high
 
   [ Julien Cristau ]
diff --git a/debian/scripts/vars.s390x b/debian/scripts/vars.s390x
new file mode 100644
index 000..525866e
--- /dev/null
+++ b/debian/scripts/vars.s390x
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-dummy
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-void


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qt1jw-0005ut...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-08-14 Thread Cyril Brulebois 
 debian/changelog |8 +
 xsf-docs/index.txt   |1 
 xsf-docs/reference/squeeze-backports.txt |  130 ++-
 3 files changed, 69 insertions(+), 70 deletions(-)

New commits:
commit 98adffe5cd75b7934b704b77dd2f60ccc5e4e62a
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:52:54 2011 +0200

Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.

diff --git a/debian/changelog b/debian/changelog
index 0477e3f..ad05ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=low
+xorg (1:7.6+8) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Add Provides: xserver to xserver-xorg.
@@ -10,6 +10,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Merge xsf-docs up to the 58c0ca7f5c commit:
 - Update: reference/squeeze-backports
+  * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 

commit 149c5d376910adb36aa26bb64f0bed1467a814ed
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:51:03 2011 +0200

Document the xsf-docs merge.

diff --git a/debian/changelog b/debian/changelog
index 35ba425..0477e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 xorg (1:7.6+8) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add Provides: xserver to xserver-xorg.
   * Add Serbian cyrillic and Serbian latin debconf translations (closes:
 #635009, #635016).  Thanks, Zlatan Todoric!
   * Use dbus activation to restart hal on kfreebsd, its init script is gone
 (closes: #624398).
 
+  [ Cyril Brulebois ]
+  * Merge xsf-docs up to the 58c0ca7f5c commit:
+- Update: reference/squeeze-backports
+
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 
 xorg (1:7.6+7) unstable; urgency=low

commit 58c0ca7f5c2de8edd1ad5c1a32e71d65cc577432
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:43:18 2011 +0200

squeeze-backports: Fix typo.

diff --git a/xsf-docs/reference/squeeze-backports.txt 
b/xsf-docs/reference/squeeze-backports.txt
index a54ebd0..214a003 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -12,7 +12,7 @@ to: the server itself, input and video drivers, libdrm, and 
mesa.
 To keep things simple, the idea is to backport all of those to
 `squeeze` through `squeeze-backports`, along with some of the
 additional packages which might be involved (like `libxfont` or
-`x11proto-xfixes-dev`).
+`x11proto-fixes-dev`).
 
 The backports were prepared so that it’s possible to upgrade the
 `input-all` and `video-all` meta packages on `amd64` and `i386`. If

commit d60d3c7c6cdef76b029c0832fd277ca89e8b592e
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:39:45 2011 +0200

squeeze-backports: Update title, and drop ToC.

diff --git a/xsf-docs/reference/squeeze-backports.txt 
b/xsf-docs/reference/squeeze-backports.txt
index 300596d..a54ebd0 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -1,6 +1,5 @@
-Backports policy for squeeze
-
-:toc:
+Backports for squeeze
+=
 Cyril Brulebois k...@debian.org
 
 

commit abb2a7005f0fadec0213962f06af3efa8a9ad0b5
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:38:34 2011 +0200

squeeze-backports: Mention best effort.

diff --git a/xsf-docs/reference/squeeze-backports.txt 
b/xsf-docs/reference/squeeze-backports.txt
index 5e0f265..300596d 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -15,6 +15,13 @@ To keep things simple, the idea is to backport all of those 
to
 additional packages which might be involved (like `libxfont` or
 `x11proto-xfixes-dev`).
 
+The backports were prepared so that it’s possible to upgrade the
+`input-all` and `video-all` meta packages on `amd64` and `i386`. If
+specific drivers (maintained by the X Strike Force) are wanted,
+requesting them on the `debian-backports@` / `debian-x@` mailing lists
+should do the trick. For other drivers, please contact the relevant
+package maintainers.
+
 
 Instructions
 

commit 5b047a8a718a5e2aadfd06ad731b1996eb3181c2
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 22:06:42 2011 +0200

squeeze-backports: Rework doc.

diff --git a/xsf-docs/reference/squeeze-backports.txt 
b/xsf-docs/reference/squeeze-backports.txt
index 11c2e30..5e0f265 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -4,73 +4,59 @@ Backports policy for squeeze
 Cyril Brulebois k...@debian.org
 
 
-Proposed plans
---
+Bird’s-eye view
+---
 
 If one forgets about libraries and clients, a whole X stack boils down
 to: the server itself, input and video drivers, libdrm, and mesa.
 
-Since

xorg: Changes to 'debian-unstable'

2011-08-14 Thread Cyril Brulebois 
 debian/changelog |   11 +++
 debian/po/sr.po  |   13 +++--
 debian/po/s...@latin.po|   14 --
 xsf-docs/reference/squeeze-backports.txt |4 
 4 files changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 737214d2dfa2016a749eafd3c622c8ef4933630e
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 23:11:09 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index bff3516..2fbbd56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=high
+xorg (1:7.6+8) unstable; urgency=high
 
   [ Julien Cristau ]
   * Add Provides: xserver to xserver-xorg.
@@ -15,7 +15,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=high
 missing step.
   * Run debian-updatepo, and specify language fields.
 
- -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
+ -- Cyril Brulebois k...@debian.org  Sun, 14 Aug 2011 23:11:05 +0200
 
 xorg (1:7.6+7) unstable; urgency=low
 

commit e51f122c60b81df53fa34b12a1d8e29cd1835d15
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 23:10:59 2011 +0200

Bump urgency again.

diff --git a/debian/changelog b/debian/changelog
index 5277d96..bff3516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+8) UNRELEASED; urgency=medium
+xorg (1:7.6+8) UNRELEASED; urgency=high
 
   [ Julien Cristau ]
   * Add Provides: xserver to xserver-xorg.
@@ -10,7 +10,9 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
   [ Cyril Brulebois ]
   * Merge xsf-docs up to the f931b66804 commit:
 - Update: reference/squeeze-backports
-  * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
+  * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix, and then
+to “high” to speed up backporting since this source package is the last
+missing step.
   * Run debian-updatepo, and specify language fields.
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200

commit 0431ec1258d2c1a208c1247aba1686fdaf0b0099
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 23:08:50 2011 +0200

Update documentation.

diff --git a/debian/changelog b/debian/changelog
index 65fab5a..5277d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
 (closes: #624398).
 
   [ Cyril Brulebois ]
-  * Merge xsf-docs up to the 58c0ca7f5c commit:
+  * Merge xsf-docs up to the f931b66804 commit:
 - Update: reference/squeeze-backports
   * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
   * Run debian-updatepo, and specify language fields.

commit f931b66804f2288a37a540be4aadf6b5615494da
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 23:07:35 2011 +0200

squeeze-backports: Mention the Linux kernel.

diff --git a/xsf-docs/reference/squeeze-backports.txt 
b/xsf-docs/reference/squeeze-backports.txt
index 214a003..e9e3a1f 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -66,3 +66,7 @@ sufficient:
 
 apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core 
xserver-xorg-input-synaptics xserver-xorg-video-intel
 
+
+It is probably a very good idea to install the Linux kernel from
+`squeeze-backports` as well. It is even required for the `nouveau`
+video driver.

commit f1586b8f1674e0f7510a2ed4681399fc29e45159
Author: Cyril Brulebois k...@debian.org
Date:   Sun Aug 14 23:00:54 2011 +0200

Run debian-updatepo, and specify language fields.

diff --git a/debian/changelog b/debian/changelog
index ad05ec5..65fab5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=medium
   * Merge xsf-docs up to the 58c0ca7f5c commit:
 - Update: reference/squeeze-backports
   * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix.
+  * Run debian-updatepo, and specify language fields.
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 
diff --git a/debian/po/sr.po b/debian/po/sr.po
index be90b6d..9a40e81 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -12,6 +12,7 @@ msgstr 
 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
 Last-Translator: Zlatan Todoric zlatan.todo...@gmail.com\n
 Language-Team: LANGUAGE l...@li.org\n
+Language: Serbian cyrillic\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -51,9 +52,9 @@ msgid 
 compromise is to permit the X server to be started only by users logged in 
 to one of the virtual consoles.
 msgstr 
-Због покретања Х сервера са суперкорисничким привилегијам, није препоручљиво
-дозволити корисницима да га покрену, из сигурносних разлога. С друге стране, 
још
-мање је препоручљиво покренути Х клијента опште намјене као главни корисник, 
што 
-се може десити ако је само главном кориснику дозвољено да покрене Х сервер.
-Компромис би био

xorg: Changes to 'debian-unstable'

2011-08-12 Thread Julien Cristau 
 debian/changelog|2 ++
 debian/control  |2 +-
 debian/xserver-xorg.postinst.in |   17 -
 3 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit e4d5a2aa626bdae31cbbd0095719adcfde89b8a0
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 12 12:56:16 2011 +0200

Use dbus activation to restart hal on kfreebsd, its init script is gone

Closes: #624398

diff --git a/debian/changelog b/debian/changelog
index 24db1a3..35ba425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg (1:7.6+8) UNRELEASED; urgency=low
   * Add Provides: xserver to xserver-xorg.
   * Add Serbian cyrillic and Serbian latin debconf translations (closes:
 #635009, #635016).  Thanks, Zlatan Todoric!
+  * Use dbus activation to restart hal on kfreebsd, its init script is gone
+(closes: #624398).
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 
diff --git a/debian/control b/debian/control
index e0fc96c..20d09b4 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends:
  xserver-xorg-video-all | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],
- hal (= 0.5.12~git20090406) [kfreebsd-any],
+ hal (= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
  xkb-data (= 1.4),
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5b38145..e595e94 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -137,6 +137,21 @@ if dpkg --compare-versions $2 lt-nl 1:7.4~3; then
   fi
 fi
 
+get_hal_pid() {
+  dbus-send --system --dest=org.freedesktop.DBus --print-reply \
+/org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \
+string:org.freedesktop.Hal 2/dev/null | awk '/uint32/ {print $2}'
+}
+
+restart_hal() {
+  # restart hald if it was running before
+  pid=$(get_hal_pid)
+  if [ -n $pid ]; then
+kill $pid 2/dev/null || true
+lshal /dev/null || true # will trigger through D-Bus activation
+  fi
+}
+
 case $1 in
   configure)
 if dpkg --compare-versions $2 lt-nl 1:7.3+11; then
@@ -147,7 +162,7 @@ case $1 in
 fi
 if dpkg --compare-versions $2 lt 1:7.5~3; then
   if [ `uname -s` = GNU/kFreeBSD ]; then
-invoke-rc.d hal restart /dev/null
+restart_hal
   fi
 fi
 ;;


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

xorg: Changes to 'debian-unstable'

2011-08-07 Thread Julien Cristau 
 debian/changelog  |2 +
 debian/po/sr.po   |   59 ++
 debian/po/s...@latin.po |   59 
++
 3 files changed, 120 insertions(+)

New commits:
commit 7e7912eb8ed8985210b8fc85ae0ac7341e106f51
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 7 16:42:37 2011 +0200

Add Serbian latin debconf translation

diff --git a/debian/changelog b/debian/changelog
index e0a1288..24db1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 xorg (1:7.6+8) UNRELEASED; urgency=low
 
   * Add Provides: xserver to xserver-xorg.
-  * Add Serbian cyrillic debconf translation (closes: #635009).  Thanks,
-Zlatan Todoric!
+  * Add Serbian cyrillic and Serbian latin debconf translations (closes:
+#635009, #635016).  Thanks, Zlatan Todoric!
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 
diff --git a/debian/po/s...@latin.po b/debian/po/s...@latin.po
new file mode 100644
index 000..fbb6944
--- /dev/null
+++ b/debian/po/s...@latin.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2011
+# This file is distributed under the same license as the PACKAGE package.
+# Zlatan Todoric zlatan.todo...@gmail.com, 2011.
+#
+#, fuzzy
+msgid 
+msgstr 
+Project-Id-Version: PACKAGE VERSION\n
+Report-Msgid-Bugs-To: x...@packages.debian.org\n
+POT-Creation-Date: 2009-06-02 20:32+0200\n
+PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
+Last-Translator: Zlatan Todoric zlatan.todo...@gmail.com\n
+Language-Team: LANGUAGE l...@li.org\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Root Only
+msgstr Samo glavni korisnik
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Console Users Only
+msgstr Samo za korisnike konzole
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Anybody
+msgstr Svako
+
+#. Type: select
+#. Description
+#: ../x11-common.templates:2002
+msgid Users allowed to start the X server:
+msgstr Korisnici kojima je dozvoljeno pokretanje X servera:
+
+#. Type: select
+#. Description
+#: ../x11-common.templates:2002
+msgid 
+Because the X server runs with superuser privileges, it may be unwise to 
+permit any user to start it, for security reasons.  On the other hand, it is 
+even more unwise to run general-purpose X client programs as root, which is 
+what may happen if only root is permitted to start the X server.  A good 
+compromise is to permit the X server to be started only by users logged in 
+to one of the virtual consoles.
+msgstr 
+Zbog pokretanja X servera sa superkorisničkim privilegijam, nije 
preporučljivo
+dozvoliti korisnicima da ga pokrenu, iz sigurnosnih razloga. S druge strane, 
još
+manje je preporučljivo pokrenuti X klijenta opšte namjene kao glavni 
korisnik, što
+se može desiti ako je samo glavnom korisniku dozvoljeno da pokrene X server.
+Kompromis bi bio dozvoliti pokretanje X servera od strane korisnika koji su 
samo
+ulogovani na jednu od virtuelnih konzola.

commit 1b4179906ca5d4b9a8f512d31cf88aa113f365fc
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 7 16:41:10 2011 +0200

Add Serbian cyrillic debconf translation (closes: #635009).

Thanks, Zlatan Todoric!

diff --git a/debian/changelog b/debian/changelog
index 06ab597..e0a1288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.6+8) UNRELEASED; urgency=low
 
   * Add Provides: xserver to xserver-xorg.
+  * Add Serbian cyrillic debconf translation (closes: #635009).  Thanks,
+Zlatan Todoric!
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
 
diff --git a/debian/po/sr.po b/debian/po/sr.po
new file mode 100644
index 000..be90b6d
--- /dev/null
+++ b/debian/po/sr.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2011
+# This file is distributed under the same license as the xorg package.
+# Zlatan Todoric zlatan.todo...@gmail.com, YEAR.
+#
+#, fuzzy
+msgid 
+msgstr 
+Project-Id-Version: PACKAGE VERSION\n
+Report-Msgid-Bugs-To: x...@packages.debian.org\n
+POT-Creation-Date: 2009-06-02 20:32+0200\n
+PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
+Last-Translator: Zlatan Todoric zlatan.todo...@gmail.com\n
+Language-Team: LANGUAGE l...@li.org\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Root Only
+msgstr Само главни корисник
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Console Users Only
+msgstr Само за кориснике конзоле
+
+#. Type: select
+#. Choices
+#: ../x11-common.templates:2001
+msgid Anybody
+msgstr Свако
+
+#. Type: select
+#. Description
+#: ../x11-common.templates:2002
+msgid Users allowed to start the X server:
+msgstr Корисници којима је дозвољено покретање Х сервера:
+
+#.

xorg: Changes to 'debian-unstable'

2011-07-31 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit ee9687abb3cea8d20182b31e6a00aae575726093
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 1 01:23:52 2011 +0200

Add Provides: xserver to xserver-xorg.

diff --git a/debian/changelog b/debian/changelog
index 4afcf28..06ab597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6+8) UNRELEASED; urgency=low
+
+  * Add Provides: xserver to xserver-xorg.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:23:42 +0200
+
 xorg (1:7.6+7) unstable; urgency=low
 
   * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
diff --git a/debian/control b/debian/control
index ce58f68..e0fc96c 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
+Provides: xserver
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server.  It does not provide the actual server itself.


-- 
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/e1qnfmc-0008ju...@vasks.debian.org

xorg: Changes to 'debian-unstable'

2011-06-03 Thread Cyril Brulebois 
 debian/changelog |8 
 debian/scripts/vars.armhf|4 +++-
 xsf-docs/index.txt   |6 +-
 xsf-docs/reference/git-usage.txt |   14 --
 4 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit f4492a5f80c6f22c5731f9499cfeb30ac0559d00
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 23:25:17 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index dd26853..4afcf28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+7) UNRELEASED; urgency=low
+xorg (1:7.6+7) unstable; urgency=low
 
   * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
 Bernhard R. Link!
@@ -15,7 +15,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
 - Update: faq/general (firmware for ATI)
 - and other minor updates.
 
- -- Cyril Brulebois k...@debian.org  Thu, 02 Jun 2011 19:00:42 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 03 Jun 2011 23:25:11 +0200
 
 xorg (1:7.6+6) unstable; urgency=low
 

commit 4a61439eac31224007dd3529e66c6b5e87399a31
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 23:24:34 2011 +0200

Keep wacom in Recommends rather than in Depends, though.

diff --git a/debian/changelog b/debian/changelog
index 9275c34..dd26853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
   * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
 Bernhard R. Link!
   * Add support for armhf (Closes: #605841), Thanks, Konstantinos
-Margaritis!
+Margaritis! Keep wacom in Recommends rather than in Depends, though.
   * Set the same permissions on all debian/scripts/vars.* files: no need
 to have them +x.
   * Remove debian/scripts/validate-posix-sh, unused.
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index db0ec34..ae27e54 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -11,4 +11,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
-   xserver-xorg-input-wacom
+
+
+XSERVER_XORG_INPUT_RECOMMENDS=xserver-xorg-input-wacom

commit 9e5ee03726d647f0678a06a605322d321f379b24
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 22:56:43 2011 +0200

Document new merge.

diff --git a/debian/changelog b/debian/changelog
index 30abb2d..9275c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
   * Remove debian/scripts/validate-posix-sh, unused.
   * Address description-synopsis-starts-with-article lintian tag.
   * Bump Standards-Version (no changes needed).
-  * Merge xsf-docs up to the 15ac25a426 commit:
+  * Merge xsf-docs up to the f920810e8f commit:
 - Add: reference/experimental
 - Add: reference/git-usage
 - Update: faq/general (firmware for ATI)

commit f920810e8f160b2560518802bb67b0c121a87f10
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 01:02:01 2011 +0200

index: Mention both URLs.

diff --git a/xsf-docs/index.txt b/xsf-docs/index.txt
index 9e04318..c1043a6 100644
--- a/xsf-docs/index.txt
+++ b/xsf-docs/index.txt
@@ -7,7 +7,11 @@ _The “X Strike Force” takes care of packaging X.Org for 
Debian._
 
 These documents are shipped in the
 http://packages.debian.org/xserver-xorgexact=1[xserver-xorg]
-metapackage (under `/usr/share/doc/xorg`), starting with `wheezy`.
+metapackage (under `/usr/share/doc/xorg`), starting with
+`wheezy`. They are also available online at
+http://x.debian.net/[x.debian.net], which is an alias for the
+longer-to-type
+http://pkg-xorg.alioth.debian.org/[pkg-xorg.alioth.debian.org].
 
 Getting started
 ---

commit 275ba95baf9c87991b6814c313457fb785d6d664
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 00:48:30 2011 +0200

git-usage: Specify a better title.

diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
index b9ee868..f2adb1f 100644
--- a/xsf-docs/reference/git-usage.txt
+++ b/xsf-docs/reference/git-usage.txt
@@ -10,8 +10,8 @@ 
http://wiki.debian.org/XStrikeForce/git-usage[wiki.debian.org/XSF/git-usage];
 this documentation is just a draft for now.
 
 
-Foreword
-
+Getting started
+---
 
 Upstream repositories are hosted on
 http://cgit.freedesktop.org/[git.freedesktop.org]

commit e344e58e55bb4d0016146e05c9b95aa5aaeaa564
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 00:42:16 2011 +0200

git-usage: Mention pushInsteadOf trick.

diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
index cdf89dd..b9ee868 100644
--- a/xsf-docs/reference/git-usage.txt
+++ b/xsf-docs/reference/git-usage.txt
@@ -33,6 +33,16 @@ so `origin` will likely point to `git.debian.org`. One can 
use
 `upstream` to point to `anongit.freedesktop.org`. The following
 documentation assumes this convention.
 
+The

xorg: Changes to 'debian-unstable'

2011-06-02 Thread Cyril Brulebois 
 debian/changelog |   19 +++
 debian/control   |   10 -
 debian/scripts/validate-posix-sh |   63 --
 debian/scripts/vars.arm  |   14 ++
 debian/xserver-xorg.postrm.in|2 
 xsf-docs/faq/general.txt |   10 +
 xsf-docs/howto/build-mesa.txt|3 
 xsf-docs/reference/experimental.txt  |   98 +++
 xsf-docs/reference/git-usage.txt |  190 +++
 xsf-docs/reference/squeeze-backports.txt |9 +
 10 files changed, 346 insertions(+), 72 deletions(-)

New commits:
commit 19f60cacb0faee0f4ed4770fbf8ae19fdf7a0f19
Author: Cyril Brulebois k...@debian.org
Date:   Thu Jun 2 23:08:17 2011 +0200

Document the merge.

diff --git a/debian/changelog b/debian/changelog
index 1670d93..30abb2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ xorg (1:7.6+7) UNRELEASED; urgency=low
   * Remove debian/scripts/validate-posix-sh, unused.
   * Address description-synopsis-starts-with-article lintian tag.
   * Bump Standards-Version (no changes needed).
+  * Merge xsf-docs up to the 15ac25a426 commit:
+- Add: reference/experimental
+- Add: reference/git-usage
+- Update: faq/general (firmware for ATI)
+- and other minor updates.
 
  -- Cyril Brulebois k...@debian.org  Thu, 02 Jun 2011 19:00:42 +0200
 

commit 15ac25a426af414f2cc3fdec1da8aa49d23c06b7
Author: Cyril Brulebois k...@debian.org
Date:   Thu Jun 2 21:16:05 2011 +0200

reference/git-usage: New doc.

diff --git a/xsf-docs/reference/git-usage.txt b/xsf-docs/reference/git-usage.txt
new file mode 100644
index 000..cdf89dd
--- /dev/null
+++ b/xsf-docs/reference/git-usage.txt
@@ -0,0 +1,190 @@
+Git usage
+=
+:toc:
+Cyril Brulebois k...@debian.org
+
+
+[NOTE]
+The old documentation is still available on the wiki:
+http://wiki.debian.org/XStrikeForce/git-usage[wiki.debian.org/XSF/git-usage];
+this documentation is just a draft for now.
+
+
+Foreword
+
+
+Upstream repositories are hosted on
+http://cgit.freedesktop.org/[git.freedesktop.org]
+
+Debian repositories are hosted on
+http://git.debian.org/[git.debian.org] under the `pkg-xorg/*`
+namespace. Each repository is about a single Debian source package.
+
+We have two types of repositories:
+
+* *regular* packages: 1 upstream repository → 1 Debian repository → 1
+   Debian source package (non-native).
+* *bundle* packages: multiple upstream repositories → 1 Debian
+   repository → 1 Debian source package (native).
+
+A local git repository can have several remotes. In the context of
+Debian packaging, one usually starts by cloning the Debian repository,
+so `origin` will likely point to `git.debian.org`. One can use
+`upstream` to point to `anongit.freedesktop.org`. The following
+documentation assumes this convention.
+
+To get the repository from `git.debian.org` one can run `debcheckout
+$package` (or `debcheckout $package $package.git`), which will use the
+`Vcs-Git` fields in the APT cache to pick the appropriate git
+location. To add the `upstream` remote (using the info stored in
+`debian/watch`), one can use `xsf-remote-add-upstream` script from the
+http://git.debian.org/?p=pkg-xorg/debian/xsf-tools.git[pkg-xorg/debian/xsf-tools.git]
+repository.
+
+**TODO:** There will be more information about how to deal with the
+many repositories maintained by the X Strike Force in a later chapter.
+
+The usual workflow is to keep the target suite in `debian/changelog`
+to `UNRELEASED` until the upload happens, the last commit before a
+commit being only `dch -r`. To achieve that, and to avoid noise since
+those packages are comaintained, it’s advised to set the following
+variable in `~/.devscripts`:
+
+
+DEBCHANGE_RELEASE_HEURISTIC=changelog
+
+
+
+Regular packages
+
+
+For most packages (exceptions include `xorg-server`), development is
+linear, and happens in a `master` branch. That `master` branch is
+pushed in the Debian repository as `upstream-$suite`
+(e.g. `upstream-unstable`), depending on the target suite. Usually,
+`upstream-unstable` tracks `upstream/master`.
+
+The packaging is kept in `debian-$suite` branches, branched from
+`upstream-$suite`. When cloning a Debian repository, the default
+branch is `debian-unstable`.
+
+To create the initial packaging from the `upstream-unstable` branch,
+just run `git checkout -b debian-unstable`, add packaging files
+(`changelog`, `control`, `copyright`, `rules` etc. under `debian/`),
+and that’s it.
+
+Here’s how to merge from upstream (`$foo` being a tag or
+`upstream/master`):
+
+
+git checkout upstream-unstable
+git merge $foo
+git log $foo  ChangeLog
+dch -v $debianrevision
+git commit -am 'Bump changelogs.'
+
+
+`$debianrevision` is usually `$foo` with `-1` appended (first upload),
+and sometimes prepended with a epoch (for example `2:`). Passing
+`$foo-1` is usually a good rule of thumb, since

xorg: Changes to 'debian-unstable'

2011-04-02 Thread Cyril Brulebois 
 debian/changelog  |   16 +
 debian/control|5 
 debian/rules  |7 
 xsf-docs/.gitignore   |1 
 xsf-docs/Makefile |   51 +--
 xsf-docs/asciidoc-xhtml11.css |  424 ++
 xsf-docs/asciidoc-xhtml11.js  |  128 +
 xsf-docs/faq/general.mdwn |   58 
 xsf-docs/faq/general.txt  |   81 +
 xsf-docs/howto/build-mesa.mdwn|  201 --
 xsf-docs/howto/build-mesa.txt |  220 +++
 xsf-docs/howto/configure-input.mdwn   |  176 
 xsf-docs/howto/configure-input.txt|  193 +
 xsf-docs/howto/report-bugs.mdwn   |   38 --
 xsf-docs/howto/report-bugs.txt|   51 +++
 xsf-docs/howto/triage-bugs.mdwn   |   95 --
 xsf-docs/howto/triage-bugs.txt|  104 +++
 xsf-docs/howto/use-gdb.mdwn   |  141 -
 xsf-docs/howto/use-gdb.txt|  176 
 xsf-docs/howto/use-xrandr.mdwn|  173 
 xsf-docs/howto/use-xrandr.txt |  214 +++
 xsf-docs/index.mdwn   |   34 --
 xsf-docs/index.txt|   46 +++
 xsf-docs/mdwn2html|   63 
 xsf-docs/reference/dependencies.mdwn  |  221 ---
 xsf-docs/reference/dependencies.txt   |  242 +
 xsf-docs/reference/squeeze-backports.mdwn |   65 
 xsf-docs/reference/squeeze-backports.txt  |   71 +
 xsf-docs/reference/upstream-contacts.mdwn |   43 ---
 xsf-docs/reference/upstream-contacts.txt  |   46 +++
 xsf-docs/upstream-features.mdwn   |   16 -
 xsf-docs/upstream-features.txt|   17 +
 xsf-docs/xsf.css  |   96 --
 33 files changed, 2063 insertions(+), 1450 deletions(-)

New commits:
commit 7bd1ffe794174af7bf57023b24e7ca4d0a90a93d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 2 17:12:34 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index aa38ff4..3aa6a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+6) UNRELEASED; urgency=low
+xorg (1:7.6+6) unstable; urgency=low
 
   * Merge xsf-docs up to the bd39472b0c commit:
 - Conversion from markdown to asciidoc.
@@ -12,7 +12,7 @@ xorg (1:7.6+6) UNRELEASED; urgency=low
 - Stop wrapping make with xvfb-run.
 - Get rid of the sparc-specific workaround.
 
- -- Cyril Brulebois k...@debian.org  Sat, 02 Apr 2011 16:50:43 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 02 Apr 2011 17:12:20 +0200
 
 xorg (1:7.6+5) unstable; urgency=low
 

commit 751bc3d52a4b770cd274abd032a03364c5c79692
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 2 17:11:50 2011 +0200

Adjust build system and build-dependencies accordingly.

diff --git a/debian/changelog b/debian/changelog
index 0aae9d5..aa38ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ xorg (1:7.6+6) UNRELEASED; urgency=low
   * Tweak the Makefile accordingly to stop trying to build and install PDF
 documents, since wkhtmltopdf fails on several architectures. Let's
 enable them again later, once bugs are fixed.
+  * Adjust build system and build-dependencies accordingly:
+- Add asciidoc build-dep.
+- Remove markdown build-dep.
+- Remove wkhtmltopdf, xauth, xvfb build-dep.
+- Stop wrapping make with xvfb-run.
+- Get rid of the sparc-specific workaround.
 
  -- Cyril Brulebois k...@debian.org  Sat, 02 Apr 2011 16:50:43 +0200
 
diff --git a/debian/control b/debian/control
index 7ad551b..c3492ae 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,7 @@ Build-Depends:
  debhelper (= 7),
  po-debconf,
 # xsf-docs:
- markdown,
- wkhtmltopdf,
- xauth,
- xvfb,
+ asciidoc,
 Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
diff --git a/debian/rules b/debian/rules
index 86955a9..861737a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,12 +50,7 @@ build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
-ifneq (,$(filter sparc sparc64,$(DEB_HOST_ARCH)))
-   # work around wkhtmltopdf's sigbus on sparc (#613141):
-   sed -i '/background-image.*svg/d' xsf-docs/xsf.css
-endif
-   # build XSF docs, under xvfb for wkhtmltodpf:
-   xvfb-run -- $(MAKE) -C xsf-docs
+   $(MAKE) -C xsf-docs
touch $@
 
 build-arch-only: build

commit bf20313ba3f29c9bd1fd51436c7fcffa4faa31dc
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 2 16:53:17 2011 +0200

Document the merge and further tweaks.

diff --git a/debian/changelog b/debian/changelog
index 38c5e29..0aae9d5 100644
--- a/debian/changelog
+++

xorg: Changes to 'debian-unstable'

2011-03-31 Thread Cyril Brulebois 
 debian/changelog  |8 
 debian/control|2 ++
 debian/scripts/vars.hurd-i386 |2 --
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 90134239c70a8ce493a8ea1a5a3d1fe356202ab5
Author: Cyril Brulebois k...@debian.org
Date:   Fri Apr 1 02:09:02 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index d7d4051..38c5e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.6+5) UNRELEASED; urgency=low
+xorg (1:7.6+5) unstable; urgency=low
 
   * Drop ati and sisusb from video-all on hurd-i386, thanks to Samuel
 Thibault (Closes: #619862).
   * Add Vcs-* fields.
 
- -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:02:06 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:08:54 +0200
 
 xorg (1:7.6+4) unstable; urgency=low
 

commit ff5b765f1b6990edf90338f49b5d2f6fa1547cac
Author: Cyril Brulebois k...@debian.org
Date:   Fri Apr 1 02:06:05 2011 +0200

Add Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index ba5b482..d7d4051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.6+5) UNRELEASED; urgency=low
 
   * Drop ati and sisusb from video-all on hurd-i386, thanks to Samuel
 Thibault (Closes: #619862).
+  * Add Vcs-* fields.
 
  -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:02:06 +0200
 
diff --git a/debian/control b/debian/control
index c07b6c6..7ad551b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends:
  wkhtmltopdf,
  xauth,
  xvfb,
+Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
 Package: x11-common
 Architecture: all

commit 5596850fd3ec43a9885a7a1dc6808b4f6bbf4de0
Author: Cyril Brulebois k...@debian.org
Date:   Fri Apr 1 02:04:34 2011 +0200

Drop ati and sisusb from video-all on hurd-i386, thanks to Samuel Thibault 
(Closes: #619862).

diff --git a/debian/changelog b/debian/changelog
index f9e7ac2..ba5b482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+5) UNRELEASED; urgency=low
+
+  * Drop ati and sisusb from video-all on hurd-i386, thanks to Samuel
+Thibault (Closes: #619862).
+
+ -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:02:06 +0200
+
 xorg (1:7.6+4) unstable; urgency=low
 
   [ Steve Langasek ]
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 5251d3f..0e88246 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -5,7 +5,6 @@
 
 XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-ark, \
-   xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
@@ -20,7 +19,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
xserver-xorg-video-sis, \
-   xserver-xorg-video-sisusb, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \


-- 
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/e1q5szt-0005jw...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2011-02-25 Thread Cyril Brulebois 
 debian/changelog  |   13 +
 xsf-docs/faq/general.mdwn |   58 
 xsf-docs/howto/build-mesa.mdwn|  201 ++
 xsf-docs/howto/configure-input.mdwn   |  176 ++
 xsf-docs/howto/report-bugs.mdwn   |   38 +
 xsf-docs/howto/triage-bugs.mdwn   |   95 ++
 xsf-docs/howto/use-gdb.mdwn   |  141 +
 xsf-docs/howto/use-xrandr.mdwn|  173 +
 xsf-docs/howtos   |1 
 xsf-docs/howtos/build-mesa.mdwn   |  201 --
 xsf-docs/howtos/configure-input.mdwn  |  167 
 xsf-docs/howtos/report-bugs.mdwn  |   35 -
 xsf-docs/howtos/triage-bugs.mdwn  |   93 -
 xsf-docs/howtos/use-gdb.mdwn  |  102 ---
 xsf-docs/howtos/use-xrandr.mdwn   |  173 -
 xsf-docs/index.mdwn   |   19 +-
 xsf-docs/reference/squeeze-backports.mdwn |   65 +
 17 files changed, 971 insertions(+), 780 deletions(-)

New commits:
commit f299727f49b84f6e52a8d09f05753331e5c4940e
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 21:05:47 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 7ac8f70..f9e7ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+4) UNRELEASED; urgency=low
+xorg (1:7.6+4) unstable; urgency=low
 
   [ Steve Langasek ]
   * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
@@ -12,7 +12,7 @@ xorg (1:7.6+4) UNRELEASED; urgency=low
 - Update: howto/triage-bugs
 - Update: howto/use-gdb (mention getting/using a core file)
 
- -- Steve Langasek vor...@debian.org  Mon, 21 Feb 2011 19:28:58 -0800
+ -- Cyril Brulebois k...@debian.org  Fri, 25 Feb 2011 21:05:36 +0100
 
 xorg (1:7.6+3) unstable; urgency=low
 

commit 73984c6b0576f15d8848cdf0cb36765f01914222
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 21:03:41 2011 +0100

Document the merge.

diff --git a/debian/changelog b/debian/changelog
index f2c1433..7ac8f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
 xorg (1:7.6+4) UNRELEASED; urgency=low
 
+  [ Steve Langasek ]
   * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
 have their dependency satisfied by it.
 
+  [ Cyril Brulebois ]
+  * Merge xsf-docs up to the 4d4bfa3eaf commit:
+- Add: faq/general
+- Add: reference/squeeze-backports
+- Update: howto/configure-input
+- Update: howto/triage-bugs
+- Update: howto/use-gdb (mention getting/using a core file)
+
  -- Steve Langasek vor...@debian.org  Mon, 21 Feb 2011 19:28:58 -0800
 
 xorg (1:7.6+3) unstable; urgency=low

commit 4d4bfa3eaff329d4fb51d970aa2f048ee0ae815d
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 00:48:50 2011 +0100

use-gdb: Mention getting a core with kdm.

diff --git a/xsf-docs/howto/use-gdb.mdwn b/xsf-docs/howto/use-gdb.mdwn
index d90591c..f60eab0 100644
--- a/xsf-docs/howto/use-gdb.mdwn
+++ b/xsf-docs/howto/use-gdb.mdwn
@@ -56,6 +56,11 @@ that.**
 [daemon]
 LocalXserverCommand=/usr/bin/Xorg -br -verbose -audit 0 -novtswitch 
-core
 
+ * Using `kdm`: One should look for the `ServerArgsLocal` variable in
+   the `/etc/kde4/kdm/kdmrc` file, and add `-core` there. Example:
+
+ServerArgsLocal=-br -nolisten tcp -core
+
  * Using `xdm`: It’s sufficient to add `-core` to the command
configured through `/etc/X11/xdm/Xservers`, for example:
 

commit 8a3e38ac6853fc35327363e26aad55f2f4b9651f
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 00:44:07 2011 +0100

use-gdb: Need to specify the binary when loading a core.

diff --git a/xsf-docs/howto/use-gdb.mdwn b/xsf-docs/howto/use-gdb.mdwn
index 8e1b097..d90591c 100644
--- a/xsf-docs/howto/use-gdb.mdwn
+++ b/xsf-docs/howto/use-gdb.mdwn
@@ -63,9 +63,10 @@ that.**
 
 ### Loading a core file
 
-That’s trivial:
+That’s trivial, one just needs to pass both the core file and the path
+to the binary:
 
-# gdb -c /etc/X11/core
+# gdb -c /etc/X11/core /usr/bin/Xorg
 
 Now `gdb` is ready to display backtraces.
 

commit 8802b8730bac49ebeb9e48772a5e1ba65920d56c
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 00:25:14 2011 +0100

use-gdb: Mention getting a core with xdm.

diff --git a/xsf-docs/howto/use-gdb.mdwn b/xsf-docs/howto/use-gdb.mdwn
index daa7cc9..8e1b097 100644
--- a/xsf-docs/howto/use-gdb.mdwn
+++ b/xsf-docs/howto/use-gdb.mdwn
@@ -56,6 +56,11 @@ that.**
 [daemon]
 LocalXserverCommand=/usr/bin/Xorg -br -verbose -audit 0 -novtswitch 
-core
 
+ * Using `xdm`: It’s sufficient to add `-core` to the command
+   configured through `/etc/X11/xdm/Xservers`, for example:
+
+:0 local /usr/bin/X :0 vt7 -nolisten tcp -core
+
 ### Loading a core file
 
 That’s

xorg: Changes to 'debian-unstable'

2011-02-21 Thread Steve Langasek 
 debian/changelog |7 +++
 debian/control   |1 +
 2 files changed, 8 insertions(+)

New commits:
commit 052474bf1f7a0d74d820e44aa7ab3f2b66bd1c9a
Author: Steve Langasek steve.langa...@canonical.com
Date:   Mon Feb 21 19:29:56 2011 -0800

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

diff --git a/debian/changelog b/debian/changelog
index ddaafb7..f2c1433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.6+4) UNRELEASED; urgency=low
+
+  * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
+have their dependency satisfied by it.
+
+ -- Steve Langasek vor...@debian.org  Mon, 21 Feb 2011 19:28:58 -0800
+
 xorg (1:7.6+3) unstable; urgency=low
 
   * Merge xsf-docs up to the 8fc70f1e37 commit:
diff --git a/debian/control b/debian/control
index 2b32214..c07b6c6 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
 
 Package: x11-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1prixv-00068z...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2011-02-12 Thread Cyril Brulebois 
 debian/changelog   |   22 +
 debian/local/Xsession.d/50x11-common_determine-startup |3 
 debian/rules   |6 
 debian/x11-common.postinst.in  |   10 
 xsf-docs/howtos/build-mesa.mdwn|  201 +
 xsf-docs/howtos/configure-input.mdwn   |4 
 xsf-docs/howtos/report-bugs.mdwn   |7 
 xsf-docs/howtos/use-gdb.mdwn   |2 
 xsf-docs/index.mdwn|2 
 xsf-docs/mdwn2html |   23 +
 xsf-docs/reference/upstream-contacts.mdwn  |   43 +++
 xsf-docs/xsf.css   |   12 -
 12 files changed, 317 insertions(+), 18 deletions(-)

New commits:
commit b4bf4c7cc266f65900a56cec2f0fb43ee53ff702
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 13 07:35:06 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 32619c7..ddaafb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+3) UNRELEASED; urgency=low
+xorg (1:7.6+3) unstable; urgency=low
 
   * Merge xsf-docs up to the 8fc70f1e37 commit:
 - Add: howtos/build-mesa
@@ -18,7 +18,7 @@ xorg (1:7.6+3) UNRELEASED; urgency=low
   * Fix FTBFS on sparc{,64} by working around wkhtmltopdf's #613141:
 remove the SVG file from the CSS on these architectures.
 
- -- Cyril Brulebois k...@debian.org  Sat, 12 Feb 2011 11:19:54 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 13 Feb 2011 07:34:14 +0100
 
 xorg (1:7.6+2) unstable; urgency=low
 

commit 22650398facb38e12a9c316d6a7c753e029b17a9
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 13 07:34:03 2011 +0100

Fix FTBFS on sparc{,64} by working around wkhtmltopdf's #613141: remove the 
SVG file from the CSS on these architectures.

diff --git a/debian/changelog b/debian/changelog
index 925abb8..32619c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg (1:7.6+3) UNRELEASED; urgency=low
 back into place. There's no secret in there (Closes: #581338).
   * 50x11-common_determine-startup: Take $SHELL into account, defaulting
 to sh if SHELL is unset or null (Closes: #604010).
+  * Fix FTBFS on sparc{,64} by working around wkhtmltopdf's #613141:
+remove the SVG file from the CSS on these architectures.
 
  -- Cyril Brulebois k...@debian.org  Sat, 12 Feb 2011 11:19:54 +0100
 
diff --git a/debian/rules b/debian/rules
index 5499952..86955a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,10 @@ build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+ifneq (,$(filter sparc sparc64,$(DEB_HOST_ARCH)))
+   # work around wkhtmltopdf's sigbus on sparc (#613141):
+   sed -i '/background-image.*svg/d' xsf-docs/xsf.css
+endif
# build XSF docs, under xvfb for wkhtmltodpf:
xvfb-run -- $(MAKE) -C xsf-docs
touch $@

commit 4d224de1fff0eb323732c0770d45b5520eaa80d1
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 12 12:56:43 2011 +0100

50x11-common_determine-startup: Take $SHELL into account, defaulting to sh 
if SHELL is unset or null (Closes: #604010).

diff --git a/debian/changelog b/debian/changelog
index 5beedab..925abb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xorg (1:7.6+3) UNRELEASED; urgency=low
 to generate the Xwrapper.config file.
   * Use “tempfile -m 644” to generate the temporary file which gets copied
 back into place. There's no secret in there (Closes: #581338).
+  * 50x11-common_determine-startup: Take $SHELL into account, defaulting
+to sh if SHELL is unset or null (Closes: #604010).
 
  -- Cyril Brulebois k...@debian.org  Sat, 12 Feb 2011 11:19:54 +0100
 
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup 
b/debian/local/Xsession.d/50x11-common_determine-startup
index cd9e4d3..4e13505 100644
--- a/debian/local/Xsession.d/50x11-common_determine-startup
+++ b/debian/local/Xsession.d/50x11-common_determine-startup
@@ -13,7 +13,8 @@ if [ -z $STARTUP ]; then
 if [ -x $STARTUPFILE ]; then
   STARTUP=$STARTUPFILE
 else
-  STARTUP=sh $STARTUPFILE
+  shell=${SHELL:-sh}
+  STARTUP=$shell $STARTUPFILE
 fi
 break
   fi

commit 7ab31eaed95248fe5cf8bfb8985301aa1f0302d7
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 12 12:46:36 2011 +0100

Use “tempfile -m 644” to generate the temporary file which gets copied back 
into place. There's no secret in there (Closes: #581338).

diff --git a/debian/changelog b/debian/changelog
index c09470a..5beedab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xorg (1:7.6+3) UNRELEASED; urgency=low
   * As a consequence of this bug, users having installed

xorg: Changes to 'debian-unstable'

2011-02-08 Thread Cyril Brulebois 
 debian/changelog |   34 
 debian/control   |   11 +
 debian/local/control |1 
 debian/local/dexconf |  240 --
 debian/local/dexconf.1   |  246 ---
 debian/local/xorg.conf   |   96 -
 debian/rules |   13 -
 debian/xbase-clients.postinst.in |   20 --
 debian/xbase-clients.postrm.in   |   20 --
 debian/xbase-clients.preinst.in  |   20 --
 debian/xserver-xorg.examples |1 
 debian/xserver-xorg.install  |2 
 debian/xserver-xorg.manpages |1 
 debian/xutils.postinst.in|   35 
 debian/xutils.postrm.in  |   31 
 debian/xutils.preinst.in |   31 
 xsf-docs/.gitignore  |3 
 xsf-docs/COPYING |   19 ++
 xsf-docs/Makefile|   61 
 xsf-docs/howtos/configure-input.mdwn |  167 +++
 xsf-docs/howtos/report-bugs.mdwn |   30 
 xsf-docs/howtos/triage-bugs.mdwn |   93 +
 xsf-docs/howtos/use-gdb.mdwn |  102 ++
 xsf-docs/howtos/use-xrandr.mdwn  |  173 
 xsf-docs/index.mdwn  |   27 +++
 xsf-docs/mdwn2html   |   48 ++
 xsf-docs/reference/dependencies.mdwn |  221 +++
 xsf-docs/upstream-features.mdwn  |   16 ++
 xsf-docs/xsf.css |   86 
 xsf-docs/xsf.png |binary
 xsf-docs/xsf.svg |  234 +
 31 files changed, 1331 insertions(+), 751 deletions(-)

New commits:
commit 0e43f190d0716b77c634751da9407909182533df
Author: Cyril Brulebois k...@debian.org
Date:   Tue Feb 8 16:38:45 2011 +0100

Add xauth build-dep, for xvfb-run.

diff --git a/debian/changelog b/debian/changelog
index 68f07a7..1d77da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg (1:7.6+2) unstable; urgency=low
 - markdown: .mdwn to .html
 - wkhtmltopdf: .html to .pdf
 - xvfb: wkhtmltopdf needs a display.
+- xauth: xvfb-run needs it.
   * Remove xbase-clients maintainer scripts: Stop caring about
 /etc/X11/app-defaults/Beforelight, which was needed while upgrading
 from versions earlier than 1:7.4+2. Now even squeeze has a newer
diff --git a/debian/control b/debian/control
index ca1c01c..2b32214 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
 # xsf-docs:
  markdown,
  wkhtmltopdf,
+ xauth,
  xvfb,
 
 Package: x11-common

commit 4346bc7d79bb8c3e08b3b7cd0db765a76aa04606
Author: Cyril Brulebois k...@debian.org
Date:   Tue Feb 8 16:32:33 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 982a0d9..68f07a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+2) UNRELEASED; urgency=low
+xorg (1:7.6+2) unstable; urgency=low
 
   * Merge xsf-docs documentation. That's an offline copy of the
 documentation available online (http://pkg-xorg.alioth.debian.org/) in
@@ -29,7 +29,7 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
 - xorg.conf: No real need for an example, with autodetection. If some
   documentation is still needed, it can be added to xsf-docs.
 
- -- Cyril Brulebois k...@debian.org  Sun, 06 Feb 2011 20:22:01 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 08 Feb 2011 16:32:29 +0100
 
 xorg (1:7.6+1) unstable; urgency=low
 

commit d9b33ad68c13bcb3861db1ec28e71cdb90c9b67f
Author: Cyril Brulebois k...@debian.org
Date:   Tue Feb 8 16:23:36 2011 +0100

Mention the directory for xsf-docs.

diff --git a/debian/changelog b/debian/changelog
index ab94888..982a0d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
   * Call make/make clean in xsf-docs/ accordingly. Do the “make” part
 under xvfb-run since wkhtmltopdf requires a working display, at least
 at the moment.
-  * Ship xsf-docs under /usr/share/doc in the xserver-xorg metapackage.
+  * Ship xsf-docs in the xserver-xorg metapackage, under the following
+directory: /usr/share/doc/xorg
   * Add build-deps accordingly:
 - markdown: .mdwn to .html
 - wkhtmltopdf: .html to .pdf

commit f76bdc79245099474e5d47e21a18b4d79612071b
Author: Cyril Brulebois k...@debian.org
Date:   Tue Feb 8 15:49:43 2011 +0100

Remove obsolete material.

- dexconf: Good bye!
- xorg.conf: No real need for an example, with autodetection. If some
  documentation is still needed, it can be added to xsf-docs.

diff --git a/debian/changelog b/debian/changelog
index c7bc270..ab94888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ xorg (1:7.6+2) UNRELEASED; urgency=low
   * Ship a bug control file for xorg, making it report-with: xserver-xorg,
 which

xorg: Changes to 'debian-unstable'

2011-02-05 Thread Cyril Brulebois 
Rebased ref, commits from common ancestor:
commit 6efa646a04f7e004bf2842393fccad3c9d08f738
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 15:23:28 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 9fb5018..7fc1152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+1) UNRELEASED; urgency=low
+xorg (1:7.6+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
@@ -17,7 +17,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 06:37:59 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 15:23:23 +0100
 
 xorg (1:7.6~2) experimental; urgency=low
 

commit 2686b6b0a9978dbf2e11897bb2697295d13324ff
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 07:23:30 2011 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9317cd3..9fb5018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
 xserver-xorg-video-all from being installable.
   * xserver-wrapper.c: Fix compilation warnings.
   * Update Uploaders list. Thanks, David  Brice!
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 06:37:59 +0100
 
diff --git a/debian/control b/debian/control
index 404c5fb..397828a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends: po-debconf, debhelper (= 7)
 
 Package: x11-common

commit 8f0b2078dacaffb7818cccb552f8f86befd855d1
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 07:07:34 2011 +0100

Update Uploaders list. Thanks, David  Brice!

diff --git a/debian/changelog b/debian/changelog
index 773ea79..9317cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
 maintained by the X Strike Force, and that shouldn't prevent
 xserver-xorg-video-all from being installable.
   * xserver-wrapper.c: Fix compilation warnings.
+  * Update Uploaders list. Thanks, David  Brice!
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 06:37:59 +0100
 
diff --git a/debian/control b/debian/control
index 6a23ba5..404c5fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Brice Goglin bgog...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
 Standards-Version: 3.8.4
 Build-Depends: po-debconf, debhelper (= 7)
 

commit 8e24e455289b2f29b0ff05355999dd6458208ba3
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 07:04:25 2011 +0100

xserver-wrapper.c: Fix compilation warnings.

diff --git a/debian/changelog b/debian/changelog
index 456a1c4..773ea79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
   * Make xserver-xorg-video-geode a recommended package. It's not
 maintained by the X Strike Force, and that shouldn't prevent
 xserver-xorg-video-all from being installable.
+  * xserver-wrapper.c: Fix compilation warnings.
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 06:37:59 +0100
 
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index de040d6..db503b5 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -213,7 +213,6 @@ main(int argc, char **argv)
   char value[257];
   int length;
   int i;
-  int intval;
   char *val;
   mode_t mask;
   SecurityLevel level = RootOnly;

commit 0bc4965fd055b4fa5e8dcd5b1ccedc11d808badf
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 06:59:52 2011 +0100

Make xserver-xorg-video-geode a recommended package.

It's not maintained by the X Strike Force, and that shouldn't prevent
xserver-xorg-video-all from being installable.

diff --git a/debian/changelog b/debian/changelog
index 0d6f116..456a1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xorg (1:7.6+1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Make xserver-xorg-video-nouveau a dependency again.
+  * Make xserver-xorg-video-geode a recommended package. It's not
+maintained by the X Strike Force, and that shouldn't prevent
+xserver-xorg-video-all from being installable.
 
  -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 06:37:59 +0100

xorg: Changes to 'debian-unstable'

2011-01-18 Thread Cyril Brulebois 
 debian/changelog  |7 +++
 debian/xserver-xorg.postrm.in |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2a49aa0180eeb2eb1eac3d523b6a7f48fa89f760
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 18 21:08:42 2011 +0100

Fix version number, 1:7.5+9 went to experimental already.

diff --git a/debian/changelog b/debian/changelog
index abbe539..eac7177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+9) UNRELEASED; urgency=low
+xorg (1:7.5+8+squeeze1) UNRELEASED; urgency=low
 
   * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
 Bernhard R. Link!

commit faa0d1fa3abec6ef9a416654834b11616de6fe50
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jan 18 21:03:23 2011 +0100

Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks, 
Bernhard R. Link!

diff --git a/debian/changelog b/debian/changelog
index 43610ac..abbe539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.5+9) UNRELEASED; urgency=low
+
+  * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks,
+Bernhard R. Link!
+
+ -- Cyril Brulebois k...@debian.org  Tue, 18 Jan 2011 20:35:52 +0100
+
 xorg (1:7.5+8) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/xserver-xorg.postrm.in b/debian/xserver-xorg.postrm.in
index 4fd7aca..652629b 100644
--- a/debian/xserver-xorg.postrm.in
+++ b/debian/xserver-xorg.postrm.in
@@ -31,7 +31,7 @@ if [ $1 = purge ]; then
   rm -f $SERVER_SYMLINK
   rm -f $XORGCONFIG_CHECKSUM $XORGCONFIG_ROSTER
   rm -f $SERVER_SYMLINK_CHECKSUM $SERVER_SYMLINK_ROSTER
-  rm -f $XORGCONFIG
+  rm -f $XORGCONFIG $XF86CONFIG
 
   for DIR in $CONFIG_DIR $CONFIG_AUX_DIR; do
   rmdir $DIR 2 /dev/null || true


-- 
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/e1pfhsj-00030r...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-10-02 Thread Cyril Brulebois 
 debian/changelog  |9 +++--
 debian/xorg.links |1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 691cd60cab4fde3f5245fcf0364902a0a64163ed
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 2 14:21:04 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 69b149b..43610ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+8) UNRELEASED; urgency=low
+xorg (1:7.5+8) unstable; urgency=low
 
   [ Julien Cristau ]
   * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
@@ -9,7 +9,7 @@ xorg (1:7.5+8) UNRELEASED; urgency=low
   * Add a symlink to use xserver-xorg-core’s bug script so that we get
 more info when one runs “reportbug xorg”.
 
- -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 02 Oct 2010 14:20:28 +0200
 
 xorg (1:7.5+7) unstable; urgency=low
 

commit 4170849898fe7bf418ce6d8a4581a73143f1b957
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 2 14:20:22 2010 +0200

Add a symlink to use xserver-xorg-core’s bug script.

diff --git a/debian/changelog b/debian/changelog
index 4f02504..69b149b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xorg (1:7.5+8) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
   * Use linux-any instead of an ever-changing list of architectures for the
 xserver-xorg-input-evdev dependency.
 
+  [ Cyril Brulebois ]
+  * Add a symlink to use xserver-xorg-core’s bug script so that we get
+more info when one runs “reportbug xorg”.
+
  -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
 
 xorg (1:7.5+7) unstable; urgency=low
diff --git a/debian/xorg.links b/debian/xorg.links
new file mode 100644
index 000..a6eb734
--- /dev/null
+++ b/debian/xorg.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xorg/script


-- 
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/e1p21bk-0007bi...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-09-19 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 44938cf0d0227d0058199f8e965acee72508c378
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 14 14:54:20 2010 +0200

Use linux-any for the xserver-xorg-input-evdev dependency

Instead of an ever-changing list of architectures, just use a wildcard.

[s390 now builds -evdev, so we can safely do this]

diff --git a/debian/changelog b/debian/changelog
index 303dc33..4f02504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.5+8) UNRELEASED; urgency=low
 
   * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
+  * Use linux-any instead of an ever-changing list of architectures for the
+xserver-xorg-input-evdev dependency.
 
  -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
 
diff --git a/debian/control b/debian/control
index 3950bd1..d7f6549 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
  xserver-xorg-core (= 2:1.7),
  xserver-xorg-video-all | xserver-xorg-video-6,
  xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc sparc64],
+ xserver-xorg-input-evdev [linux-any],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oxh2c-7v...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-09-14 Thread Julien Cristau 
 debian/changelog|8 
 debian/control  |2 +-
 debian/scripts/vars.sparc64 |   34 ++
 3 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 665f99c85fa643240e1299e4882a599e9e790d2a
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 14 14:54:20 2010 +0200

Use linux-any for the xserver-xorg-input-evdev dependency

Instead of an ever-changing list of architectures, just use a wildcard.

diff --git a/debian/changelog b/debian/changelog
index 303dc33..4f02504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg (1:7.5+8) UNRELEASED; urgency=low
 
   * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
+  * Use linux-any instead of an ever-changing list of architectures for the
+xserver-xorg-input-evdev dependency.
 
  -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
 
diff --git a/debian/control b/debian/control
index 3950bd1..d7f6549 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
  xserver-xorg-core (= 2:1.7),
  xserver-xorg-video-all | xserver-xorg-video-6,
  xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc sparc64],
+ xserver-xorg-input-evdev [linux-any],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},

commit df93f3040013e190d1ddcc93da2ce4a447460c8a
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 14 14:52:31 2010 +0200

Changelog entry

diff --git a/debian/changelog b/debian/changelog
index a0495fc..303dc33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+8) UNRELEASED; urgency=low
+
+  * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
+
+ -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
+
 xorg (1:7.5+7) unstable; urgency=low
 
   [ Julien Cristau ]

commit 8637d1a19ef22ed0432fad3fc2b1cd119a9e1cb9
Author: Aurelien Jarno aure...@debian.org
Date:   Tue Sep 14 14:27:27 2010 +0200

Bug#596828: xorg: support for sparc64

Please find below a patch that it is necessary to build xorg on
sparc64. It is basically a copy of the sparc configuration.

diff --git a/debian/control b/debian/control
index 4b87f47..3950bd1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
  xserver-xorg-core (= 2:1.7),
  xserver-xorg-video-all | xserver-xorg-video-6,
  xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc],
+ xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc sparc64],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64
new file mode 100644
index 000..5cb831a
--- /dev/null
+++ b/debian/scripts/vars.sparc64
@@ -0,0 +1,34 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
+   xserver-xorg-video-ark, \
+   xserver-xorg-video-ati, \
+   xserver-xorg-video-chips, \
+   xserver-xorg-video-cirrus, \
+   xserver-xorg-video-fbdev, \
+   xserver-xorg-video-i128, \
+   xserver-xorg-video-i740, \
+   xserver-xorg-video-mga, \
+   xserver-xorg-video-neomagic, \
+   xserver-xorg-video-nv, \
+   xserver-xorg-video-rendition, \
+   xserver-xorg-video-s3virge, \
+   xserver-xorg-video-savage, \
+   xserver-xorg-video-siliconmotion, \
+   xserver-xorg-video-suncg14, \
+   xserver-xorg-video-suncg3, \
+   xserver-xorg-video-suncg6, \
+   xserver-xorg-video-sunffb, \
+   xserver-xorg-video-sunleo, \
+   xserver-xorg-video-suntcx, \
+   xserver-xorg-video-tdfx, \
+   xserver-xorg-video-trident, \
+   xserver-xorg-video-vesa, \
+
+
+XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
+   xserver-xorg-input-synaptics, \
+   xserver-xorg-input-wacom


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ovvmf-0008m8...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-09-14 Thread Julien Cristau 
 debian/changelog |2 --
 debian/control   |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit aacdacde31ccfba891eba8474138230ad18d5513
Author: Julien Cristau jcris...@debian.org
Date:   Tue Sep 14 15:31:42 2010 +0200

Revert Use linux-any for the xserver-xorg-input-evdev dependency

s390 doesn't have xserver-xorg-input-evdev.

This reverts commit 665f99c85fa643240e1299e4882a599e9e790d2a.

diff --git a/debian/changelog b/debian/changelog
index 4f02504..303dc33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 xorg (1:7.5+8) UNRELEASED; urgency=low
 
   * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
-  * Use linux-any instead of an ever-changing list of architectures for the
-xserver-xorg-input-evdev dependency.
 
  -- Julien Cristau jcris...@debian.org  Tue, 14 Sep 2010 14:52:03 +0200
 
diff --git a/debian/control b/debian/control
index d7f6549..3950bd1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
  xserver-xorg-core (= 2:1.7),
  xserver-xorg-video-all | xserver-xorg-video-6,
  xserver-xorg-input-all | xserver-xorg-input-7,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia 
m32r m68k mips mipsel powerpc sparc sparc64],
  hal (= 0.5.12~git20090406) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ovvcw-0003dd...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-09-04 Thread Cyril Brulebois 
 debian/changelog   |   10 +--
 debian/control |2 -
 debian/po/ar.po|5 ++-
 debian/po/ast.po   |5 ++-
 debian/po/be.po|7 ++---
 debian/po/bg.po|   17 ++--
 debian/po/bn.po|1 
 debian/po/bs.po|   17 ++--
 debian/po/ca.po|   25 +-
 debian/po/cs.po|   17 ++--
 debian/po/da.po|   23 -
 debian/po/de.po|   31 +++
 debian/po/dz.po|   21 ---
 debian/po/el.po|1 
 debian/po/eo.po|1 
 debian/po/es.po|   34 +
 debian/po/eu.po|1 
 debian/po/fi.po|   17 ++--
 debian/po/fr.po|   14 +-
 debian/po/gl.po|   25 +-
 debian/po/gu.po|1 
 debian/po/he.po|1 
 debian/po/hr.po|   17 ++--
 debian/po/hu.po|   17 ++--
 debian/po/id.po|1 
 debian/po/it.po|   54 
 debian/po/ja.po|1 
 debian/po/kk.po|1 
 debian/po/km.po|   21 ---
 debian/po/ko.po|1 
 debian/po/ku.po|1 
 debian/po/lt.po|   21 ---
 debian/po/ml.po|1 
 debian/po/mr.po|   25 +-
 debian/po/nb.po|   71 -
 debian/po/ne.po|   17 ++--
 debian/po/nl.po|   17 ++--
 debian/po/nn.po|   59 +++-
 debian/po/pl.po|   25 +-
 debian/po/pt.po|   17 ++--
 debian/po/pt_BR.po |   25 +-
 debian/po/ro.po|1 
 debian/po/ru.po|   27 ++--
 debian/po/sk.po|   21 ---
 debian/po/sq.po|   17 ++--
 debian/po/sv.po|9 +++---
 debian/po/ta.po|   17 ++--
 debian/po/th.po|   21 ---
 debian/po/tr.po|   17 ++--
 debian/po/vi.po|   13 +
 debian/po/wo.po|1 
 debian/po/zh_CN.po |   17 ++--
 debian/po/zh_TW.po |   17 ++--
 53 files changed, 456 insertions(+), 390 deletions(-)

New commits:
commit 64f804732883edf998f94a87d73542a73445db4c
Author: Cyril Brulebois k...@debian.org
Date:   Sat Sep 4 19:39:47 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 1df5269..a0495fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+7) UNRELEASED; urgency=low
+xorg (1:7.5+7) unstable; urgency=low
 
   [ Julien Cristau ]
   * Nuke x11-common's Conflicts.  This was needed for upgrades from the
@@ -14,7 +14,7 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
   * Update Debian po files by running debconf-updatepo (through
 debian/rules clean).
 
- -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 04 Sep 2010 19:39:41 +0200
 
 xorg (1:7.5+6) unstable; urgency=medium
 

commit 536bc4be32f5dc977808b8e82fc0ccf278f2c479
Author: Cyril Brulebois k...@debian.org
Date:   Sat Sep 4 19:39:20 2010 +0200

Update Debian po files by running debconf-updatepo (through debian/rules 
clean).

diff --git a/debian/changelog b/debian/changelog
index 1e02e5b..1df5269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Add myself to Uploaders.
+  * Update Debian po files by running debconf-updatepo (through
+debian/rules clean).
 
  -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
 
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 46e8ed2..aedbb64 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -12,12 +12,13 @@ msgstr 
 PO-Revision-Date: 2008-06-12 03:41+0300\n
 Last-Translator: Ossama M. Khayat okha...@yahoo.com\n
 Language-Team: Arabic supp...@arabeyes.org\n
+Language: ar\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 X-Generator: KBabel 1.11.4\n
-Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n%
-100=3  n%100=10 ? 2 : 3;\n
+Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n
+%100=3  n%100=10 ? 2 : 3;\n
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ast.po b/debian/po/ast.po
index 793f4e1..49d49e9 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -12,6 +12,7 @@ msgstr 
 Last-Translator: Marcos Alvarez Costales marcos.alvarez.costa...@gmail.
 com\n
 Language-Team: Asturian softast-xene...@lists.sourceforge.net\n
+Language: ast\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -323,8 +324,8 @@ msgstr 
 #~ of most other keyboards should generally enter \pc105\.
 #~ msgstr 
 #~ Los usuarios de teclaos estauxunidenses tendríen d'introducir \pc104\, 
-#~ y los usuarios de práuticamente'l restu de teclaos tendríen d'usar \pc105
-#~ \.
+#~ y los usuarios de práuticamente'l restu de teclaos tendríen d'usar

xorg: Changes to 'debian-unstable'

2010-09-03 Thread Julien Cristau 
 debian/changelog |1 +
 debian/scripts/vars.i386 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5b38e15ad54f08d37202401dc8c8e6974921d326
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 3 14:01:48 2010 +0200

Add xserver-xorg-video-geode to -all on i386.

diff --git a/debian/changelog b/debian/changelog
index 0aa172b..f75f6eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
 x11-common.preinst was removed in 1:7.4+2.
   * Drop versioned build-dep on dpkg 1.7.0.  Even woody had that..
   * Drop x11-common Depends on debianutils 1.13.  That was also in woody.
+  * Add xserver-xorg-video-geode to -all on i386 (closes: #567909).
 
  -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
 
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 6258683..39ae3e0 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -9,6 +9,7 @@ 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, \


-- 
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/e1oruzr-0003ti...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-06-28 Thread Julien Cristau 
 debian/changelog |   11 ++
 debian/control   |   59 +--
 2 files changed, 13 insertions(+), 57 deletions(-)

New commits:
commit 26ebb33c526431117b5a4017105e669bea10a746
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 12:31:42 2010 +0100

Drop x11-common Depends on debianutils 1.13.

That was also in woody.

diff --git a/debian/changelog b/debian/changelog
index 5b1085c..0aa172b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
   * Also drop Pre-Depends on debconf.  The debconf interaction in
 x11-common.preinst was removed in 1:7.4+2.
   * Drop versioned build-dep on dpkg 1.7.0.  Even woody had that..
+  * Drop x11-common Depends on debianutils 1.13.  That was also in woody.
 
  -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
 
diff --git a/debian/control b/debian/control
index 1a66aa5..d7fd60b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: po-debconf, debhelper (= 7)
 
 Package: x11-common
 Architecture: all
-Depends: ${misc:Depends}, debianutils (= 1.13), lsb-base (= 1.3-9ubuntu2)
+Depends: ${misc:Depends}, lsb-base (= 1.3-9ubuntu2)
 Breaks: gdm ( 2.20.7-5)
 Replaces: xfree86-common, xorg-common, xserver-common ( 7), x-common
 Description: X Window System (X.Org) infrastructure

commit 1a9bb9ef05e3d5e81ef4e952f6862636efa15cc9
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 12:28:09 2010 +0100

Drop versioned build-dep on dpkg 1.7.0.

Even woody had that..

diff --git a/debian/changelog b/debian/changelog
index b17ce70..5b1085c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
 monolith, which aren't relevant anymore.
   * Also drop Pre-Depends on debconf.  The debconf interaction in
 x11-common.preinst was removed in 1:7.4+2.
+  * Drop versioned build-dep on dpkg 1.7.0.  Even woody had that..
 
  -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
 
diff --git a/debian/control b/debian/control
index 57fe5dc..1a66aa5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Brice Goglin bgog...@debian.org
 Standards-Version: 3.8.4
-Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 7)
+Build-Depends: po-debconf, debhelper (= 7)
 
 Package: x11-common
 Architecture: all

commit 4ec50b108f0b047c06f6fb621fcb84c79fff7418
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 12:24:23 2010 +0100

Also drop Pre-Depends on debconf.

The debconf interaction in x11-common.preinst was removed in 1:7.4+2.

diff --git a/debian/changelog b/debian/changelog
index dd00042..b17ce70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.5+7) UNRELEASED; urgency=low
 
   * Nuke x11-common's Conflicts.  This was needed for upgrades from the
 monolith, which aren't relevant anymore.
+  * Also drop Pre-Depends on debconf.  The debconf interaction in
+x11-common.preinst was removed in 1:7.4+2.
 
  -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
 
diff --git a/debian/control b/debian/control
index 5134145..57fe5dc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 7)
 Package: x11-common
 Architecture: all
 Depends: ${misc:Depends}, debianutils (= 1.13), lsb-base (= 1.3-9ubuntu2)
-Pre-Depends: debconf | debconf-2.0
 Breaks: gdm ( 2.20.7-5)
 Replaces: xfree86-common, xorg-common, xserver-common ( 7), x-common
 Description: X Window System (X.Org) infrastructure

commit 1d025ea416513e628859c51279d06741e00e7a0c
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 12:19:39 2010 +0100

Nuke x11-common's Conflicts.

This was needed for upgrades from the monolith, which aren't relevant 
anymore.

diff --git a/debian/changelog b/debian/changelog
index c9f1086..dd00042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.5+7) UNRELEASED; urgency=low
+
+  * Nuke x11-common's Conflicts.  This was needed for upgrades from the
+monolith, which aren't relevant anymore.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 12:18:58 +0100
+
 xorg (1:7.5+6) unstable; urgency=medium
 
   * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel
diff --git a/debian/control b/debian/control
index 731c839..5134145 100644
--- a/debian/control
+++ b/debian/control
@@ -10,60 +10,6 @@ Package: x11-common
 Architecture: all
 Depends: ${misc:Depends}, debianutils (= 1.13), lsb-base (= 1.3-9ubuntu2)
 Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common ( 7), x-common,
- xserver-xorg ( 1:7.4~), xserver-xfree86 ( 1:7.0),
-

xorg: Changes to 'debian-unstable'

2010-05-07 Thread Julien Cristau 
 debian/changelog|8 ++--
 debian/scripts/vars.amd64   |1 +
 debian/scripts/vars.i386|1 +
 debian/scripts/vars.powerpc |1 +
 debian/x11-common.init  |2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

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

Prepare changelog for upload

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

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

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

We only depend on $local_fs.  Silences lintian error.

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

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

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

Other arches can be added later if needed.

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


-- 
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/e1oam1r-0005qz...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-04-18 Thread Julien Cristau 
 debian/changelog|2 ++
 debian/scripts/vars.alpha   |2 +-
 debian/scripts/vars.amd64   |1 -
 debian/scripts/vars.arm |2 +-
 debian/scripts/vars.armeb   |2 +-
 debian/scripts/vars.armel   |2 +-
 debian/scripts/vars.hppa|2 +-
 debian/scripts/vars.i386|2 +-
 debian/scripts/vars.ia64|2 +-
 debian/scripts/vars.m32r|2 +-
 debian/scripts/vars.m68k|2 +-
 debian/scripts/vars.mips|2 +-
 debian/scripts/vars.mipsel  |2 +-
 debian/scripts/vars.powerpc |2 +-
 debian/scripts/vars.ppc64   |1 -
 debian/scripts/vars.sh4 |2 +-
 debian/scripts/vars.sparc   |2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit ae44bbe841bcfd7166dbd4f8b8bd7b94a920c73f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 18 16:48:47 2010 +0200

Drop v4l from xserver-xorg-video-all.

It depends on the obsolete V4L1 API, see #569103.

diff --git a/debian/changelog b/debian/changelog
index 9d7aa9e..037b7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
 
   * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel
 modesetting for radeon, and that clashes with this driver.
+  * Drop v4l from xserver-xorg-video-all.  It depends on the obsolete V4L1
+API, see #569103.
 
  -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 17:27:16 +0200
 
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 7198581..98949a3 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -27,7 +27,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
-   xserver-xorg-video-v4l
+
 
 # , xserver-xorg-video-glide,
 
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index d1db431..2a5afad 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -27,7 +27,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-vesa, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
-   xserver-xorg-video-v4l, \
xserver-xorg-video-vmware
 
 
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 52277a8..c496170 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
-   xserver-xorg-video-v4l
+
 
 # xserver-xorg-video-glide,
 
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 52277a8..c496170 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
-   xserver-xorg-video-v4l
+
 
 # xserver-xorg-video-glide,
 
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 52277a8..c496170 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
-   xserver-xorg-video-v4l
+
 
 # xserver-xorg-video-glide,
 
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index ad2ae2c..2b23472 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -14,7 +14,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-sis, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
-   xserver-xorg-video-v4l
+
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 2e52268..eee1fae 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -29,7 +29,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
-   xserver-xorg-video-v4l
+
 
 # xserver-xorg-video-glide,
 
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 462e67c..f9c0afd 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -24,7 +24,7 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-trident, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
-   xserver-xorg-video-v4l
+
 
 XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 52277a8..c496170 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -26,7

xorg: Changes to 'debian-unstable'

2010-04-17 Thread Julien Cristau 
 debian/changelog   |7 +++
 debian/scripts/vars.alpha  |1 -
 debian/scripts/vars.amd64  |1 -
 debian/scripts/vars.arm|1 -
 debian/scripts/vars.armeb  |1 -
 debian/scripts/vars.armel  |1 -
 debian/scripts/vars.hppa   |1 -
 debian/scripts/vars.hurd-i386  |1 -
 debian/scripts/vars.i386   |1 -
 debian/scripts/vars.ia64   |1 -
 debian/scripts/vars.kfreebsd-amd64 |1 -
 debian/scripts/vars.kfreebsd-i386  |1 -
 debian/scripts/vars.m32r   |1 -
 debian/scripts/vars.m68k   |1 -
 debian/scripts/vars.mips   |1 -
 debian/scripts/vars.mipsel |1 -
 debian/scripts/vars.powerpc|1 -
 debian/scripts/vars.ppc64  |1 -
 debian/scripts/vars.sh4|1 -
 debian/scripts/vars.sparc  |1 -
 20 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 3457d61c33c2883c6d18fdf0efac0cf6d251e038
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 17 17:28:00 2010 +0200

Drop radeonhd from xserver-xorg-video-all.

We switched to kernel modesetting for radeon, and that clashes with this
driver.

diff --git a/debian/changelog b/debian/changelog
index 54fab9e..9d7aa9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.5+6) UNRELEASED; urgency=low
+
+  * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel
+modesetting for radeon, and that clashes with this driver.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 17 Apr 2010 17:27:16 +0200
+
 xorg (1:7.5+5) unstable; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 553b18a..7198581 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index e14e7f1..d1db431 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index e267434..52277a8 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index e267434..52277a8 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index e267434..52277a8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index 10a92a5..ad2ae2c 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nv, \
-   xserver-xorg-video-radeonhd, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index bc6b2da..9b95ab5 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \

Re: xorg: Changes to 'debian-unstable'

2010-03-31 Thread Michel Dänzer 
On Tue, 2010-03-30 at 18:01 +, Timo Aaltonen wrote: 
 debian/changelog   |6 --
  debian/x11-common.dirs |1 -
  2 files changed, 7 deletions(-)
 
 New commits:
 commit 30a7db1bf67a4a5b6e4d146768b9f6deb80579fa
 Author: Timo Aaltonen tjaal...@cc.hut.fi
 Date:   Tue Mar 30 21:00:45 2010 +0300
 
 Don't install /etc/X11/xorg.conf.d, since it would override 
 /usr/lib/X11/xorg.conf.d

So if a user wants to put anything in /etc/X11/xorg.conf.d/, he also
needs to create symlinks there for everything
in /usr/lib/X11/xorg.conf.d/? That doesn't seem desirable.


-- 
Earthling Michel Dänzer   |http://www.vmware.com
Libre software enthusiast |  Debian, X and DRI developer


--
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/1270039325.28518.31.ca...@thor.local

Re: xorg: Changes to 'debian-unstable'

2010-03-31 Thread Didier 'OdyX' Raboud 
Michel Dänzer wrote:

 On Tue, 2010-03-30 at 18:01 +, Timo Aaltonen wrote:
 debian/changelog   |6 --
  debian/x11-common.dirs |1 -
  2 files changed, 7 deletions(-)
 
 New commits:
 commit 30a7db1bf67a4a5b6e4d146768b9f6deb80579fa
 Author: Timo Aaltonen tjaal...@cc.hut.fi
 Date:   Tue Mar 30 21:00:45 2010 +0300
 
 Don't install /etc/X11/xorg.conf.d, since it would override
 /usr/lib/X11/xorg.conf.d
 
 So if a user wants to put anything in /etc/X11/xorg.conf.d/, he also
 needs to create symlinks there for everything
 in /usr/lib/X11/xorg.conf.d/? That doesn't seem desirable.

IMHO (and that's how other pieces actually in Debian work [udev]) :

System configuration (from packages) go in /usr/lib/X11/xorg.conf.d and 
users use /etc/X11/xorg.conf.d . Both are used with /etc/… being superior 
to /usr/lib/…


-- 
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/hovgio$ad...@dough.gmane.org

xorg: Changes to 'debian-unstable'

2010-03-30 Thread Timo Aaltonen 
 debian/changelog   |6 ++
 debian/x11-common.dirs |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 9817b4651426ef89214529a9c9a9e4ecc31346e8
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Tue Mar 30 19:19:27 2010 +0300

x11-common: Add /etc/X11/xorg.conf.d.

diff --git a/debian/changelog b/debian/changelog
index 54fab9e..8d9c4fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+6) UNRELEASED; urgency=low
+
+  * x11-common: Add /etc/X11/xorg.conf.d.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 30 Mar 2010 19:18:27 +0300
+
 xorg (1:7.5+5) unstable; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index 59b24d0..e757fdf 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,6 +1,7 @@
 etc/X11/Xresources
 etc/X11/Xreset.d
 etc/X11/Xsession.d
+etc/X11/xorg.conf.d
 usr/include/X11
 usr/lib/X11
 usr/share/X11


-- 
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/e1nwea8-0006jf...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-30 Thread Timo Aaltonen 
 debian/changelog   |6 --
 debian/x11-common.dirs |1 -
 2 files changed, 7 deletions(-)

New commits:
commit 30a7db1bf67a4a5b6e4d146768b9f6deb80579fa
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Tue Mar 30 21:00:45 2010 +0300

Don't install /etc/X11/xorg.conf.d, since it would override 
/usr/lib/X11/xorg.conf.d

diff --git a/debian/changelog b/debian/changelog
index 8d9c4fa..54fab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xorg (1:7.5+6) UNRELEASED; urgency=low
-
-  * x11-common: Add /etc/X11/xorg.conf.d.
-
- -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 30 Mar 2010 19:18:27 +0300
-
 xorg (1:7.5+5) unstable; urgency=low
 
   * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index e757fdf..59b24d0 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,7 +1,6 @@
 etc/X11/Xresources
 etc/X11/Xreset.d
 etc/X11/Xsession.d
-etc/X11/xorg.conf.d
 usr/include/X11
 usr/lib/X11
 usr/share/X11


-- 
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/e1nwflh-0006ve...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-14 Thread Brice Goglin 
 debian/changelog   |   16 +++--
 debian/local/Xsession.d/20x11-common_process-args  |   14 +++
 debian/local/Xsession.d/30x11-common_xresources|   30 +++--
 debian/local/Xsession.d/50x11-common_determine-startup |4 +-
 debian/local/Xsession.d/90x11-common_ssh-agent |2 -
 5 files changed, 43 insertions(+), 23 deletions(-)

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

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 442a8d6..7a58436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+4) UNRELEASED; urgency=low
+xorg (1:7.5+4) unstable; urgency=low
 
   * Add Xreset and Xreset.d support, closes: #230422.
   * Improve startup speed of Xsession.d scripts by eliminating all unnecessary
@@ -12,7 +12,7 @@ xorg (1:7.5+4) UNRELEASED; urgency=low
   unlikely (like ~/.Xresources exists) outside, to avoid running the
   other tests (like xrdb exists) on systems which don't use Xresources.
 
- -- Brice Goglin bgog...@debian.org  Sat, 06 Mar 2010 16:15:01 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 14 Mar 2010 11:15:07 +0100
 
 xorg (1:7.5+3) unstable; urgency=low
 

commit f4928802701d1a2301ce3e92da015d9bf7ed5d65
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 14 11:14:59 2010 +0100

Improve startup speed of Xsession.d scripts by eliminating all unnecessary 
external program calls

diff --git a/debian/changelog b/debian/changelog
index 0359056..442a8d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
 xorg (1:7.5+4) UNRELEASED; urgency=low
 
   * Add Xreset and Xreset.d support, closes: #230422.
+  * Improve startup speed of Xsession.d scripts by eliminating all unnecessary
+external program calls, thanks Martin Pitt, closes: #570447.
+- In 20x11-common_process-args, cat $OPTIONFILE once into a variable and
+  use POSIX variable substitution in all scripts instead of calling grep
+  for every single test.
+- Use shell built in type instead of external which to test for
+  programs.
+- 30x11-common_xresources: Swap the order of tests to keep the most
+  unlikely (like ~/.Xresources exists) outside, to avoid running the
+  other tests (like xrdb exists) on systems which don't use Xresources.
 
  -- Brice Goglin bgog...@debian.org  Sat, 06 Mar 2010 16:15:01 +0100
 
diff --git a/debian/local/Xsession.d/20x11-common_process-args 
b/debian/local/Xsession.d/20x11-common_process-args
index 53e7a7b..93e4653 100644
--- a/debian/local/Xsession.d/20x11-common_process-args
+++ b/debian/local/Xsession.d/20x11-common_process-args
@@ -2,6 +2,18 @@
 
 # This file is sourced by Xsession(5), not executed.
 
+# read OPTIONFILE
+OPTIONS=$(cat $OPTIONFILE) || true
+
+has_option() {
+  if [ ${OPTIONS#*
+$1} != $OPTIONS ]; then
+return 0
+  else
+return 1
+  fi
+}
+
 # Determine how many arguments were provided.
 case $# in
   0)
@@ -12,7 +24,7 @@ case $# in
 case $1 in
   failsafe)
 # Failsafe session was requested.
-if grep -qs ^allow-failsafe $OPTIONFILE; then
+if has_option allow-failsafe; then
   if [ -e /usr/bin/x-terminal-emulator ]; then
 if [ -x /usr/bin/x-terminal-emulator ]; then
   exec x-terminal-emulator -geometry +1+1
diff --git a/debian/local/Xsession.d/30x11-common_xresources 
b/debian/local/Xsession.d/30x11-common_xresources
index f9f6e13..c3f53a8 100644
--- a/debian/local/Xsession.d/30x11-common_xresources
+++ b/debian/local/Xsession.d/30x11-common_xresources
@@ -4,25 +4,23 @@
 
 # If xrdb (from xbase-clients) is installed, merge system-wide X resources.
 # Then merge the user's X resources, if the options file is so configured.
-if /usr/bin/which xrdb /dev/null 21; then
-  if [ -d $SYSRESOURCES ]; then
-RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
-if [ -n $RESOURCEFILES ]; then
-  for RESOURCEFILE in $RESOURCEFILES; do
-xrdb -merge $RESOURCEFILE
-  done
-fi
+if [ -d $SYSRESOURCES ]  type xrdb /dev/null 21; then
+  RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
+  if [ -n $RESOURCEFILES ]; then
+for RESOURCEFILE in $RESOURCEFILES; do
+  xrdb -merge $RESOURCEFILE
+done
   fi
+fi
 
-  if grep -qs ^allow-user-resources $OPTIONFILE; then
-if [ -f $USRRESOURCES ]; then
-  xrdb -merge $USRRESOURCES
-fi
+if has_option allow-user-resources  [ -f $USRRESOURCES ]; then
+  if type xrdb /dev/null 21; then
+xrdb -merge $USRRESOURCES
+  else
+# Comment out this command if you desire a legacy-free X environment, and 
find
+# the warning spurious.
+message warning: xrdb command not found; X resources not merged.
   fi
-else
-  # Comment out this command if you desire a legacy-free X environment, and 
find
-  # the warning spurious.
-  message warning: xrdb command not

xorg: Changes to 'debian-unstable'

2010-03-14 Thread Brice Goglin 
 debian/changelog   |6 ++
 debian/local/Xsession.d/50x11-common_determine-startup |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

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

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


-- 
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/e1nqvbz-wq...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-14 Thread Brice Goglin 
 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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

Prepare changelog for upload

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

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

Bump Standards-Version to 3.8.4

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


-- 
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/e1nqvlc-00041k...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-07 Thread Brice Goglin 
 debian/local/Xreset.d/README |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f8de4719d7755ad049021adafcda400a5740824d
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 7 12:50:38 2010 +0100

Document username in Xreset.d README

diff --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
index b695e6f..3c03f42 100644
--- a/debian/local/Xreset.d/README
+++ b/debian/local/Xreset.d/README
@@ -1,2 +1,4 @@
 # Scripts in this directory are executed as root when a user log out from
 # a display manager using /etc/X11/Xreset.
+# The username of the user logging out is provided in the $USER environment
+# variable.


-- 
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/e1nof7m-p9...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-06 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/local/Xreset  |   34 ++
 debian/local/Xreset.d/README |2 ++
 debian/rules |2 ++
 debian/x11-common.dirs   |1 +
 debian/x11-common.install|2 ++
 6 files changed, 47 insertions(+)

New commits:
commit b355aeb2b8b6eed2174cb02d99119c7dff048753
Author: Brice Goglin bgog...@debian.org
Date:   Sat Mar 6 16:16:16 2010 +0100

Add Xreset and Xreset.d support

diff --git a/debian/changelog b/debian/changelog
index 7b3d5d5..0359056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+4) UNRELEASED; urgency=low
+
+  * Add Xreset and Xreset.d support, closes: #230422.
+
+ -- Brice Goglin bgog...@debian.org  Sat, 06 Mar 2010 16:15:01 +0100
+
 xorg (1:7.5+3) unstable; urgency=low
 
   * Remove the obsolete x11proto-evie-dev from xorg-dev dependencies.
diff --git a/debian/local/Xreset b/debian/local/Xreset
new file mode 100644
index 000..7a0974c
--- /dev/null
+++ b/debian/local/Xreset
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# /etc/X11/Xreset
+#
+# global Xreset file -- for use by display managers
+
+# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+
+set -e
+
+PROGNAME=Xreset
+SYSSESSIONDIR=/etc/X11/Xreset.d
+
+if [ ! -d $SYSSESSIONDIR ]; then
+  # Nothing to do, exiting
+  exit 0
+fi
+
+# use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other
+SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+if [ -n $SESSIONFILES ]; then
+  set +e
+  for SESSIONFILE in $SESSIONFILES; do
+. $SESSIONFILE
+  done
+  set -e
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
new file mode 100644
index 000..f7ef6d3
--- /dev/null
+++ b/debian/local/Xreset.d/README
@@ -0,0 +1,2 @@
+Scripts in this directory are executed as root when a user log out from
+a display manager using /etc/X11/Xreset.
diff --git a/debian/rules b/debian/rules
index a3b6616..8e3927f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,8 @@ binary-indep: build install
dh_link
dh_compress
dh_fixperms
+   chown root:root debian/x11-common/etc/X11/Xreset
+   chmod 755 debian/x11-common/etc/X11/Xreset
chown root:root debian/x11-common/etc/X11/Xsession
chmod 755 debian/x11-common/etc/X11/Xsession
dh_installdeb
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index 5ac730e..59b24d0 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,4 +1,5 @@
 etc/X11/Xresources
+etc/X11/Xreset.d
 etc/X11/Xsession.d
 usr/include/X11
 usr/lib/X11
diff --git a/debian/x11-common.install b/debian/x11-common.install
index c52e550..bee9350 100644
--- a/debian/x11-common.install
+++ b/debian/x11-common.install
@@ -1,4 +1,6 @@
 debian/local/rgb.txt etc/X11
+debian/local/Xreset etc/X11
+debian/local/Xreset.d/* etc/X11/Xreset.d
 debian/local/Xsession etc/X11
 debian/local/Xsession.d/* etc/X11/Xsession.d
 debian/local/Xsession.options etc/X11


-- 
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/e1nnvkp-0006rm...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-03-06 Thread Brice Goglin 
 debian/local/Xreset.d/README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 66cedab350b61de50503fd2d3e4fb20f6c3257e7
Author: Brice Goglin bgog...@debian.org
Date:   Sat Mar 6 17:37:55 2010 +0100

Prefix Xreset.d lines with a # so that they are ignored when reading all 
Xreset.d files

diff --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
index f7ef6d3..b695e6f 100644
--- a/debian/local/Xreset.d/README
+++ b/debian/local/Xreset.d/README
@@ -1,2 +1,2 @@
-Scripts in this directory are executed as root when a user log out from
-a display manager using /etc/X11/Xreset.
+# Scripts in this directory are executed as root when a user log out from
+# a display manager using /etc/X11/Xreset.


-- 
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/e1nnx10-0006ka...@alioth.debian.org

xorg: Changes to 'debian-unstable'

2010-01-27 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/control   |1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 282b5ebbe5c8d514dc745a87ab767a7e35af888d
Author: Brice Goglin bgog...@debian.org
Date:   Wed Jan 27 16:49:44 2010 +0100

Remove the obsolete x11proto-evie-dev from xorg-dev dependencies

diff --git a/debian/changelog b/debian/changelog
index 6e4dd3a..e70147c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+3) UNRELEASED; urgency=low
+
+  * Remove the obsolete x11proto-evie-dev from xorg-dev dependencies.
+
+ -- Brice Goglin bgog...@debian.org  Wed, 27 Jan 2010 16:49:08 +0100
+
 xorg (1:7.5+2) unstable; urgency=low
 
   * Fix typo in debian/scripts/vars.hurd-i386.  Thanks, Samuel Thibault!
diff --git a/debian/control b/debian/control
index db6ad18..3d22056 100644
--- a/debian/control
+++ b/debian/control
@@ -197,7 +197,6 @@ Depends:
  x11proto-core-dev,
  x11proto-damage-dev,
  x11proto-dmx-dev,
- x11proto-evie-dev,
  x11proto-fixes-dev,
  x11proto-fonts-dev,
  x11proto-gl-dev,


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

  1   2   3   >