I am attaching diff for NMU 1.28-3.3. Includes all changes except ru.po and new Debian logo, to keep things smaller.
ru.po is available at #541760 -- Agustin
diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/changelog wdm-1.28/debian/changelog --- wdm-1.28/debian/changelog 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/changelog 2010-02-08 19:42:09.000000000 +0100 @@ -1,3 +1,33 @@ +wdm (1.28-3.3) unstable; urgency=low + + * Non-maintainer upload. + * Provide virtual facility x-display-manager for dependency + based boot system (Closes: #554837). + * debian/config/Xservers: Updated to use current paths and comments + from xdm Xservers. Make sure we start in vt7 to avoid race condition + with tty creation leading to conflicts with other terminals due + to missing VT selection in /etc/X11/wdm/Xservers (Closes: #272704). + * Add Russian debconf templates translation, thanks to Yuri Kozlov + (Closes: #541760). + * Replace fake Debian logo by Debian Open Use Logo from + http://www.debian.org/logos (Closes: #490269). + * debian/config/{Xresources,Xresources_0}: + - xlogin*namePrompt: Remove trailing backslash and space. + * debian/control: + - Add Build-Depends on x11-xserver-utils so wdm knows during build + where is xrdb (Closes: #292298). + - Make Build-Depends multiline for easier inspection. + - Move Homepage to header from description. + - Add ${misc:Depends} to fix debhelper-but-no-misc-depends. + * debian/wdm.postinst: + - Use HOST_NAME instead of HOSTNAME as variable name in a for loop + to work around a bogus checkbashisms report (Closes: #530222). + * Xsession: Read ~/.wm_style only if available (Closes: #515621). + * Copy dpatch README.source into the package. + * debian/man/update_wdm_wmlist.8: Fix some errors. + + -- Agustin Martin Domingo <agmar...@debian.org> Mon, 08 Feb 2010 14:01:27 +0100 + wdm (1.28-3.2) unstable; urgency=low * Non-maintainer upload. diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/config/Xresources wdm-1.28/debian/config/Xresources --- wdm-1.28/debian/config/Xresources 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/config/Xresources 2010-02-08 19:42:09.000000000 +0100 @@ -9,7 +9,7 @@ <Key>Return: set-session-argument() finish-field() xlogin*borderWidth: 3 xlogin*greeting: Debian GNU/Linux (CLIENTHOST) -xlogin*namePrompt: login:\ +xlogin*namePrompt: login: xlogin*fail: Login incorrect #ifdef COLOR xlogin*greetColor: CadetBlue diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/config/Xresources_0 wdm-1.28/debian/config/Xresources_0 --- wdm-1.28/debian/config/Xresources_0 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/config/Xresources_0 2010-02-08 19:42:09.000000000 +0100 @@ -19,7 +19,7 @@ <Key>KP_Enter: set-session-argument() finish-field() xlogin*borderWidth: 3 xlogin*greeting: Debian GNU/Linux (CLIENTHOST) -xlogin*namePrompt: login:\ +xlogin*namePrompt: login: xlogin*fail: Login incorrect #ifdef COLOR xlogin*greetColor: CadetBlue diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/config/Xservers wdm-1.28/debian/config/Xservers --- wdm-1.28/debian/config/Xservers 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/config/Xservers 2010-02-08 19:42:09.000000000 +0100 @@ -1,7 +1,9 @@ # /etc/X11/wdm/Xservers # -# This file should contain entries to start the servers on the -# local machine; if you have more than one display (not screen), +# Xservers file, workstation prototype +# +# This file should contain an entry to start the server on the +# local display; if you have more than one display (not screen), # you can add entries to the list (one per line). If you also # have some X terminals connected which do not support XDMCP, # you can add them here as well. Each X terminal line should @@ -9,15 +11,25 @@ # XTerminalName:0 foreign # # When adding X servers, please keep the following things in mind: -# - For each X server other than :0, the display number must be -# on the command line. -# - This is the place to add the -bpp option to the command line. -# - If you run multiple X servers, it is wise to add the vtXX -# option to each of them, since this is the only sure way of -# knowing in advance which X server attaches to which console. -# -# Example: -# :0 local /usr/bin/X11/X :0 vt9 -bpp 16 -# :1 local /usr/bin/X11/X :1 vt10 -bpp 8 +# - If the X server's number is not zero, it must be passed to the X +# server's command line as its first argument. +# - When using the XFree86 X server, it is wise to add the vtXX +# option to each local X server, since this is the only sure way +# of knowing in advance which X server attaches to which virtual +# console. +# - SECURITY NOTE: Always pass the "-nolisten tcp" option to the X +# server, as shown in the examples below, unless you know you +# need the X server listening on a TCP port. Omitting this +# option can expose your X server to attacks from remote hosts. +# Note also that SSH's X11 port-forwarding option works even with +# X servers that do not listen on a TCP port, so you do not need +# to remove the "-nolisten tcp" option for SSH's benefit. +# - See the Xserver(1) manpage for a description of X server +# options. If you are using the XFree86 X server, see the +# XFree86(1) manpage for a description of options specific to it +# (such as "-depth"). # -:0 local /usr/bin/X11/X -nolisten TCP +# Examples for multiple local X displays: +# :0 local /usr/bin/X :0 vt9 -depth 15 -nolisten tcp +# :1 local /usr/bin/X :1 vt10 -depth 8 -nolisten tcp +:0 local /usr/bin/X :0 vt7 -nolisten tcp diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/config/Xsession wdm-1.28/debian/config/Xsession --- wdm-1.28/debian/config/Xsession 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/config/Xsession 2010-02-08 19:42:09.000000000 +0100 @@ -3,8 +3,14 @@ # This is an Xsession wrapper for use with wdm to take care of the # handling of the 'NoChange' window manager selection option. -if [ $# -eq 1 ] ; then - echo $1 >$HOME/.wm_style - shift +if [ $# -eq 1 ] ; then + echo $1 >$HOME/.wm_style + shift fi -exec /bin/sh /etc/X11/Xsession `cat $HOME/.wm_style` $@ + +# Use $HOME/.wm_style only if available. +if [ -r $HOME/.wm_style ]; then + WM_STYLE_CONTENTS=`cat $HOME/.wm_style` +fi + +exec /bin/sh /etc/X11/Xsession $WM_STYLE_CONTENTS $@ diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/control wdm-1.28/debian/control --- wdm-1.28/debian/control 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/control 2010-02-08 19:42:09.000000000 +0100 @@ -2,16 +2,23 @@ Section: x11 Priority: optional Maintainer: Vlad Shakhov <lumpen.intellect...@gmail.com> +Homepage: http://voins.program.ru/wdm Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5), libjpeg62-dev, libpam0g-dev, libwings-dev, libpng12-dev, libgif-dev, libwraster3-dev, libxpm-dev, zlib1g-dev, libx11-dev, libxau-dev, libxdmcp-dev, libxinerama-dev, libxkbfile-dev, libxmu-dev, libxpm-dev, libxt-dev, x11proto-core-dev, libxft-dev, dpatch, po-debconf +Build-Depends: debhelper (>= 5), dpatch, po-debconf, + libjpeg62-dev, libpam0g-dev, libwings-dev, libpng12-dev, libgif-dev, + libwraster3-dev, libxpm-dev, zlib1g-dev, libx11-dev, libxau-dev, + libxdmcp-dev, libxinerama-dev, libxkbfile-dev, libxmu-dev, libxpm-dev, + libxt-dev, x11proto-core-dev, libxft-dev, x11-xserver-utils Package: wdm Architecture: any -Depends: libpam-runtime (>= 0.76-13.1), libpam-modules, debconf (>= 1.5.20) | debconf-2.0, ${shlibs:Depends}, psmisc, xutils, x11-xserver-utils, x11-apps, x11-common +Depends: ${shlibs:Depends}, ${misc:Depends}, + libpam-runtime (>= 0.76-13.1), libpam-modules, + debconf (>= 1.5.20) | debconf-2.0, + psmisc, xutils, x11-xserver-utils, x11-apps, x11-common Suggests: xfonts-base | xfs Provides: x-display-manager Description: WINGs Display Manager - an xdm replacement with a WindowMaker look This is an xdm replacement based on the WINGs widget set. WINGs is the NeXT-like widget set used by WindowMaker and some other programs. wdm provides a nice and versatile login panel along with xdm functionality. -Homepage: http://voins.program.ru/wdm diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/dirs wdm-1.28/debian/dirs --- wdm-1.28/debian/dirs 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/dirs 2010-02-08 19:42:09.000000000 +0100 @@ -1,6 +1,7 @@ etc/X11/wdm etc/pam.d etc/logrotate.d +etc/insserv.conf.d usr/share/man/man1 usr/share/man/man8 usr/sbin diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/docs wdm-1.28/debian/docs --- wdm-1.28/debian/docs 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/docs 2010-02-08 19:42:09.000000000 +0100 @@ -1,5 +1,6 @@ NEWS README +debian/README.source AUTHORS TODO ChangeLog.old diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/man/update_wdm_wmlist.8 wdm-1.28/debian/man/update_wdm_wmlist.8 --- wdm-1.28/debian/man/update_wdm_wmlist.8 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/man/update_wdm_wmlist.8 2010-02-08 19:42:09.000000000 +0100 @@ -26,6 +26,7 @@ <wakke...@debian.org>. .UE wdm was written by Gene Czarcinski -.UR mailto: ge...@mindspring.com +.UR mailto:ge...@mindspring.com <ge...@mindspring.com> -.UE. +.UE . + diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/patches/00options wdm-1.28/debian/patches/00options --- wdm-1.28/debian/patches/00options 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/patches/00options 2010-02-08 19:42:09.000000000 +0100 @@ -1 +1 @@ -DPATCH_OPTION_CPP=1 \ No hay ningún carácter de nueva línea al final del fichero +DPATCH_OPTION_CPP=1 diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/README.source wdm-1.28/debian/README.source --- wdm-1.28/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ wdm-1.28/debian/README.source 2010-02-08 19:42:09.000000000 +0100 @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa <dan...@debian.org> +10 Aug 2008. diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/rules wdm-1.28/debian/rules --- wdm-1.28/debian/rules 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/rules 2010-02-08 19:42:09.000000000 +0100 @@ -105,6 +105,8 @@ $(INSTALL_REGFILE) pixmaps/*.xpm pixmaps/*.jpg \ $(WDM_BUILD_DIR)/usr/share/pixmaps/ $(INSTALL_REGFILE) debian/*.xpm $(WDM_BUILD_DIR)/usr/share/pixmaps/ + # Provide virtual facility x-display-manager for dependency based boot system + $(INSTALL_REGFILE) debian/wdm.insservd $(WDM_BUILD_DIR)/etc/insserv.conf.d/wdm dh_installdocs dh_installdebconf cp debian/lintian.overrides $(WDM_BUILD_DIR)/usr/share/lintian/overrides/wdm @@ -132,7 +134,7 @@ dh_md5sums dh_builddeb -source diff: +source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false patch: patch-stamp diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/wdm.insservd wdm-1.28/debian/wdm.insservd --- wdm-1.28/debian/wdm.insservd 1970-01-01 01:00:00.000000000 +0100 +++ wdm-1.28/debian/wdm.insservd 2010-02-08 19:42:09.000000000 +0100 @@ -0,0 +1 @@ +$x-display-manager wdm diff -Nru --exclude wdmDebianSwirl.xpm --exclude ru.po wdm-1.28/debian/wdm.postinst wdm-1.28/debian/wdm.postinst --- wdm-1.28/debian/wdm.postinst 2010-02-08 19:42:09.000000000 +0100 +++ wdm-1.28/debian/wdm.postinst 2010-02-08 19:42:09.000000000 +0100 @@ -71,8 +71,8 @@ NOSTART=yes fi # or if we're currently in X on the display it attempts to manage by default -for HOSTNAME in "" "localhost" "$(hostname)" "$(hostname -f)"; do - if echo $DISPLAY | grep -q "^${HOSTNAME}:0.*"; then +for HOST_NAME in "" "localhost" "$(hostname)" "$(hostname -f)"; do + if echo $DISPLAY | grep -q "^${HOST_NAME}:0.*"; then NOSTART=yes fi done
