From e6f0d0e7fc39d91e12f1cef9d725d54f7e4cc336 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 9 Feb 2021 16:12:00 +0100 Subject: Merging upstream version 20210101. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 8 ++++++++ Makefile | 4 ++-- VERSION.txt | 2 +- manpages/progress-linux-metapackages.7 | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 46109e3..9880436 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2021-01-01 Daniel Baumann + + * Releasing version 20210101. + + [ Daniel Baumann ] + * Updating copyright notices for 2021. + * Updating manpage for 2021. + 2019-07-01 Daniel Baumann * Releasing version 20190701. diff --git a/Makefile b/Makefile index cd1d300..a72387f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2019 Daniel Baumann +# Copyright (C) 2010-2021 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -17,7 +17,7 @@ SHELL := sh -e -PROJECT := progress-linux-meta-packages +PROJECT := progress-linux-metapackages all: build diff --git a/VERSION.txt b/VERSION.txt index f664d27..71bc3f4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20190701 +20210101 diff --git a/manpages/progress-linux-metapackages.7 b/manpages/progress-linux-metapackages.7 index 408f777..099af03 100644 --- a/manpages/progress-linux-metapackages.7 +++ b/manpages/progress-linux-metapackages.7 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2010-2019 Daniel Baumann +.\" Copyright (C) 2010-2021 Daniel Baumann .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" @@ -15,10 +15,10 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . -.TH PROGRESS\-LINUX\-METAPACKAGES 7 2019\-07\-01 20190701 "Progress Linux Metapackages" +.TH PROGRESS\-LINUX\-METAPACKAGES 7 2021\-01\-01 20210101 "Progress Linux Metapackages" .SH NAME -\fBProgress Linux Metapackages\fR \- Package selection for Progress Linux images +\fBProgress Linux Metapackages\fR \- Package selection for Progress Linux systems .SH DESCRIPTION \fBProgress Linux\fR is a Debian derivative distribution focused on system integration. @@ -37,7 +37,7 @@ The Progress Linux GNOME Desktop is a complete system configured as a desktop for power users. .SH HOMEPAGE -More information about the Progress Linux project can be found on the homepage at <\fIhttps://progress-linux.org/\fR>. +More information about the Progress Linux project can be found on the homepage at <\fIhttps://progress-linux.org\fR>. .SH AUTHOR This manpage was written by Daniel Baumann <\fIdaniel.baumann@progress-linux.org\fR>. -- cgit v1.2.3