diff --git a/ChangeLog b/ChangeLog index 296886d0..f4cba599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ === rmw ChangeLog === +2021-03-01 + + * rmw v0.7.06 released + 2021-02-25 * When using -s,--select, the number of lines the terminal has will diff --git a/README.md b/README.md index 1725a3f9..8c661f53 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -# rmw-0.7.06-dev - -This README applies to the current development version and some -information it contains may not apply to the [last -release](https://github.com/theimpossibleastronaut/rmw/releases/tag/v0.7.05). +# rmw-0.7.06 ## Description @@ -166,7 +162,7 @@ configuration file). To enable, use a value greater than '0' (Example: If '45' is specified, rmw will permanently delete files that have been in the waste (or trash) for more than 45 days. -The value of 'purge_after' can be temporarily overriden by using -g +The value of 'purge_after' can be temporarily overridden by using -g [N_DAYS] or --purge[=NDAYS]. The time of the last automatic purge check is stored in `purge-time`, diff --git a/ReleaseNotes b/ReleaseNotes index 8becfe79..014858bc 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,20 +1,25 @@ === RMW Release Notes === - * Fix for compiling with gcc 10 (Thanks to muralikodali and GazL) +v0.7.06 - * rmw will now refuse to move a waste folder or a file that resides - within a waste folder (This feature was in place before, but at some - point Andy accidentally removed the code). - - * Feature removed: restore with '-z' using only the basename from any - directory. User must be in a Trash directory or specify the full path - (e.g. rmw -z ~/.local/share/Trash/foo.bar). For details, see issue - #272. - - * Added '-R' option, changed '--recurse' option to '--recursive', - added recursive (rm compatibility) options in --help output, fixed - message shown when using '-r, --recursive' - - * Fixed broken purge test - - See https://github.com/theimpossibleastronaut/rmw/blob/v0.7.05/ChangeLog for more details. + * When using -s,--select, the number of lines the terminal has will + be checked. The number of items in the list will be based on that; if + it doesn't meet the minumum requirement, rmw will exit. + + * Allow optional argument to -g/--purge that can override the value of + 'purge_after' in the configuration file (-g[N_DAYS], --purge[=N_DAYS]). + + * bugfix: restore broken symbolic links instead of giving a "file not + found" message (issue #292) + + * Improved handling of file with leading hyphens + + * When an invalid option is given, usage output no longer displays + + * You can view how many days remain until a file is purged by using + -vv (with -fg). + + * If lstat() encounters and error, also display the filename/directory it + was attempting to access. + + * add '-m, --most-recent-list' option: list most recently rmw'ed files diff --git a/configure b/configure index 264443f9..abe83d30 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rmw 0.7.06-dev. +# Generated by GNU Autoconf 2.69 for rmw 0.7.06. # # Report bugs to . # @@ -581,8 +581,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rmw' PACKAGE_TARNAME='rmw' -PACKAGE_VERSION='0.7.06-dev' -PACKAGE_STRING='rmw 0.7.06-dev' +PACKAGE_VERSION='0.7.06' +PACKAGE_STRING='rmw 0.7.06' PACKAGE_BUGREPORT='https://github.com/theimpossibleastronaut/rmw/issues' PACKAGE_URL='https://remove-to-waste.info/' @@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rmw 0.7.06-dev to adapt to many kinds of systems. +\`configure' configures rmw 0.7.06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1394,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rmw 0.7.06-dev:";; + short | recursive ) echo "Configuration of rmw 0.7.06:";; esac cat <<\_ACEOF @@ -1512,7 +1512,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rmw configure 0.7.06-dev +rmw configure 0.7.06 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1935,7 +1935,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rmw $as_me 0.7.06-dev, which was +It was created by rmw $as_me 0.7.06, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2799,7 +2799,7 @@ fi # Define the identity of the package. PACKAGE='rmw' - VERSION='0.7.06-dev' + VERSION='0.7.06' cat >>confdefs.h <<_ACEOF @@ -9913,7 +9913,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rmw $as_me 0.7.06-dev, which was +This file was extended by rmw $as_me 0.7.06, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9980,7 +9980,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rmw config.status 0.7.06-dev +rmw config.status 0.7.06 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c398e30c..5c6d096f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rmw], [0.7.06-dev], [https://github.com/theimpossibleastronaut/rmw/issues],,[https://remove-to-waste.info/]) +AC_INIT([rmw], [0.7.06], [https://github.com/theimpossibleastronaut/rmw/issues],,[https://remove-to-waste.info/]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall subdir-objects foreign no-dependencies]) AM_SILENT_RULES([yes]) diff --git a/man/rmw.1 b/man/rmw.1 index a8db7a54..f71b01e9 100644 --- a/man/rmw.1 +++ b/man/rmw.1 @@ -1,4 +1,4 @@ -.TH RMW "1" "June 2020" +.TH RMW "1" "March 2021" .SH NAME rmw - remove files, safely .SH SYNOPSIS @@ -41,7 +41,7 @@ configuration file). To enable, use a value greater than '0' (Example: If '45' is specified, rmw will permanently delete files that have been in the waste (or trash) for more than 45 days. -The value of 'purge_after' can be temporarily overriden by using -g +The value of 'purge_after' can be temporarily overridden by using -g [N_DAYS] or --purge[=NDAYS] (Examples: -g90, --purge=90). The time of the last automatic purge check is stored in `purge-time`, diff --git a/packaging/Slackbuild/rmw/rmw.SlackBuild b/packaging/Slackbuild/rmw/rmw.SlackBuild index 3bccaeea..81fd0b5f 100755 --- a/packaging/Slackbuild/rmw/rmw.SlackBuild +++ b/packaging/Slackbuild/rmw/rmw.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for rmw # -# Copyright 2019-2020 / Andy Alt / United States +# Copyright 2019-2021 / Andy Alt / United States # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rmw -VERSION=${VERSION:-0.7.05} +VERSION=${VERSION:-0.7.06} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/packaging/Slackbuild/rmw/rmw.info b/packaging/Slackbuild/rmw/rmw.info index 241e3d78..778de6ab 100644 --- a/packaging/Slackbuild/rmw/rmw.info +++ b/packaging/Slackbuild/rmw/rmw.info @@ -1,8 +1,8 @@ PRGNAM="rmw" -VERSION="0.7.05" +VERSION="0.7.06" HOMEPAGE="https://remove-to-waste.info/" -DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.05/rmw-0.7.05.tar.gz" -MD5SUM="adaa3ce4f4e10203e772d5d80c4a0b5a" +DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.06/rmw-0.7.06.tar.gz" +MD5SUM="9b5e0fcda2e32b1886efd50030e51a5e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/packaging/debian/changelog b/packaging/debian/changelog index ca4268a9..2f291521 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,5 @@ -rmw (0.7.05) stable; urgency=low +rmw (0.7.06-1) stable; urgency=medium - -- Andy Alt Fri, 10 Aug 2019 14:45:58 -0500 + * New upstream release + + -- Andy Alt Mon, 01 Mar 2021 09:39:02 -0600 diff --git a/packaging/debian/control b/packaging/debian/control index 70352b0d..636a1bf0 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -12,6 +12,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: Safe-remove utility for the command line rmw (ReMove to Waste) is a safe-remove utility for the command line. Its goal is to conform to the FreeDesktop.org Trash specification and - therefore be compatible with KDE, GNOME, XFCE, and others. Desktop + therefore be compatible with KDE, GNOME, Xfce, and others. Desktop integration is optional however, and by default, rmw will only use a waste folder separated from your desktop trash. diff --git a/packaging/debian/copyright b/packaging/debian/copyright index 4b193523..4b5beb67 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: rmw Source: Files: * -Copyright: 2012-2019 Andy Alt +Copyright: 2012-2021 Andy Alt License: GPL-3.0+ Files: debian/* -Copyright: 2019 Andy Alt +Copyright: 2021 Andy Alt License: GPL-3.0+ License: GPL-3.0+ diff --git a/packaging/debian/source/format b/packaging/debian/source/format index 89ae9db8..163aaf8d 100644 --- a/packaging/debian/source/format +++ b/packaging/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/packaging/release-checklist.txt b/packaging/release-checklist.txt index d832ce96..937bfefb 100644 --- a/packaging/release-checklist.txt +++ b/packaging/release-checklist.txt @@ -20,7 +20,6 @@ Add release date to ChangeLog Change Month and Year in man/man.1 -make check make distcheck make dist @@ -34,7 +33,14 @@ Make Debian package tar xf rmw-.tar.gz cd rmw- cp -a packaging/debian . + dch -v -1 + cp debian/changelog /packaging/debian dpkg-buildpackage -us -uc -tc (The resulting package will be one level up) Check the Debian package lintian -i -I --show-overrides gentoo_0.9.12-1_i386.changes + +Get the md5sum and sha256sum of the source tarball and Debian package + +Publish the release + paste in the ReleaseNotes file and the 'sums of the two files listed above.