From cdcc38d2c7ac3ebae854d18a5f74e52502e12e97 Mon Sep 17 00:00:00 2001 From: ankry Date: Fri, 17 Sep 2004 01:28:05 +0000 Subject: [PATCH] fvwm -> fvwm1 Changed files: fvwm-man.patch -> 1.1 fvwm-system.fvwmrc -> 1.7 fvwm-xsession.desktop -> 1.4 fvwm.desktop -> 1.4 --- fvwm-man.patch | 45 +++++++++++++++++++++++++++++++++++++++++++ fvwm-system.fvwmrc | 8 ++++---- fvwm-xsession.desktop | 4 ++-- fvwm.desktop | 4 ++-- 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 fvwm-man.patch diff --git a/fvwm-man.patch b/fvwm-man.patch new file mode 100644 index 0000000..68194c0 --- /dev/null +++ b/fvwm-man.patch @@ -0,0 +1,45 @@ +--- fvwm-1.24r/fvwm/fvwm.man~ 2004-09-17 03:08:51.000000000 +0200 ++++ fvwm-1.24r/fvwm/fvwm.man 2004-09-17 03:08:51.000000000 +0200 +@@ -17,12 +17,12 @@ + .TH FVWM 1.2 "Jan 28, 1994" + .UC + .SH NAME +-fvwm \- F(?) Virtual Window Manager for X11 ++fvwm1 \- F(?) Virtual Window Manager for X11 + .SH SYNOPSIS +-\fBfvwm\fP [ \fIoptions\fP ] ++\fBfvwm1\fP [ \fIoptions\fP ] + .SH DESCRIPTION +-\fIFvwm\fP is a window manager for X11. It is a derivative of \fItwm\fP, +-redesigned ++\fIFvwm\fP (binary is named \fIfvwm1\fP to avoid conflict with newer version ++of fvwm) is a window manager for X11. It is a derivative of \fItwm\fP, redesigned + to minimize memory consumption, provide a 3-D look to window frames, and + provide a simple virtual desktop. Memory consumption is estimated at about + one-half to one-third the memory consumption of \fItwm\fP, due primarily to a +@@ -383,20 +383,20 @@ + define M4. + + .SH OPTIONS +-These are the command line options that are recoginzed by \fIfvwm\fP: ++These are the command line options that are recoginzed by \fIfvwm1\fP: + .IP "\fB-f\fP \fIconfig_file\fP" +-Causes \fIfvwm\fP to use \fIconfig_file\fP in the user's home directory ++Causes \fIfvwm1\fP to use \fIconfig_file\fP in the user's home directory + instead of .fvwmrc as the window manager configuration file. + .IP "\fB-debug\fP" + Puts X transactions in synchronous mode, which dramatically slows things +-down, but guarantees that \fIfvwm\fP's internal error messages are correct. ++down, but guarantees that \fIfvwm1\fP's internal error messages are correct. + .IP "\fB-d\fP \fIdisplayname\fP" + Manage the display called "displayname" instead of the name obtained from + the environment variable $DISPLAY. + .IP "\fB-s\fP" +-On a multi-screen display, run \fIfvwm\fP only on the screen named in ++On a multi-screen display, run \fIfvwm1\fP only on the screen named in + the $DISPLAY environment variable or provided through the -d +-option. Normally, \fIfvwm\fP will attempt to start up on all screens ++option. Normally, \fIfvwm1\fP will attempt to start up on all screens + of a multi-screen display. + .IP "\fB-version\fP" + Print the version of \fIfvwm\fP to stderr. diff --git a/fvwm-system.fvwmrc b/fvwm-system.fvwmrc index 6e942c4..2772060 100644 --- a/fvwm-system.fvwmrc +++ b/fvwm-system.fvwmrc @@ -185,7 +185,7 @@ DeskTopScale 32 # Module path and paths to the icons # # ModulePath is a colon-separated list, just like regular unix PATH -ModulePath /usr/X11R6/lib/X11/fvwm/ +ModulePath /usr/lib/fvwm1/ PixmapPath /usr/share/pixmaps/:/usr/share/pixmaps/mini/:/usr/X11R6/include/X11/pixmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/ IconPath /usr/share/pixmaps/:/usr/share/pixmaps/mini/:/usr/X11R6/include/X11/bitmaps/:/usr/X11R6/share/icons/:/usr/X11R6/share/icons/mini/:/usr/share/icons/:/usr/share/icons/mini/ @@ -241,7 +241,7 @@ ButtonStyle 4 50x50 Function "InitFunction" # Module "I" FvwmBanner -# Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm & +# Exec "I" xpmroot /usr/share/pixmaps/fvwm.xpm & Exec "I" xsetroot -solid "#266294" Module "I" GoodStuff # Exec "I" exec xterm -geometry 80x64+0+0 & @@ -325,7 +325,7 @@ EndFunction Popup "Quit-Verify" Title "Really Quit Fvwm?" Quit "Yes, Really Quit" - Restart "Restart Fvwm" fvwm + Restart "Restart Fvwm" fvwm1 Restart "Start twm" twm Restart "Start tvtwm" tvtwm Restart "Start mwm" mwm @@ -404,7 +404,7 @@ Popup "Main Menu" Nop "" Popup "Modules" Module-Popup Nop "" - Restart "Restart Fvwm" fvwm + Restart "Restart Fvwm" fvwm1 Popup "Exit Fvwm" Quit-Verify EndPopup diff --git a/fvwm-xsession.desktop b/fvwm-xsession.desktop index ffbfb0f..eb96659 100644 --- a/fvwm-xsession.desktop +++ b/fvwm-xsession.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=XSession -Exec=fvwm -TryExec=fvwm +Exec=fvwm1 +TryExec=fvwm1 Name=FVWM Comment=A powerful ICCCM-compliant multiple virtual desktop window manager Comment[nl]=Een krachtige ICCCM-compliant window manager met meerdere bureaubladen diff --git a/fvwm.desktop b/fvwm.desktop index 71ed297..49ff9f9 100644 --- a/fvwm.desktop +++ b/fvwm.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=Fvwm -Exec=fvwm -TryExec=fvwm +Exec=fvwm1 +TryExec=fvwm1 [Window Manager] SessionManaged=false -- 2.43.0