release v0.8.1

theimpossibleastronaut · Jan 26, 2022 · 83112d3 · 83112d3
1 parent 4ed49f0
commit 83112d3
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 54 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,20 +1,25 @@
 === rmw ChangeLog ===
 
+2022-01-25
+
+  * rmw v0.8.1 released
+
 2022-01-24
 
   * the curses menu library is now much more likely to be found on *BSD
   systems
-  * bugfix:if a waste folder listed in the config file has a trailing
-  slash, rmw will no longer report that the file is not in a waste
-  folder.
+
+  * bugfix: when attempting to restore a file from a waste folder
+  listed in the config file that has a trailing slash, rmw will no
+  longer report that the file is not in a waste folder.
 
 2022-01-07
 
-  * curses is no longer a requirement (configure -Dwithout-curses=true)
+  - curses is no longer a requirement (configure -Dwithout-curses=true)
 
 2021-12-30
 
-  * removed '-e' command line option ('--empty' option not affected)
+  - removed '-e' command line option ('--empty' option not affected)
 
 2021-06-28
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# rmw-0.8.0.555
+# rmw-0.8.1
 ## Description
 
 rmw (ReMove to Waste) is a safe-remove utility for the command line. It
@@ -241,8 +241,6 @@ page on the website.
 
 ## Installation
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/rmw.svg)](https://repology.org/project/rmw/versions)
-
 rmw is available in the [homebrew and
 linuxbrew](https://github.com/Homebrew/) repositories; or there may may
 be a binary package available for your OS. You can view a list at

diff --git a/ReleaseNotes b/ReleaseNotes
@@ -1,30 +1,14 @@
 === RMW Release Notes ===
 
-v0.8.0
+v0.8.1
 
-  * The config option 'purge_after' has been deprecated and replaced
-  with 'expire_age' ('purge_after' will still be accepted, but the user
-  will be given a deprecation warning).
+  * the curses menu library is now much more likely to be found on *BSD
+  systems
 
-  * When '-u' is used, the mrl file will no longer be removed, but
-  emptied instead. If a user gives the '-u' option when the mrl file is
-  empty, they will get a friendlier message stating that there are no
-  items in the list (instead of an error message about the file not
-  being found).
+  * bugfix: when attempting to restore a file from a waste folder
+  listed in the config file that has a trailing slash, rmw will no
+  longer report that the file is not in a waste folder.
 
-  * fixed handling of dot dirs ('.' and '..'). Instead of giving an
-  error message and quitting, rmw will print a message stating that
-  they'll be skipped.
+  - curses is no longer a requirement (configure -Dwithout-curses=true)
 
-  * The environmental variable RMWTEST_HOME has been replaced with
-  RMW_FAKE_HOME (Trying to use RMWTEST_HOME will give a deprecation
-  warning and still work).
-
-  * Expanded the man page and updated the README (improved documentation)
-
-  * Replaced autotools build system with meson
-
-  * rmw now uses the canfigger library for parsing the configuration file.
-
-  - disabled a restore test that failed when 'make check' is run with
-  superuser privileges
+  - removed '-e' command line option ('--empty' option not affected)
diff --git a/man/rmw.1 b/man/rmw.1
@@ -1,4 +1,4 @@
-.TH RMW "1" "May 2021" "rmw 0.8.0" "User Commands"
+.TH RMW "1" "Jan 2022" "rmw 0.8.1" "User Commands"
 .SH NAME
 rmw \- safe-remove utility for the command line
 .SH SYNOPSIS
@@ -215,7 +215,7 @@ The RMW team: see AUTHORS.md
 .SH REPORTING BUGS
 Report bugs to <https://github.com/theimpossibleastronaut/rmw/issues>.
 .SH "COPYRIGHT"
-Copyright \(co 2012-2021 Andy Alt
+Copyright \(co 2012-2022 Andy Alt
 
 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
 .br

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'rmw',
   'c',
-  version: '0.8.0.555',
+  version: '0.8.1',
   meson_version : '>= 0.56.0',
   default_options: ['warning_level=3']
   )

diff --git a/packaging/Slackbuild/rmw/README.Slackware b/packaging/Slackbuild/rmw/README.Slackware
@@ -1,4 +1,4 @@
-# rmw-0.8.0
+# rmw-0.8.1
 ## Description
 
 rmw (ReMove to Waste) is a safe-remove utility for the command line. It
@@ -74,7 +74,7 @@ OPTIONS
               you would like to require it, add 'force_required' to your config
               file.
 
-       -e, --empty
+           --empty
               completely empty (purge) all waste directories
 
        -r, -R, --recursive
@@ -241,8 +241,6 @@ page on the website.
 
 ## Installation
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/rmw.svg)](https://repology.org/project/rmw/versions)
-
 rmw is available in the [homebrew and
 linuxbrew](https://github.com/Homebrew/) repositories; or there may may
 be a binary package available for your OS. You can view a list at
@@ -253,7 +251,7 @@ available.
 AppImages and maintainer-created amd64 Debian packages are available in
 the [releases section][releases-url].
 
-[releases-url]: https://github.com/theimpossibleastronaut/rmw/releases]
+[releases-url]: https://github.com/theimpossibleastronaut/rmw/releases
 
 ## Installing from source
 
@@ -279,7 +277,8 @@ run 'configure' from any directory you like.)
     ninja
 ```
 
-Use `meson configure` in the build dir to view available options.
+Use `meson configure` in the build dir to view or change available
+options.
 
 #### Installing without superuser privileges
 
@@ -294,7 +293,7 @@ or while in the build dir
 
 To install:
 
-    ninja install
+    meson install
 
 In the example above, the rmw binary will be installed to
 `$HOME/.local/bin` and documentation to `$HOME/.local/doc`.
@@ -315,6 +314,7 @@ brew](https://formulae.brew.sh/formula/rmw).
 
     ninja uninstall (uninstalls the program if installed with 'ninja install`)
 
-Note that the uninstall does not remove any language files that were installed. To remove them:
+Note that if using Meson version < 0.60.0, uninstall does not remove
+any language files that were installed. To remove them:
 
     sh uninstall_langs.sh
diff --git a/packaging/Slackbuild/rmw/rmw.SlackBuild b/packaging/Slackbuild/rmw/rmw.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for rmw
 #
-# Copyright 2021 / Andy Alt / Minnesota, USA
+# Copyright 2021-2022 / Andy Alt / Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=rmw
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 

diff --git a/packaging/Slackbuild/rmw/rmw.info b/packaging/Slackbuild/rmw/rmw.info
@@ -1,7 +1,7 @@
 PRGNAM="rmw"
-VERSION="0.8.0"
+VERSION="0.8.1"
 HOMEPAGE="https://remove-to-waste.info/"
-DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.8.0/rmw-0.8.0-2.tar.gz"
+DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.8.1/rmw-0.8.1.tar.gz"
 MD5SUM="96fb309442916eb040593f9ebf571bad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,5 +1,5 @@
-rmw (0.8.0) stable; urgency=medium
+rmw (0.8.1) stable; urgency=medium
 
   * New upstream release
 
- -- Andy Alt <andy400-dev@yahoo.com>  Thu, 28 Jun 2021 07:25:14 +0000
+ -- Andy Alt <andy400-dev@yahoo.com>  Wed, 26 Jan 2022 05:50:56 +0000
diff --git a/packaging/file_id.diz b/packaging/file_id.diz
@@ -1,4 +1,4 @@
-rmw v0.8.0
+rmw v0.8.1
 ReMove to Waste is a safe-remove utility for
 the command line. It can move and restore
 files to and from directories specified in a

diff --git a/packaging/release-checklist.txt b/packaging/release-checklist.txt
@@ -30,7 +30,9 @@ Ex:
 Change Month and Year in man/rmw.1
 
 cd ..
-ninja dist
+
+commit changes (NOTE: ninja dist only packages *committed* changes)
+meson dist --include-subprojects
 
 Remove packaging directory from the resulting xz file
 
@@ -43,8 +45,6 @@ Remove packaging directory from the resulting xz file
 
 sha256 the tarball and paste into packaging/Slackbuild/rmw/rmw.info
 
-
-
 Make the AppImage
 
   To pass the test on https://github.com/AppImage/appimage.github.io, the image must be

diff --git a/test/test_restore.sh b/test/test_restore.sh
@@ -144,7 +144,9 @@ if test -d /mnt/e2f95a91; then
   output=$(grep Path /home/andy/src/.Trash-1000/info/$test_file.trashinfo)
   echo $SEPARATOR
   # There should be no leading '/' in the filename.
-  test "$output" = "Path=rmw-project/rmw/builddir/test/rmw-tests-home/test_restore.sh_dir/media_root_test"
+  path_expected=$(echo ${MESON_BUILD_ROOT} | sed -e "s/\/home\/andy\/src\///g")
+  echo $path_expected
+  test "$output" = "Path=${path_expected}/test/rmw-tests-home/test_restore.sh_dir/media_root_test"
   echo $SEPARATOR
   output=$($BIN_DIR/rmw -uvv -c /home/andy/.config/rmwrc | grep media_root_test)
   echo $SEPARATOR