On Wed, Mar 03, 2010 at 08:28:47PM +0100, Jan Hauke Rahm wrote:
> Package: wnpp
> Severity: normal
>
> The current maintainer of wdm, Vlad Shakhov <lumpen.intellect...@gmail.com>,
> is not active anymore. Therefore, I orphan this package now.
No, I do not intend to adopt this package, but have some changes ready for
it.
I was making some NMU for it lately and was playing a bit more after the
last one. Last changes in my side include severity normal
#571611 [wdm: Please provide a Xreset hook using a common framework]
and fixing piuparts sid uninstallation error,
http://piuparts.debian.org/sid/fail/wdm_1.28-3.4.log
I also noticed that although tries to enable selinux when running
configure, it is actually not set because does not build-depends on
libselinux-dev.
Changes also include making emacs and vi editing options closer and
sanitizing indentation (postrm one was insane).
Since nobody has yet intended to adopt the package, let me know if you think
is OK to upload my changes along with changing maintainership to the QA team.
For prospective maintainers, seems to be no news from upstream in some time,
so anyone adopting this package should probably act as upstream. I have put
all my changes in a git repo, so if anyone is interested in maintaining this
package, it can be made available through collab-maint or through watever
way is desired.
Changes (excluding whitespace ones) are attached.
Cheers,
--
Agustin
diff -wu wdm-1.28/debian/changelog wdm-1.28/debian/changelog
--- wdm-1.28/debian/changelog
+++ wdm-1.28/debian/changelog
@@ -1,3 +1,16 @@
+wdm (1.28-3.5~2) unstable; urgency=low
+
+ * debian/control: Really enable selinux in linux targets by
+ adding libselinux1-dev to Build-Depends for them.
+ * debian/config/Xreset: Use common Xreset framework if
+ available (Closes: #571611).
+ * Remove /etc/X11/default-display-manager if debconf question
+ db_get shared/default-x-display-manager no longer exists. Was
+ left behind in purge when no other X display managers were
+ installed.
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Fri, 12 Mar 2010 14:27:51 +0100
+
wdm (1.28-3.4) unstable; urgency=low
* Non-maintainer upload.
diff -wu wdm-1.28/debian/control wdm-1.28/debian/control
--- wdm-1.28/debian/control
+++ wdm-1.28/debian/control
@@ -9,6 +9,7 @@
libpam0g-dev, libwings-dev, libwraster3-dev, zlib1g-dev,
libxdmcp-dev, libxinerama-dev, libxkbfile-dev, libxmu-dev,
libx11-dev, libxau-dev, libxt-dev,
+ libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
x11proto-core-dev, libxft-dev, x11-xserver-utils
Package: wdm
diff -wu wdm-1.28/debian/wdm.prerm wdm-1.28/debian/wdm.prerm
--- wdm-1.28/debian/wdm.prerm
+++ wdm-1.28/debian/wdm.prerm
@@ -196,0 +197,6 @@
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
diff -wu wdm-1.28/debian/wdm.postrm wdm-1.28/debian/wdm.postrm
--- wdm-1.28/debian/wdm.postrm
+++ wdm-1.28/debian/wdm.postrm
@@ -7,6 +7,7 @@
log_file=/var/log/wdm-errors
pid_file=/var/run/wdm.pid
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
case "$1" in
remove)
@@ -18,6 +19,13 @@
if [ -e /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
db_purge
+ # Remove default display manager file if question not present
+ if ! db_get shared/default-x-display-manager; then
+ if [ -f $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+ echo "wdm.postrm: Removing file $DEFAULT_DISPLAY_MANAGER_FILE" >&2
+ rm -f $DEFAULT_DISPLAY_MANAGER_FILE
+ fi
+ fi
fi
rmdir /etc/X11/wdm > /dev/null 2>&1 || true
rmdir /var/lib/wdm/authdir/authfiles || true
@@ -41,0 +50,9 @@
+
+
+# vim:set ai et sts=2 sw=2 tw=0:
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
diff -wu wdm-1.28/debian/config/Xreset wdm-1.28/debian/config/Xreset
--- wdm-1.28/debian/config/Xreset
+++ wdm-1.28/debian/config/Xreset
@@ -4,6 +4,11 @@
#
# This script is run as root after any X session ends.
+# Use common X11 Xreset framework if available
+if [ -x /etc/X11/Xreset ]; then
+ /etc/X11/Xreset
+fi
+
# Remove the utmp entry for the session
if grep -q ^use-sessreg /etc/X11/wdm/wdm.options; then
sessreg -d -l $DISPLAY -u /var/run/utmp -x /etc/X11/wdm/Xservers $USER
