summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-02-09 14:37:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-02-09 14:37:31 +0000
commit33ea23999b1ee8f67ded0129a796f0630dacc92a (patch)
tree50d9f6a4b3170491dff784d81c5b88f67024dfd5
parentReleasing debian version 20201001-1. (diff)
downloadprogress-linux-33ea23999b1ee8f67ded0129a796f0630dacc92a.tar.xz
progress-linux-33ea23999b1ee8f67ded0129a796f0630dacc92a.zip
Merging upstream version 20210101.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt8
-rw-r--r--Makefile2
-rw-r--r--manpages/progress-linux.74
3 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2cd0ff4..f138092 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2021-01-01 Daniel Baumann <daniel.baumann@progress-linux.org>
+
+ * Releasing version 20210101.
+
+ [ Daniel Baumann ]
+ * Updating copyright notices for 2021.
+ * Updating manpage for 2021.
+
2020-10-01 Daniel Baumann <daniel.baumann@progress-linux.org>
* Releasing version 20201001.
diff --git a/Makefile b/Makefile
index 12d081b..030f4bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2019 Daniel Baumann <daniel.baumann@progress-linux.org>
+# Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org>
#
# SPDX-License-Identifier: GPL-3.0+
#
diff --git a/manpages/progress-linux.7 b/manpages/progress-linux.7
index 003054a..a2731e2 100644
--- a/manpages/progress-linux.7
+++ b/manpages/progress-linux.7
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2010-2019 Daniel Baumann <daniel.baumann@progress-linux.org>
+.\" Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org>
.\"
.\" SPDX-License-Identifier: GPL-3.0+
.\"
@@ -15,7 +15,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
-.TH PROGRESS\-LINUX 7 2019\-01\-01 20190101 "Progress Linux"
+.TH PROGRESS\-LINUX 7 2021\-01\-01 20210101 "Progress Linux"
.SH NAME
\fBProgress Linux\fR \- A Debian derivative distribution