Processed: reasign #801655 to xorg-server

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> reassign 801655 xserver-xorg 1:7.7+12
Bug #801655 [xserver-xorg-video-nouveau] xorg crashes with "NOUVEAU(0): failed 
to set mode: Permission denied" when exiting tty2-6 shell
Bug reassigned from package 'xserver-xorg-video-nouveau' to 'xserver-xorg'.
No longer marked as found in versions xserver-xorg-video-nouveau/1:1.0.11-1.
Ignoring request to alter fixed versions of bug #801655 to the same values 
previously set
Bug #801655 [xserver-xorg] xorg crashes with "NOUVEAU(0): failed to set mode: 
Permission denied" when exiting tty2-6 shell
Marked as found in versions xorg/1:7.7+12.
> --
Stopping processing here.

Please contact me if you need assistance.
-- 
801655: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801655
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#801655: xorg crashes with "NOUVEAU(0): failed to set mode: Permission denied" when exiting tty2-6 shell

[Alexandre Hoïde]

On Tue, Oct 13, 2015 at 09:16:17PM +0200, Sven Joachim wrote:
> On 2015-10-13 05:13 +0200, Alexandre Hoïde wrote:
> 
> >* What led up to the situation?
> >1. Boot to multi-user.target as [default] systemd target;
> >2. login to tty1 and 'startx' with following ~/.xsession :
> > xrdb -merge ~/.Xresources
> > exec /usr/bin/xmonad
> >3. switch and login to any of tty2-6 (CTRL-ALT-Fx), then 'exit' from
> >shell (bash) on this tty;
> >4. xorg crashes with :
> > ---
> > […]
> > [  6629.597] (II) AIGLX: Suspending AIGLX clients for VT switch
> > [  6629.597] (II) NOUVEAU(0): NVLeaveVT is called.
> > [  6629.783] (II) systemd-logind: got pause for 13:66
> > […]
> > [  6635.892] (II) systemd-logind: got resume for 226:0
> > [  6636.046] (II) AIGLX: Resuming AIGLX clients after VT switch
> > [  6636.046] (II) NOUVEAU(0): NVEnterVT is called.
> > [  6636.047] (EE) NOUVEAU(0): failed to set mode: Permission denied
> > [  6636.049] (EE) 
> > Fatal server error:
> > [  6636.049] (EE) EnterVT failed for screen 0
> > [  6636.049] (EE) 
> > [  6636.049] (EE) 
> > […]
> > [  6636.049] (EE) 
> > [  6636.049] (II) AIGLX: Suspending AIGLX clients for VT switch
> > [  6636.049] (II) NOUVEAU(0): NVLeaveVT is called.
> > [  6636.059] (EE) Server terminated with error (1). Closing log file.
> > ---
> >  
> >* Workaround :
> >  - No such problem when launching 'startx' from any of tty2-6.
> >  - No such problem with Gnome (residing on vt8, gdm vt7)
> >
> >Sorry if this is not related to nouveau driver and regards,
> 
> I don't think this has anything to do with nouveau, rather I suspect the
> X server which no longer runs suid root.  See bug #801518 for a similar
> problem.
> 
> Anyway, you could try the modesetting driver, you would need this
> minimal /etc/X11//etc/X11/xorg.conf to use it:
> 
> --8<---cut here---start->8---
> Section "Device"
>   Identifier  "n"
>   Driver  "modesetting"
> EndSection
> --8<---cut here---end--->8---
> 
> Cheers,
>Sven

  Thank you Sven,

  I'll [try to] reassign to xserver-xorg then. Although #801518 does
have similarities, I am unsure if it should be merged.

  I have tried the xorg.conf you suggested, and I hit another problem :
same sequence now leads to
---
[…]
FatalError re-entered, aborting
[   480.355] (EE) xf86CloseConsole: VT_ACTIVATE failed: Input/output error
[   480.355] (EE) 
---
(mouse/keyboard unresponsive although laptop "fn" keys does respond)
same workaround ('startx' from any of tty2-6)

  Regards,
  Alexandre Hoïde

Bug#801401: cannot start X from the console command line

[James Richardson]

Julien Cristau writes:

> On Mon, Oct 12, 2015 at 10:59:27 -0400, James Richardson wrote:
>
>> Package: xserver-xorg
>> Version: 1:7.7+12
>> Followup-For: Bug #801401
>> 
>> Dear Maintainer,
>> 
>> I resolved this on my workstation by installing xserver-xorg-legacy
>> and adding the line
>> 
>> needs_root_rights=yes
>> 
>> to /etc/X11/Xwrapper.config
>> 
>> 
>> In case it matters: my init system is runit, I run fluxbox via startx.
>
> It does.  X won't work as non-root without logind:
>
>> [   172.319] (EE) systemd-logind: failed to get session: The name 
>> org.freedesktop.login1 was not provided by any .service files

I don't have systemd-logind installed, so obviously it will not get a
systemd session, nor do I need such a thing. Other than that it works.

Bug#801401: cannot start X from the console command line

[Julien Cristau]

On Mon, Oct 12, 2015 at 10:59:27 -0400, James Richardson wrote:

> Package: xserver-xorg
> Version: 1:7.7+12
> Followup-For: Bug #801401
> 
> Dear Maintainer,
> 
> I resolved this on my workstation by installing xserver-xorg-legacy
> and adding the line
> 
> needs_root_rights=yes
> 
> to /etc/X11/Xwrapper.config
> 
> 
> In case it matters: my init system is runit, I run fluxbox via startx.

It does.  X won't work as non-root without logind:

> [   172.319] (EE) systemd-logind: failed to get session: The name 
> org.freedesktop.login1 was not provided by any .service files

Cheers,
Julien


signature.asc
Description: PGP signature

Bug#801487: introducing xserver-xorg-legacy without telling anybody?

[Julien Cristau]

On Tue, Oct 13, 2015 at 19:03:23 +0200, Harald Dunkel wrote:

> [  7573.945] (EE) systemd-logind: failed to get session: The name 
> org.freedesktop.login1 was not provided by any .service files

I suspect that explains your issue.  You need logind for X to work as
non-root.

Cheers,
Julien


signature.asc
Description: PGP signature

Bug#801401: cannot start X from the console command line

[Julien Cristau]

On Mon, Oct 12, 2015 at 19:08:03 -0700, Kelly Clowers wrote:

> On Mon, Oct 12, 2015 at 8:15 AM, Julien Cristau  wrote:
> > On Sun, Oct 11, 2015 at 15:48:09 -0700, Kelly Clowers wrote:
> >
> >> I just hit this bug as well.
> >>
> >> I have a bash script that sets the WM I choose (from when I was trying
> >> different ones - now I always choose "awesome"), and then does "exec
> >> xinit". Ultimately xinitrc is running the command "awesome" which
> >> starts Awesome WM. No idea what Awesome does internally, but it has
> >> always worked.
> >>
> > You need to make sure X is started on the current VT.
> >
> > Cheers,
> > Julien
> 
> 
> Attempting startx makes it try the same VT, but it still fails with
> "xf86EnableIOPorts: failed to set IOPL for I/O (Operation not
> permitted)"
> 
What driver are you using?  Are you running systemd?  Please show your
Xorg log.

Thanks,
Julien


signature.asc
Description: PGP signature

Bug#801605: xserver-xorg: X fails to start as normal user

[Julien Cristau]

On Tue, Oct 13, 2015 at 16:22:45 -0300, Ricardo Peliquero wrote:

> I had to install libpam-systemd and systemd-shim to solve the problem. Should 
> this package be recommended by xorg or xinit?
> 
Ah, thanks.  I think adding that as a Recommends in xinit sounds sensible, yes.

Cheers,
Julien


signature.asc
Description: PGP signature

Bug#801605: xserver-xorg: X fails to start as normal user

[Ricardo Peliquero]

On Mon, Oct 12, 2015 at 05:17:29PM +0200, Julien Cristau wrote:
> On Mon, Oct 12, 2015 at 10:24:22 -0300, Ricardo Peliquero wrote:
> 
> > Package: xserver-xorg
> > Version: 1:7.7+12
> > Severity: important
> > 
> > Dear Maintainer,
> > 
> > I have updated xserver-xorg from 1:7.7+9 to 1:7.7+12. After that, startx 
> > does not work as normal user.
> > 
> > ~/.local/share/xorg/Xorg.0.log says '(EE) AddScreen/ScreenInit failed for 
> > driver 0'
> > 
> > X server starts when loging in as root. Then it is possible to execute 
> > 'DISPLAY=:0 x-window-manager' as normal user and have an operating X 
> > environment in tty7.
> > 
> > 'ngetty' is used as login session daemon and 'sysvinit-core' as boot 
> > manager.
> > 
> > If I downgrade xserver-xorg, I can startx normally.
> > 
> Whatever spawns Xorg needs to make it start on the current VT, and
> logind needs to be running and working.  That may or may not involve
> using systemd as init.

Thank you for your kind reply (FYI, it went to the Spam folder in Gmail :-(, so 
I am writing from another account).

If I executed 'startx' as root, Xorg started on current VT; but, if I executed 
it as normal user, it didn't work, as I previously said.

I had to install libpam-systemd and systemd-shim to solve the problem. Should 
this package be recommended by xorg or xinit?

Cheers,

Zhana

Bug#801655: xorg crashes with "NOUVEAU(0): failed to set mode: Permission denied" when exiting tty2-6 shell

[Sven Joachim]

On 2015-10-13 05:13 +0200, Alexandre Hoïde wrote:

>* What led up to the situation?
>1. Boot to multi-user.target as [default] systemd target;
>2. login to tty1 and 'startx' with following ~/.xsession :
> xrdb -merge ~/.Xresources
> exec /usr/bin/xmonad
>3. switch and login to any of tty2-6 (CTRL-ALT-Fx), then 'exit' from
>shell (bash) on this tty;
>4. xorg crashes with :
> ---
> […]
> [  6629.597] (II) AIGLX: Suspending AIGLX clients for VT switch
> [  6629.597] (II) NOUVEAU(0): NVLeaveVT is called.
> [  6629.783] (II) systemd-logind: got pause for 13:66
> […]
> [  6635.892] (II) systemd-logind: got resume for 226:0
> [  6636.046] (II) AIGLX: Resuming AIGLX clients after VT switch
> [  6636.046] (II) NOUVEAU(0): NVEnterVT is called.
> [  6636.047] (EE) NOUVEAU(0): failed to set mode: Permission denied
> [  6636.049] (EE) 
> Fatal server error:
> [  6636.049] (EE) EnterVT failed for screen 0
> [  6636.049] (EE) 
> [  6636.049] (EE) 
> […]
> [  6636.049] (EE) 
> [  6636.049] (II) AIGLX: Suspending AIGLX clients for VT switch
> [  6636.049] (II) NOUVEAU(0): NVLeaveVT is called.
> [  6636.059] (EE) Server terminated with error (1). Closing log file.
> ---
>  
>* Workaround :
>  - No such problem when launching 'startx' from any of tty2-6.
>  - No such problem with Gnome (residing on vt8, gdm vt7)
>
>Sorry if this is not related to nouveau driver and regards,

I don't think this has anything to do with nouveau, rather I suspect the
X server which no longer runs suid root.  See bug #801518 for a similar
problem.

Anyway, you could try the modesetting driver, you would need this
minimal /etc/X11//etc/X11/xorg.conf to use it:

--8<---cut here---start->8---
Section "Device"
Identifier  "n"
Driver  "modesetting"
EndSection
--8<---cut here---end--->8---

Cheers,
   Sven

Bug#801487: introducing xserver-xorg-legacy without telling anybody?

[Harald Dunkel]

Attached you can find the log file of a session without xserver-xorg-legacy
installed. Hope this helps.


Regards
Harri
[  7573.895] 
X.Org X Server 1.17.2
Release Date: 2015-06-16
[  7573.895] X Protocol Version 11, Revision 0
[  7573.895] Build Operating System: Linux 4.2.0-1-amd64 x86_64 Debian
[  7573.895] Current Operating System: Linux cecil.afaics.de 4.2.3 #1 SMP 
PREEMPT Sun Oct 4 08:09:33 CEST 2015 x86_64
[  7573.895] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-4.2.3 
root=UUID=68cc0c8f-306a-44bd-af2d-8441039bae5e ro
[  7573.895] Build Date: 06 October 2015  07:27:47AM
[  7573.895] xorg-server 2:1.17.2-3 (http://www.debian.org/support) 
[  7573.895] Current version of pixman: 0.33.2
[  7573.895]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[  7573.895] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[  7573.895] (==) Log file: "/home/harri/.local/share/xorg/Xorg.4.log", Time: 
Tue Oct 13 18:52:52 2015
[  7573.895] (==) Using config file: "/etc/X11/xorg.conf"
[  7573.895] (==) Using system config directory "/usr/share/X11/xorg.conf.d"
[  7573.920] Parse error on line 15 of section Files in file /etc/X11/xorg.conf
Ignoring obsolete keyword "RgbPath".
[  7573.944] (==) ServerLayout "Layout0"
[  7573.944] (**) |-->Screen "Screen0" (0)
[  7573.944] (**) |   |-->Monitor "Monitor0"
[  7573.944] (**) |   |-->Device "Device0"
[  7573.944] (**) |-->Input Device "Keyboard0"
[  7573.944] (**) |-->Input Device "TrackmanFX"
[  7573.944] (**) |-->Input Device "Logitech USB Receiver"
[  7573.944] (**) Option "DontZap" "false"
[  7573.944] (==) Automatically adding devices
[  7573.944] (==) Automatically enabling devices
[  7573.944] (==) Automatically adding GPU devices
[  7573.944] (WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist.
[  7573.944]Entry deleted from font path.
[  7573.944] (==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
built-ins
[  7573.944] (**) ModulePath set to 
"/usr/lib/xorg/extra-modules,/usr/lib/xorg/modules"
[  7573.944] (**) Extension "Composite" is disabled
[  7573.944] (WW) Hotplugging is on, devices using drivers 'kbd', 'mouse' or 
'vmmouse' will be disabled.
[  7573.944] (WW) Disabling Keyboard0
[  7573.944] (WW) Disabling TrackmanFX
[  7573.944] (II) Loader magic: 0x556f2ee82de0
[  7573.944] (II) Module ABI versions:
[  7573.944]X.Org ANSI C Emulation: 0.4
[  7573.944]X.Org Video Driver: 19.0
[  7573.944]X.Org XInput driver : 21.0
[  7573.944]X.Org Server Extension : 9.0
[  7573.945] (EE) systemd-logind: failed to get session: The name 
org.freedesktop.login1 was not provided by any .service files
[  7573.945] (II) xfree86: Adding drm device (/dev/dri/card0)
[  7573.946] (--) PCI:*(0:1:0:0) 10de:0de1:19da:1167 rev 161, Mem @ 
0xfa00/16777216, 0xe800/134217728, 0xf000/33554432, I/O @ 
0xe000/128, BIOS @ 0x/524288
[  7573.946] (II) "glx" will be loaded. This was enabled by default and also 
specified in the config file.
[  7573.946] (II) LoadModule: "dbe"
[  7573.946] (II) Module "dbe" already built-in
[  7573.946] (II) LoadModule: "extmod"
[  7573.946] (II) Module "extmod" already built-in
[  7573.946] (II) LoadModule: "glx"
[  7573.946] (II) Loading /usr/lib/xorg/modules/linux/libglx.so
[  7573.980] (II) Module glx: vendor="NVIDIA Corporation"
[  7573.980]compiled for 4.0.2, module version = 1.0.0
[  7573.980]Module class: X.Org Server Extension
[  7573.980] (II) NVIDIA GLX Module  352.41  Fri Aug 21 22:40:16 PDT 2015
[  7573.980] (II) LoadModule: "evdev"
[  7573.980] (II) Loading /usr/lib/xorg/modules/input/evdev_drv.so
[  7573.981] (II) Module evdev: vendor="X.Org Foundation"
[  7573.981]compiled for 1.16.4, module version = 2.9.2
[  7573.981]Module class: X.Org XInput Driver
[  7573.981]ABI class: X.Org XInput driver, version 21.0
[  7573.981] (II) LoadModule: "nvidia"
[  7573.981] (II) Loading /usr/lib/xorg/modules/drivers/nvidia_drv.so
[  7573.983] (II) Module nvidia: vendor="NVIDIA Corporation"
[  7573.983]compiled for 4.0.2, module version = 1.0.0
[  7573.983]Module class: X.Org Video Driver
[  7573.983] (II) LoadModule: "evdev"
[  7573.983] (II) Loading /usr/lib/xorg/modules/input/evdev_drv.so
[  7573.983] (II) Module evdev: vendor="X.Org Foundation"
[  7573.983]compiled for 1.16.4, module version = 2.9.2
[  7573.983]Module class: X.Org XInput Driver
[  7573.983]ABI class: X.Org XInput driver, version 21.0
[  7573.983] (II) NVIDIA dlloader X Driver  352.41  Fri Aug 21 22:14:01 PDT 2015
[  7573.983] (II) NVIDIA Unified Driver for all Support

libxi_1.7.5-1_source.changes ACCEPTED into unstable

[Debian FTP Masters]

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 13 Oct 2015 12:29:20 +0200
Source: libxi
Binary: libxi6 libxi6-udeb libxi6-dbg libxi-dev
Architecture: source
Version: 2:1.7.5-1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force 
Changed-By: Julien Cristau 
Description:
 libxi-dev  - X11 Input extension library (development headers)
 libxi6 - X11 Input extension library
 libxi6-dbg - X11 Input extension library (debug package)
 libxi6-udeb - X11 Input extension library (udeb)
Changes:
 libxi (2:1.7.5-1) unstable; urgency=medium
 .
   [ Andreas Boll ]
   * New upstream release.
   * Switch to dh with the autoreconf and quilt addons.
   * Fix lintian error: pre-depends-directly-on-multiarch-support libxi6.
   * Let uscan verify tarball signatures.
   * Fix Vcs-* fields.
   * Remove obsolete XC- prefix from Package-Type field.
   * Add upstream url.
   * Bump standards version to 3.9.6.
 .
   [ Julien Cristau ]
   * Delete obsolete debian/xsfbs.
Checksums-Sha1:
 e7e2a61eaa1c49044ec0d76f670298eeaab0c845 2350 libxi_1.7.5-1.dsc
 ee1b52e79cfe10b3426310f74b9d3f1b8a88995d 581557 libxi_1.7.5.orig.tar.gz
 011b611b257bf4c8d5bee5ca3fa56165e6e7119c 10073 libxi_1.7.5-1.diff.gz
Checksums-Sha256:
 6cc8bb1564b4557ebe03ba0f30678e1c6af12afed6eaa4d3410278c8ff18749a 2350 
libxi_1.7.5-1.dsc
 d9965454f72b2deeb45195487f7431d344189eed82166b648850f7a7c5838deb 581557 
libxi_1.7.5.orig.tar.gz
 c010d41dd652a88c45889f12ba48f59939cf02e2a2913188ef79f746162afb5e 10073 
libxi_1.7.5-1.diff.gz
Files:
 fb2d5fb8f5335c2244aa69b840d30ab6 2350 x11 optional libxi_1.7.5-1.dsc
 cdf05beb9f3c6e5b748ac51bf60ca775 581557 x11 optional libxi_1.7.5.orig.tar.gz
 3293f130c5b943c7c548c1ab9bff5ecf 10073 x11 optional libxi_1.7.5-1.diff.gz

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCAAGBQJWHO0jAAoJEDEBgAUJBeQM++wP/ihtUyAruorIUhGrBijc+wt0
3E/i4QJr+jHb3T1eMK+XTokUoWm+G1RboLtby7mp6xmVa8/dgwqmX4EddVPHipJS
5of1li+Mo60avDkrp2COAHg9j6eSjwXXKZv+NeDpz8gt9+r6+5EFaLmLmnPUzVNo
Y6QRasIXj59cO79CBtHHj/eBwTVjJAMu3cEIX9tSd14dKuttsDv6xSMSFFv3clWY
r932T64PRV0bDq3l+sB46Y3uu9/GkB/H9OMcAg7RD3h//qKfMGQzDknddppb2tV1
Qk9tkVbu39NdyEl2TznN9/eFFzCHacUponoIMYrLp1FAFLfQwRnOXEejj7jO61Pz
1CjauYUMVsQDy0rLLj4iGCb7yOTvCt7+Ur4qDdRgwqHLOmH+qDEJTPBEkPaVJrzS
azW7VekAsRKDqxuYATCQHs6YjCY3bZG0MOwxhWFjqkYWYIKE8OMcnaKMQ+yhCKnD
uoUv/CJwhNxITr4qGzgArXbfb6xeQkIVWZ5gwS1FhFg0/DOFHW9fCzYRQjroj2e+
42BPcczts/1n9MEZKO1jSKXlYZIkxVNyhmzj0F6Ig9J/wwfDMfEcmPjc+LJdfd5y
bgwDtkgzUYIdFV0OHS+pCQRdYfIW0jC2TzbnKYP2j4rX/MPlH/7muHwX+0Z8kiFL
KCo3JJWC3mnulEovTKE2
=Bjly
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

libxi: Changes to 'debian-unstable'

[Julien Cristau]

 debian/README.source   |   24 -
 debian/changelog   |9 
 debian/control |3 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  276 -
 debian/xsfbs/xsfbs.sh  |  622 -
 6 files changed, 8 insertions(+), 958 deletions(-)

New commits:
commit c3bb0ab82b3eab0b03c06676982fdac50d0d8931
Author: Julien Cristau 
Date:   Tue Oct 13 12:29:29 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 27d31f4..54e3d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.7.5-1) UNRELEASED; urgency=medium
+libxi (2:1.7.5-1) unstable; urgency=medium
 
   [ Andreas Boll ]
   * New upstream release.
@@ -13,7 +13,7 @@ libxi (2:1.7.5-1) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Delete obsolete debian/xsfbs.
 
- -- Andreas Boll   Thu, 10 Sep 2015 13:59:46 +0200
+ -- Julien Cristau   Tue, 13 Oct 2015 12:29:20 +0200
 
 libxi (2:1.7.4-1) unstable; urgency=low
 

commit e6f49eed61d776917d3c2c1daae2db39d6a023ac
Author: Julien Cristau 
Date:   Tue Oct 13 12:29:17 2015 +0200

Delete obsolete debian/xsfbs.

diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..749dfde 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 810bb14..27d31f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libxi (2:1.7.5-1) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
   * Switch to dh with the autoreconf and quilt addons.
   * Fix lintian error: pre-depends-directly-on-multiarch-support libxi6.
@@ -9,6 +10,9 @@ libxi (2:1.7.5-1) UNRELEASED; urgency=medium
   * Add upstream url.
   * Bump standards version to 3.9.6.
 
+  [ Julien Cristau ]
+  * Delete obsolete debian/xsfbs.
+
  -- Andreas Boll   Thu, 10 Sep 2015 13:59:46 +0200
 
 libxi (2:1.7.4-1) unstable; urgency=low
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 5e16b10..000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,276 +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 

Processing of libxi_1.7.5-1_source.changes

[Debian FTP Masters]

libxi_1.7.5-1_source.changes uploaded successfully to localhost
along with the files:
  libxi_1.7.5-1.dsc
  libxi_1.7.5.orig.tar.gz
  libxi_1.7.5-1.diff.gz

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

libxi: Changes to 'refs/tags/libxi-2_1.7.5-1'

[Julien Cristau]

Tag 'libxi-2_1.7.5-1' created by Julien Cristau  at 
2015-10-13 11:36 +

Tagging upload of libxi 2:1.7.5-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCAAGBQJWHOy9AAoJEDEBgAUJBeQMUJoQANguIP1EhEIRQUe02QCMrC3K
lDj5P5tqn9LH9BzRgx3dIdO2fYybP3r2WVlDAduKibQFIHjEd1j33coOmj9p8JM4
iv6hMT0Zpj60i0fSHC91B4yxbelaV4oHBhzTtfI6NwgV7beUrEI+/EhkHitRz7CA
bHuTd1uZxLT/TFSwGBAR7GdJYyG56oIw1WhEtcmxffWj3mrgS/hhRrvAhYbW4uUV
Fm1MXhVq97qVxvJxRUReJQK7UU6/exLK8u6Qnb3HJbi6f3Irm85BLSlW1uNUH5eu
pRMe0h0SQziYIooEw8AsP1D2xCy/AOkcc35vEEvOKSwclOjkMsG6H9H0AW2Rso2U
cDwxz2nYcfGuZUPb1V3ZTtGCRSIMF4nFT1P8WwVMN6uZaGeDlcPCnvvt9rmqSWmZ
Ppj2K4+l/sGoWZ7yJ6ScVSkBfdjpg3bEaFY1UiBSL0OLfw5qF6oGMwvujyMrt1b3
BLfRrI/Pnd+ijLSWKfPY45JoVdKFvVrlrNIo6ExHZI5e6tI2sNm8nbn9Nwxfd5S7
oqDSMA2VuAs3ANuilJ2ah+amOknxcG8ayJV6qGFN0zRpLiXWajC5nTGXL0KIQzT/
55xjiQ6I8jV1D/+P1XX9R5C4TlR11dOiwtAbn4jwDYKIH1x8UXWCwFDgztMHXOdX
zM+/fuMgLx0DrkOt1bKP
=pU8z
-END PGP SIGNATURE-

Changes since libxi-2%1.7.4-1:
Andreas Boll (10):
  Merge branch 'upstream-unstable' into debian-unstable
  Bump changelogs.
  Switch to dh with the autoreconf and quilt addons.
  Fix lintian error: pre-depends-directly-on-multiarch-support libxi6.
  Let uscan verify tarball signatures.
  Fix Vcs-* fields.
  Remove obsolete XC- prefix from Package-Type field.
  Remove unused ${shlibs:Depends} from libxi6-dbg and libxi-dev.
  Add upstream url.
  Bump standards version to 3.9.6.

Cosimo Cecchi (1):
  Fix version check in _XIAllowEvents

Julien Cristau (4):
  Advance the request buffer by the right amount in XIChangeHierarchy
  Revert "Remove unused ${shlibs:Depends} from libxi6-dbg and libxi-dev."
  Delete obsolete debian/xsfbs.
  Upload to unstable

Michal Srb (7):
  Fix double unlock when _XiCheckExtInit return -1.
  XIChangeHierarchy: Add missing unlock.
  Do not return NoSuchExtension casted to pointer as an error.
  XIGetClientPointer: Return False on error.
  Fix logic in _XIAllowEvents and prevent double unlock.
  Refactor XGetExtensionVersion.
  XIGrabDevice: Unlock display in error path.

Peter Hutterer (1):
  libXi 1.7.5

---
 ChangeLog   |  119 +++
 configure.ac|2 
 debian/README.source|   24 -
 debian/changelog|   17 +
 debian/compat   |2 
 debian/control  |   17 -
 debian/rules|  101 --
 debian/upstream/signing-key.asc |   23 +
 debian/watch|1 
 debian/xsfbs/repack.sh  |   32 --
 debian/xsfbs/xsfbs.mk   |  276 -
 debian/xsfbs/xsfbs.sh   |  622 
 src/XExtInt.c   |2 
 src/XGMotion.c  |2 
 src/XGetCPtr.c  |2 
 src/XGetDCtl.c  |2 
 src/XGetFCtl.c  |2 
 src/XGetKMap.c  |2 
 src/XGetMMap.c  |2 
 src/XGetProp.c  |2 
 src/XGetVers.c  |   28 -
 src/XIAllowEvents.c |4 
 src/XIGrabDevice.c  |   11 
 src/XIHierarchy.c   |   16 -
 src/XIProperties.c  |3 
 src/XIQueryDevice.c |3 
 src/XIQueryVersion.c|8 
 src/XISelEv.c   |7 
 src/XIint.h |1 
 src/XListDProp.c|2 
 src/XOpenDev.c  |2 
 src/XQueryDv.c  |2 
 32 files changed, 244 insertions(+), 1095 deletions(-)
---

xorg: Changes to 'debian-unstable'

[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 'xsf-docs'

[Andreas Boll]

 xsf-docs/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
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