[Pkg-wmaker-commits] [wmaker] 02/04: Remove Debian menu; deprecated with Standards-Version 3.9.8.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Jul 24 02:42:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmaker.
commit 57db9defa9b85462c925f12db413a4c63ad8d0f7
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Sun Jul 23 22:25:02 2017 -0400
Remove Debian menu; deprecated with Standards-Version 3.9.8.
---
debian/debianfiles/conf/WMRootMenu | 1 -
debian/debianfiles/menu/wmappearance | 26 ------------
debian/rules | 3 --
debian/wmaker-common.dirs | 1 -
debian/wmaker-common.install | 2 -
debian/wmaker-common.lintian-overrides | 3 --
debian/wmaker-common.postinst | 41 -------------------
debian/wmaker-common.postrm | 38 ------------------
debian/wmaker.lintian-overrides | 15 -------
debian/wmaker.menu | 72 ----------------------------------
debian/wmaker.menu-method | 45 ---------------------
debian/wmaker.postinst | 11 ------
debian/wmaker.postrm | 28 -------------
13 files changed, 286 deletions(-)
diff --git a/debian/debianfiles/conf/WMRootMenu b/debian/debianfiles/conf/WMRootMenu
deleted file mode 100644
index e86eda4..0000000
--- a/debian/debianfiles/conf/WMRootMenu
+++ /dev/null
@@ -1 +0,0 @@
-"menu.hook"
diff --git a/debian/debianfiles/menu/wmappearance b/debian/debianfiles/menu/wmappearance
deleted file mode 100644
index 230a656..0000000
--- 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 8d1de46..2368151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,6 @@ 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
diff --git a/debian/wmaker-common.dirs b/debian/wmaker-common.dirs
index b6707ff..24f1872 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 7517f25..d4864fe 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -2,10 +2,8 @@ debian/debianfiles/Themes/Debian.style usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianLegacy.style usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianSwirl.jpg usr/share/WindowMaker/Backgrounds
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/wmaker usr/bin
debian/debianfiles/wmaker-common.desktop usr/share/xsessions
etc/GNUstep/Defaults/WMGLOBAL
diff --git a/debian/wmaker-common.lintian-overrides b/debian/wmaker-common.lintian-overrides
deleted file mode 100644
index 7a5e057..0000000
--- 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.postinst b/debian/wmaker-common.postinst
deleted file mode 100644
index 63ca577..0000000
--- a/debian/wmaker-common.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-
-# Window Maker postinst.
-#
-# Marcelo Magallon <mmagallo at debian.org>
-# Rodolfo "kix" García <kix at 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
diff --git a/debian/wmaker-common.postrm b/debian/wmaker-common.postrm
deleted file mode 100644
index 9ca9c8e..0000000
--- a/debian/wmaker-common.postrm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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
diff --git a/debian/wmaker.lintian-overrides b/debian/wmaker.lintian-overrides
deleted file mode 100644
index df59b20..0000000
--- 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.menu b/debian/wmaker.menu
deleted file mode 100644
index 2955cca..0000000
--- 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 4c1bd33..0000000
--- 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
index c5e5e85..2ac835a 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker.postinst
@@ -9,24 +9,13 @@ set -e
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)
diff --git a/debian/wmaker.postrm b/debian/wmaker.postrm
deleted file mode 100644
index b31f7f9..0000000
--- a/debian/wmaker.postrm
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git
More information about the Pkg-wmaker-commits
mailing list