diff options
Diffstat (limited to '')
| -rw-r--r-- | CHANGELOG.txt | 10 | ||||
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rw-r--r-- | man/Makefile | 59 | ||||
| -rw-r--r-- | man/man.in | 19 | ||||
| -rw-r--r-- | man/progress-linux-metapackages.7.rst | 80 | ||||
| -rw-r--r-- | manpages/progress-linux-metapackages.7 | 43 |
7 files changed, 187 insertions, 54 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9880436..6ce4600 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,15 @@ 2021-01-01 Daniel Baumann <daniel.baumann@progress-linux.org> + * 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. + +2021-01-01 Daniel Baumann <daniel.baumann@progress-linux.org> + * Releasing version 20210101. [ Daniel Baumann ] @@ -1,3 +1,5 @@ +# Progress Linux metapackages + # Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org> # # 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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. SHELL := sh -e @@ -21,11 +23,17 @@ PROJECT := progress-linux-metapackages all: build -clean: - @# empty +clean: clean-man -build: - @# empty +clean-man: + # clean man + $(MAKE) -C man clean + +build: build-man + +build-man: + # build man + $(MAKE) -C man build test: @# empty @@ -38,13 +46,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 +63,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..42a10c8 --- /dev/null +++ b/man/Makefile @@ -0,0 +1,59 @@ +# Progress Linux metapackages + +# Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org> +# +# 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 <https://www.gnu.org/licenses/>. + +# 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} progress-linux-metapackages |" \ + >> $$(basename $${FILE} .rst); \ + echo -n "."; \ + done + + @echo " done." + +clean: + rm -f *.[0-9] + +.PHONY: all clean build rebuild man diff --git a/man/man.in b/man/man.in new file mode 100644 index 0000000..b602b75 --- /dev/null +++ b/man/man.in @@ -0,0 +1,19 @@ +.\" Progress Linux metapackages + +.\" Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org> +.\" +.\" 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 <https://www.gnu.org/licenses/>. +.\" diff --git a/man/progress-linux-metapackages.7.rst b/man/progress-linux-metapackages.7.rst new file mode 100644 index 0000000..6eb8603 --- /dev/null +++ b/man/progress-linux-metapackages.7.rst @@ -0,0 +1,80 @@ +.. Progress Linux metapackages + +.. Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org> +.. +.. 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 <https://www.gnu.org/licenses/>. + +=========================== +progress-linux-metapackages +=========================== + +------------------------------------ +Package selection for Progress Linux +------------------------------------ + +:manual section: 7 +:manual group: Progress Linux + +Description +=========== + +Progress Linux is a Debian derivative distribution focused on system +integration. + +The following main metapackages are available: + +progress-linux-base-system +-------------------------- + +| The Progress Linux Base System includes packages that provide a reasonably +| small but not too limited character-mode system. + +progress-linux-container-server +------------------------------- + +| The Progress Linux Container Server is a complete system configured as a +| server for systemd-nspawn based containers. + +progress-linux-gnome-desktop +---------------------------- + +| The Progress Linux 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 Progress Linux Maintainers Mailing List +(https://lists.progress-linux.org/listinfo/maintainers). + +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 Progress Linux can be found on the homepage +(https://progress-linux.org). + +Authors +======= + +progress-linux-metapackages were written by Daniel Baumann +<daniel.baumann@progress-linux.org> and others. diff --git a/manpages/progress-linux-metapackages.7 b/manpages/progress-linux-metapackages.7 deleted file mode 100644 index 099af03..0000000 --- a/manpages/progress-linux-metapackages.7 +++ /dev/null @@ -1,43 +0,0 @@ -.\" Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org> -.\" -.\" 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 <http://www.gnu.org/licenses/>. - -.TH PROGRESS\-LINUX\-METAPACKAGES 7 2021\-01\-01 20210101 "Progress Linux Metapackages" - -.SH NAME -\fBProgress Linux Metapackages\fR \- Package selection for Progress Linux systems - -.SH DESCRIPTION -\fBProgress Linux\fR is a Debian derivative distribution focused on system integration. -The following metapackages are available: - -.IP "\fBbase\-system\fR" 4 -The Progress Linux Base System includes packages that provide a reasonably -small but not too limited character-mode system. - -.IP "\fBcontainer\-server\fR" 4 -The Progress Linux Container Server is a complete system configured as a server -for systemd\-nspawn based containers. - -.IP "\fBgnome\-desktop\fR" 4 -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>. - -.SH AUTHOR -This manpage was written by Daniel Baumann <\fIdaniel.baumann@progress-linux.org\fR>. |