From f4e26ef34dec10b8cc2df7161c7af3acb4d4c322 Mon Sep 17 00:00:00 2001 From: Michael Herstine Date: Wed, 10 Mar 2021 06:50:37 -0800 Subject: [PATCH] Boilerplate update. This commit updates copyright statements throughout, as well as a few typos. --- .github/workflows/release.yml | 2 +- ChangeLog | 8 +++++++- README.org | 28 +++++++++++++++------------- mpdpopm/Cargo.toml.in | 2 +- mpdpopm/src/bin/mppopm.rs | 2 +- mpdpopm/src/bin/mppopmd.rs | 2 +- mpdpopm/src/clients.rs | 2 +- mpdpopm/src/commands.rs | 2 +- mpdpopm/src/error_from.rs | 2 +- mpdpopm/src/lib.rs | 2 +- mpdpopm/src/messages.rs | 2 +- mpdpopm/src/playcounts.rs | 2 +- mpdpopm/src/ratings.rs | 2 +- 13 files changed, 33 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3dd4215..b8f257b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -208,7 +208,7 @@ jobs: if: matrix.os == 'ubuntu-18.04' shell: bash # You would think I can deduce the name of the package from - # RELEASE_VERSION, but Debian uses different designatures for + # RELEASE_VERSION, but Debian uses different designators for # architecture (amd64 instead of x86_64, e.g.) than those # produced by `uname'. Since there will only be one .deb in the # output directory, I'll just figure it out that way. diff --git a/ChangeLog b/ChangeLog index 79d1fb9..a64dfa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2021-03-08 Michael Herstine +2021-03-10 Michael Herstine + + Boilerplate update. + This commit updates copyright statements throughout, as well + as a few typos. + +2021-03-09 Michael Herstine Clear-up some packaging issues. This commit: diff --git a/README.org b/README.org index cb64743..354c6e3 100644 --- a/README.org +++ b/README.org @@ -2,7 +2,7 @@ #+AUTHOR: Michael Herstine #+DESCRIPTION: mpdpopm #+EMAIL: sp1ff@pobox.com -#+DATE: <2021-03-05 Fri 17:22> +#+DATE: <2021-03-10 Wed 19:27> #+AUTODATE: t * Introduction @@ -36,10 +36,10 @@ Thanks to a suggestion by [[https://github.com/m040601][m040601]], you can down #+BEGIN_SRC bash cd /tmp -curl -L --output mpdpopm-0.1.14.tar.gz https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm-0.1.14-x86_64-unknown-linux.tar.gz -tar xf mpdpopm-0.1.14.tar.gz -tree mpdpopm-0.1.14-x86_64-unknown-linux/ -mpdpopm-0.1.14-x86_64-unknown-linux/ +curl -L --output mpdpopm-0.1.15.tar.gz https://github.com/sp1ff/mpdpopm/releases/download/0.1.15/mpdpopm-0.1.15-x86_64-unknown-linux.tar.gz +tar xf mpdpopm-0.1.15.tar.gz +tree mpdpopm-0.1.15-x86_64-unknown-linux/ +mpdpopm-0.1.15-x86_64-unknown-linux/ ├── bin │ ├── mppopm │ └── mppopmd @@ -49,7 +49,9 @@ mpdpopm-0.1.14-x86_64-unknown-linux/ ├── COPYING ├── NEWS ├── README.org - └── THANKS + ├── THANKS + ├── mppopmd.conf + └── mppopmd.service 2 directories, 8 files #+END_SRC @@ -66,8 +68,8 @@ If you're running on a Debian-based Linux distribution, and you're on an x86_64 #+BEGIN_SRC bash cd /tmp -curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm_0.1.14_amd64.deb -sudo dpkg -i mpdpopm_0.1.14_amd64.deb +curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.15/mpdpopm_0.1.15_amd64.deb +sudo dpkg -i mpdpopm_0.1.15_amd64.deb #+END_SRC The binaries will be placed in =/usr/local/bin=, and you can proceed to [[#getting_started][Getting Started]], below. @@ -78,9 +80,9 @@ If you've got the Rust toolchain as well as Autotools installed, you can build f #+BEGIN_SRC bash cd /tmp -curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm-0.1.14.tar.xz -tar xf mpdpopm-0.1.14.tar.xz -cd mpdpopm-0.1.14 +curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.15/mpdpopm-0.1.15.tar.xz +tar xf mpdpopm-0.1.15.tar.xz +cd mpdpopm-0.1.15 ./configure make make check @@ -196,8 +198,8 @@ Once you've got your configuration file prepared, you should probably start the #+BEGIN_SRC bash mppopmd -v -F -c -[2020-12-12T15:26:19.620806454-08:00][mppopmd] mppopmd 0.1.14 logging at level Debug. -[2020-12-12T15:26:19.621395828-08:00][mpdpopm] mpdpopm 0.1.14 beginning. +[2020-12-12T15:26:19.620806454-08:00][mppopmd] mppopmd 0.1.15 logging at level Debug. +[2020-12-12T15:26:19.621395828-08:00][mpdpopm] mpdpopm 0.1.15 beginning. [2020-12-12T15:26:19.621998677-08:00][mpdpopm::clients] Connected 0.22.0. [2020-12-12T15:26:19.623398521-08:00][mpdpopm::clients] Connected 0.22.0. [2020-12-12T15:26:19.623874861-08:00][mpdpopm::clients] Sent subscribe message for unwoundstack.com:commands; got `OK diff --git a/mpdpopm/Cargo.toml.in b/mpdpopm/Cargo.toml.in index c4b3172..30abb09 100644 --- a/mpdpopm/Cargo.toml.in +++ b/mpdpopm/Cargo.toml.in @@ -32,7 +32,7 @@ tokio = { version = "0.2.22", features = ["dns", "io-util", "macros", "process", [package.metadata.deb] maintainer = "@PACKAGE_AUTHOR@" -copyright = "Copyright (C) 2020 @PACKAGE_AUTHOR@" +copyright = "Copyright (C) 2020-2021 @PACKAGE_AUTHOR@" extended-description = """ mpdpopm provides a companion daemon to mpd / \ for maintaining play counts, ratings and last-played timestamps, \ diff --git a/mpdpopm/src/bin/mppopm.rs b/mpdpopm/src/bin/mppopm.rs index beaa872..5347f15 100644 --- a/mpdpopm/src/bin/mppopm.rs +++ b/mpdpopm/src/bin/mppopm.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/bin/mppopmd.rs b/mpdpopm/src/bin/mppopmd.rs index a4df8d3..a79242d 100644 --- a/mpdpopm/src/bin/mppopmd.rs +++ b/mpdpopm/src/bin/mppopmd.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/clients.rs b/mpdpopm/src/clients.rs index dd72310..2c0509c 100644 --- a/mpdpopm/src/clients.rs +++ b/mpdpopm/src/clients.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/commands.rs b/mpdpopm/src/commands.rs index 98ac4d4..93365f3 100644 --- a/mpdpopm/src/commands.rs +++ b/mpdpopm/src/commands.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/error_from.rs b/mpdpopm/src/error_from.rs index a2f6042..c868a03 100644 --- a/mpdpopm/src/error_from.rs +++ b/mpdpopm/src/error_from.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/lib.rs b/mpdpopm/src/lib.rs index be0894a..8b45c61 100644 --- a/mpdpopm/src/lib.rs +++ b/mpdpopm/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/messages.rs b/mpdpopm/src/messages.rs index ddaf999..410f91a 100644 --- a/mpdpopm/src/messages.rs +++ b/mpdpopm/src/messages.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/playcounts.rs b/mpdpopm/src/playcounts.rs index 42c6d6f..b881359 100644 --- a/mpdpopm/src/playcounts.rs +++ b/mpdpopm/src/playcounts.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. // diff --git a/mpdpopm/src/ratings.rs b/mpdpopm/src/ratings.rs index 239784e..eedd287 100644 --- a/mpdpopm/src/ratings.rs +++ b/mpdpopm/src/ratings.rs @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Michael Herstine +// Copyright (C) 2020-2021 Michael Herstine // // This file is part of mpdpopm. //