fvwm (1:2.5.30.ds-1) sample.fvwmrc/system.fvwm2rc-sample-95

--- fvwm-2.5.30.ds.orig/sample.fvwmrc/system.fvwm2rc-sample-95
+++ fvwm-2.5.30.ds/sample.fvwmrc/system.fvwm2rc-sample-95
@@ -1427,8 +1427,10 @@
 + "&Documents%documents.xpm%"	Popup Documents
 + "&Settings%settings.xpm%"	Popup Settings
 + "" Nop
-Test (f /etc/X11/fvwm/DebianMenu) + "&Debian Menu%programs.xpm%" Popup /Debian
-+ "&Module%modules.xpm%"		Popup Module-Popup
+Test (f  /etc/X11/fvwm/menudefs.hook) + "&Debian Menu%programs.xpm%" Popup /Debian
+Test (f  /etc/X11/fvwm/menudefs.hook) + "$[gt.&Re-read System Menu]%menu/terminal.xpm%" Read "/etc/X11/fvwm/menudefs.hook"
+Test (f  /etc/X11/fvwm/menudefs.hook) + "$[gt.&Update My Debian Menu]%menu/terminal.xpm%" PipeRead 'update-menus &&  echo "Read $./menudefs.hook"'
++ "&Module%modules.xpm%"	Popup Module-Popup
 + "&Find%find1.xpm%"		FvwmScript FvwmScript-Find
 + "&Help%help.xpm%"		Exec exec  xman
 #PREF 1
@@ -1460,18 +1462,23 @@
 + "&Restart%mini.turn.xpm%"		Popup Restart
 + "&Quit fvwm%mini.stop.xpm%"		FvwmForm FvwmForm-QuitVerify
 
+# Make sure that the Debian menus, and the icons they reference, are 
+# available if we have /etc/X11/fvwm/menudefs.hook
 DestroyFunc SetDebianMenu
 AddToFunc   SetDebianMenu
-+ I Read /etc/X11/fvwm/DebianMenu
++ I ImagePath /usr/share/icons:/usr/share/pixmaps:/usr/share/icons/wm-icons:+
++ I ImagePath +:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/include/X11/bitmaps/
++ I ImagePath +:/usr/include/X11/bitmaps/
++ I Read /etc/X11/fvwm/menudefs.hook
 + I DestroyMenu Utilities
 + I AddToMenu   Utilities "Root Menu" Title
 #PREF 3
 + I + "&Terminal%mini.term.xpm%"	Exec exec x-terminal-emulator
-+ I + "&Editor%mini.edit.xpm"		Exec exec emacs
++ I + "&Editor%mini.edit.xpm%"		Exec exec emacs
 + I + "&File Manager%mini.filemgr.xpm%"	Exec exec xfm
 + I + "&Top%mini.run.xpm%"		Exec exec xterm -geometry 80x40	-T Top -n Top -e top
 + I + ""				Nop
-+ I + "&Shells%mini.term.xpm"		Popup /Debian/XShells
++ I + "&Shells%mini.term.xpm%"		Popup /Debian/XShells
 + I + "&Programs%mini.start.xpm%"	Popup /Debian/Apps
 + I + ""				Nop
 + I + "&Fvwm Modules%mini.modules.xpm%"	Popup Module-Popup
@@ -1484,7 +1491,7 @@
 + I + "&Restart%mini.turn.xpm%"		Restart
 + I + "&Quit fvwm%mini.stop.xpm%"	FvwmForm FvwmForm-QuitVerify
 
-Test (f /etc/X11/fvwm/DebianMenu) SetDebianMenu
+Test (f  /etc/X11/fvwm/menudefs.hook) SetDebianMenu
 
 #------------------------------------------------------------------------------
 #--------- SHELLS
@@ -1542,13 +1549,13 @@
 #AddToMenu Programs  "GNOME &RedHat%mini.gnome.xpm%"	Popup gnome-redhat
 #+ ""	Nop
 #K_SM 2
-#AddToMenu Programs "&KDE Menu%mini.kde.xpm"		Popup kde-sys
+#AddToMenu Programs "&KDE Menu%mini.kde.xpm%"		Popup kde-sys
 #+ ""	Nop
 #K_UM 2
-#AddToMenu Programs "KDE &User%mini.kde.xpm"		Popup kde-user
+#AddToMenu Programs "KDE &User%mini.kde.xpm%"		Popup kde-user
 #+ ""	Nop
 #CDE 2
-#AddToMenu Programs "&CDE Menu%mini.folder.xpm"		Popup cde-menu
+#AddToMenu Programs "&CDE Menu%mini.folder.xpm%"		Popup cde-menu
 #+ "" Nop
 AddToMenu Programs
 + "&Accessories%mini.hammer.xpm%"		Popup Accessories