This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via d6f754e7473c4303b29854e356cd47e68193977d (commit)
from b07075aed33e11266b86d8704082ab608734f47c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6f754e7473c4303b29854e356cd47e68193977d
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Mon, 14 Aug 2017 23:17:28 -0400
URL: <http://repo.or.cz/wmaker-crm.git/d6f754e7473c4303>
debian: Update with version 0.95.8-2 packaging.
---
debian/changelog | 31 +++++++++++
debian/compat | 2 +-
debian/control | 8 +--
debian/debianfiles/conf/plmenu.Debian | 29 +++++++++++
debian/debianfiles/menu/wmappearance | 26 ----------
debian/rules | 8 +--
debian/wmaker-common.dirs | 1 -
debian/wmaker-common.install | 2 +-
debian/wmaker-common.links | 1 +
debian/wmaker-common.lintian-overrides | 3 --
debian/wmaker-common.maintscript | 1 +
debian/wmaker-common.manpages | 2 -
debian/wmaker-common.postinst | 55 +++++---------------
debian/wmaker-common.postrm | 44 +++-------------
debian/wmaker.lintian-overrides | 15 ------
debian/wmaker.maintscript | 1 +
debian/wmaker.manpages | 2 +
debian/wmaker.menu | 72 --------------------------
debian/wmaker.menu-method | 45 ----------------
debian/wmaker.postinst | 58 +++++----------------
debian/wmaker.postrm | 34 +++---------
debian/wmaker.prerm | 22 --------
debian/wmaker.wm | 1 +
23 files changed, 116 insertions(+), 347 deletions(-)
create mode 100644 debian/debianfiles/conf/plmenu.Debian
delete mode 100644 debian/debianfiles/menu/wmappearance
create mode 100644 debian/wmaker-common.links
delete mode 100644 debian/wmaker-common.lintian-overrides
delete mode 100644 debian/wmaker-common.manpages
rewrite debian/wmaker-common.postinst (96%)
rewrite debian/wmaker-common.postrm (95%)
delete mode 100644 debian/wmaker.lintian-overrides
create mode 100644 debian/wmaker.maintscript
delete mode 100644 debian/wmaker.menu
delete mode 100644 debian/wmaker.menu-method
rewrite debian/wmaker.postinst (96%)
rewrite debian/wmaker.postrm (93%)
delete mode 100644 debian/wmaker.prerm
create mode 100644 debian/wmaker.wm
diff --git a/debian/changelog b/debian/changelog
index e26789ae119a..09f1297e4fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+wmaker (0.95.8-2) unstable; urgency=low
+
+ [ Doug Torrance ]
+ * Remove and replace the deprecated Debian menu. The list of
+ applications is now generated by the wmmenugen utility (with some
+ patches from upstream's development branch) from .desktop files in
+ /usr/share/applications. This gives a decent approximation of
+ compliance with freedesktop.org's menu standards (Closes: #868431).
+ * Bump Standards-Version to 4.0.1.
+ * Use dh_installwm to register Window Maker with update-alternatives.
+ In particular, we add a new file, debian/wmaker.wm, and a new target,
+ override_dh_installwm, to debian/rules which sets the priority.
+ To accommodate this, we move the manpage from wmaker-common to
+ wmaker.
+ * Bump debhelper compatibility level to 10.
+ * Remove explicit call to dh_autoreconf; enabled by default in
+ debhelper 10.
+
+ [ Andreas Metzler ]
+ * Handle removal of menu-methods on upgrades (orphaned conffiles) with
+ debian/wmaker{,-common}.maintscript. Remove generated menufiles
+ (etc/GNUstep/Defaults/appearance.menu and /etc/GNUstep/Defaults/menu.hook
+ on upgrades and purge.
+ * Because of the moved manpage (which in turn is needed for using
+ dh_installwm) wmaker breaks/replaces wmaker-common (<< 0.95.8-2~).
+ * Ship our menu as /etc/GNUstep/Defaults/plmenu.Debian and add a symlink
+ to it as /usr/share/WindowMaker/menu.hook to make the menu accessible for
+ upgraded installations.
+
+ -- Andreas Metzler <ametz...@debian.org> Mon, 14 Aug 2017 14:11:24 +0200
+
wmaker (0.95.8-1) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/compat b/debian/compat
index ec635144f600..f599e28b8ab0 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 07b770fb5960..7b7647b05991 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,9 @@ Priority: optional
Maintainer: Debian Window Maker Team <pkg-wmaker-de...@lists.alioth.debian.org>
Uploaders: Andreas Metzler <ametz...@debian.org>,
Doug Torrance <dtorra...@piedmont.edu>
-Standards-Version: 3.9.7
+Standards-Version: 4.0.1
Build-Depends: automake (>= 1:1.12),
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 10),
gettext,
libfontconfig1-dev,
libgif-dev,
@@ -39,12 +38,13 @@ Depends: wmaker-common (= ${source:Version}),
${shlibs:Depends}
Provides: x-window-manager
Suggests: desktop-base,
- menu,
wmaker-data,
wmaker-utils,
x-terminal-emulator,
x11-apps,
xterm
+Breaks: wmaker-common (<< 0.95.8-2~)
+Replaces: wmaker-common (<< 0.95.8-2~)
Description: NeXTSTEP-like window manager for X
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
very closely, and it is now an official GNU project. Window Maker (originally
diff --git a/debian/debianfiles/conf/plmenu.Debian
b/debian/debianfiles/conf/plmenu.Debian
new file mode 100644
index 000000000000..e65b9330b329
--- /dev/null
+++ b/debian/debianfiles/conf/plmenu.Debian
@@ -0,0 +1,29 @@
+(
+ Debian,
+ (
+ Applications,
+ OPEN_PLMENU,
+ "|| wmmenugen -parser:xdg /usr/share/applications/"
+ ),
+ (Run..., EXEC, "%A(Run,Type command to run)"),
+ (
+ "Window Maker",
+ ("Info Panel ...", INFO_PANEL),
+ ("Legal Panel ...", LEGAL_PANEL),
+ (Preferences, EXEC, WPrefs),
+ ("Refresh screen", REFRESH),
+ (Restart, RESTART)
+ ),
+ (
+ WorkSpace,
+ (Appearance, OPEN_MENU, appearance.menu),
+ ("Arrange Icons", ARRANGE_ICONS),
+ ("Clear Session", CLEAR_SESSION),
+ ("Hide Others", HIDE_OTHERS),
+ ("Save Session", SAVE_SESSION),
+ ("Show All", SHOW_ALL),
+ (Workspaces, WORKSPACE_MENU)
+ ),
+ (Exit, EXIT),
+ ("Exit session", SHUTDOWN)
+)
diff --git a/debian/debianfiles/menu/wmappearance
b/debian/debianfiles/menu/wmappearance
deleted file mode 100644
index 230a6569cc43..000000000000
--- a/debian/debianfiles/menu/wmappearance
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/install-menu
-#
-# Generates the Window Maker Appereance menu
-compat="menu-1"
-
-#!include menu.h
-
-genmenu="appearance.menu"
-rootprefix="/etc/GNUstep/Defaults"
-userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}")
"/Library/WindowMaker"
-treewalk=(M)
-
-supported
-wmappearance = " \"" $title "\" " $command "\n"
-endsupported
-
-# Please note that items should specify "section=Appearance"
-
-preoutput="/* Automatically generated file. Do not edit. */\n\n#include
\"wmmacros\"\n\n"
-
-postoutput="\n"
-
-mainmenutitle=""
-submenutitle= ""
-startmenu= ifnempty ($title, $title " MENU \n")
-endmenu= ifnempty ($title, $title " END \n")
diff --git a/debian/rules b/debian/rules
index 8d1de462055e..cf725f837076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,15 +30,12 @@ COMMON_OPTIONS := --datadir=$(SHAREDIR) \
--with-defsdatadir=$(DEFSDATADIR)
%:
- dh $@ --parallel --with autoreconf
+ dh $@ --parallel
override_dh_auto_configure:
env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
$(COMMON_OPTIONS) $(WMAKER_OPTIONS)
-override_dh_installmenu:
- dh_installmenu -a --noscripts
-
override_dh_installdocs:
# Readmes - Copy+rename before install
# We use the root of the temporal directory debian/tmp
@@ -61,3 +58,6 @@ override_dh_install:
# Install files
dh_install
+
+override_dh_installwm:
+ dh_installwm --priority=50
diff --git a/debian/wmaker-common.dirs b/debian/wmaker-common.dirs
index b6707ffc8fc9..24f187246b55 100644
--- a/debian/wmaker-common.dirs
+++ b/debian/wmaker-common.dirs
@@ -1,2 +1 @@
-etc/menu-methods
usr/share/xsessions
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 7517f25fd3e4..57410fc27d8a 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -5,7 +5,7 @@ debian/debianfiles/Themes/debian.tiff
usr/share/WindowMaker/Backgrounds
debian/debianfiles/conf/WMRootMenu etc/GNUstep/Defaults
debian/debianfiles/conf/WMWindowAttributes etc/GNUstep/Defaults
debian/debianfiles/conf/WindowMaker etc/GNUstep/Defaults
-debian/debianfiles/menu/wmappearance etc/menu-methods
+debian/debianfiles/conf/plmenu.Debian etc/GNUstep/Defaults
debian/debianfiles/wmaker usr/bin
debian/debianfiles/wmaker-common.desktop usr/share/xsessions
etc/GNUstep/Defaults/WMGLOBAL
diff --git a/debian/wmaker-common.links b/debian/wmaker-common.links
new file mode 100644
index 000000000000..9b6ea7051c0a
--- /dev/null
+++ b/debian/wmaker-common.links
@@ -0,0 +1 @@
+etc/GNUstep/Defaults/plmenu.Debian usr/share/WindowMaker/menu.hook
diff --git a/debian/wmaker-common.lintian-overrides
b/debian/wmaker-common.lintian-overrides
deleted file mode 100644
index 7a5e057e8bb9..000000000000
--- a/debian/wmaker-common.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# The Window Maker Appereance menu don't needs the menu.h
-# because the Window Maker menu is not Debian standard
-wmaker-common: menu-method-should-include-menu-h
diff --git a/debian/wmaker-common.maintscript b/debian/wmaker-common.maintscript
index 5fece8286833..0aad65541547 100644
--- a/debian/wmaker-common.maintscript
+++ b/debian/wmaker-common.maintscript
@@ -3,3 +3,4 @@ mv_conffile /etc/X11/WindowMaker/wmmacros
/usr/share/WindowMaker/wmmacros 0.95.7
rm_conffile /etc/X11/WindowMaker/appearance.menu 0.95.7-5~
rm_conffile /etc/X11/WindowMaker/menu.posthook 0.95.7-5~
rm_conffile /etc/X11/WindowMaker/menu.prehook 0.95.7-5~
+rm_conffile /etc/menu-methods/wmappearance 0.95.8-2~
diff --git a/debian/wmaker-common.manpages b/debian/wmaker-common.manpages
deleted file mode 100644
index 98dc491d7d2b..000000000000
--- a/debian/wmaker-common.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/WindowMaker.1
-doc/wmaker.1
diff --git a/debian/wmaker-common.postinst b/debian/wmaker-common.postinst
dissimilarity index 96%
index 63ca5777028d..b0b22b699ed0 100644
--- a/debian/wmaker-common.postinst
+++ b/debian/wmaker-common.postinst
@@ -1,41 +1,14 @@
-#!/bin/sh
-set -e
-
-# Window Maker postinst.
-#
-# Marcelo Magallon <mmaga...@debian.org>
-# Rodolfo "kix" García <k...@kix.es>
-
-inst="/etc/menu-methods/wmappearance"
-
-case "$1" in
- configure)
- for file in $inst ; do
- if [ -f $file ] ; then
- chmod a+x $file
- fi
- done
-
- if [ -x /usr/bin/update-menus -a -x /usr/bin/install-menu ] ; then
-# Remove the menu.hook from all the possible paths.
- rm -f /etc/X11/WindowMaker/menu.hook
- rm -f /usr/share/WindowMaker/menu.hook
-# Remove appearance.menu
- rm -f /usr/share/WindowMaker/appearance.menu
- update-menus
- fi
- ;;
-
- abort-upgrade|abort-deconfigure|abort-remove)
- # how did we got here? Force a non-zero exit code
- exit 1
- ;;
-
- *)
- echo "postinst called with unkown argument: \$1" >&2
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
+#!/bin/sh
+set -e
+#DEBHELPER#
+
+# run after debhelper code, which removes menu-methods.
+if [ "$1" = "configure" ] &&
+ [ x"$2" != "x" ] &&
+ test -e /etc/GNUstep/Defaults/appearance.menu &&
+ dpkg --compare-versions "$2" '<<' '0.95.8-2~' ; then
+ if head -n1 /etc/GNUstep/Defaults/appearance.menu |
+ grep -q 'Automatically generated file. Do not edit.' ; then
+ rm /etc/GNUstep/Defaults/appearance.menu
+ fi
+fi
diff --git a/debian/wmaker-common.postrm b/debian/wmaker-common.postrm
dissimilarity index 95%
index 9ca9c8e51efb..49ecaec7fb99 100644
--- a/debian/wmaker-common.postrm
+++ b/debian/wmaker-common.postrm
@@ -1,38 +1,6 @@
-#!/bin/sh
-set -e
-
-inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
-
-case "$1" in
- remove)
- for file in $inst ; do
- if [ -f $file ] ; then
- chmod a-x $file
- fi
- done
- ;;
- purge)
- if which update-menus >/dev/null 2>&1 ; then
- update-menus
- rm -f /etc/GNUstep/Defaults/menu.hook
/etc/GNUstep/Defaults/appearance.menu
- fi
- ;;
- upgrade|abort-install|disappear)
- # nothing to do
- ;;
- failed-upgrade)
- # this is an upgrade, and it has failed. What can fail?
- exit 1
- ;;
- abort-upgrade)
- # preinst failed, leave things like they were
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
+#!/bin/sh
+set -e
+if [ "$1" = "purge" ] && test -e /etc/GNUstep/Defaults/appearance.menu ; then
+ rm /etc/GNUstep/Defaults/appearance.menu
+fi
+#DEBHELPER#
diff --git a/debian/wmaker.lintian-overrides b/debian/wmaker.lintian-overrides
deleted file mode 100644
index df59b20bd8fb..000000000000
--- a/debian/wmaker.lintian-overrides
+++ /dev/null
@@ -1,15 +0,0 @@
-# wmaker (WindowMaker) has a different menu system,
-# non debian-standard.
-#
-# wmaker has menus for Appearance, Workspaces,...
-# These menus are created as new root sections.
-wmaker: menu-item-creates-new-root-section
-# wmaker has commands like SHUTDOWN, EXEC, OPEN_MENU,...
-# that are not system/package/binary commands (hooks?)
-wmaker: menu-command-not-in-package
-# arg is used to pass an argument to the hook command
-# eg: command="OPEN_MENU" arg="appearance.menu"
-wmaker: menu-item-contains-unknown-tag
-# needs has the tag "wmaker"
-# eg: ?package(wmaker):needs="wmaker"
-wmaker: menu-item-needs-tag-has-unknown-value
diff --git a/debian/wmaker.maintscript b/debian/wmaker.maintscript
new file mode 100644
index 000000000000..28ce643ddb5d
--- /dev/null
+++ b/debian/wmaker.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/menu-methods/wmaker 0.95.8-2~
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index 68412b9b57bf..056365672046 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -1,4 +1,5 @@
doc/WPrefs.1
+doc/WindowMaker.1
doc/geticonset.1
doc/getstyle.1
doc/seticons.1
@@ -6,6 +7,7 @@ doc/setstyle.1
doc/wdread.1
doc/wdwrite.1
doc/wmagnify.1
+doc/wmaker.1
doc/wmgenmenu.1
doc/wmiv.1
doc/wmmenugen.1
diff --git a/debian/wmaker.menu b/debian/wmaker.menu
deleted file mode 100644
index 2955cca0a6b6..000000000000
--- a/debian/wmaker.menu
+++ /dev/null
@@ -1,72 +0,0 @@
-?package(wmaker):needs="wm" \
- section="Window Managers" title="Window Maker" \
- command="/usr/bin/wmaker"
-?package(wmaker):needs="wmaker" \
- section="/" title="Run..." \
- command="SHEXEC \"%A(Run,Type Command:)\""
-?package(wmaker):needs="wmaker" \
- section="/" title="Exit" sort="ZZ" \
- command="EXIT"
-?package(wmaker):needs="wmaker" \
- section="/" title="Exit session" sort="ZZ" \
- command="SHUTDOWN"
-?package(wmaker):needs="wmaker" \
- section="Window Maker" title="Restart" \
- command="RESTART"
-?package(wmaker):needs="wmaker" \
- section="Window Maker" title="Info Panel ..." \
- command="INFO_PANEL"
-?package(wmaker):needs="wmaker" \
- section="Window Maker" title="Legal Panel ..." \
- command="LEGAL_PANEL"
-?package(wmaker):needs="wmaker" \
- section="Window Maker" title="Preferences" \
- command="EXEC" arg="WPrefs"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Workspaces" \
- command="WORKSPACE_MENU"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Hide Others" \
- command="HIDE_OTHERS"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Show All" \
- command="SHOW_ALL"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Arrange Icons" \
- command="ARRANGE_ICONS"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Save Session" \
- command="SAVE_SESSION"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Clear Session" \
- command="CLEAR_SESSION"
-?package(wmaker):needs="wmaker" \
- section="Window Maker" title="Refresh screen" \
- command="REFRESH"
-?package(wmaker):needs="wmaker" \
- section="WorkSpace" title="Appearance" \
- command="OPEN_MENU" arg="appearance.menu"
-?package(wmaker):needs="wmappearance" \
- section="Appearance" title="Background"\
- sort="$" \
- command="OPEN_MENU background.menu"
-?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" \
- section="Appearance" title="Themes"\
- sort="$" \
- command="OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR
WITH setstyle"
-?package(wmaker):needs="wmappearance" \
- section="Appearance" title="Icon Sets"\
- sort="ss" \
- command="OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR
USER_ICON_SETS_DIR WITH seticons"
-?package(wmaker):needs="wmappearance" \
- section="Appearance" title="Save IconSet"\
- sort="zz" \
- command="EXEC geticonset USER_ICON_SETS_DIR/\"%a(IconSet name)\""
-?package(wmaker):needs="wmappearance" \
- section="Appearance" title="Save Theme"\
- sort="zz" \
- command="EXEC getstyle -t USER_THEMES_DIR/\"%a(Theme name)\""
diff --git a/debian/wmaker.menu-method b/debian/wmaker.menu-method
deleted file mode 100644
index 4c1bd33cfc1c..000000000000
--- a/debian/wmaker.menu-method
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/install-menu
-#
-# Generates Window Maker menus for all registered applications.
-
-!include menu.h
-compat="menu-1";
-outputencoding="UTF-8"
-outputlanguage="C"
-
-genmenu="menu.hook"
-rootprefix="/etc/GNUstep/Defaults"
-userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}")
"/Library/WindowMaker/"
-treewalk="(M)"
-rootsection="/Debian"
-
-function mytitle()=replacewith(title(),"\"","'")
-
-function exec($action,$com)= \
- " \"" translate(,mytitle()) "\" " ifnempty($shortcut, "SHORTCUT "
$shortcut " ") $action " " esc($com,"*") "\n"
-
-supported
-x11= exec("SHEXEC",$command)
-wm= exec("RESTART",$command)
-text= exec("SHEXEC",term())
-wmaker= exec("",$command ifnempty($arg," " $arg))
-endsupported
-
-preoutput= "/* Automatically generated file. Do not edit (see
/usr/share/doc/menu/menu.txt.gz) */\n\n#include \"wmmacros\"\n"
-
-mainmenutitle=""
-submenutitle= ""
-
-startmenu= "\n" \
- ifelse( \
- title(), \
- ifneq(mytitle(), "Applications", "\"" translate(,mytitle())
"\" MENU"), \
- "Debian MENU\n\n" \
- ) \
- "\n"
-endmenu= ifelse( \
- title(), \
- ifneq(mytitle(), "Applications", "\"" translate(,mytitle())
"\" END"), \
- "\n\nDebian END" \
- ) \
- "\n"
diff --git a/debian/wmaker.postinst b/debian/wmaker.postinst
dissimilarity index 96%
index c5e5e85d1c25..1ef49c20c0ee 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker.postinst
@@ -1,44 +1,14 @@
-#!/bin/sh
-set -e
-
-# Window Maker postinst.
-#
-# Marcelo Magallon <mmaga...@debian.org>
-# Rodolfo "kix" García <k...@kix.es>
-
-x_wm_link=/etc/alternatives/x-window-manager
-x_wm_man_link=/usr/share/man/man1/x-window-manager.1.gz
-
-inst="/etc/menu-methods/wmaker"
-
-case "$1" in
- configure)
- for file in $inst ; do
- if [ -f $file ] ; then
- chmod a+x $file
- fi
- done
-
- update-alternatives --install /usr/bin/x-window-manager \
- x-window-manager /usr/bin/wmaker 50 \
- --slave /usr/share/man/man1/x-window-manager.1.gz \
- x-window-manager.1.gz /usr/share/man/man1/wmaker.1.gz
-
- if [ -x /usr/bin/update-menus -a -x /usr/bin/install-menu ] ; then
- update-menus
- fi
- ;;
-
- abort-upgrade|abort-deconfigure|abort-remove)
- # how did we got here? Force a non-zero exit code
- exit 1
- ;;
-
- *)
- echo "postinst called with unkown argument: \$1" >&2
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
+#!/bin/sh
+set -e
+#DEBHELPER#
+
+# run after debhelper code, which removes menu-methods.
+if [ "$1" = "configure" ] &&
+ [ x"$2" != "x" ] &&
+ test -e /etc/GNUstep/Defaults/menu.hook &&
+ dpkg --compare-versions "$2" '<<' '0.95.8-2~' ; then
+ if head -n1 /etc/GNUstep/Defaults/menu.hook |
+ grep -q 'Automatically generated file. Do not edit' ; then
+ rm /etc/GNUstep/Defaults/menu.hook
+ fi
+fi
diff --git a/debian/wmaker.postrm b/debian/wmaker.postrm
dissimilarity index 93%
index b31f7f94f854..2671a5267810 100644
--- a/debian/wmaker.postrm
+++ b/debian/wmaker.postrm
@@ -1,28 +1,6 @@
-#!/bin/sh
-set -e
-
-case "$1" in
- remove)
- if which update-menus >/dev/null 2>&1 ; then
- update-menus
- fi
- ;;
- purge|upgrade|abort-install|disappear)
- # nothing to do
- ;;
- failed-upgrade)
- # this is an upgrade, and it has failed. What can fail?
- exit 1
- ;;
- abort-upgrade)
- # preinst failed, leave things like they were
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
+#!/bin/sh
+set -e
+if [ "$1" = "purge" ] && test -e /etc/GNUstep/Defaults/menu.hook ; then
+ rm /etc/GNUstep/Defaults/menu.hook
+fi
+#DEBHELPER#
diff --git a/debian/wmaker.prerm b/debian/wmaker.prerm
deleted file mode 100644
index d5c2e1e37094..000000000000
--- a/debian/wmaker.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- failed-upgrade|abort-upgrade|deconfigure)
- update-alternatives --remove x-window-manager /usr/bin/wmaker
- ;;
- remove)
- update-alternatives --remove x-window-manager /usr/bin/wmaker
- ;;
- upgrade)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/wmaker.wm b/debian/wmaker.wm
new file mode 100644
index 000000000000..127da351f274
--- /dev/null
+++ b/debian/wmaker.wm
@@ -0,0 +1 @@
+/usr/bin/wmaker
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 31 +++++++++++
debian/compat | 2 +-
debian/control | 8 +--
debian/debianfiles/conf/plmenu.Debian | 29 +++++++++++
debian/debianfiles/menu/wmappearance | 26 ----------
debian/rules | 8 +--
debian/wmaker-common.dirs | 1 -
debian/wmaker-common.install | 2 +-
debian/wmaker-common.links | 1 +
debian/wmaker-common.lintian-overrides | 3 --
debian/wmaker-common.maintscript | 1 +
debian/wmaker-common.manpages | 2 -
debian/wmaker-common.postinst | 55 +++++---------------
debian/wmaker-common.postrm | 44 +++-------------
debian/wmaker.lintian-overrides | 15 ------
debian/wmaker.maintscript | 1 +
debian/wmaker.manpages | 2 +
debian/wmaker.menu | 72 --------------------------
debian/wmaker.menu-method | 45 ----------------
debian/wmaker.postinst | 58 +++++----------------
debian/wmaker.postrm | 34 +++---------
debian/wmaker.prerm | 22 --------
debian/wmaker.wm | 1 +
23 files changed, 116 insertions(+), 347 deletions(-)
create mode 100644 debian/debianfiles/conf/plmenu.Debian
delete mode 100644 debian/debianfiles/menu/wmappearance
create mode 100644 debian/wmaker-common.links
delete mode 100644 debian/wmaker-common.lintian-overrides
delete mode 100644 debian/wmaker-common.manpages
rewrite debian/wmaker-common.postinst (96%)
rewrite debian/wmaker-common.postrm (95%)
delete mode 100644 debian/wmaker.lintian-overrides
create mode 100644 debian/wmaker.maintscript
delete mode 100644 debian/wmaker.menu
delete mode 100644 debian/wmaker.menu-method
rewrite debian/wmaker.postinst (96%)
rewrite debian/wmaker.postrm (93%)
delete mode 100644 debian/wmaker.prerm
create mode 100644 debian/wmaker.wm
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
