summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2021-10-08 12:20:33 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2021-10-08 18:06:39 +0000
commitc071a2d8bef9034b8198fe49fdf8ce77a8d4b68c (patch)
treec1302433cded329e0fd0863f0df62de51221ec41
parentReleasing debian version 20211008-1. (diff)
downloadbfh-metapackages-c071a2d8bef9034b8198fe49fdf8ce77a8d4b68c.tar.xz
bfh-metapackages-c071a2d8bef9034b8198fe49fdf8ce77a8d4b68c.zip
Merging upstream version 20211009.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--CHANGELOG.txt9
-rw-r--r--Makefile3
-rw-r--r--VERSION.txt2
-rw-r--r--man/Makefile2
4 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e06b002..bee5c83 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+2021-10-09 Daniel Baumann <daniel@debian.org>
+
+ * Releasing version 20211009.
+
+ [ Daniel Baumann ]
+ * Correcting manpage header fixing.
+ * Harmonizing makefile comments.
+ * Updating year in main makefile copyright notice.
+
2021-10-08 Daniel Baumann <daniel@debian.org>
* Releasing version 20211008.
diff --git a/Makefile b/Makefile
index cb73659..06a48ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# BFH metapackages
-# Copyright (C) 2021 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2013-2021 Daniel Baumann <daniel@debian.org>
#
# SPDX-License-Identifier: GPL-3.0+
#
@@ -26,6 +26,7 @@ all: build
clean: clean-man
clean-man:
+ # clean man
$(MAKE) -C man clean
build: build-man
diff --git a/VERSION.txt b/VERSION.txt
index 202e0fe..352475c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20211008
+20211009
diff --git a/man/Makefile b/man/Makefile
index 03fd019..d663b7b 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -46,7 +46,7 @@ man: man.in *.rst
$(RST2MAN) $${FILE} | \
sed -e '/^.\\" Man page generated/d' \
-e '/^.\\" Generated by/d' \
- -e "s|^\(.TH .*\) \(\"\" \"\"\) |\1 $${VERSION} compute-tools |" \
+ -e "s|^\(.TH .*\) \(\"\" \"\"\) |\1 $${VERSION} bfh-metapackages |" \
>> $$(basename $${FILE} .rst); \
echo -n "."; \
done