diff -Nru fvwm-2.6.7/debian/changelog fvwm-2.6.7/debian/changelog --- fvwm-2.6.7/debian/changelog 2016-12-15 07:08:00.000000000 +0000 +++ fvwm-2.6.7/debian/changelog 2017-01-16 17:52:00.000000000 +0000 @@ -1,3 +1,17 @@ +fvwm (1:2.6.7-3) unstable; urgency=low + + * Updates to default configuration. + * Improved fvwm-menu-directory error handling when python-xdg or + a menu is not installed. + * Fixed an issue with FvwmIconMan triggering window hit warnings. + (Closes: #849355) + * Added patch to improve window hit warnings (related to above). + * Added FvwmDebug to the list of removed modules in debian/changelog. + (Closes: #849423) + * Removed reference to removed modules from manpages. (Closes: #849422) + + -- Jaimos Skriletz Mon, 16 Jan 2017 10:52:00 -0700 + fvwm (1:2.6.7-2) unstable; urgency=low * Fixed a path mentioned in debian/NEWS.Debian. @@ -20,9 +34,9 @@ * New upstream version. (Closes: #820425) - Fvwm now has a default config. See /usr/share/doc/fvwm/NEWS.Debian.gz - Removed the following modules: - FvwmDragWell, FvwmGTK, FvwmSave, FvwmSaveDesk, FvwmScroll, - FvwmTabs, FvwmTaskBar, FvwmTheme, FvwmWharf, FvwmWinList, - FvwmWindowMenu, FvwmIconBox. + FvwmDebug, FvwmDragWell, FvwmGTK, FvwmSave, FvwmSaveDesk, + FvwmScroll, FvwmTabs, FvwmTaskBar, FvwmTheme, FvwmWharf, + FvwmWinList, FvwmWindowMenu, FvwmIconBox. - fvwm-menu-desktop updated (now a python script). (Closes: #808292) - New features and bug fixes. For a full list between 2.6.5 and 2.6.7 see /usr/share/doc/fvwm/changelog.gz diff -Nru fvwm-2.6.7/debian/patches/default-config.patch fvwm-2.6.7/debian/patches/default-config.patch --- fvwm-2.6.7/debian/patches/default-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ fvwm-2.6.7/debian/patches/default-config.patch 2017-01-16 17:52:00.000000000 +0000 @@ -0,0 +1,336 @@ +Description: Default Config Changes + * Modified FvwmScript-ConfirmCopyConfig to state config file + destination (not just directory). + * Improved/simplified Function Handling mostly around Mouse Bindings. + * Simplified IconManClick function + * Updated SendTo menu so it can send to any desk, page or the + current desk/page. + * No longer use Decor. + * Added hotkey's to MenuFvwmRoot + * Updated FvwmIconMan's configuration. Iconfied windows + now shown with grey text. + * Changed placement policy to MinOverlapPlacement + * Removed some settings such as XorValue and HideGeometryWindow + * Add delete to double click action on Menu button. +Origin: https://github.com/fvwmorg/fvwm/commit/5318ac96aea33b6638399655abe48dcb4d023f99 +Author: Jaimos Skriletz +Date: Sat, 31 Dec 2016 20:30:36 -0700 +--- + default-config/FvwmScript-ConfirmCopyConfig | 2 +- + default-config/config | 158 +++++++++++++++------------- + 2 files changed, 88 insertions(+), 72 deletions(-) + +diff --git a/default-config/FvwmScript-ConfirmCopyConfig b/default-config/FvwmScript-ConfirmCopyConfig +index edf714c..496292f 100644 +--- a/default-config/FvwmScript-ConfirmCopyConfig ++++ b/default-config/FvwmScript-ConfirmCopyConfig +@@ -9,7 +9,7 @@ Init + Set $UserConf=$UserDir {/config} + Set $BackupConf=$UserDir {/config-bak} + +- ChangeTitle 3 $UserDir ++ ChangeTitle 3 $UserConf + ChangeTitle 5 $BackupConf + + Do {Style ConfirmCopyConfig Layer 6} +diff --git a/default-config/config b/default-config/config +index 2f997a5..fbc9b41 100644 +--- a/default-config/config ++++ b/default-config/config +@@ -63,26 +63,22 @@ AddToFunc StartFunction + + I Module FvwmButtons RightPanel + + I Module FvwmEvent EventNewDesk + +-# Function: MoveClickX $0 $1 $2 +-# +-# This function runs variable actions on different events +-# and is used with the mouse bindings to allow different +-# actions depending on if the mouse is clicked, double clicked +-# or moved. Use "Nop" for no action. +-# +-# $0 - Action on Mouse Hold + Move +-# $1 - Action on Mouse Click +-# $2 - Action on Mouse DoubleClick +-# +-# Example: Mouse 1 T A MoveClickX Move Raise Maximize +-# +-# Click title bar to raise, double click to maximize, +-# and click+move to move the window. +-DestroyFunc MoveClickX +-AddToFunc MoveClickX ++# Mouse Bindings Functions ++DestroyFunc RaiseMoveX ++AddToFunc RaiseMoveX +++ I Raise +++ M $0 +++ D $1 ++ ++DestroyFunc RaiseMove ++AddToFunc RaiseMove +++ I Raise + + M $0 +-+ C $1 +-+ D $2 ++ ++DestroyFunc MoveToCurrent ++AddToFunc MoveToCurrent +++ I ThisWindow MoveToPage +++ I ThisWindow MoveToDesk + + # Function: ViewManPage $0 + # +@@ -119,9 +115,9 @@ DestroyFunc IconManClick + AddToFunc IconManClick + + I ThisWindow (Raised, !Shaded, !Iconic, CurrentPage) Iconify + + I TestRc (Match) Break +-+ I ThisWindow (!Raised) Raise +-+ I ThisWindow (Shaded) WindowShade +-+ I ThisWindow (Iconic) Iconify +++ I ThisWindow WindowShade off +++ I ThisWindow Iconify off +++ I ThisWindow Raise + + I ThisWindow (AcceptsFocus) FlipFocus + + # Function: ToggleTitle +@@ -187,7 +183,7 @@ EwmhBaseStruts 0 120 0 0 + + # This sets the ClickTime and MoveThreshold used to determine + # Double Clicks, Hold and Move for the mouse. +-ClickTime 350 ++ClickTime 250 + MoveThreshold 3 + + # Sets the focus style to SloppyFocus and a mouse click +@@ -198,14 +194,12 @@ Style * SloppyFocus, MouseFocusClickRaises + DefaultFont "xft:Sans:Bold:size=8:antialias=True" + + # Window Placement +-Style * TileCascadePlacement, GrabFocusOff, !UsePPosition ++Style * MinOverlapPlacement, GrabFocusOff, !UsePPosition + + # Sets all windows to OpaqueMove (vs a wired frame) and windows will + # snap to each other and the edge of the screen. +-OpaqueMoveSize -1 +-HideGeometryWindow ++OpaqueMoveSize unlimited + Style * ResizeOpaque, SnapAttraction 15 SameType ScreenAll, SnapGrid +-XorValue 55555 + + # Transient Windows (such as open file windows) + Style * DecorateTransient, StackTransientParent +@@ -219,8 +213,7 @@ Style * WindowShadeScrolls, WindowShadeSteps 10 + IgnoreModifiers L25 + + # Decor Styles +-Style * BorderWidth 5, HandleWidth 5, MWMButtons, \ +- FvwmBorder, FirmBorder, UseDecor FvwmDecor ++Style * BorderWidth 5, HandleWidth 5, MWMButtons, FvwmBorder, FirmBorder + Style * Colorset 1, HilightColorset 2 + Style * BorderColorset 3, HilightBorderColorset 4 + +@@ -229,7 +222,8 @@ Style * BorderColorset 3, HilightBorderColorset 4 + Style * !Icon + + # Window Specific Styles +-Style RightPanel !Title, !Borders, !Handles, Sticky, WindowListSkip, NeverFocus ++Style RightPanel !Title, !Borders, !Handles, Sticky, \ ++ WindowListSkip, NeverFocus + Style ConfirmQuit !Title, PositionPlacement Center, WindowListSkip, Layer 6 + Style FvwmIdent WindowListSkip + +@@ -256,6 +250,7 @@ Style FvwmIdent WindowListSkip + # 11 - Module Hilight + # 12 - Module ActiveButton (Mouse Hover) + # 13 - FvwmPager Active Page ++# 14 - FvwmIconMan Iconified Button + ########### + Colorset 0 fg #ffffff, bg #003c3c, hi, sh, Plain, NoShape + Colorset 1 fg #000000, bg #8f9f8f, hi, sh, Plain, NoShape +@@ -270,6 +265,7 @@ Colorset 10 fg #ffffff, bg #003c3c, hi #aaaaaa, sh #999999, Plain, NoShape + Colorset 11 fg #ffffff, bg #1a6e99, hi #ffffff, sh #ffffff, Plain, NoShape + Colorset 12 fg #2d2d2d, bg #ffffff, hi, sh, Plain, NoShape + Colorset 13 fg #ffffff, bg #006c6c, hi, sh, Plain, NoShape ++Colorset 14 fg #555555, bg #003c3c, hi #aaaaaa, sh #999999, Plain, NoShape + + ####### + # 4: Menus +@@ -286,18 +282,18 @@ MenuStyle * Font "xft:Sans:Bold:size=8:antialias=True" + # window or using alt-f1 (or menu). + DestroyMenu MenuFvwmRoot + AddToMenu MenuFvwmRoot "Fvwm" Title +-+ "Programs%icons/programs.png%" Popup MenuPrograms +-+ "XDG Menu%icons/apps.png%" Popup XDGMenu +-+ "XTerm%icons/terminal.png%" Exec exec $[infostore.terminal] +++ "&Programs%icons/programs.png%" Popup MenuPrograms +++ "XDG &Menu%icons/apps.png%" Popup XDGMenu +++ "&XTerm%icons/terminal.png%" Exec exec $[infostore.terminal] + + "" Nop +-+ "FvwmConsole%icons/terminal.png%" Module FvwmConsole -terminal $[infostore.terminal] +-+ "Wallpapers%icons/wallpaper.png%" Popup BGMenu +-+ "Man Pages%icons/help.png%" Popup MenuFvwmManPages +++ "Fvwm&Console%icons/terminal.png%" Module FvwmConsole -terminal $[infostore.terminal] +++ "&Wallpapers%icons/wallpaper.png%" Popup BGMenu +++ "M&an Pages%icons/help.png%" Popup MenuFvwmManPages + + "Copy Config%icons/conf.png%" FvwmScript FvwmScript-ConfirmCopyConfig + + "" Nop +-+ "Refresh%icons/refresh.png%" Refresh +-+ "Restart%icons/restart.png%" Restart +-+ "Quit%icons/quit.png%" Module FvwmScript FvwmScript-ConfirmQuit +++ "Re&fresh%icons/refresh.png%" Refresh +++ "&Restart%icons/restart.png%" Restart +++ "&Quit%icons/quit.png%" Module FvwmScript FvwmScript-ConfirmQuit + + # Generate XDGMenu + PipeRead "fvwm-menu-desktop" +@@ -349,7 +345,7 @@ AddToMenu MenuWindowOpsLong + + "(Un)Shade" WindowShade + + "(Un)Sticky" Stick + + "(No)TitleBar" Pick (CirculateHit) ToggleTitle +-+ "Send To Desk" Popup MenuSendToDesk +++ "Send To" Popup MenuSendTo + + "" Nop + + "Close" Close + + "Destroy" Destroy +@@ -370,7 +366,7 @@ AddToMenu MenuIconOps + + "(Un)Shade" WindowShade + + "(Un)Sticky" Stick + + "(No)TitleBar" Pick (CirculateHit) ToggleTitle +-+ "Send To Desk" Popup MenuSendToDesk +++ "Send To" Popup MenuSendTo + + "" Nop + + "Close" Close + + "Destroy" Destroy +@@ -384,14 +380,27 @@ AddToMenu MenuIconOps + + "" Nop + + "Identify" Module FvwmIdent + ++DestroyMenu MenuSendTo ++AddToMenu MenuSendTo +++ "Current" MoveToCurrent +++ "Page" PopUp MenuSendToPage +++ "Desk" PopUp MenuSendToDesk ++ + DestroyMenu MenuSendToDesk + AddToMenu MenuSendToDesk +-+ "Current" MoveToDesk + + "Desk 0" MoveToDesk 0 0 + + "Desk 1" MoveToDesk 0 1 + + "Desk 2" MoveToDesk 0 2 + + "Desk 3" MoveToDesk 0 3 + ++DestroyMenu MenuSendToPage ++AddToMenu MenuSendToPage +++ "Page (0,0)" MoveToPage 0 0 +++ "Page (0,1)" MoveToPage 0 1 +++ "Page (1,0)" MoveToPage 1 0 +++ "Page (1,1)" MoveToPage 1 1 ++ ++ + # Fvwm Man Pages (Help) Menu + DestroyMenu MenuFvwmManPages + AddToMenu MenuFvwmManPages "Help" Title +@@ -459,8 +468,8 @@ Silent Key Super_R A A Exec exec $[infostore.terminal] + # 2 - Close on single click, Destory on double click. + # 4 - Maximize (right/middle button will only maximize vertical/horizontal) + # 6 - Iconify (minimize) +-Mouse 1 1 A Menu MenuWindowOps +-Mouse 1 2 A MoveClickX Nop Close Destroy ++Mouse 1 1 A Menu MenuWindowOps Delete ++Mouse 1 2 A Close + Mouse 1 4 A Maximize 100 100 + Mouse 2 4 A Maximize 0 100 + Mouse 3 4 A Maximize 100 0 +@@ -473,14 +482,14 @@ Mouse 1 6 A Iconify + # Right Click - WindowOps Menu + # Middle Click - Window List Menu + # Right click TitleBar/Borders for WindowOps Menu +-Mouse 1 T A MoveClickX Move Raise Maximize +-Mouse 1 FS A MoveClickX Resize Raise Nop +-Mouse 4 T A MoveClickX Nop Raise "WindowShade True" +-Mouse 5 T A MoveClickX Nop Raise "WindowShade False" ++Mouse 1 T A RaiseMoveX Move Maximize ++Mouse 1 FS A RaiseMove Resize ++Mouse 4 T A WindowShade True ++Mouse 5 T A WindowShade False + Mouse 1 R A Menu MenuFvwmRoot + Mouse 2 R A WindowList + Mouse 3 R A Menu MenuWindowOpsLong +-Mouse 1 I A MoveClickX Move Nop Iconify ++Mouse 1 I A RaiseMoveX Move "Iconify off" + Mouse 3 T A Menu MenuWindowOps + Mouse 3 I A Menu MenuIconOps + +@@ -494,26 +503,30 @@ Mouse 3 I A Menu MenuIconOps + # 4 - Maximize + # 6 - Minimize + ########### +-DestroyDecor FvwmDecor +-AddToDecor FvwmDecor +-+ TitleStyle Centered Height 18 -- Flat +-+ ButtonStyle All ActiveUp Vector 5 15x15@4 15x85@3 85x85@3 85x15@3 15x15@3 -- Flat +-+ ButtonStyle All ToggledActiveUp Vector 5 15x15@4 15x85@3 85x85@3 85x15@3 15x15@3 -- Flat +-+ ButtonStyle All ActiveDown Vector 5 20x20@4 20x80@3 80x80@3 80x20@3 20x20@3 -- Flat +-+ ButtonStyle All ToggledActiveDown Vector 5 20x20@4 20x80@3 80x80@3 80x20@3 20x20@3 -- Flat +-+ ButtonStyle All ToggledInactive Vector 5 47x47@3 57x53@3 53x53@3 53x47@3 47x47@3 -- Flat +-+ ButtonStyle All Inactive Vector 5 47x47@3 57x53@3 53x53@3 53x47@3 47x47@3 -- Flat +-+ AddButtonStyle 1 Active Vector 5 45x45@3 55x45@3 55x55@3 45x55@3 45x45@3 +-+ AddButtonStyle 2 Active Vector 4 35x35@3 65x65@3 65x35@4 35x65@3 +-+ AddButtonStyle 4 Active Vector 8 30x70@3 30x30@3 70x30@3 70x70@3 30x70@3 \ +- 30x50@4 50x50@3 50x70@3 +-+ AddButtonStyle 4 ToggledActiveUp Vector 8 30x70@3 30x30@3 70x30@3 70x70@3 30x70@3 \ +- 50x30@4 50x50@3 70x50@3 +-+ AddButtonStyle 6 Active Vector 5 35x60@3 65x60@3 65x50@3 35x50@3 35x60@3 +-+ ButtonStyle All - Clear +-+ ButtonStyle 1 - MwmDecorMenu +-+ ButtonStyle 4 - MwmDecorMax +-+ ButtonStyle 6 - MwmDecorMin ++TitleStyle Centered Height 18 -- Flat ++ButtonStyle All ActiveUp Vector 5 15x15@4 15x85@3 85x85@3 85x15@3 \ ++ 15x15@3 -- Flat ++ButtonStyle All ToggledActiveUp Vector 5 15x15@4 15x85@3 85x85@3 \ ++ 85x15@3 15x15@3 -- Flat ++ButtonStyle All ActiveDown Vector 5 20x20@4 20x80@3 80x80@3 80x20@3 \ ++ 20x20@3 -- Flat ++ButtonStyle All ToggledActiveDown Vector 5 20x20@4 20x80@3 80x80@3 \ ++ 80x20@3 20x20@3 -- Flat ++ButtonStyle All ToggledInactive Vector 5 47x47@3 57x53@3 53x53@3 \ ++ 53x47@3 47x47@3 -- Flat ++ButtonStyle All Inactive Vector 5 47x47@3 57x53@3 53x53@3 53x47@3 \ ++ 47x47@3 -- Flat ++AddButtonStyle 1 Active Vector 5 45x45@3 55x45@3 55x55@3 45x55@3 45x45@3 ++AddButtonStyle 2 Active Vector 4 35x35@3 65x65@3 65x35@4 35x65@3 ++AddButtonStyle 4 Active Vector 8 30x70@3 30x30@3 70x30@3 70x70@3 30x70@3 \ ++ 30x50@4 50x50@3 50x70@3 ++AddButtonStyle 4 ToggledActiveUp Vector 8 30x70@3 30x30@3 70x30@3 70x70@3 \ ++ 30x70@3 50x30@4 50x50@3 70x50@3 ++AddButtonStyle 6 Active Vector 5 35x60@3 65x60@3 65x50@3 35x50@3 35x60@3 ++ButtonStyle All - Clear ++ButtonStyle 1 - MwmDecorMenu ++ButtonStyle 4 - MwmDecorMax ++ButtonStyle 6 - MwmDecorMin + + ############ + # 7: Modules +@@ -607,8 +620,11 @@ DestroyModuleConfig FvwmPager:* + DestroyModuleConfig FvwmIconMan:* + *FvwmIconMan: UseWinList true + *FvwmIconMan: ButtonGeometry 120x20 +-*FvwmIconMan: Colorset 10 ++*FvwmIconMan: ManagerGeometry 1x1 ++*FvwmIconMan: Background #003c3c ++*FvwmIconMan: Foreground #ffffff + *FvwmIconMan: FocusColorset 11 ++*FvwmIconMan: IconColorset 14 + *FvwmIconMan: FocusAndSelectColorset 12 + *FvwmIconMan: SelectColorset 12 + *FvwmIconMan: IconAndSelectColorset 12 +@@ -616,8 +632,8 @@ DestroyModuleConfig FvwmIconMan:* + *FvwmIconMan: ReliefThickness 0 + *FvwmIconMan: Format "%t" + *FvwmIconMan: Font "xft:Sans:Bold:size=8:antialias=True" ++*FvwmIconMan: Action Mouse 0 A ret + *FvwmIconMan: Action Mouse 1 A sendcommand IconManClick +-*FvwmIconMan: Action Mouse 2 A sendcommand Nop + *FvwmIconMan: Action Mouse 3 A sendcommand "Menu MenuIconOps" + *FvwmIconMan: Resolution global + *FvwmIconMan: Tips needed diff -Nru fvwm-2.6.7/debian/patches/fix-hardcoded-xterm.patch fvwm-2.6.7/debian/patches/fix-hardcoded-xterm.patch --- fvwm-2.6.7/debian/patches/fix-hardcoded-xterm.patch 2016-11-17 02:24:28.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fix-hardcoded-xterm.patch 2016-12-28 23:13:21.000000000 +0000 @@ -5,8 +5,6 @@ and removed the --name option. Changed the man page to document the Debian specific change. . - git-archimport-id: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1 - . Converted with metadata by Vincent W. Chen . . Added updates to change xterm to x-terminal-emulator in the default-config diff -Nru fvwm-2.6.7/debian/patches/fix-makefile-paths.patch fvwm-2.6.7/debian/patches/fix-makefile-paths.patch --- fvwm-2.6.7/debian/patches/fix-makefile-paths.patch 2016-11-17 04:22:36.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fix-makefile-paths.patch 2016-12-28 23:13:39.000000000 +0000 @@ -1,6 +1,7 @@ Description: Fixes the links created by the default-config Makefiles. This is needed to create correct links when building the debian package. Author: Jaimos Skriletz +Forwarded: not-needed Last-Update: 2016-11-07 --- a/default-config/Makefile.am +++ b/default-config/Makefile.am diff -Nru fvwm-2.6.7/debian/patches/fix-TabCom.patch fvwm-2.6.7/debian/patches/fix-TabCom.patch --- fvwm-2.6.7/debian/patches/fix-TabCom.patch 2016-11-17 04:21:20.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fix-TabCom.patch 2016-12-28 23:12:18.000000000 +0000 @@ -1,5 +1,8 @@ Description: Fixes conflicting array sizes for variable `TabCom' in - TabCommodules/FvwmScript/FvwmScript.c and modules/FvwmScript/Instructions.c. + TabCommodules/FvwmScript/FvwmScript.c and modules/FvwmScript/Instructions.c +Author: Michael Tautschnig +Reviewd-By: Jaimos Skriletz +Last-Updated: 2015-10-12 --- a/modules/FvwmScript/FvwmScript.c +++ b/modules/FvwmScript/FvwmScript.c @@ -77,7 +77,7 @@ Window ref; diff -Nru fvwm-2.6.7/debian/patches/FvwmIconMan-fix-size-hints-warnings.patch fvwm-2.6.7/debian/patches/FvwmIconMan-fix-size-hints-warnings.patch --- fvwm-2.6.7/debian/patches/FvwmIconMan-fix-size-hints-warnings.patch 1970-01-01 00:00:00.000000000 +0000 +++ fvwm-2.6.7/debian/patches/FvwmIconMan-fix-size-hints-warnings.patch 2016-12-28 23:19:16.000000000 +0000 @@ -0,0 +1,56 @@ +Description: Fix FvwmIconMan sometimes triggering size hint warnings. +Origin: https://github.com/fvwmorg/fvwm/commit/32af9dcc3f1debea36bce6e9e3bdcb5b0bd41713 +Debian-Bug: https://bugs.debian.org/849355 +Author: Dominik Vogt +Reviewed-By: Jaimos Skriletz +Date: Wed, 28 Dec 2016 02:42:54 +0100 +--- + modules/FvwmIconMan/xmanager.c | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/modules/FvwmIconMan/xmanager.c b/modules/FvwmIconMan/xmanager.c +index f0276cf..58eaaed 100644 +--- a/modules/FvwmIconMan/xmanager.c ++++ b/modules/FvwmIconMan/xmanager.c +@@ -374,6 +374,22 @@ static void fix_manager_size(WinManager *man, int w, int h) + XSetWMNormalHints(theDisplay, man->theWindow, &size); + } + ++static void release_manager_size(WinManager *man) ++{ ++ XSizeHints size; ++ long mask; ++ ++ if (man->geometry.dir & GROW_FIXED) ++ return; ++ ++ FGetWMNormalHints(theDisplay, man->theWindow, &size, &mask); ++ size.min_width = 1; ++ size.max_width = 65535; ++ size.min_height = 1; ++ size.max_height = 65535; ++ XSetWMNormalHints(theDisplay, man->theWindow, &size); ++} ++ + /* Like XMoveResizeWindow(), but can move in arbitary directions */ + static void resize_window(WinManager *man) + { +@@ -381,7 +397,9 @@ static void resize_window(WinManager *man) + int x_changed, y_changed, dir; + + dir = man->geometry.dir; +- fix_manager_size(man, man->geometry.width, man->geometry.height); ++ /* Remove any size limits so that the window can be resized without ++ * warnings. */ ++ release_manager_size(man); + + if ((dir & GROW_DOWN) && (dir & GROW_RIGHT)) { + XResizeWindow(theDisplay, man->theWindow, man->geometry.width, +@@ -421,6 +439,7 @@ static void resize_window(WinManager *man) + } + MyXUngrabServer(theDisplay); + } ++ fix_manager_size(man, man->geometry.width, man->geometry.height); + } + + static char *make_display_string(WinData *win, char *format, int len) diff -Nru fvwm-2.6.7/debian/patches/fvwm-menu-desktop-error-handling.patch fvwm-2.6.7/debian/patches/fvwm-menu-desktop-error-handling.patch --- fvwm-2.6.7/debian/patches/fvwm-menu-desktop-error-handling.patch 1970-01-01 00:00:00.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fvwm-menu-desktop-error-handling.patch 2017-01-16 17:52:00.000000000 +0000 @@ -0,0 +1,210 @@ +Description: Improve fvwm-menu-desktop error handling. + * Checks if $FVWM_USERDIR is defined. + * Errors out nicer if python-xdg is not installed. + * New option --menu-error|-e that will output the python-xdg + not found error or no menus found error to the generated menu. + For use in default-config. + * Add -e to default-config. + * --verbose now informs the user when defaults are loaded from + the config file. +Origin: https://github.com/fvwmorg/fvwm/commit/2ef5b73e631fba1fa9f8fac24082287768aac042 +Author: Jaimos Skriletz +Date: Sat, 31 Dec 2016 20:19:01 -0700 +--- + bin/fvwm-menu-desktop.1.in | 5 +++ + bin/fvwm-menu-desktop.in | 76 ++++++++++++++++++++++++++++++++++++---------- + default-config/config | 2 +- + 3 files changed, 66 insertions(+), 17 deletions(-) + +--- a/bin/fvwm-menu-desktop.1.in ++++ b/bin/fvwm-menu-desktop.1.in +@@ -42,6 +42,7 @@ fvwm-menu-desktop + [ \fB\-\-include\-items\fR \fINAME\fR ] + [ \fB\-\-regen\-cmd\fR \fICMD\fR ] + [ \fB\-\-dynamic\fR ] ++[ \fB\-\-menu-error\fR|\fB\-e\fR ] + [ \fB\-\-verbose\fR|\fB\-v\fR ] + + +@@ -145,6 +146,10 @@ Generates all menus listed in a space se + This option overrides any defaults and \fB\-\-desktop\fR|\fB\-\-menu\-type\fR + settings. + ++.IP "\fB\-\-menu-error\fR |\fB\-t\fR" ++If this option is present and python-xdg is not found, the script ++will print the error in the generated menu. Used in the default-config. ++ + .IP "\fB\-\-verbose\fR" + Enables additional information printouts on STDERR. + +--- a/bin/fvwm-menu-desktop.in ++++ b/bin/fvwm-menu-desktop.in +@@ -2,7 +2,13 @@ + + # Modification History + +-# Changed on 26/10/27 by Jaimos Skrietz: ++# Changed on 16/12/31 by Jaimos Skriletz: ++# - Added check for FVWM_USERDIR env variable. ++# - Added check for python-xdg module to print less errors if not found. ++# - Added option -e/--menu-error to output phython-xdg not found as ++# a menu for the default-config. ++ ++# Changed on 16/10/27 by Jaimos Skrietz: + # - Renamed default menu to XDGMenu and changed the name of the + # FvwmForm to FvwmForm-XDGMenu-Config + # - Modified the FvwmForm and added the abilty to load defaults from +@@ -75,17 +81,25 @@ + + import sys + import getopt +-import xdg.Menu +-import xdg.IconTheme +-import xdg.Locale + import os.path + import os +-from xdg.DesktopEntry import * +-from xdg.BaseDirectory import * + import fnmatch + import time + ++# Test for python-xdg ++try: ++ import xdg.Menu ++except ImportError: ++ xdg_import_error = True ++else: ++ xdg_import_error = False ++ import xdg.IconTheme ++ import xdg.Locale ++ from xdg.DesktopEntry import * ++ from xdg.BaseDirectory import * ++ + ++# Main Function + def main (): + + description = """ +@@ -136,10 +150,10 @@ Standard output is a series Fvwm command + dashed_obs_parms.append('--'+a) + + try: +- opts, args = getopt.getopt(sys.argv[1:], "hs:t:vw", ++ opts, args = getopt.getopt(sys.argv[1:], "hs:t:vwe", + ["help", "verbose", "enable-mini-icons", "with-titles", "without-titles", "version", + "desktop=", "size=", "theme=", "install-prefix=", "menu-type=", "regen-cmd=", +- "title=", "get-menus=", "set-menus=", "insert-in-menu=", "mini-icon-dir=", ++ "title=", "get-menus=", "set-menus=", "insert-in-menu=", "mini-icon-dir=", "menu-error", + "app-icon=", "dir-icon=", "include-items=", "dynamic", "all-menus"]+obs_args+equaled_obs_parms) + except getopt.GetoptError, err: + # print help information and exit: +@@ -174,10 +188,15 @@ Standard output is a series Fvwm command + include_items = 'both' + regen_cmd = 'PipeRead `fvwm-menu-desktop`' + dynamic_menu = False ++ menu_error = False + + # Loads config options from $FVWM_USERDIR/.FvwmForm-XDGMenu-Config +- if os.path.isfile("%s/.FvwmForm-XDGMenu-Config" % os.environ['FVWM_USERDIR']): +- fvwmform_config = open("%s/.FvwmForm-XDGMenu-Config" % os.environ['FVWM_USERDIR'], "r") ++ if "FVWM_USERDIR" in os.environ: ++ config_file = "%s/.FvwmForm-XDGMenu-Config" % os.environ['FVWM_USERDIR'] ++ else: ++ config_file = "%s/.fvwm/.FvwmForm-XDGMenu-Config" % os.environ['HOME'] ++ if os.path.isfile(config_file): ++ fvwmform_config = open(config_file, "r") + + for l in fvwmform_config: + o = l.split() +@@ -216,14 +235,20 @@ Standard output is a series Fvwm command + fvwmform_config.close() + + for o, a in opts: +- if o == "-v": ++ if o in ("-v", "--verbose"): + verbose = True ++ if os.path.isfile(config_file): ++ vprint("Defaults loaded from %s\n" % config_file) ++ else: ++ vprint("Config file not found: %s\nUsing built-in defaults.\n" % config_file) + elif o in ("-h", "--help") : + print usage + sys.exit() + elif o in ("--version") : + print "fvwm-menu-desktop version " + version + sys.exit() ++ elif o in ("-e", "--menu-error") : ++ menu_error = True + elif o in ("--enable-mini-icons") : + force=True + elif o in ("--insert-in-menu") : +@@ -260,12 +285,10 @@ Standard output is a series Fvwm command + current_theme = a + elif o in ("--menu-type") : + menu_type = a +- elif o in ("-w","--with-titles") : ++ elif o in ("-w", "--with-titles") : + with_titles = True +- elif o in ("-w","--without-titles") : ++ elif o in ("--without-titles") : + with_titles = False +- elif o in ("--verbose") : +- verbose = True + elif o in ("--app-icon") : + default_app_icon = a + elif o in ("--dir-icon") : +@@ -289,6 +312,19 @@ Standard output is a series Fvwm command + else: + assert False, "unhandled option" + ++ # Exit if python-xdg not found ++ if xdg_import_error: ++ if menu_error: ++ printtext('DestroyMenu "%s"' % top) ++ printtext('AddToMenu "%s" "%s" Title' % (top, top)) ++ printtext('+ "Error: python-xdg not found" Nop') ++ printtext('+ "" Nop') ++ printtext('+ "Regenerate" PipeRead `fvwm-menu-desktop -e`') ++ else: ++ sys.stderr.write('Python module python-xdg not found.') ++ sys.exit(1) ++ ++ + timestamp = time.time() + + if len(set_menus) == 0: +@@ -320,7 +356,14 @@ Standard output is a series Fvwm command + if menu_list_length == 0: + if not desktop == '': + desktop = desktop + '-' +- sys.stderr.write(install_prefix+desktop+menu_type+".menu not available on this system. Exiting...\n") ++ if menu_error: ++ printtext('DestroyMenu "%s"' % top) ++ printtext('AddToMenu "%s" "%s" Title' % (top, top)) ++ printtext('+ "Error: No menus found" Nop') ++ printtext('+ "" Nop') ++ printtext('+ "Regenerate" PipeRead `fvwm-menu-desktop -e`') ++ else: ++ sys.stderr.write(install_prefix+desktop+menu_type+".menu not available on this system. Exiting...\n") + sys.exit(1) + else: + # set previous_theme if /.theme exist +@@ -777,6 +820,7 @@ Options: + --regen-cmd ACTION The fvwm ACTION for the 'Regenerate' menu item. + Default: 'PipeRead `fvwm-menu-desktop`' + --dynamic used with dynamic menus. ++ -e, --menu-error out python-xdg not found error in menu. + -v, --verbose run and display debug info on STDERR.""" + + if __name__ == "__main__": +--- a/default-config/config ++++ b/default-config/config +@@ -296,7 +296,7 @@ AddToMenu MenuFvwmRoot "Fvwm" Title + + "&Quit%icons/quit.png%" Module FvwmScript FvwmScript-ConfirmQuit + + # Generate XDGMenu +-PipeRead "fvwm-menu-desktop" ++PipeRead "fvwm-menu-desktop -e" + + # Programs Menu + # diff -Nru fvwm-2.6.7/debian/patches/fvwm-menu-desktop.patch fvwm-2.6.7/debian/patches/fvwm-menu-desktop.patch --- fvwm-2.6.7/debian/patches/fvwm-menu-desktop.patch 2016-11-17 02:55:32.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fvwm-menu-desktop.patch 2017-01-01 02:34:29.000000000 +0000 @@ -2,10 +2,11 @@ On some builds python3 is detected and improperly makes the shebang #!/usr/bin/python3. This forces it to be #!/usr/bin/python Author: Jaimos F Skriletz +Forwarded: not-needed Last-Update: 2016-11-13 ---- fvwm-2.6.7.orig/bin/fvwm-menu-desktop.in -+++ fvwm-2.6.7/bin/fvwm-menu-desktop.in +--- a/bin/fvwm-menu-desktop.in ++++ b/bin/fvwm-menu-desktop.in @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!/usr/bin/python diff -Nru fvwm-2.6.7/debian/patches/fvwm-perllib.patch fvwm-2.6.7/debian/patches/fvwm-perllib.patch --- fvwm-2.6.7/debian/patches/fvwm-perllib.patch 2016-12-08 10:05:55.000000000 +0000 +++ fvwm-2.6.7/debian/patches/fvwm-perllib.patch 2016-12-28 23:15:43.000000000 +0000 @@ -5,7 +5,10 @@ . Fixed a deprecated warning about unescaped braces {} in regex. Author: Jaimos Skriletz -Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777471 +Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777471 +Forwarded: http://www.mail-archive.com/fvwm-workers@fvwm.org/msg04549.html +Last-Updated: 2016-12-10 + --- a/bin/fvwm-perllib.in +++ b/bin/fvwm-perllib.in @@ -390,7 +390,7 @@ if (exists $internal_pods->{$topic}) { diff -Nru fvwm-2.6.7/debian/patches/improve-window-size-hints.patch fvwm-2.6.7/debian/patches/improve-window-size-hints.patch --- fvwm-2.6.7/debian/patches/improve-window-size-hints.patch 1970-01-01 00:00:00.000000000 +0000 +++ fvwm-2.6.7/debian/patches/improve-window-size-hints.patch 2016-12-28 23:19:37.000000000 +0000 @@ -0,0 +1,135 @@ +Description: Improve window size hints warnings. +Origin: https://github.com/fvwmorg/fvwm/commit/1665dec2a3039725c9e12fd66ab0c44973c77c94 +Debian-Bug: https://bugs.debian.org/849355 +Author: Dominik Vogt +Reviewed-By: Jaimos Skriletz +Date: Wed, 28 Dec 2016 02:42:28 +0100 +--- + fvwm/add_window.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +--- a/fvwm/add_window.c ++++ b/fvwm/add_window.c +@@ -2819,7 +2819,7 @@ void GetWindowSizeHintsWithCheck( + int do_reject_invalid_size_constraints_on_existing_window) + { + long supplied = 0; +- char *broken_cause =""; ++ char *broken_cause = 0; + XSizeHints orig_hints; + XSizeHints new_hints; + Status rc; +@@ -2873,7 +2873,7 @@ void GetWindowSizeHintsWithCheck( + (new_hints.flags & PMaxSize) && + new_hints.min_height != new_hints.max_height)) + { +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "height_inc"; + } +@@ -2891,11 +2891,11 @@ void GetWindowSizeHintsWithCheck( + + if (new_hints.flags & PMinSize) + { +- if (new_hints.min_width < 0 && !*broken_cause) ++ if (new_hints.min_width < 0 && !broken_cause) + { + broken_cause = "min_width"; + } +- if (new_hints.min_height < 0 && !*broken_cause) ++ if (new_hints.min_height < 0 && !broken_cause) + { + broken_cause = "min_height"; + } +@@ -2927,7 +2927,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.max_width < new_hints.min_width) + { + new_hints.max_width = DEFAULT_MAX_MAX_WINDOW_WIDTH; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "max_width"; + } +@@ -2935,7 +2935,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.max_height < new_hints.min_height) + { + new_hints.max_height = DEFAULT_MAX_MAX_WINDOW_HEIGHT; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "max_height"; + } +@@ -2957,7 +2957,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.base_width < 0) + { + new_hints.base_width = 0; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "base_width"; + } +@@ -2965,7 +2965,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.base_height < 0) + { + new_hints.base_height = 0; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "base_height"; + } +@@ -2984,7 +2984,7 @@ void GetWindowSizeHintsWithCheck( + #if 0 + /* Keep silent about this, since the Xlib manual + * actually recommends making min <= base <= max ! */ +- broken_cause = ""; ++ broken_cause = 0; + #endif + } + } +@@ -3013,7 +3013,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.max_width < new_hints.base_width) + { + new_hints.max_width = DEFAULT_MAX_MAX_WINDOW_WIDTH; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "max_width"; + } +@@ -3021,7 +3021,7 @@ void GetWindowSizeHintsWithCheck( + if (new_hints.max_height < new_hints.base_height) + { + new_hints.max_height = DEFAULT_MAX_MAX_WINDOW_HEIGHT; +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "max_height"; + } +@@ -3065,7 +3065,7 @@ void GetWindowSizeHintsWithCheck( + (((double)minAspectX * (double)maxAspectY) > + ((double)maxAspectX * (double)minAspectY))) + { +- if (!*broken_cause) ++ if (!broken_cause) + { + broken_cause = "aspect ratio"; + } +@@ -3145,8 +3145,8 @@ void GetWindowSizeHintsWithCheck( + " invalid. The new hints will become active" + " when the window generates the next" + " ConfigureRequest.\n", is_invalid); ++ broken_cause = "inconsistent with current size"; + } +- broken_cause = ""; + } + else + { +@@ -3154,7 +3154,7 @@ void GetWindowSizeHintsWithCheck( + fw->orig_hints.width_inc = orig_hints.width_inc; + fw->orig_hints.height_inc = orig_hints.height_inc; + } +- if (*broken_cause != 0) ++ if (broken_cause != 0) + { + fvwm_msg( + WARN, "GetWindowSizeHints", diff -Nru fvwm-2.6.7/debian/patches/manpage-ClickTime.patch fvwm-2.6.7/debian/patches/manpage-ClickTime.patch --- fvwm-2.6.7/debian/patches/manpage-ClickTime.patch 2016-12-08 10:22:13.000000000 +0000 +++ fvwm-2.6.7/debian/patches/manpage-ClickTime.patch 2016-12-28 23:16:58.000000000 +0000 @@ -1,6 +1,8 @@ Description: Add double click time info to ClickTime in manpage. Author: Jaimos Skriletz -Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567387 +Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567387 +Forwarded: http://www.mail-archive.com/fvwm-workers@fvwm.org/msg04561.html +Last-Updated: 2016-12-10 --- a/doc/commands/ClickTime.xml +++ b/doc/commands/ClickTime.xml @@ -26,4 +26,6 @@ is 150 milliseconds. Omitting the delay diff -Nru fvwm-2.6.7/debian/patches/manpage-remove-old-modules.patch fvwm-2.6.7/debian/patches/manpage-remove-old-modules.patch --- fvwm-2.6.7/debian/patches/manpage-remove-old-modules.patch 1970-01-01 00:00:00.000000000 +0000 +++ fvwm-2.6.7/debian/patches/manpage-remove-old-modules.patch 2016-12-28 23:18:44.000000000 +0000 @@ -0,0 +1,386 @@ +Description: Removes reference to obsolete Modules from man pages. +Author: Jaimos Skriletz +Debian-Bug: https://bugs.debian.org/849422 +Forwarded: http://www.mail-archive.com/fvwm-workers@fvwm.org/msg04580.html +Last-Updated: 2016-12-28 + +--- a/doc/commands/Module.xml ++++ b/doc/commands/Module.xml +@@ -26,7 +26,6 @@ spawned. Currently several modules, incl + , + , + , +-, + , + + support aliases. Aliases are useful if more than one instance of +@@ -53,12 +52,8 @@ Module FvwmForm MyForm + (a command server to use with shell's FvwmCommand client), + (to execute fvwm commands directly), + (to preprocess your config with cpp), +- (to help debug fvwm), +- (the place to drag&drop to), + (trigger various actions by events), + (to bring up dialogs), +- (to bring up GTK menus and dialogs), +- (like the mwm IconBox), + (a flexible icon manager), + (to get window info), + (to preprocess your config with m4), +@@ -66,16 +61,7 @@ Module FvwmForm MyForm + (a Perl manipulator and preprocessor), + (to locate and control obscured windows by using small proxy windows), + (to rearrange windows), +- (saves the desktop state in .xinitrc style), +- (saves the desktop state in fvwm commands), + (another powerful dialog toolkit), +- (puts scrollbars on any window), +- (a generic tabbing module), +- (a Windows like task bar), +- (managed colorsets, obsolete), +- (an AfterStep like button bar), +- (a configurable fvwm menu listing current windows), +- (a window list). + These modules have their own man + pages. There may be other modules out on there as well. + +--- a/doc/commands/Colorset.xml ++++ b/doc/commands/Colorset.xml +@@ -237,22 +237,15 @@ uses Colorset 10 as background. If you w + the + RootTransparent + option. +-, ++ + , +-, +- + and +- ++, + are relatively simple. There is one main colorset option which + defines the background of the window and the other colorsets (if + any) are drawn on the foreground. The case of +- and +- +-are simpler. With +- +-all the colorsets are drawn on the foreground and with + +-the two colorsets refer to the window backgrounds. ++is simpler, the two colorsets refer to the window backgrounds. + + is more complicated as almost everything in the pager are windows + with some parental relations (the mini windows are the child and +--- a/doc/fvwm/initialization.xml ++++ b/doc/fvwm/initialization.xml +@@ -136,14 +136,14 @@ is used instead of ExitFunction. + InitFunction + InitFunction + + I +- + I ++ + I + + I xsetroot -solid cyan + + I xterm + + I netscape + + RestartFunction + RestartFunction +- + I ++ + I + + SessionInitFunction + SessionInitFunction +--- a/doc/commands/LocalePath.xml ++++ b/doc/commands/LocalePath.xml +@@ -87,8 +87,6 @@ parameter: + available. + + Note that the +- +-module has its own catalog and that the + + module has a set of special instructions for string + translation. It is out of the scope of this discussion to explain +--- a/doc/commands/Style.xml ++++ b/doc/commands/Style.xml +@@ -1105,7 +1105,7 @@ window. This miniature icon can be drawn + (see + ), + and can be used by various fvwm modules +-(, and ). ++( and ). + It takes the name of a pixmap as an argument. + + and +@@ -2265,8 +2265,8 @@ Style rxvt !State 11 + + styles do not appear in the menu that is created with the + +-command or the lists shown in several modules like +- or . ++command or the lists shown in modules like ++. + In the modules, the style can usually be ignored with an option. + Please refer to the man page of the module in question for + further information. To disable this feature, use the default +--- a/doc/commands/Wait.xml ++++ b/doc/commands/Wait.xml +@@ -44,8 +44,8 @@ After the xmh window appears control mov + Fvwm remains partially functional during a wait, but any input + from the modules is queued up and processed only after the window + appears or the command is aborted. For example, windows can not +-be focused with or +- during a wait. ++be focused with or ++ during a wait. + + You can escape from a + Wait +--- a/doc/fvwm/colorsets.xml ++++ b/doc/fvwm/colorsets.xml +@@ -24,7 +24,8 @@ other color operations. + + was introduced to manage colorsets. Starting with the 2.5.x beta + version, the functionality was moved to the core fvwm, +-so this module became obsolete. ++so this module became obsolete. In 2.6.7 the ++module was removed. + + The old syntax: + +--- a/doc/fvwm/virtualDesktop.xml ++++ b/doc/fvwm/virtualDesktop.xml +@@ -29,11 +29,11 @@ windows on a range of desktops can be vi + , + a miniature view of the desktops. The pager is an accessory + program, called a module, which is not essential for the window +-manager to operate. Windows may also be listed, along with their +-geometries, in a window list, accessible as a pop-up menu, or as a +-separate window, called the +- +-(another module). ++manager to operate. Windows may also be listed using the ++ ++command or the ++ ++module. + + Fvwm keeps the windows on the desktop in a layered stacking order; + a window in a lower layer never obscures a window in a higher +--- a/doc/commands/Asterisk.xml ++++ b/doc/commands/Asterisk.xml +@@ -26,7 +26,6 @@ optional spaces, between the module name + this is recommended to avoid conflicts. + + +-*FvwmIconBox: MaxIconSize 48x48 + *FvwmPager: WindowBorderWidth 1 + *FvwmButtons-TopRight: Geometry 100x100-0+0 + *FvwmButtons-Bottom: Geometry +0-0 +--- a/doc/commands/DestroyModuleConfig.xml ++++ b/doc/commands/DestroyModuleConfig.xml +@@ -31,7 +31,7 @@ In this case a module name (or alias) ca + + DestroyModuleConfig FvwmButtons* + DestroyModuleConfig FvwmForm: Fore +-DestroyModuleConfig FvwmIconBox: Max* ++DestroyModuleConfig FvwmIconMan: Tips* + + + +--- a/modules/FvwmBacker/FvwmBacker.1.in ++++ b/modules/FvwmBacker/FvwmBacker.1.in +@@ -74,7 +74,7 @@ color names may be used). + + If the \fIcommand\fP is \fIcolorset\fP FvwmBacker uses the background + specified in colorset \fIn\fP for the given desk. Please refer to +-the man page of the FvwmTheme module for details about colorsets. ++the fvwm man page for details about colorsets. + + Otherwise the command is sent to fvwm to execute. + +@@ -85,7 +85,7 @@ has been set. This works only for the + commands. This is useful for applications which want to use the root + Pixmap on the background to simulate transparency (for example, + Eterm and Aterm use this method). This option should also be used for the +-RootTransparent colorset option (see the FvwmTheme man page). ++RootTransparent colorset option. + Note: with a colorset background this command may add a lot of memory + to the X server. For example, this adds the pixmap width times height bytes + with a TiledPixmap +--- a/modules/FvwmButtons/FvwmButtons.1.in ++++ b/modules/FvwmButtons/FvwmButtons.1.in +@@ -113,7 +113,7 @@ This is the default. + + .IP "*FvwmButtons: Colorset \fIcolorset\fP" + Tells the module to use colorset \fIcolorset\fP for the window +-background. Refer to the FvwmTheme man page ++background. Refer to the fvwm man page + for details about colorsets. + + .IP "*FvwmButtons: ActiveColorset \fIcolorset\fP" +@@ -299,8 +299,8 @@ is not applied to the swallowed module. + in the module configuration. If the swallowed module has a + transparent colorset background, then the FvwmButtons background + (and not the button colorset) is seen by transparency of the +-background of the swallowed module. Refer to the man page of the +-FvwmTheme module for details about colorsets. ++background of the swallowed module. Refer to the fvwm man page ++for details about colorsets. + + .IP "ActiveColorset \fIcolorset\fP" + Use colorset \fIcolorset\fP for the background color/image and/or title +--- a/modules/FvwmForm/FvwmForm.1.in ++++ b/modules/FvwmForm/FvwmForm.1.in +@@ -277,7 +277,7 @@ distance from the right (bottom) of the + If this option is omitted, FvwmForm starts at the center of the screen. + .TP 4 + .B *FvwmForm: Colorset \fIn\fP +-Tells the module to use colorset \fIn\fP. See FvwmTheme. ++Tells the module to use colorset \fIn\fP. + .TP 4 + .B *FvwmForm: Back \fIcolor\fP + Specifies the background color of the FvwmForm window +@@ -292,7 +292,7 @@ Switches off the Colorset option. + See DEFAULTS. + .TP 4 + .B *FvwmForm: ItemColorset \fIn\fP +-Tells the module to use colorset \fIn\fP for items. See FvwmTheme. ++Tells the module to use colorset \fIn\fP for items. + .TP 4 + .B *FvwmForm: ItemBack \fIcolor\fP + Specifies the background color for the text input windows, and +--- a/modules/FvwmIconMan/FvwmIconMan.1.in ++++ b/modules/FvwmIconMan/FvwmIconMan.1.in +@@ -183,7 +183,7 @@ specified height is 0, then the button h + size. X and Y coordinates are ignored. + + .IP "*FvwmIconMan: [id] Colorset \fIcolorset\fP" +-The default colorset used. Overrides background and foreground. See FvwmTheme. ++The default colorset used. Overrides background and foreground. + + .IP "*FvwmIconMan: [id] DrawIcons \fIvalue\fP" + If your version of fvwm is capable of using mini icons, then this option +@@ -198,7 +198,7 @@ both selected, and have the keyboard foc + + .IP "*FvwmIconMan: [id] FocusAndSelectColorset \fIcolorset\fP" + Works like focusandselectbutton but uses colorsets instead. The style setting can +-still only be applied with focusandselectbutton. See FvwmTheme. ++still only be applied with focusandselectbutton. + + .IP "*FvwmIconMan: [id] FocusButton \fIstyle\fP [\fIforecolor\fP \fIbackcolor\fP]" + Same as the plainbutton option, but specifies the look of buttons whose +@@ -206,7 +206,7 @@ windows have the keyboard focus. + + .IP "*FvwmIconMan: [id] FocusColorset \fIcolorset\fP" + Works like focusbutton but uses colorsets instead. The style setting can still +-only be applied with focusbutton. See FvwmTheme. ++only be applied with focusbutton. + + .IP "*FvwmIconMan: [id] FollowFocus \fIboolean\fP" + If \fItrue\fP, then the button appearance reflects +@@ -240,11 +240,11 @@ windows are iconified. + + .IP "*FvwmIconMan: [id] IconAndSelectColorset \fIcolorset\fP" + Works like IconAndSelectButton but uses colorsets instead. The style setting +-can still only be applied with iconbutton. See FvwmTheme. ++can still only be applied with iconbutton. + + .IP "*FvwmIconMan: [id] IconColorset \fIcolorset\fP" + Works like iconbutton but uses colorsets instead. The style setting can still +-only be applied with iconbutton. See FvwmTheme. ++only be applied with iconbutton. + + .IP "*FvwmIconMan: [id] ManagerGeometry \fIgeometry\fP" + Specifies the initial geometry of the manager, in units of buttons. If +@@ -291,7 +291,7 @@ option is ignored, but must still be set + + .IP "*FvwmIconMan: [id] PlainColorset \fIcolorset\fP" + Works like plainbutton but uses colorsets instead. The style setting can +-still only be applied with plainbutton. See FvwmTheme. ++still only be applied with plainbutton. + + .IP "*FvwmIconMan: [id] ReliefThickness \fInum\fP" + \fInum\fP is an integer specifying the number of pixels thick +@@ -332,7 +332,7 @@ mouse is over them. + + .IP "*FvwmIconMan: [id] SelectColorset \fIcolorset\fP" + Works like selectbutton but uses colorsets instead. The style setting can +-still only be applied with selectbutton. See FvwmTheme. ++still only be applied with selectbutton. + + .IP "*FvwmIconMan: [id] Shape \fIboolean\fP" + If \fITrue\fP, then use make the window shaped. Probably only useful if you +@@ -448,7 +448,6 @@ font. + + .IP "*FvwmIconMan: [id] TipsColorset \fIcolorset\fP" + Specifies the colors for tips window. Default is colorset 0. +-See FvwmTheme. + + .IP "*FvwmIconMan: [id] TipsFormat \fIformatstring\fP" + Similar to the Format option but for the tips window. The default is +--- a/modules/FvwmIdent/FvwmIdent.1.in ++++ b/modules/FvwmIdent/FvwmIdent.1.in +@@ -54,7 +54,7 @@ FvwmIdent reads the same .fvwm2rc file a + and looks for lines as listed below: + + .IP "*FvwmIdent: Colorset \fIn\fP" +-Tells the module to use colorset \fIn\fP. See FvwmTheme. ++Tells the module to use colorset \fIn\fP. + + .IP "*FvwmIdent: Fore \fIcolor\fP" + Tells the module to use \fIcolor\fP instead of black for text. Switches off the +--- a/modules/FvwmPager/FvwmPager.1.in ++++ b/modules/FvwmPager/FvwmPager.1.in +@@ -380,25 +380,21 @@ the string to display in the balloons. T + .IP "*FvwmPager: Colorset \fIdesk colorset\fP" + Tells the module to use colorset \fIcolorset\fP for \fIdesk\fP. If + you use an asterisk '*' in place of \fIdesk\fP, the colorset is +-used on all desks. Please refer to the man page of the FvwmTheme +-module for details about colorsets. ++used on all desks. + + .IP "*FvwmPager: BalloonColorset \fIdesk colorset\fP" + Tells the module to use colorset \fIcolorset\fP for balloons on + \fIdesk\fP. If you use an asterisk '*' in place of \fIdesk\fP, the +-colorset is used on all desks. Please refer to the man page of the +-FvwmTheme module for details about colorsets. ++colorset is used on all desks. + + .IP "*FvwmPager: HilightColorset \fIdesk colorset\fP" + Tells the module to use colorset \fIcolorset\fP for hilighting on + \fIdesk\fP. If you use an asterisk '*' in place of \fIdesk\fP, the +-colorset is used on all desks. Please refer to the man page of the +-FvwmTheme module for details about colorsets. ++colorset is used on all desks. + + .IP "*FvwmPager: WindowColorsets \fIcolorset activecolorset\fP" +-Uses colorsets in the same way as *FvwmPager: WindowColors. Please +-refer to the man page of the FvwmTheme module for details about +-colorsets. The shadow and hilight colors of the colorset are only ++Uses colorsets in the same way as *FvwmPager: WindowColors. ++The shadow and hilight colors of the colorset are only + used for the window borders if the *FvwmPager: Window3DBorders is + specified too. + +--- a/modules/FvwmScript/FvwmScript.1.in ++++ b/modules/FvwmScript/FvwmScript.1.in +@@ -84,8 +84,6 @@ command or in the script with the Shadow + + .IP "*FvwmScript: DefaultColorset \fIcolorset\fP" + Tells the module to use colorset \fIcolorset\fP as the default colorset. +-Refer to the FvwmTheme man page for details about +-colorsets. + + .SH ANATOMY OF A SCRIPT + FvwmScript uses a particular programming language. A script is composed of +@@ -813,7 +811,7 @@ that the script has destroyed + + FvwmScript-Buttons is a buttons panel which can replace FvwmButtons (this + script supports popup menus and requires xload, xclock, FvwmPager, TkDesk). +-FvwmScript-Colorset allows you to edit your colorset (see FvwmTheme). ++FvwmScript-Colorset allows you to edit your colorset. + FvwmScript-Date allows you to set date and time. + FvwmScript-FileBrowser is a file browser used by the other scripts. + FvwmScript-Find is an elementary front-end to find. diff -Nru fvwm-2.6.7/debian/patches/menu-directory.patch fvwm-2.6.7/debian/patches/menu-directory.patch --- fvwm-2.6.7/debian/patches/menu-directory.patch 2016-11-17 03:01:47.000000000 +0000 +++ fvwm-2.6.7/debian/patches/menu-directory.patch 2016-12-28 23:20:42.000000000 +0000 @@ -1,5 +1,8 @@ Description: Change escape function. Use escape_file_name instead of escape_fvwm_name since $name is a filename. +Author: Unknown +Forwarded: not-needed +Last-Updated: 2016-12-10 --- a/bin/fvwm-menu-directory.in +++ b/bin/fvwm-menu-directory.in @@ -201,7 +201,7 @@ diff -Nru fvwm-2.6.7/debian/patches/reproducible-build.patch fvwm-2.6.7/debian/patches/reproducible-build.patch --- fvwm-2.6.7/debian/patches/reproducible-build.patch 2016-11-17 02:24:28.000000000 +0000 +++ fvwm-2.6.7/debian/patches/reproducible-build.patch 2016-12-28 23:21:29.000000000 +0000 @@ -1,6 +1,7 @@ Description: Reproducible Builds - Allow fvwm to be built reproducibly. (Closes #831646) + Allow fvwm to be built reproducibly. Author: Chris Lamb +Debian-Bug: https://bugs.debian.org/831646 Last-Update: 2016-07-18 --- a/bin/fvwm-bug.in +++ b/bin/fvwm-bug.in diff -Nru fvwm-2.6.7/debian/patches/series fvwm-2.6.7/debian/patches/series --- fvwm-2.6.7/debian/patches/series 2016-12-08 16:18:09.000000000 +0000 +++ fvwm-2.6.7/debian/patches/series 2017-01-16 17:52:00.000000000 +0000 @@ -1,9 +1,14 @@ +default-config.patch +manpage-remove-old-modules.patch +FvwmIconMan-fix-size-hints-warnings.patch +improve-window-size-hints.patch manpage-ClickTime.patch fvwm-perllib.patch fix-makefile-paths.patch spelling-errors.patch fix-TabCom.patch reproducible-build.patch +fvwm-menu-desktop-error-handling.patch menu-directory.patch fix-hardcoded-xterm.patch enable-more-mouse-buttons.patch diff -Nru fvwm-2.6.7/debian/patches/spelling-errors.patch fvwm-2.6.7/debian/patches/spelling-errors.patch --- fvwm-2.6.7/debian/patches/spelling-errors.patch 2016-12-06 05:29:57.000000000 +0000 +++ fvwm-2.6.7/debian/patches/spelling-errors.patch 2016-12-28 23:21:52.000000000 +0000 @@ -1,6 +1,7 @@ Description: Spelling Errors. Fixes spelling errors found by lintian. Author: Jaimos Skriletz +Forwarded: http://www.mail-archive.com/fvwm-workers@fvwm.org/msg04561.html Last-Update: 2016-12-05 --- a/modules/FvwmCommand/FvwmCommand.c +++ b/modules/FvwmCommand/FvwmCommand.c