diff -Nru wdm-1.28/debian/changelog wdm-1.28/debian/changelog --- wdm-1.28/debian/changelog 2019-09-05 11:15:57.000000000 +0000 +++ wdm-1.28/debian/changelog 2020-05-03 15:35:45.000000000 +0000 @@ -1,8 +1,29 @@ -wdm (1.28-24build1) eoan; urgency=medium +wdm (1.28-25) unstable; urgency=medium - * No-change upload with strops.h and sys/strops.h removed in glibc. + [ Rui Branco ] + * Update Portuguese translation for debconf. (Closes: #914430) - -- Matthias Klose Thu, 05 Sep 2019 11:15:57 +0000 + [ Joe Hansen ] + * Update Danish translation of the debconf template. (Closes: #923127) + + [ Axel Beckert ] + * Declare compliance with Debian Policy 4.5.0. (No changes needed.) + * Update 03_autoconf.patch to use pkg-config for libwings 0.95.9 + compatibility. (Closes: #959646) + * Add config.log to debian/clean to be able to build twice in a row. + * debian/rules: Drop -Wl,--as-needed linker flag which is now default. + * Rename debian/NEWS.Debian to debian/NEWS. Thanks Lintian! + * Bump debhelper compatibility level to 13. + + Build-depend on "debhelper-compat (= 13)" to replace debian/compat. + + Rename debian/wdm.tmpfile to debian/wdm.tmpfiles. + + Add a dh_installsystemd override as the dh_installinit override no + more suffices. + * Add ${perl:Depends} to Depends as hinted by dpkg-gencontrol. + * Update wdm.service to use Alias=display-manager.service instead of + using ExecStartPre to check which display manager should currently be + running. (Closes: #950395) + + -- Axel Beckert Sun, 03 May 2020 17:35:45 +0200 wdm (1.28-24) unstable; urgency=medium diff -Nru wdm-1.28/debian/clean wdm-1.28/debian/clean --- wdm-1.28/debian/clean 2017-04-17 13:25:19.000000000 +0000 +++ wdm-1.28/debian/clean 2020-05-03 14:53:58.000000000 +0000 @@ -1,3 +1,4 @@ debian/man/wdm.1x debian/man/wdmLogin.1x po/*.mo +config.log diff -Nru wdm-1.28/debian/compat wdm-1.28/debian/compat --- wdm-1.28/debian/compat 2018-01-03 03:19:44.000000000 +0000 +++ wdm-1.28/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru wdm-1.28/debian/control wdm-1.28/debian/control --- wdm-1.28/debian/control 2018-10-20 00:57:15.000000000 +0000 +++ wdm-1.28/debian/control 2020-05-03 15:30:35.000000000 +0000 @@ -5,8 +5,8 @@ Homepage: https://github.com/voins/wdm Vcs-Git: https://salsa.debian.org/debian/wdm.git Vcs-Browser: https://salsa.debian.org/debian/wdm -Standards-Version: 4.2.1 -Build-Depends: debhelper (>= 11~), +Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.15.7~), libgif-dev, libjpeg-dev, @@ -43,6 +43,7 @@ x11-xserver-utils, xserver-xorg | xserver, ${misc:Depends}, + ${perl:Depends}, ${shlibs:Depends} Suggests: xfonts-base Provides: x-display-manager diff -Nru wdm-1.28/debian/NEWS wdm-1.28/debian/NEWS --- wdm-1.28/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ wdm-1.28/debian/NEWS 2017-04-17 13:25:19.000000000 +0000 @@ -0,0 +1,7 @@ +wdm (1.28-2) unstable; urgency=low + + * Previous versions of WDM package used policy-incompatible files layout. + Since 1.28-2, WDM is placed in /usr/{bin,share/man}. I expect no problems + with upgrade, but if you have one - please let me know. + + -- Vladimir Shakhov Wed, 18 Aug 2005 03:25:13 +0300 diff -Nru wdm-1.28/debian/NEWS.Debian wdm-1.28/debian/NEWS.Debian --- wdm-1.28/debian/NEWS.Debian 2017-04-17 13:25:19.000000000 +0000 +++ wdm-1.28/debian/NEWS.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -wdm (1.28-2) unstable; urgency=low - - * Previous versions of WDM package used policy-incompatible files layout. - Since 1.28-2, WDM is placed in /usr/{bin,share/man}. I expect no problems - with upgrade, but if you have one - please let me know. - - -- Vladimir Shakhov Wed, 18 Aug 2005 03:25:13 +0300 diff -Nru wdm-1.28/debian/patches/03_autoconf.patch wdm-1.28/debian/patches/03_autoconf.patch --- wdm-1.28/debian/patches/03_autoconf.patch 2017-10-08 17:33:31.000000000 +0000 +++ wdm-1.28/debian/patches/03_autoconf.patch 2020-05-03 14:53:17.000000000 +0000 @@ -1,19 +1,28 @@ Author: Agustin Martin -Description: Add needed libs and filter out some unneeded. -Index: wdm/configure.ac -=================================================================== ---- wdm.orig/configure.ac 2012-01-26 15:28:47.000000000 +0100 -+++ wdm/configure.ac 2012-03-05 18:58:53.229935406 +0100 -@@ -159,9 +159,9 @@ - AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.]) +Author: Axel Beckert +Last-Update: 2020-05-03 +Description: Add needed libs and filter out some unneeded, use pkg-config +Bug-Debian: https://bugs.debian.org/959646 + +--- a/configure.ac ++++ b/configure.ac +@@ -154,14 +154,14 @@ + fi + + dnl WINGs support +-AC_CHECK_PROG(GETWINGSFLAGS,get-wings-flags,get-wings-flags,,[$PATH]) ++AC_CHECK_PROG(GETWINGSFLAGS,pkg-config,pkg-config,,[$PATH]) + if test -z "$GETWINGSFLAGS"; then +- AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.]) ++ AC_MSG_ERROR(['pkg-config' command was not found in \$PATH, please install it.]) fi -WCFLAGS=`get-wings-flags --cflags` -WLDFLAGS=`get-wings-flags --ldflags` -WLIBS=`get-wings-flags --libs` -+WCFLAGS="`get-wings-flags --cflags` `get-wutil-flags --cflags`" -+WLDFLAGS="`get-wings-flags --ldflags` `get-wutil-flags --ldflags`" -+WLIBS="`get-wings-flags --libs` `get-wutil-flags --libs`" ++WCFLAGS="`pkg-config --cflags WINGs` `pkg-config --cflags WUtil`" ++WLDFLAGS="`pkg-config --ldflags WINGs` `pkg-config --ldflags WUtil`" ++WLIBS="`pkg-config --libs WINGs` `pkg-config --libs WUtil`" AC_SUBST(XLIBS) AC_SUBST(XCFLAGS) diff -Nru wdm-1.28/debian/po/da.po wdm-1.28/debian/po/da.po --- wdm-1.28/debian/po/da.po 2018-01-03 03:26:16.000000000 +0000 +++ wdm-1.28/debian/po/da.po 2020-05-03 14:23:31.000000000 +0000 @@ -1,13 +1,17 @@ +# Copyright (C) 2019 wdm og nedenstående oversættere. +# This file is distributed under the same license as the wdm package. # Danish translation of the Debconf-template for wdm. # Morten Bo Johansen , 2004. +# Joe Hansen , 2019. +# msgid "" msgstr "" -"Project-Id-Version: wdm_1.27-2.1_da.po\n" +"Project-Id-Version: wdm_1.28-24\n" "Report-Msgid-Bugs-To: wdm@packages.debian.org\n" "POT-Creation-Date: 2017-10-08 21:22+0200\n" -"PO-Revision-Date: 2004-12-17 16:36+0100\n" -"Last-Translator: Morten Bo Johansen \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2019-02-24 16:36+0100\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,10 +20,8 @@ #. Type: select #. Description #: ../templates:1001 -#, fuzzy -#| msgid "Select the desired default display manager." msgid "Desired default display manager." -msgstr "Vælg det foretrukne skærmhåndteringsprogram." +msgstr "Foretrukne skærmhåndteringsprogram." #. Type: select #. Description diff -Nru wdm-1.28/debian/po/pt.po wdm-1.28/debian/po/pt.po --- wdm-1.28/debian/po/pt.po 2017-10-08 19:22:19.000000000 +0000 +++ wdm-1.28/debian/po/pt.po 2020-05-03 14:23:31.000000000 +0000 @@ -1,15 +1,15 @@ # Portuguese translation of wdm's debconf messages. -# 2005, Rui Branco > -# -# 2005-10-23 - Rui Branco +# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER +# 2005, Rui Branco +# 2005-10-23 - Rui Branco ,2018 # msgid "" msgstr "" -"Project-Id-Version: wdm 1.28-2\n" +"Project-Id-Version: wdm 1.28-24\n" "Report-Msgid-Bugs-To: wdm@packages.debian.org\n" "POT-Creation-Date: 2017-10-08 21:22+0200\n" -"PO-Revision-Date: 2005-10-23 10:49+0100\n" -"Last-Translator: Rui Branco \n" +"PO-Revision-Date: 2018-11-23 10:42+0000\n" +"Last-Translator: Rui Branco \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -19,10 +19,8 @@ #. Type: select #. Description #: ../templates:1001 -#, fuzzy -#| msgid "Select the desired default display manager." msgid "Desired default display manager." -msgstr "Seleccione o gestor gráfico por omissão que deseja." +msgstr "Gestor gráfico predefinido desejado." #. Type: select #. Description diff -Nru wdm-1.28/debian/rules wdm-1.28/debian/rules --- wdm-1.28/debian/rules 2017-10-08 19:15:02.000000000 +0000 +++ wdm-1.28/debian/rules 2020-05-03 15:35:45.000000000 +0000 @@ -26,7 +26,6 @@ # wdm build structure is ancient and links against unneeded libs. # Make sure this does not happen. LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS += -Wl,--as-needed export LDFLAGS @@ -65,6 +64,10 @@ override_dh_installinit: dh_installinit --noscripts +override_dh_installsystemd: + # Both options seen needed, see #959678. + dh_installsystemd --no-restart-on-upgrade --no-restart-after-upgrade + override_dh_installman: cp doc/wdm.man debian/man/wdm.1x cp doc/wdmLogin.man debian/man/wdmLogin.1x diff -Nru wdm-1.28/debian/wdm.service wdm-1.28/debian/wdm.service --- wdm-1.28/debian/wdm.service 2017-10-08 14:32:22.000000000 +0000 +++ wdm-1.28/debian/wdm.service 2020-05-03 15:35:45.000000000 +0000 @@ -5,5 +5,7 @@ After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service [Service] -ExecStartPre=/bin/sh -c 'if grep -qs '^auto-update-wmlist' /etc/X11/wdm/wdm.options; then update_wdm_wmlist; fi' ExecStart=/usr/bin/wdm -nodaemon + +[Install] +Alias=display-manager.service diff -Nru wdm-1.28/debian/wdm.tmpfile wdm-1.28/debian/wdm.tmpfile --- wdm-1.28/debian/wdm.tmpfile 2017-10-08 14:35:40.000000000 +0000 +++ wdm-1.28/debian/wdm.tmpfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -d /run/wdm 0755 root root -L /run/wdm/GNUstep - - - - /etc/GNUstep diff -Nru wdm-1.28/debian/wdm.tmpfiles wdm-1.28/debian/wdm.tmpfiles --- wdm-1.28/debian/wdm.tmpfiles 1970-01-01 00:00:00.000000000 +0000 +++ wdm-1.28/debian/wdm.tmpfiles 2020-05-03 15:35:45.000000000 +0000 @@ -0,0 +1,2 @@ +d /run/wdm 0755 root root +L /run/wdm/GNUstep - - - - /etc/GNUstep