debian/changelog | 9 +++++++++ debian/control | 2 +- debian/local/Xreset | 2 -- debian/local/Xstartup | 2 -- debian/xdm.postrm.in | 8 +++++++- 5 files changed, 17 insertions(+), 6 deletions(-)
New commits: commit c36f1ba0a18620069f8bc28f18736ffda2dc4535 Author: Julien Cristau <jcris...@debian.org> Date: Thu Aug 6 16:25:44 2009 +0200 xdm.prerm uses ps, add Depends on procps. diff --git a/debian/changelog b/debian/changelog index d869687..89c171f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xdm (1:1.1.8-7) UNRELEASED; urgency=low * Xreset, Xstartup: don't add /usr/bin/X11 to PATH. * xdm.postrm: remove /etc/X11/default-display-manager on purge if it exists and points to xdm. Fixes piuparts failure. + * xdm.prerm uses ps, add Depends on procps. -- Julien Cristau <jcris...@debian.org> Thu, 06 Aug 2009 15:57:08 +0200 diff --git a/debian/control b/debian/control index db6c589..de68eea 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git Package: xdm Architecture: any -Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, x11-utils | xbase-clients | xmessage, cpp, lsb-base (>= 3.0-6), x11-xserver-utils +Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, x11-utils | xbase-clients | xmessage, cpp, lsb-base (>= 3.0-6), x11-xserver-utils, procps Pre-Depends: x11-common (>= 1:7.0.0) Provides: x-display-manager Description: X display manager commit feaab1a915509c6aa1c1ca1df6bac2e86a0268b2 Author: Julien Cristau <jcris...@debian.org> Date: Thu Aug 6 16:17:57 2009 +0200 make sure we remove the display manager configuration file on purge xdm.postrm: remove /etc/X11/default-display-manager on purge if it exists and points to xdm. Fixes piuparts failure. diff --git a/debian/changelog b/debian/changelog index acd0996..d869687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xdm (1:1.1.8-7) UNRELEASED; urgency=low * Xreset, Xstartup: don't add /usr/bin/X11 to PATH. + * xdm.postrm: remove /etc/X11/default-display-manager on purge if it exists + and points to xdm. Fixes piuparts failure. -- Julien Cristau <jcris...@debian.org> Thu, 06 Aug 2009 15:57:08 +0200 diff --git a/debian/xdm.postrm.in b/debian/xdm.postrm.in index e44330a..a6c4315 100644 --- a/debian/xdm.postrm.in +++ b/debian/xdm.postrm.in @@ -15,7 +15,8 @@ THIS_SCRIPT=postrm #INCLUDE_SHELL_LIB# OBSOLETE_CONFFILES="pixmaps/XFree86.xpm pixmaps/XFree86bw.xpm pixmaps/debian.xpm pixmaps/debianbw.xpm pixmaps/xorg.xpm pixmaps/xorg-bw.xpm" -DAEMON=/usr/bin/X11/xdm +DAEMON=/usr/bin/xdm +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then if [ -d /usr/X11R6/lib/X11/xdm.moved-by-preinst ]; then @@ -43,6 +44,11 @@ if [ "$1" = "purge" ]; then rm -r "$DIR" fi done + if [ -f "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ + [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$DAEMON" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE" + rmdir --ignore-fail-on-non-empty /etc/X11 + fi fi if [ "$1" = "abort-upgrade" ]; then commit 58bdb39edc14da3ca26c84550b3ea0bd014abd22 Author: Julien Cristau <jcris...@debian.org> Date: Thu Aug 6 15:57:29 2009 +0200 Xreset, Xstartup: don't add /usr/bin/X11 to PATH. diff --git a/debian/changelog b/debian/changelog index 78390ce..acd0996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xdm (1:1.1.8-7) UNRELEASED; urgency=low + + * Xreset, Xstartup: don't add /usr/bin/X11 to PATH. + + -- Julien Cristau <jcris...@debian.org> Thu, 06 Aug 2009 15:57:08 +0200 + xdm (1:1.1.8-6) unstable; urgency=low * Updated Spanish debconf translation, thanks to Francisco Javier Cuadrado diff --git a/debian/local/Xreset b/debian/local/Xreset index d2372a2..1513a26 100644 --- a/debian/local/Xreset +++ b/debian/local/Xreset @@ -4,8 +4,6 @@ # # This script is run as root after the user's X session ends. -PATH="$PATH:/usr/bin/X11" - # Remove the utmp entry for the session. if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \ && which sessreg >/dev/null 2>&1; then diff --git a/debian/local/Xstartup b/debian/local/Xstartup index 7e775a3..8c0c5cb 100644 --- a/debian/local/Xstartup +++ b/debian/local/Xstartup @@ -5,8 +5,6 @@ # This script is run as root after the user logs in. If this script exits with # a return code other than 0, the user's session will not be started. -PATH="$PATH:/usr/bin/X11" - if [ -e /etc/nologin ]; then # always display the nologin message, if possible if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org