tags 319574 + patch
tags 332142 + patch
tags 367754 + patch
tags 386424 + patch
thanks
Hi,
In order to finish the cdebconf transition, see:
http://lists.debian.org/debian-devel/2005/08/msg00136.html
I intend to *lovingly* NMU, along with some other fixes.
I will upload to DELAYED-7, so that you still have time to stop
it if needed.
Attached is the diff for my wdm 1.28-2.3 NMU.
--
ยท''`. If I can't dance to it, it's not my revolution
: :' : -- Emma Goldman
`. `' Proudly running Debian GNU/Linux (unstable)
`- www.amayita.com www.malapecora.com www.chicasduras.com
diff -u 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-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch from Peter Colberg <[EMAIL PROTECTED]> to allow setting of greeter
+ font (Closes: #386424).
+ * Apply patch to fix cosmetic issues in manpage, from Nelson A. de Oliveira
+ <[EMAIL PROTECTED]> (Closes: #319574).
+ * Use invoke-rc.d to run init.d scripts(Closes: #367754).
+ * cdebconf transition: allow the dependency on debconf to be satisfied with
+ an alternate of debconf-2.0 (Closes: #332142).
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]> Mon, 20 Aug 2007 23:59:50 +0200
+
wdm (1.28-2.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u wdm-1.28/debian/control wdm-1.28/debian/control
--- wdm-1.28/debian/control
+++ wdm-1.28/debian/control
@@ -7,7 +7,7 @@
Package: wdm
Architecture: any
-Depends: libpam-runtime (>= 0.76-13.1), libpam-modules, debconf (>= 0.5.00), ${shlibs:Depends}, psmisc, xutils, xbase-clients
+Depends: libpam-runtime (>= 0.76-13.1), libpam-modules, debconf (>= 0.5.00) | debconf-2.0, ${shlibs:Depends}, psmisc, xutils, xbase-clients
Suggests: xfonts-base | xfs
Provides: x-display-manager
Description: WINGs Display Manager - an xdm replacement with a WindowMaker look
diff -u wdm-1.28/debian/init wdm-1.28/debian/init
--- wdm-1.28/debian/init
+++ wdm-1.28/debian/init
@@ -48,6 +48,7 @@
if grep -qs ^auto-update-wmlist /etc/X11/wdm/wdm.options; then
update_wdm_wmlist
fi
+ mkdir -p /var/run/wdm && ln -f -s /etc/GNUstep /var/run/wdm
start-stop-daemon --start --quiet $SSD_ARGS || echo -n " already running"
echo "."
fi
diff -u wdm-1.28/debian/wdm.postinst wdm-1.28/debian/wdm.postinst
--- wdm-1.28/debian/wdm.postinst
+++ wdm-1.28/debian/wdm.postinst
@@ -102,7 +102,11 @@
update-rc.d wdm defaults 99 01 > /dev/null 2>&1
# redirect stdout to /dev/tty so debconf doesn't choke on it
-[ -n "$NOSTART" ] || /etc/init.d/wdm start > /dev/tty || true
+[ -n "$NOSTART" ] || if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d package start
+ else
+ /etc/init.d/package start
+fi > /dev/tty || true
#DEBHELPER#
diff -u wdm-1.28/debian/wdm.prerm wdm-1.28/debian/wdm.prerm
--- wdm-1.28/debian/wdm.prerm
+++ wdm-1.28/debian/wdm.prerm
@@ -103,7 +103,11 @@
fi
if [ -n "$STOP" ]; then
- /etc/init.d/wdm stop || true
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d wdm stop
+ else
+ /etc/init.d/wdm stop || true
+ fi
else
if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
touch /var/run/wdm.upgrade
only in patch2:
unchanged:
--- wdm-1.28.orig/doc/wdm.man.in
+++ wdm-1.28/doc/wdm.man.in
@@ -7,7 +7,7 @@
\fBwdm\fP is an X display manager based on the original X11
X Display Manager (xdm).
It features numerous functionality improvements, including the ability
- to reboot or halt the machine (once
+to reboot or halt the machine (once
the proper password has been supplied) and to select from a list of available
X sessions to start. The look of the login panel is
somewhat configurable, too.
@@ -42,11 +42,11 @@
resource. This is factility to use with all messages if log is
redirected to syslog.
.IP "\fB\-usesyslog\fP"
-Specifies ``true'' as the value for the \fBDisplayManager.useSyslog\dP
+Specifies ``true'' as the value for the \fBDisplayManager.useSyslog\fP
resource. This will force all messages go to syslog with facility
specified by \fBDisplayManager.syslogFacility\fP resource.
.IP "\fB\-useerrfile\fP"
-Specifies ``false'' as the value for the \fBDisplayManager.useSyslog\dP
+Specifies ``false'' as the value for the \fBDisplayManager.useSyslog\fP
resource. This will force all messages go to log file
specified by \fBDisplayManager.errorLogFile\fP resource.
.IP "\fB\-resources\fP \fIresource_file\fP"
