From 8afaf687631cfe490e171f8d53e1ff72e4e288a8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 8 Oct 2021 11:25:49 +0200 Subject: Merging upstream version 20211008. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 13 +++++++- Makefile | 27 +++++++++------ VERSION.txt | 2 +- man/Makefile | 59 +++++++++++++++++++++++++++++++++ man/bfh-metapackages.7.rst | 81 +++++++++++++++++++++++++++++++++++++++++++++ man/man.in | 19 +++++++++++ manpages/bfh-metapackages.7 | 47 -------------------------- 7 files changed, 189 insertions(+), 59 deletions(-) create mode 100644 man/Makefile create mode 100644 man/bfh-metapackages.7.rst create mode 100644 man/man.in delete mode 100644 manpages/bfh-metapackages.7 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 009a167..e06b002 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,14 @@ -2021-01-01 Daniel Baumann +2021-10-08 Daniel Baumann + + * Releasing version 20211008. + + [ Daniel Baumann ] + * Using https in GPL URLs. + * Using rst to generate manpage. + * Consistently renaming manpages files and sub-directory to man. + * Updating main makefile for handling manpages. + * Using same email adresses consistently. + +2021-01-01 Daniel Baumann * Releasing version 20210101. diff --git a/Makefile b/Makefile index 34bbded..cb73659 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +# BFH metapackages + # Copyright (C) 2021 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ @@ -13,7 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . SHELL := sh -e @@ -21,11 +23,16 @@ PROJECT := bfh-metapackages all: build -clean: - @# empty +clean: clean-man -build: - @# empty +clean-man: + $(MAKE) -C man clean + +build: build-man + +build-man: + # build man + $(MAKE) -C man build test: @# empty @@ -38,13 +45,13 @@ install-doc: cp *.txt $(DESTDIR)/usr/share/doc/$(PROJECT) install-man: - # install manpages + # install man for SECTION in $$(seq 1 8); \ do \ - if ls manpages/*.$${SECTION} > /dev/null 2>&1; \ + if ls man/*.$${SECTION} > /dev/null 2>&1; \ then \ mkdir -p $(DESTDIR)/usr/share/man/man$${SECTION}; \ - cp manpages/*.$${SECTION} $(DESTDIR)/usr/share/man/man$${SECTION}; \ + cp man/*.$${SECTION} $(DESTDIR)/usr/share/man/man$${SECTION}; \ fi; \ done @@ -55,10 +62,10 @@ uninstall-doc: rm -rf $(DESTDIR)/usr/share/doc/$(PROJECT) uninstall-man: - # uninstall manpages + # uninstall man for SECTION in $$(seq 1 8); \ do \ - for FILE in manpages/*.$${SECTION}; \ + for FILE in man/*.$${SECTION}; \ do \ rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${FILE}); \ done; \ diff --git a/VERSION.txt b/VERSION.txt index 71bc3f4..202e0fe 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20210101 +20211008 diff --git a/man/Makefile b/man/Makefile new file mode 100644 index 0000000..03fd019 --- /dev/null +++ b/man/Makefile @@ -0,0 +1,59 @@ +# BFH metapackages + +# Copyright (C) 2013-2021 Daniel Baumann +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Depends: python3-docutils + +RST2MAN = rst2man \ + --no-datestamp \ + --no-generator \ + --strict \ + --strip-comments \ + --tab-width=4 \ + --verbose + +VERSION := $(shell cat ../VERSION.txt) + +SHELL := sh -e + +all: build + +build: man + +rebuild: clean build + +man: man.in *.rst + @echo -n "Creating manpages... " + + @for FILE in *.rst; \ + do \ + cp man.in $$(basename $${FILE} .rst); \ + $(RST2MAN) $${FILE} | \ + sed -e '/^.\\" Man page generated/d' \ + -e '/^.\\" Generated by/d' \ + -e "s|^\(.TH .*\) \(\"\" \"\"\) |\1 $${VERSION} compute-tools |" \ + >> $$(basename $${FILE} .rst); \ + echo -n "."; \ + done + + @echo " done." + +clean: + rm -f *.[0-9] + +.PHONY: all clean build rebuild man diff --git a/man/bfh-metapackages.7.rst b/man/bfh-metapackages.7.rst new file mode 100644 index 0000000..5c2ebb6 --- /dev/null +++ b/man/bfh-metapackages.7.rst @@ -0,0 +1,81 @@ +.. BFH metapackages + +.. Copyright (C) 2013-2021 Daniel Baumann +.. +.. SPDX-License-Identifier: GPL-3.0+ +.. +.. This program is free software: you can redistribute it and/or modify +.. it under the terms of the GNU General Public License as published by +.. the Free Software Foundation, either version 3 of the License, or +.. (at your option) any later version. +.. +.. This program is distributed in the hope that it will be useful, +.. but WITHOUT ANY WARRANTY; without even the implied warranty of +.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. GNU General Public License for more details. +.. +.. You should have received a copy of the GNU General Public License +.. along with this program. If not, see . + +================ +bfh-metapackages +================ + +--------------------------------------------------------- +Package selection for Bern University of Applied Sciences +--------------------------------------------------------- + +:manual section: 7 +:manual group: BFH + +Description +=========== + +Bern University of Applied Sciences (BFH) provides Debian-based images and +systems to its users and everyone else interested in the form of a Debian +Derrivative. + +The following main metapackages are available: + +bfh-base-system +--------------- + +| The BFH Base System includes packages that provide a reasonably small but not +| too limited character-mode system. + +bfh-container-server +-------------------- + +| The BFH Container Server is a complete system configured as a server for +| systemd-nspawn based containers. + +bfh-gnome-desktop +----------------- + +| The BFH GNOME Desktop is a complete system configured as a desktop for power +| users. + + +Development +=========== + +Bug reports, feature requests, help, patches, support and everything else are +welcome on the BFH Linux Users Mailing List +(https://lists.bfh.science/listinfo/bfh-linux-users/listinfo/software). + +Please base patches against the 'next' Git branch using common sense +(https://www.kernel.org/doc/Documentation/SubmittingPatches). + +Debian specific bugs can also be reported in the Debian Bug Tracking System +(https://bugs.debian.org). + +Homepage +======== + +More information about BFH and Team Linux & Infrastructure Services can be found +on the homepage (https://bfh.science). + +Authors +======= + +bfh-metapackages were written by Daniel Baumann and others. diff --git a/man/man.in b/man/man.in new file mode 100644 index 0000000..70e22db --- /dev/null +++ b/man/man.in @@ -0,0 +1,19 @@ +.\" BFH metapackages + +.\" Copyright (C) 2013-2021 Daniel Baumann +.\" +.\" SPDX-License-Identifier: GPL-3.0+ +.\" +.\" This program is free software: you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation, either version 3 of the License, or +.\" (at your option) any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program. If not, see . +.\" diff --git a/manpages/bfh-metapackages.7 b/manpages/bfh-metapackages.7 deleted file mode 100644 index 835af47..0000000 --- a/manpages/bfh-metapackages.7 +++ /dev/null @@ -1,47 +0,0 @@ -.\" Copyright (C) 2021 Daniel Baumann -.\" -.\" SPDX-License-Identifier: GPL-3.0+ -.\" -.\" This program is free software: you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation, either version 3 of the License, or -.\" (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program. If not, see . - -.TH BFH\-METAPACKAGES 7 2021\-01\-01 20210101 "BFH Metapackages" - -.SH NAME -\fBBFH Metapackages\fR \- Package selection for Bern University of Applied Sciences - -.SH DESCRIPTION -Bern University of Applied Sciences (BFH) provides Debian-based images and -systems to its users and everyone else interested in the form of a Debian -Derrivative. -.TP -The following main metapackages are available: - -.IP "\fBbfh-base\-system\fR" 4 -The BFH Base System includes packages that provide a reasonably small but not -too limited character-mode system. - -.IP "\fBbfh-container\-server\fR" 4 -The BFH Container Server is a complete system configured as a server for -systemd\-nspawn based containers. - -.IP "\fBbfh-gnome\-desktop\fR" 4 -The BFH GNOME Desktop is a complete system configured as a desktop for power -users. - -.SH HOMEPAGE -More information about BFH and Team Linux & Infrastructure Servicescan be found -on the homepage at <\fIhttps://bfh.science\fR>. - -.SH AUTHOR -This manpage was written by Daniel Baumann <\fIdaniel.baumann@bfh.ch\fR>. -- cgit v1.2.3