--- Begin Message ---
Package: wmaker
Version: 0.80.1-8.1
Severity: normal
Hello Marcello,
I will upload to Delayed/5 the following wmaker NMU. I hope you
won't mind. This was intended to improve the menu but this also fix a
FTBFS with current libtool. Here the changelog, the patch is in
attachment.
wmaker (0.80.1-8.1) unstable; urgency=low
* NMU
* Rebuild with current libtool (1.5.6-1).
* src/Makefile.am: Fix FTBFS with new libtool.
+ Add @[EMAIL PROTECTED]
* debian/wmaker.menu-methods:
+ Add outputencoding="ISO-8859-1" (closes: #234587).
+ Add support for GNUSTEP_USER_ROOT (closes: #192741, #243612).
+ Use title() not $title and convert " to '.
* debian/wmaker.menu: quote 'needs' fields. (27 lintian warnings)
* debian/control:
+ Add Conflicts with menu (<<2.1.10) (needed for shell()).
+ Remove broken link in wmaker description (closes: #196936), thanks Jay
Bonci.
+ Add Homepage: <http://www.windowmaker.org/> in wmaker description
+ Remove extraneous comma in Uploaders: field.
+ Set libpng build-dependency to libpng12-dev (>= 1.2.5.0-4)
(closes: #165139).
+ Apply patch from Kevin B. McCarty for more fine grained X11 deps.
(closes: #241520).
+ Change section of -dev packages to libdevel to match overrides file.
+ Bump Standard-Version to 3.6.1.
+ Remove dots at the end of the short descriptions (3 lintian warnings).
* debian/wmaker:
+ Apply patch by Kevin B. McCarty to handle spaces in GNUSTEP_USER_ROOT.
(closes: #220497).
* debian/wmaker.desktop: Added (closes: #241554), thanks Sylvain Le Gall.
* debian/rules: install wmaker.desktop in /usr/share/xsessions.
* debian/changelog: convert to UTF-8.
+ Remove obsolete user emacs settings (5 lintian warnings).
* The maintainer scripts below were removed, since they are copy of
automatically generated scripts by debhelper for the /usr/share/doc
transition: (14 lintian warnings)
+ debian/libwings-dev.postinst, debian/libwings-dev.prerm
+ debian/libwmaker0-dev.postinst, debian/libwmaker0-dev.prerm
+ debian/libwraster2-dev.postinst, debian/libwraster2-dev.prerm
+ debian/libdockapp-dev.postinst, debian/libdockapp-dev.prerm
+ debian/libwraster2.prerm
* debian/libwraster2.postinst (2 lintian warnings)
+ Replace debhelper generated part by DEBHELPER token.
+ Fix "unkow" typo.
* debian/wmaker.postinst.tmpl, debian/wmaker.prerm:
+ Remove /usr/share/doc transition code. (1 warning)
-- Bill Allombert <[EMAIL PROTECTED]> Sat, 15 May 2004 14:41:58 +0200
Cheers,
--
Bill. <[EMAIL PROTECTED]>
Imagine a large red swirl here.
diff -u wmaker-0.80.1/debian/changelog wmaker-0.80.1/debian/changelog
--- wmaker-0.80.1/debian/changelog
+++ wmaker-0.80.1/debian/changelog
@@ -1,3 +1,50 @@
+wmaker (0.80.1-8.1) unstable; urgency=low
+
+ * NMU
+ * Rebuild with current libtool (1.5.6-1).
+ * src/Makefile.am: Fix FTBFS with new libtool.
+ + Add @[EMAIL PROTECTED]
+ * debian/wmaker.menu-methods:
+ + Add outputencoding="ISO-8859-1" (closes: #234587).
+ + Add support for GNUSTEP_USER_ROOT (closes: #192741, #243612).
+ + Use title() not $title and convert " to '.
+ * debian/wmaker.menu: quote 'needs' fields. (27 lintian warnings)
+ * debian/control:
+ + Add Conflicts with menu (<<2.1.10) (needed for shell()).
+ + Remove broken link in wmaker description (closes: #196936), thanks Jay
+ Bonci.
+ + Add Homepage: <http://www.windowmaker.org/> in wmaker description
+ + Remove extraneous comma in Uploaders: field.
+ + Set libpng build-dependency to libpng12-dev (>= 1.2.5.0-4)
+ (closes: #165139).
+ + Apply patch from Kevin B. McCarty for more fine grained X11 deps.
+ (closes: #241520).
+ + Change section of -dev packages to libdevel to match overrides file.
+ + Bump Standard-Version to 3.6.1.
+ + Remove dots at the end of the short descriptions (3 lintian warnings).
+ * debian/wmaker:
+ + Apply patch by Kevin B. McCarty to handle spaces in GNUSTEP_USER_ROOT.
+ (closes: #220497).
+ * debian/wmaker.desktop: Added (closes: #241554), thanks Sylvain Le Gall.
+ * debian/rules: install wmaker.desktop in /usr/share/xsessions.
+ * debian/changelog: convert to UTF-8.
+ + Remove obsolete user emacs settings (5 lintian warnings).
+ * The maintainer scripts below were removed, since they are copy of
+ automatically generated scripts by debhelper for the /usr/share/doc
+ transition: (14 lintian warnings)
+ + debian/libwings-dev.postinst, debian/libwings-dev.prerm
+ + debian/libwmaker0-dev.postinst, debian/libwmaker0-dev.prerm
+ + debian/libwraster2-dev.postinst, debian/libwraster2-dev.prerm
+ + debian/libdockapp-dev.postinst, debian/libdockapp-dev.prerm
+ + debian/libwraster2.prerm
+ * debian/libwraster2.postinst (2 lintian warnings)
+ + Replace debhelper generated part by DEBHELPER token.
+ + Fix "unkow" typo.
+ * debian/wmaker.postinst.tmpl, debian/wmaker.prerm:
+ + Remove /usr/share/doc transition code. (1 warning)
+
+ -- Bill Allombert <[EMAIL PROTECTED]> Sat, 15 May 2004 14:41:58 +0200
+
wmaker (0.80.1-8) unstable; urgency=low
* debian/patches/11_alt_focus.diff: patch from the mailing list to fix yet
@@ -116,7 +163,7 @@
* doc/wcopy.1x: change description a little, apparently .SH doesn't
work with multiple commands and descriptions. (closes: bug#135085)
* src/defaults.c: fix braino when updating a patch, it's GNUstep/Defaults,
- not GNUstep/Defaults/WindowMaker. Thanks Torbjørn Andersson (and sorry
+ not GNUstep/Defaults/WindowMaker. Thanks Torbjørn Andersson (and sorry
about the long delay) (closes: bug#129466, bug#127718)
* debian/rules: rm -f src/wconfig.h when configuring wmaker, I'm not sure
I understand why this is suddenly a problem.
@@ -1608,3 +1655,2 @@
mode: debian-changelog
-add-log-mailing-address: "[EMAIL PROTECTED]"
End:
reverted:
--- wmaker-0.80.1/debian/libdockapp-dev.postinst
+++ wmaker-0.80.1.orig/debian/libdockapp-dev.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libdockapp-dev -a -d
/usr/share/doc/libdockapp-dev ]; then
- ln -sf ../share/doc/libdockapp-dev /usr/doc/libdockapp-dev
- fi
-fi
-# End automatically added section
diff -u wmaker-0.80.1/debian/control wmaker-0.80.1/debian/control
--- wmaker-0.80.1/debian/control
+++ wmaker-0.80.1/debian/control
@@ -2,9 +2,9 @@
Section: x11
Priority: optional
Maintainer: Marcelo E. Magallon <[EMAIL PROTECTED]>
-Uploaders: John H. Robinson, IV <[EMAIL PROTECTED]>, Martin F. Krafft <[EMAIL
PROTECTED]>
-Standards-Version: 3.1.1
-Build-Depends: libjpeg62-dev, libungif4-dev, libpng12-0-dev, libtiff3g-dev,
hermes1-dev, xlibs-dev, debhelper (>= 3.0.9), sharutils, libtool, gettext,
autoconf, automake
+Uploaders: John H. Robinson IV <[EMAIL PROTECTED]>, Martin F. Krafft <[EMAIL
PROTECTED]>
+Standards-Version: 3.6.1
+Build-Depends: libjpeg62-dev, libungif4-dev, libpng12-dev (>= 1.2.5.0-4),
libtiff3g-dev, hermes1-dev, xlibs-dev, debhelper (>= 3.0.9), sharutils,
libtool, gettext, autoconf, automake
Package: wmaker
Architecture: any
@@ -14,36 +14,37 @@
Provides: x-window-manager, wmaker-plain, wmaker-kde, wmaker-gnome
Suggests: wmaker-data (>= 0.7), menu (>= 1.5), wmakerconf-data (>= 0.62.0),
wmaker-usersguide, asclock
Replaces: wmaker-superfluous, wmaker-traditional, wmaker-sound, wmaker-gnome,
wmaker-kde, wmaker-plain
-Conflicts: wmaker-superfluous, wmaker-traditional, wmaker-sound, wmsound (<=
0.9.3-1), wmaker-gnome, wmaker-kde, wmaker-plain
+Conflicts: wmaker-superfluous, wmaker-traditional, wmaker-sound, wmsound (<=
0.9.3-1), wmaker-gnome, wmaker-kde, wmaker-plain, menu (<=2.1.9)
Description: NeXTSTEP-like window manager for X
- Written by Alfredo Kojima (http://www.inf.ufrgs.br/~kojima) almost
- from scratch, resembles the NeXTStep look very closely, and it's now
- an official GNU project. Window Maker is not overloaded with
- features, and it's easier to configure than most other window
- managers. Its final goal is to produce a window manager that doesn't
- require editing of configuration files. Window Maker is fast and
- doesn't require tons of memory to run.
+ Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
+ very closely, and it's now an official GNU project. Window Maker is not
+ overloaded with features, and it's easier to configure than most other window
+ managers. Its final goal is to produce a window manager that doesn't require
+ editing of configuration files. Window Maker is fast and doesn't require tons
+ of memory to run.
+ .
+ Homepage: <http://www.windowmaker.org/>
Package: libwmaker0-dev
Architecture: any
-Section: devel
+Section: libdevel
Priority: optional
-Depends: libc6-dev, xlibs-dev
+Depends: libc6-dev, libx11-dev | xlibs-dev
Provides: libwmaker-dev
Conflicts: libwmaker-dev, wmlib-dev
Replaces: wmlib-dev
-Description: Static libraries and headers for Window Maker applications.
+Description: Static libraries and headers for Window Maker applications
Contains libWMaker and header files, for building Window Maker aware
applications.
Package: libwraster2-dev
Architecture: any
-Section: devel
+Section: libdevel
Priority: optional
-Depends: libwraster2 (= ${Source-Version}), libc6-dev, xlibs-dev, hermes1-dev,
libjpeg62-dev, libpng12-0-dev, libungif4-dev, libtiff3g-dev
+Depends: libwraster2 (= ${Source-Version}), libc6-dev, libx11-dev | xlibs-dev,
libxext-dev | xlibs-dev, libxpm-dev | xlibs-dev, hermes1-dev, libjpeg62-dev,
libpng12-0-dev, libungif4-dev, libtiff3g-dev
Provides: libwraster-dev
Conflicts: libwraster-dev, wmlib-dev
-Description: Static libraries and headers of Window Maker rasterizer.
+Description: Static libraries and headers of Window Maker rasterizer
Contains libwraster and header files, for manipulating and
rasterizing images.
@@ -53,14 +54,14 @@
Priority: optional
Depends: ${shlibs:Depends}
Conflicts: fsviewer (<= 0.2.4-1), gnustep-back (<= 0.8.1-1), wdm (<= 1.20-17),
wmakerconf (<= 2.7-2.1), wsoundprefs (<= 1.1.1-5), wsoundserver (<= 0.4.0-13),
libwsound-dev (<= 0.4.0-13), wterm (<= 6.2.9-5), wterm-ml (<= 6.2.9-5)
-Description: Shared libraries of Window Maker rasterizer.
+Description: Shared libraries of Window Maker rasterizer
Contains libwraster, for manipulating and rasterizing images.
Package: libwings-dev
Architecture: any
-Section: devel
+Section: libdevel
Priority: optional
-Depends: libc6-dev, xlibs-dev, libwraster2-dev
+Depends: libc6-dev, libx11-dev | xlibs-dev, libxext-dev | xlibs-dev,
libwraster2-dev
Conflicts: wmaker (<= 0.17.5-2)
Description: Window Maker's own widget set
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
reverted:
--- wmaker-0.80.1/debian/libwraster2.prerm
+++ wmaker-0.80.1.orig/debian/libwraster2.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libwraster2 ];
then
- rm -f /usr/doc/libwraster2
-fi
-# End automatically added section
reverted:
--- wmaker-0.80.1/debian/libwmaker0-dev.prerm
+++ wmaker-0.80.1.orig/debian/libwmaker0-dev.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libwmaker0-dev
]; then
- rm -f /usr/doc/libwmaker0-dev
-fi
-# End automatically added section
reverted:
--- wmaker-0.80.1/debian/libwmaker0-dev.postinst
+++ wmaker-0.80.1.orig/debian/libwmaker0-dev.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libwmaker0-dev -a -d
/usr/share/doc/libwmaker0-dev ]; then
- ln -sf ../share/doc/libwmaker0-dev /usr/doc/libwmaker0-dev
- fi
-fi
-# End automatically added section
diff -u wmaker-0.80.1/debian/rules wmaker-0.80.1/debian/rules
--- wmaker-0.80.1/debian/rules
+++ wmaker-0.80.1/debian/rules
@@ -180,6 +180,7 @@
$(DEBTMPDIR)/$(WMCONFDIR)/
touch $(DEBTMPDIR)/$(WMCONFDIR)/menu.prehook
touch $(DEBTMPDIR)/$(WMCONFDIR)/menu.posthook
+ $(install_file) debian/wmaker.desktop $(DEBTMPDIR)/usr/share/xsessions
# build a conffiles list AFTER installing the menus
# the sed part is there because of policy
-cd $(DEBTMPDIR) && \
reverted:
--- wmaker-0.80.1/debian/libwings-dev.postinst
+++ wmaker-0.80.1.orig/debian/libwings-dev.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libwings-dev -a -d
/usr/share/doc/libwings-dev ]; then
- ln -sf ../share/doc/libwings-dev /usr/doc/libwings-dev
- fi
-fi
-# End automatically added section
reverted:
--- wmaker-0.80.1/debian/libwraster2-dev.postinst
+++ wmaker-0.80.1.orig/debian/libwraster2-dev.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libwraster2-dev -a -d
/usr/share/doc/libwraster2-dev ]; then
- ln -sf ../share/doc/libwraster2-dev /usr/doc/libwraster2-dev
- fi
-fi
-# End automatically added section
diff -u wmaker-0.80.1/debian/wmaker.postinst.tmpl
wmaker-0.80.1/debian/wmaker.postinst.tmpl
--- wmaker-0.80.1/debian/wmaker.postinst.tmpl
+++ wmaker-0.80.1/debian/wmaker.postinst.tmpl
@@ -30,10 +30,6 @@
fi
done
- if [ -d /usr/doc -a ! -e /usr/doc/wmaker -a -d /usr/share/doc/wmaker ];
then
- ln -sf ../share/doc/wmaker /usr/doc/wmaker
- fi
-
if [ "$2" ] && dpkg --compare-versions "$2" lt $critical_version ; then
/usr/sbin/upgrade-windowmaker-defaults
fi
diff -u wmaker-0.80.1/debian/wmaker.prerm wmaker-0.80.1/debian/wmaker.prerm
--- wmaker-0.80.1/debian/wmaker.prerm
+++ wmaker-0.80.1/debian/wmaker.prerm
@@ -7,15 +7,9 @@
update-alternatives --remove x-window-manager /usr/bin/wmaker
;;
remove)
- if [ -L /usr/doc/wmaker ]; then
- rm -f /usr/doc/wmaker
- fi
update-alternatives --remove x-window-manager /usr/bin/wmaker
;;
upgrade)
- if [ -L /usr/doc/wmaker ]; then
- rm -f /usr/doc/wmaker
- fi
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
reverted:
--- wmaker-0.80.1/debian/libdockapp-dev.prerm
+++ wmaker-0.80.1.orig/debian/libdockapp-dev.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libdockapp-dev
]; then
- rm -f /usr/doc/libdockapp-dev
-fi
-# End automatically added section
diff -u wmaker-0.80.1/debian/libwraster2.postinst
wmaker-0.80.1/debian/libwraster2.postinst
--- wmaker-0.80.1/debian/libwraster2.postinst
+++ wmaker-0.80.1/debian/libwraster2.postinst
@@ -12,16 +12,9 @@
*)
- echo "postinst called with unkown argument: \$1" >&2
+ echo "postinst called with unknown argument: \$1" >&2
;;
esac
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libwraster2 -a -d
/usr/share/doc/libwraster2 ]; then
- ln -sf ../share/doc/libwraster2 /usr/doc/libwraster2
- fi
-fi
-# End automatically added section
-
+#DEBHELPER#
exit 0
diff -u wmaker-0.80.1/debian/wmaker wmaker-0.80.1/debian/wmaker
--- wmaker-0.80.1/debian/wmaker
+++ wmaker-0.80.1/debian/wmaker
@@ -5,64 +5,64 @@
-[ $GNUSTEP_USER_ROOT ] || export GNUSTEP_USER_ROOT=$HOME/GNUstep
-gs_base=$GNUSTEP_USER_ROOT
-gs_defaults=$gs_base/Defaults
+[ -n "$GNUSTEP_USER_ROOT" ] || export GNUSTEP_USER_ROOT="$HOME/GNUstep"
+gs_base="$GNUSTEP_USER_ROOT"
+gs_defaults="$gs_base/Defaults"
gs_system_defaults=/etc/GNUstep/Defaults
-wm_base=$gs_base/Library/WindowMaker
-wm_backgrounds=$wm_base/Backgrounds
-wm_iconsets=$wm_base/IconSets
-wm_soundsets=$wm_base/SoundSets
-wm_pixmaps=$wm_base/Pixmaps
-gs_icons=$gs_base/Library/Icons
-wm_style=$wm_base/Style
-wm_styles=$wm_base/Styles
-wm_sounds=$wm_base/Sounds
-wm_themes=$wm_base/Themes
+wm_base="$gs_base/Library/WindowMaker"
+wm_backgrounds="$wm_base/Backgrounds"
+wm_iconsets="$wm_base/IconSets"
+wm_soundsets="$wm_base/SoundSets"
+wm_pixmaps="$wm_base/Pixmaps"
+gs_icons="$gs_base/Library/Icons"
+wm_style="$wm_base/Style"
+wm_styles="$wm_base/Styles"
+wm_sounds="$wm_base/Sounds"
+wm_themes="$wm_base/Themes"
WindowMaker=/usr/bin/WindowMaker
make_dir_if_needed ()
{
- if [ ! -d $1 ] ; then
- install -m 0755 -d $1
+ if [ ! -d "$1" ] ; then
+ install -m 0755 -d "$1"
fi
}
rename_dir_if_possible ()
{
- if [ ! -d $2 ] ; then
- if [ -d $1 ] ; then
- mv $1 $2
+ if [ ! -d "$2" ] ; then
+ if [ -d "$1" ] ; then
+ mv "$1" "$2"
fi
fi
}
copy_defaults_if_needed ()
{
- file=$gs_defaults/$1
- system_file=$gs_system_defaults/$1
- if [ ! -f $file ] ; then
- install -m 0644 $system_file $file
+ file="$gs_defaults/$1"
+ system_file="$gs_system_defaults/$1"
+ if [ ! -f "$file" ] ; then
+ install -m 0644 "$system_file" "$file"
fi
}
-make_dir_if_needed $gs_defaults
-make_dir_if_needed $wm_base
-make_dir_if_needed $wm_backgrounds
-make_dir_if_needed $wm_iconsets
-make_dir_if_needed $wm_soundsets
-make_dir_if_needed $wm_pixmaps
-make_dir_if_needed $gs_icons
-make_dir_if_needed $wm_sounds
-rename_dir_if_possible $wm_style $wm_styles
-make_dir_if_needed $wm_styles
-make_dir_if_needed $wm_themes
+make_dir_if_needed "$gs_defaults"
+make_dir_if_needed "$wm_base"
+make_dir_if_needed "$wm_backgrounds"
+make_dir_if_needed "$wm_iconsets"
+make_dir_if_needed "$wm_soundsets"
+make_dir_if_needed "$wm_pixmaps"
+make_dir_if_needed "$gs_icons"
+make_dir_if_needed "$wm_sounds"
+rename_dir_if_possible "$wm_style" "$wm_styles"
+make_dir_if_needed "$wm_styles"
+make_dir_if_needed "$wm_themes"
copy_defaults_if_needed WindowMaker
copy_defaults_if_needed WMRootMenu
copy_defaults_if_needed WMState
#copy_defaults_if_needed WMWindowAttributes
-if [ -n "$1" -a -x $WindowMaker$1 ] ; then
- WindowMaker=$WindowMaker$1
+if [ -n "$1" -a -x "$WindowMaker$1" ] ; then
+ WindowMaker="$WindowMaker$1"
shift
fi
-exec $WindowMaker $@
+exec "$WindowMaker" "$@"
reverted:
--- wmaker-0.80.1/debian/libwraster2-dev.prerm
+++ wmaker-0.80.1.orig/debian/libwraster2-dev.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libwraster2-dev
]; then
- rm -f /usr/doc/libwraster2-dev
-fi
-# End automatically added section
diff -u wmaker-0.80.1/debian/wmaker.dirs wmaker-0.80.1/debian/wmaker.dirs
--- wmaker-0.80.1/debian/wmaker.dirs
+++ wmaker-0.80.1/debian/wmaker.dirs
@@ -8 +8 @@
-
+usr/share/xsessions
diff -u wmaker-0.80.1/debian/wmaker.menu wmaker-0.80.1/debian/wmaker.menu
--- wmaker-0.80.1/debian/wmaker.menu
+++ wmaker-0.80.1/debian/wmaker.menu
@@ -1,69 +1,69 @@
-?package(wmaker):needs=wm \
+?package(wmaker):needs="wm" \
section="WindowManagers" title="Window Maker" \
command="/usr/bin/wmaker"
-?package(wmaker):needs=wmaker \
- section="WindowManagers" title="Exit" sort=$ \
+?package(wmaker):needs="wmaker" \
+ section="WindowManagers" title="Exit" sort="$" \
command="EXIT"
-?package(wmaker):needs=wmaker \
- section="WindowManagers" title="Exit session" sort=$ \
+?package(wmaker):needs="wmaker" \
+ section="WindowManagers" title="Exit session" sort="$" \
command="SHUTDOWN"
-?package(wmaker):needs=wmaker \
- section="WindowManagers" title="Restart" sort=$ \
+?package(wmaker):needs="wmaker" \
+ section="WindowManagers" title="Restart" sort="$" \
command="RESTART"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WindowManagers" title="Info Panel ..." sort="ZZ" \
command="INFO_PANEL"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WindowManagers" title="Legal Panel ..." sort="ZZ" \
command="LEGAL_PANEL"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WindowManagers" title="Preferences" \
command="EXEC" arg="WPrefs"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Workspaces" \
command="WORKSPACE_MENU"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Hide Others" \
command="HIDE_OTHERS"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Show All" \
command="SHOW_ALL"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Arrange Icons" \
command="ARRANGE_ICONS"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Save Session" \
command="SAVE_SESSION"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Clear Session" \
command="CLEAR_SESSION"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="Screen" title="Refresh" \
command="REFRESH"
-?package(wmaker):needs=wmaker \
+?package(wmaker):needs="wmaker" \
section="WorkSpace" title="Appearance" \
command="OPEN_MENU" arg="appearance.menu"
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Background"\
sort="$" \
command="OPEN_MENU background.menu"
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Styles"\
sort="$" \
command="OPEN_MENU -noext LOCAL_STYLES_DIR STYLES_DIR USER_STYLES_DIR
WITH setstyle"
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Themes"\
sort="$" \
command="OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR
WITH setstyle"
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Icon Sets"\
- sort=ss \
+ sort="ss" \
command="OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR
USER_ICON_SETS_DIR WITH seticons"
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Save IconSet"\
- sort=zz \
+ sort="zz" \
command="EXEC geticonset USER_ICON_SETS_DIR/\"%a(IconSet name)\""
-?package(wmaker):needs=wmappearance \
+?package(wmaker):needs="wmappearance" \
section="Appearance" title="Save Theme"\
- sort=zz \
+ sort="zz" \
command="EXEC getstyle -t USER_THEMES_DIR/\"%a(Theme name)\""
diff -u wmaker-0.80.1/debian/wmaker.menu-method
wmaker-0.80.1/debian/wmaker.menu-method
--- wmaker-0.80.1/debian/wmaker.menu-method
+++ wmaker-0.80.1/debian/wmaker.menu-method
@@ -1,18 +1,22 @@
#!/usr/sbin/install-menu
#
# Generates Window Maker menus for all registered applications.
-compat="menu-1"
!include menu.h
+compat="menu-1";
+outputencoding="ISO-8859-1"
genmenu="menu.hook"
rootprefix="/etc/X11/WindowMaker/"
-userprefix="GNUstep/Library/WindowMaker/"
-treewalk=(M)
+userprefix=shell("echo -n ${GNUSTEP_USER_ROOT-GNUstep}")
"/Library/WindowMaker/"
+treewalk="(M)"
rootsection="/Debian"
+
+function mytitle()=replacewith(title(),"\"","'")
+
function exec($action,$com)= \
- " \"" $title "\" " ifnempty($shortcut, "SHORTCUT " $shortcut " ")
$action " " esc($com,"*") "\n"
+ " \"" mytitle() "\" " ifnempty($shortcut, "SHORTCUT " $shortcut " ")
$action " " esc($com,"*") "\n"
supported
x11= exec("EXEC",$command)
@@ -29,13 +33,13 @@
startmenu= "\n" \
ifelse( \
title(), \
- "\"" title() "\" MENU", \
+ "\"" mytitle() "\" MENU", \
"Debian MENU\n\n#include <menu.prehook>" \
) \
"\n"
endmenu= ifelse( \
title(), \
- "\"" title() "\" END", \
+ "\"" mytitle() "\" END", \
"\n#include <menu.posthook>\n\nDebian END" \
) \
"\n"
reverted:
--- wmaker-0.80.1/debian/libwings-dev.prerm
+++ wmaker-0.80.1.orig/debian/libwings-dev.prerm
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libwings-dev ];
then
- rm -f /usr/doc/libwings-dev
-fi
-# End automatically added section
only in patch2:
unchanged:
--- wmaker-0.80.1.orig/src/Makefile.am
+++ wmaker-0.80.1/src/Makefile.am
@@ -115,6 +115,7 @@
wmaker_LDADD = \
$(top_builddir)/WINGs/libWINGs.a\
$(top_builddir)/wrlib/libwraster.la\
+ @LIBRARY_SEARCH_PATH@ \
@XLIBS@ \
@INTLIBS@ \
@DLLIBS@
only in patch2:
unchanged:
--- wmaker-0.80.1.orig/src/config.h.in
+++ wmaker-0.80.1/src/config.h.in
@@ -118,6 +118,10 @@
/* Define to 1 if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+ don't. */
+#undef HAVE_DECL_SYS_SIGLIST
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -241,17 +245,14 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define to 1 if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
-#undef SYS_SIGLIST_DECLARED
-
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
only in patch2:
unchanged:
--- wmaker-0.80.1.orig/debian/wmaker.desktop
+++ wmaker-0.80.1/debian/wmaker.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Window maker
+Comment=This session logs you into Window Maker
+Exec=/usr/bin/wmaker
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
signature.asc
Description: Digital signature
--- End Message ---
