Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 icewm (1.4.1+mod+20170728-1) experimental; urgency=low
 .
   * New (unofficial fork) upstream snapshot
Author: Eduard Bloch <blade@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2017-07-28

--- icewm-1.4.1+mod+20170728.orig/ChangeLog
+++ icewm-1.4.1+mod+20170728/ChangeLog
@@ -1,3 +1,17 @@
+commit 8f1eed9cd44455a198c2f2d31a3927823f2c81ef
+Author: Bert Gijsbers <gijsbers@science.uva.nl>
+Date:   Fri Jul 28 00:33:50 2017 +0200
+
+    Prepare for 1.4.1 release.
+
+ ChangeLog      | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS           |  20 ++++++++-
+ README.md      |   6 +--
+ README.md.in   |   2 +-
+ VERSION        |   2 +-
+ configure.ac   |   6 +--
+ doc/icewm.adoc |   2 +-
+ 7 files changed, 146 insertions(+), 10 deletions(-)
 # created with git log --stat=76 -M -C -300|fmt -sct -w80
 
 commit 9b13b2837831888a369c34b9c28939b99c1cd175
--- icewm-1.4.1+mod+20170728.orig/lib/keys.in
+++ icewm-1.4.1+mod+20170728/lib/keys.in
@@ -9,9 +9,9 @@
 # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
 # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
 #
-key "Alt+Ctrl+t"			xterm
-key "Alt+Ctrl+b"			xdg-open about:blank
-key "Alt+Ctrl+s"			xdg-open http://www.google.com
+key "Alt+Ctrl+t"			x-terminal-emulator
+key "Alt+Ctrl+b"			sensible-browser about:blank
+key "Alt+Ctrl+s"			sensible-browser http://www.duckduckgo.com
 
 key "Super+KP_Subtract"			amixer sset PCM 5%-
 key "Super+KP_Add"			amixer sset PCM 5%+
@@ -20,12 +20,12 @@ key "Super+KP_Add"			amixer sset PCM 5%+
 # advanced function keys by watching the output of the xev command whilest
 # pressing those keys and map those symbols by using xmodmap.
 
-key "XF86Standby"			/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
-key "XF86Sleep"				/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+key "XF86Standby"			/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } || sudo -n pm-suspend"
+key "XF86Sleep"				/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } || sudo -n pm-suspend"
 key "XF86AudioLowerVolume"		amixer sset PCM 5%-
 key "XF86AudioRaiseVolume"		amixer sset PCM 5%+
 key "XF86AudioMute"			amixer sset PCM 0%
-key "XF86HomePage"			xdg-open about:blank
-key "XF86Search"			xdg-open http://www.google.com
+key "XF86HomePage"			sensible-browser about:blank
+key "XF86Search"			sensible-browser http://www.duckduckgo.com
 key "XF86Eject"				eject
 key "XF86Calculator"  /bin/sh -c "gnome-calculator || xcalc || ( type bc >/dev/null 2>&1 && xterm -e bc -l)"
--- icewm-1.4.1+mod+20170728.orig/lib/menu.in
+++ icewm-1.4.1+mod+20170728/lib/menu.in
@@ -5,10 +5,10 @@
 # (re)install icewm.
 #
 prog xterm xterm xterm
-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+prog rxvt xterm rxvt -rv -C -fn 9x15 -sl 500
 prog fte fte fte
 prog NEdit nedit nedit
-prog Mozilla mozilla mozilla
+prog "Iceweasel" iceweasel iceweasel
 prog XChat xchat xchat
 prog Gimp gimp gimp
 separator
--- icewm-1.4.1+mod+20170728.orig/lib/toolbar.in
+++ icewm-1.4.1+mod+20170728/lib/toolbar.in
@@ -4,6 +4,5 @@
 # since modifications to this file will be discarded when you
 # (re)install icewm.
 #
-prog xterm utilities-terminal xterm
-prog "Web browser" web-browser xdg-open about:blank
-
+prog Terminal /usr/share/icons/gnome/16x16/apps/terminal.png x-terminal-emulator
+prog "Web browser" /usr/share/icewm/icons/mozilla_16x16.xpm sensible-browser about:blank
--- icewm-1.4.1+mod+20170728.orig/lib/winoptions.in
+++ icewm-1.4.1+mod+20170728/lib/winoptions.in
@@ -6,6 +6,8 @@
 
 xterm.icon: xterm
 rxvt.icon: xterm
+urxvtc.icon: urxvt
+urxvt.icon: urxvt
 nxterm.icon: xterm
 fte.icon: fte
 emacs.Emacs.icon: emacs
--- icewm-1.4.1+mod+20170728.orig/src/default.h
+++ icewm-1.4.1+mod+20170728/src/default.h
@@ -122,7 +122,7 @@ XIV(bool, win95keys,
 XIV(bool, autoReloadMenus,                      true)
 XIV(bool, arrangeWindowsOnScreenSizeChange,     true)
 XIV(bool, clientMouseActions,                   true)
-XIV(bool, showPrograms,                         false)
+XIV(bool, showPrograms,                         true)
 XIV(bool, showSettingsMenu,                     true)
 XIV(bool, showFocusModeMenu,                    true)
 XIV(bool, showThemesMenu,                       true)
@@ -175,20 +175,20 @@ XSV(const char *, acpiIgnoreBatteries,
 #endif
 
 XSV(const char *, mailBoxPath,                  0)
-XSV(const char *, mailCommand,                  "xterm -name mutt -e mutt")
+XSV(const char *, mailCommand,                  "x-terminal-emulator -e mutt")
 XSV(const char *, mailClassHint,                "mutt.XTerm")
 XSV(const char *, newMailCommand,               0)
-XSV(const char *, lockCommand,                  0)
+XSV(const char *, lockCommand,                  "xscreensaver-command -lock")
 XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
 XSV(const char *, clockClassHint,               "icewm.XClock")
 XSV(const char *, runDlgCommand,                0)
 XSV(const char *, openCommand,                  0)
-XSV(const char *, terminalCommand,              "xterm")
+XSV(const char *, terminalCommand,              "x-terminal-emulator")
 XSV(const char *, logoutCommand,                0)
 XSV(const char *, logoutCancelCommand,          0)
 #if defined(__linux__)
-XSV(const char *, shutdownCommand,              "/bin/sh -c \"{ test -e /run/systemd/system && systemctl poweroff; } ||:\"")
-XSV(const char *, rebootCommand,                "/bin/sh -c \"{ test -e /run/systemd/system && systemctl reboot; } ||:\"")
+XSV(const char *, shutdownCommand,              "/bin/sh -c \"{ test -e /run/systemd/system && systemctl poweroff; } || sudo -n /sbin/halt\"")
+XSV(const char *, rebootCommand,                "/bin/sh -c \"{ test -e /run/systemd/system && systemctl reboot; } || sudo -n /sbin/reboot\"")
 #else
 XSV(const char *, shutdownCommand,              0)
 XSV(const char *, rebootCommand,                0)
@@ -197,10 +197,10 @@ XIV(int, taskBarCPUDelay,
 XIV(int, taskBarMEMDelay,                       500)
 XIV(int, taskBarNetSamples,                     20)
 XIV(int, taskBarNetDelay,                       500)
-XSV(const char *, cpuCommand,                   "xterm -name top -title Process\\ Status -e top")
+XSV(const char *, cpuCommand,                   "x-terminal-emulator -e top")
 XSV(const char *, cpuClassHint,                 "top.XTerm")
+XSV(const char *, netCommand,                   "x-terminal-emulator -e netstat -c")
 XIV(bool, cpuCombine,                           true)
-XSV(const char *, netCommand,                   "xterm -name netstat -title 'Network Status' -e netstat -c")
 XSV(const char *, netClassHint,                 "netstat.XTerm")
 XSV(const char *, netDevice,                    "eth0 wlan0")
 XSV(const char *, addressBarCommand,            0)
--- icewm-1.4.1+mod+20170728.orig/src/themable.h
+++ icewm-1.4.1+mod+20170728/src/themable.h
@@ -45,26 +45,26 @@ XSV(const char *, titleButtonsSupported,
 XSV(const char *, themeAuthor,                  0)
 XSV(const char *, themeDescription,             0)
 
-XFV(const char *, titleFontName,                FONT(120), "sans-serif:size=12")
-XFV(const char *, menuFontName,                 BOLDFONT(100), "sans-serif:size=10:bold")
-XFV(const char *, statusFontName,               BOLDTTFONT(120), "monospace:size=12:bold")
-XFV(const char *, switchFontName,               BOLDTTFONT(120), "monospace:size=12:bold")
-XFV(const char *, normalButtonFontName,         FONT(120), "sans-serif:size=12")
-XFV(const char *, activeButtonFontName,         BOLDFONT(120), "sans-serif:size=12:bold")
+XFV(const char *, titleFontName,                FONT(120), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, menuFontName,                 BOLDFONT(100), "DejaVu Sans,sans-serif,Bitstream Vera Serif:size=10:bold")
+XFV(const char *, statusFontName,               BOLDTTFONT(110), "DejaVu Sans Mono,monospace:size=11:bold")
+XFV(const char *, switchFontName,               BOLDTTFONT(110), "DejaVu Sans Mono,monospace:size=11")
+XFV(const char *, normalButtonFontName,         FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, activeButtonFontName,         BOLDFONT(110), "DejaVu Sans,sans-serif:size=11:bold")
 #ifdef CONFIG_TASKBAR
-XFV(const char *, normalTaskBarFontName,        FONT(120), "sans-serif:size=12")
-XFV(const char *, activeTaskBarFontName,        BOLDFONT(120), "sans-serif:size=12:bold")
-XFV(const char *, toolButtonFontName,           FONT(120), "sans-serif:size=12")
-XFV(const char *, normalWorkspaceFontName,      FONT(120), "sans-serif:size=12")
-XFV(const char *, activeWorkspaceFontName,      FONT(120), "sans-serif:size=12")
+XFV(const char *, normalTaskBarFontName,        FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, activeTaskBarFontName,        BOLDFONT(110), "DejaVu Sans,sans-serif:size=10:bold")
+XFV(const char *, toolButtonFontName,           FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, normalWorkspaceFontName,      FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, activeWorkspaceFontName,      FONT(110), "DejaVu Sans,sans-serif:size=11")
 #endif
-XFV(const char *, minimizedWindowFontName,      FONT(120), "sans-serif:size=12")
-XFV(const char *, listBoxFontName,              FONT(120), "sans-serif:size=12")
-XFV(const char *, labelFontName,                FONT(140), "sans-serif:size=12")
-XFV(const char *, clockFontName,                TTFONT(140), "monospace:size=12")
+XFV(const char *, minimizedWindowFontName,      FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, listBoxFontName,              FONT(110), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, labelFontName,                FONT(140), "DejaVu Sans,sans-serif:size=11")
+XFV(const char *, clockFontName,                TTFONT(140), "DejaVu Sans Mono,monospace:size=11")
 XFV(const char *, tempFontName,                 TTFONT(140), "monospace:size=12")
-XFV(const char *, apmFontName,                  TTFONT(140), "monospace:size=12")
-XFV(const char *, inputFontName,                TTFONT(140), "monospace:size=12")
+XFV(const char *, apmFontName,                  TTFONT(140), "DejaVu Sans Mono,monospace:size=11")
+XFV(const char *, inputFontName,                TTFONT(140), "DejaVu Sans Mono,monospace:size=11")
 
 XSV(const char *, clrDialog,                    "rgb:C0/C0/C0")
 XSV(const char *, clrActiveBorder,              "rgb:C0/C0/C0")
--- icewm-1.4.1+mod+20170728.orig/src/yapp.cc
+++ icewm-1.4.1+mod+20170728/src/yapp.cc
@@ -451,7 +451,7 @@ int YApplication::mainLoop() {
             handleSignal(SIGHUP);
 #endif
 
-        {
+        if (measure_latency) { // no spam in user's logs please
             struct timeval difftime;
             struct timeval curtime;
 
--- icewm-1.4.1+mod+20170728.orig/src/yfontxft.cc
+++ icewm-1.4.1+mod+20170728/src/yfontxft.cc
@@ -182,8 +182,8 @@ YXftFont::YXftFont(ustring name, bool us
         msg("xft: fallback from '%s'", cstring(name).c_str());
         XftFont *sans =
             XftFontOpen(xapp->display(), xapp->screen(),
-                        XFT_FAMILY, XftTypeString, "sans-serif",
-                        XFT_PIXEL_SIZE, XftTypeInteger, 12,
+                        XFT_FAMILY, XftTypeString, "DejaVu Sans,sans-serif",
+                        XFT_PIXEL_SIZE, XftTypeInteger, 11,
                         NULL);
 
         if (NULL != sans) {
@@ -196,7 +196,7 @@ YXftFont::YXftFont(ustring name, bool us
             fAscent = sans->ascent;
             fDescent = sans->descent;
         } else
-            warn(_("Loading of fallback font \"%s\" failed."), "sans-serif");
+            warn(_("Loading of fallback font \"%s\" failed."), "DejaVu Sans,sans-serif");
     }
 }
 
@@ -339,7 +339,7 @@ ref<YFont> getXftFontXlfd(ustring name,
     ref<YFont> font(new YXftFont(name, true, antialias));
     if (font == null || !font->valid()) {
         msg("failed to load font '%s', trying fallback", cstring(name).c_str());
-        font.init(new YXftFont("sans-serif:size=12", false, antialias));
+        font.init(new YXftFont("DejaVu Sans,sans-serif:size=11", false, antialias));
         if (font == null || !font->valid())
             msg("Could not load fallback Xft font.");
     }
@@ -350,7 +350,7 @@ ref<YFont> getXftFont(ustring name, bool
     ref<YFont>font(new YXftFont(name, false, antialias));
     if (font == null || !font->valid()) {
         msg("failed to load font '%s', trying fallback", cstring(name).c_str());
-        font.init(new YXftFont("sans-serif:size=12", false, antialias));
+        font.init(new YXftFont("DejaVu Sans,sans-serif:size=11", false, antialias));
         if (font == null || !font->valid())
             msg("Could not load fallback Xft font.");
     }
--- icewm-1.4.1+mod+20170728.orig/src/yprefs.h
+++ icewm-1.4.1+mod+20170728/src/yprefs.h
@@ -62,6 +62,6 @@ XIV(WMLook, wmLook,
 XSV(const char *, clrToolTip,                   "rgb:E0/E0/00")
 XSV(const char *, clrToolTipText,               "rgb:00/00/00")
 #endif
-XFV(const char *, toolTipFontName,              FONT(120), "sans-serif:size=12")
+XFV(const char *, toolTipFontName,              FONT(120), "DejaVu Sans,sans-serif:size=11")
 
 #endif
