[patchlogo]

Debian patch tracking system

- icewm - icewm/1.3.7~pre2-1 - series patch debian_defaults

icewm (1.3.7~pre2-1) debian_defaults

Summary

 Makefile.in       |    2 ++
 lib/keys.in       |   21 ++++++++++++++-------
 lib/menu.in       |    4 ++--
 lib/toolbar.in    |    8 +++++---
 lib/winoptions.in |    2 ++
 src/Makefile.in   |    6 +++---
 src/default.h     |   14 +++++++-------
 src/themable.h    |   34 +++++++++++++++++-----------------
 src/wmapp.cc      |    2 +-
 src/yfontxft.cc   |    8 ++++----
 src/yprefs.h      |    4 ++--
 11 files changed, 59 insertions(+), 46 deletions(-)
download this patch

Patch contents

#!/bin/sh -e
## debian_defaults.dpatch by Eduard Bloch <blade@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
Index: icewm-1.3.7~pre2/Makefile.in
===================================================================
--- icewm-1.3.7~pre2.orig/Makefile.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/Makefile.in	2010-04-29 22:10:41.559041506 +0200
@@ -4,6 +4,8 @@
 # Please run 'configure' first (generate it with autogen.sh)
 ################################################################################
 
+SHELL=/bin/bash
+
 srcdir     = @srcdir@
 top_srcdir = @top_srcdir@
 
Index: icewm-1.3.7~pre2/lib/keys.in
===================================================================
--- icewm-1.3.7~pre2.orig/lib/keys.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/lib/keys.in	2010-04-29 22:10:41.560013404 +0200
@@ -9,13 +9,16 @@
 # 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+t"		x-terminal-emulator
 key "Alt+Ctrl+f"		fte
 key "Alt+Ctrl+e"		nedit
 key "Alt+Ctrl+g"		gimp
-key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
-key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
-key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
+#key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
+#key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
+#key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
+key "Alt+Ctrl+n"		sensible-browser
+#key "Alt+Ctrl+b"		mozilla -noraise -remote openBookmarks
+key "Alt+Ctrl+m"		mozilla-thunderbird mailto:
 
 key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
 key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
@@ -30,7 +33,11 @@
 key "XF86AudioMute"		aumix -v 0
 key "XF86AudioPlay"		cdplay play 1
 key "XF86AudioStop"		cdplay stop
-key "XF86HomePage"		netscape -noraise -remote openHomepage
-key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
-key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
+#key "XF86HomePage"		netscape -noraise -remote openHomepage
+#key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
+#key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
+key "XF86HomePage"		sensible-browser
+key "XF86WWW"		sensible-browser
+key "XF86Mail"			mozilla-thunderbird mailto:
+key "XF86Search"		sensible-browser http://www.yahoo.com/
 key "XF86Eject"			eject
Index: icewm-1.3.7~pre2/lib/menu.in
===================================================================
--- icewm-1.3.7~pre2.orig/lib/menu.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/lib/menu.in	2010-04-29 22:10:41.560013404 +0200
@@ -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
Index: icewm-1.3.7~pre2/lib/toolbar.in
===================================================================
--- icewm-1.3.7~pre2.orig/lib/toolbar.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/lib/toolbar.in	2010-04-29 22:10:41.560013404 +0200
@@ -4,6 +4,8 @@
 # since modifications to this file will be discarded when you
 # (re)install icewm.
 #
-prog XTerm xterm xterm
-prog FTE fte fte
-prog Netscape netscape netscape
+prog XTerm xterm x-terminal-emulator
+#prog FTE fte fte
+#prog Netscape netscape netscape
+prog    "gvim" /usr/X11R6/include/X11/pixmaps/vim.xpm /usr/bin/gvim -f
+prog    "Iceweasel" /usr/share/pixmaps/iceweasel.xpm iceweasel
Index: icewm-1.3.7~pre2/lib/winoptions.in
===================================================================
--- icewm-1.3.7~pre2.orig/lib/winoptions.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/lib/winoptions.in	2010-04-29 22:10:41.560013404 +0200
@@ -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
Index: icewm-1.3.7~pre2/src/Makefile.in
===================================================================
--- icewm-1.3.7~pre2.orig/src/Makefile.in	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/Makefile.in	2010-04-29 22:10:41.560013404 +0200
@@ -11,7 +11,7 @@
 
 CXX =           @CXX@
 HOSTCXX =       @HOSTCXX@
-LD =            @CXX_LINK@
+LD =            gcc
 HOSTLD =        @HOSTCXX_LINK@
 EXEEXT =        @EXEEXT@
 
@@ -32,11 +32,11 @@
                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+                -DICEHELPIDX='"/usr/share/doc/icewm-common/html/icewm.html"'
 
 CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
-LFLAGS =	@LDFLAGS@ 
+LFLAGS =	@LDFLAGS@ -lsupc++ -Wl,--as-needed
 LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
 
 CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
Index: icewm-1.3.7~pre2/src/default.h
===================================================================
--- icewm-1.3.7~pre2.orig/src/default.h	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/default.h	2010-04-29 22:10:41.560013404 +0200
@@ -112,7 +112,7 @@
 XIV(bool, win95keys,                            true)
 XIV(bool, autoReloadMenus,                      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)
@@ -161,15 +161,15 @@
 #endif
 
 XSV(const char *, mailBoxPath,                  0)
-XSV(const char *, mailCommand,                  "xterm -name pine -title PINE -e pine")
-XSV(const char *, mailClassHint,                "pine.XTerm")
+XSV(const char *, mailCommand,                  "x-terminal-emulator -name mutt -title Mutt -e mutt")
+XSV(const char *, mailClassHint,                "mutt.XTerm")
 XSV(const char *, newMailCommand,               0)
-XSV(const char *, lockCommand,                  0)
+XSV(const char *, lockCommand,                  "xlock -remote -mode blank")
 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)
 XSV(const char *, shutdownCommand,              0)
@@ -177,9 +177,9 @@
 XIV(int, taskBarCPUDelay,                       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 -name top -title Process\\ Status -e top")
 XSV(const char *, cpuClassHint,                 "top.XTerm")
-XSV(const char *, netCommand,                   "xterm -name netstat -title 'Network Status' -e netstat -c")
+XSV(const char *, netCommand,                   "x-terminal-emulator -name netstat -title 'Network Status' -e netstat -c")
 XSV(const char *, netClassHint,                 "netstat.XTerm")
 XSV(const char *, netDevice,                    "ppp0 eth0")
 XSV(const char *, addressBarCommand,            0)
Index: icewm-1.3.7~pre2/src/themable.h
===================================================================
--- icewm-1.3.7~pre2.orig/src/themable.h	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/themable.h	2010-04-29 22:10:41.561047768 +0200
@@ -45,25 +45,25 @@
 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), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, menuFontName,                 BOLDFONT(100), "sans-serif,Bitstream Vera Serif:size=10:bold")
+XFV(const char *, statusFontName,               BOLDTTFONT(120), "monospace,Bitstream Vera Sans Mono:size=12:bold")
+XFV(const char *, switchFontName,               BOLDTTFONT(120), "monospace,Bitstream Vera Sans Mono:size=12:bold")
+XFV(const char *, normalButtonFontName,         FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, activeButtonFontName,         BOLDFONT(120), "sans-serif,Bitstream Vera Serif:size=12: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(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, activeTaskBarFontName,        BOLDFONT(120), "sans-serif,Bitstream Vera Serif:size=12:bold")
+XFV(const char *, toolButtonFontName,           FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, normalWorkspaceFontName,      FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, activeWorkspaceFontName,      FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
 #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 *, apmFontName,                  TTFONT(140), "monospace:size=12")
-XFV(const char *, inputFontName,                TTFONT(140), "monospace:size=12")
+XFV(const char *, minimizedWindowFontName,      FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, listBoxFontName,              FONT(120), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, labelFontName,                FONT(140), "sans-serif,Bitstream Vera Serif:size=12")
+XFV(const char *, clockFontName,                TTFONT(140), "monospace,Bitstream Vera Sans Mono:size=12")
+XFV(const char *, apmFontName,                  TTFONT(140), "monospace,Bitstream Vera Sans Mono:size=12")
+XFV(const char *, inputFontName,                TTFONT(140), "monospace,Bitstream Vera Sans Mono:size=12")
 
 XSV(const char *, clrDialog,                    "rgb:C0/C0/C0")
 XSV(const char *, clrActiveBorder,              "rgb:C0/C0/C0")
Index: icewm-1.3.7~pre2/src/wmapp.cc
===================================================================
--- icewm-1.3.7~pre2.orig/src/wmapp.cc	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/wmapp.cc	2010-04-29 22:10:41.561047768 +0200
@@ -774,7 +774,7 @@
             logoutMenu->addItem(_("Restart _Icewm"), -2, null, actionRestart);
 
             DProgram *restartXTerm =
-                DProgram::newProgram(_("Restart _Xterm"), null, true, 0, "xterm", noargs);
+                DProgram::newProgram(_("Restart _Xterm"), null, true, 0, "x-terminal-emulator", noargs);
             if (restartXTerm)
                 logoutMenu->add(new DObjectMenuItem(restartXTerm));
 #endif
Index: icewm-1.3.7~pre2/src/yfontxft.cc
===================================================================
--- icewm-1.3.7~pre2.orig/src/yfontxft.cc	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/yfontxft.cc	2010-04-29 22:10:41.561047768 +0200
@@ -131,7 +131,7 @@
         msg("xft: fallback from '%s'", cstring(name).c_str());
         XftFont *sans =
             XftFontOpen(xapp->display(), xapp->screen(),
-                        XFT_FAMILY, XftTypeString, "sans-serif",
+                        XFT_FAMILY, XftTypeString, "sans-serif,Bitstream Vera Serif",
                         XFT_PIXEL_SIZE, XftTypeInteger, 12,
                         NULL);
 
@@ -145,7 +145,7 @@
             fAscent = sans->ascent;
             fDescent = sans->descent;
         } else
-            warn(_("Loading of fallback font \"%s\" failed."), "sans-serif");
+            warn(_("Loading of fallback font \"%s\" failed."), "sans-serif,Bitstream Vera Serif");
     }
 }
 
@@ -287,7 +287,7 @@
     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("sans-serif,Bitstream Vera Serif:size=12", false, antialias));
         if (font == null || !font->valid())
             msg("Could not load fallback Xft font.");
     }
@@ -298,7 +298,7 @@
     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("sans-serif,Bitstream Vera Serif:size=12", false, antialias));
         if (font == null || !font->valid())
             msg("Could not load fallback Xft font.");
     }
Index: icewm-1.3.7~pre2/src/yprefs.h
===================================================================
--- icewm-1.3.7~pre2.orig/src/yprefs.h	2010-04-28 21:00:30.000000000 +0200
+++ icewm-1.3.7~pre2/src/yprefs.h	2010-04-29 22:10:41.561047768 +0200
@@ -33,7 +33,7 @@
 #ifdef CONFIG_XFREETYPE
 XIV(bool, haveXft,                              true)
 #endif
-XSV(const char *, iconPath,                     0)
+XSV(const char *, iconPath,                     "/usr/share/icons:/usr/share/pixmaps")
 #define CONFIG_DEFAULT_THEME "icedesert/default.theme"
 XSV(const char *, themeName,                    CONFIG_DEFAULT_THEME)
 XSV(const char *, xineramaPrimaryScreenName,    0)
@@ -165,6 +165,6 @@
 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), "sans-serif,Bitstream Vera Serif:size=12")
 
 #endif
page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo