From 62f935d36ab117f15684f78efc9536e7b37d3414 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Sat, 23 May 2020 01:29:43 +0100 Subject: [PATCH 1/3] configure.ac: remove references to FTP In FVWM2, the release tarballs used to be stored on a public-facing FTP server. This hasn't been true in years, since the switch to Github. --- configure.ac | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index 717ff1c52..d6ee28098 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,6 @@ RELDATENUM="2016-11-06" # constant variable settings FVWMNAMELONG="F? Virtual Window Manager" FVWMHOMEPAGE="http://fvwm.org/" -FVWMFTP="ftp.fvwm.org" -FVWMFTPDIR="/pub/ftp" -FVWMALTFTP="metalab.unc.edu" -FVWMALTFTPDIR="/pub/Linux/X11/window-managers/" FVWMLIST="fvwm@fvwm.org" FVWMWORKERSLIST="fvwm-workers@fvwm.org" FVWMWORKERSLISTLONG="fvwm workers list " @@ -51,10 +47,6 @@ AC_SUBST(RELDATESHORT) AC_SUBST(RELDATENUM) AC_SUBST(FVWMNAMELONG) AC_SUBST(FVWMHOMEPAGE) -AC_SUBST(FVWMFTP) -AC_SUBST(FVWMFTPDIR) -AC_SUBST(FVWMALTFTP) -AC_SUBST(FVWMALTFTPDIR) AC_SUBST(FVWMLIST) AC_SUBST(FVWMWORKERSLIST) AC_SUBST(FVWMWORKERSLISTLONG) From b940d145228cd2f1274e57135374edf63f10603d Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Sat, 23 May 2020 01:30:50 +0100 Subject: [PATCH 2/3] version: output fvwm3 When referring to version information, make it clearer this is fvwm3. --- configure.ac | 2 +- fvwm/fvwm3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d6ee28098..d09a96d69 100644 --- a/configure.ac +++ b/configure.ac @@ -1708,7 +1708,7 @@ eval my_localedir="`eval echo ${LOCALEDIR}`" test x"$USE_NLS" = xno && my_localedir="(Not installed) $my_localdir" echo " -Fvwm Configuration: +Fvwm3 Configuration: Version: $VERSION$VERSIONINFO diff --git a/fvwm/fvwm3.c b/fvwm/fvwm3.c index 42e5ca87d..61eeeba4c 100644 --- a/fvwm/fvwm3.c +++ b/fvwm/fvwm3.c @@ -1261,12 +1261,12 @@ static void setVersionInfo(void) int support_len; /* Set version information string */ - sprintf(version_str, "fvwm %s%s compiled on %s at %s", + sprintf(version_str, "fvwm3 %s%s compiled on %s at %s", VERSION, VERSIONINFO, __DATE__, __TIME__); Fvwm_VersionInfo = fxstrdup(version_str); sprintf(license_str, - "fvwm comes with NO WARRANTY, to the extent permitted by law. " + "fvwm3 comes with NO WARRANTY, to the extent permitted by law. " "You may\nredistribute copies of fvwm under " "the terms of the GNU General Public License.\n" "For more information about these matters, see the file " From cd8b9b5b41e59f1e4314c2211f42e019af93969e Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Sat, 23 May 2020 01:33:30 +0100 Subject: [PATCH 3/3] doc: remove and blacklist docbook *.ent Entity files as used by docbook are transient and as such don't need to be tracked in git. --- .gitignore | 1 + doc/fvwm3.ent | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 doc/fvwm3.ent diff --git a/.gitignore b/.gitignore index 4ae91dcf4..a8485f308 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ configure core doc/footer.html doc/fvwm.ent +doc/fvwm3.ent etc/ fvwm/fvwm fvwm/fvwm3 diff --git a/doc/fvwm3.ent b/doc/fvwm3.ent deleted file mode 100644 index b14cb08ec..000000000 --- a/doc/fvwm3.ent +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -FIXME">