...
 
Commits (17)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# Changelog for manpages-de
## Version 2.11
*Wed Feb 6 21:16:40 CET 2019*
* Updated many translations
## Version 2.10
*Sun Jan 13 00:15:11 CET 2019*
* Updated many translations
## Version 2.9
*Fri Oct 19 22:44:27 CEST 2018*
......
# Makefile for manpages-de
#
# Copyright © 2012-2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2012-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -26,19 +26,12 @@ update-upstream:
git commit -m "Update upstream manpages" || true
# Update all template files from upstream manpages.
# In order to re-use translations from 'primary' for
# the secondary translations before they get overwritten
# by changes to the primary templates, it's needed to
# update all translations (with 'make update-po') first,
# and afterwards update the templates, the common
# templates, and then the translations again.
.PHONY: update-translations
update-translations:
cd $(top_srcdir)/po ; \
$(MAKE) update-po ; \
cd .. ; \
cd $(top_srcdir)/templates ; \
./update-templates.sh ; \
./update-all-templates.sh ; \
git add . ; \
git commit -m "Update templates" || true ; \
./create-common-templates.sh ; \
git add . ; \
git commit -m "Update common templates" || true ; \
......
......@@ -16,7 +16,7 @@
# Makefile for manpages-de
#
# Copyright © 2012-2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2012-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -259,6 +259,7 @@ build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
distribution = @distribution@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
......@@ -288,7 +289,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
upstream = @upstream@
SUBDIRS = po
all: all-recursive
......@@ -756,19 +756,12 @@ update-upstream:
git commit -m "Update upstream manpages" || true
# Update all template files from upstream manpages.
# In order to re-use translations from 'primary' for
# the secondary translations before they get overwritten
# by changes to the primary templates, it's needed to
# update all translations (with 'make update-po') first,
# and afterwards update the templates, the common
# templates, and then the translations again.
.PHONY: update-translations
update-translations:
cd $(top_srcdir)/po ; \
$(MAKE) update-po ; \
cd .. ; \
cd $(top_srcdir)/templates ; \
./update-templates.sh ; \
./update-all-templates.sh ; \
git add . ; \
git commit -m "Update templates" || true ; \
./create-common-templates.sh ; \
git add . ; \
git commit -m "Update common templates" || true ; \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for manpages-de 2.9.
# Generated by GNU Autoconf 2.69 for manpages-de 2.11.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -576,15 +576,15 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='manpages-de'
PACKAGE_TARNAME='manpages-de'
PACKAGE_VERSION='2.9'
PACKAGE_STRING='manpages-de 2.9'
PACKAGE_VERSION='2.11'
PACKAGE_STRING='manpages-de 2.11'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
ac_subst_vars='LTLIBOBJS
LIBOBJS
po4a
upstream
distribution
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
......@@ -1210,7 +1210,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures manpages-de 2.9 to adapt to many kinds of systems.
\`configure' configures manpages-de 2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1277,7 +1277,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of manpages-de 2.9:";;
short | recursive ) echo "Configuration of manpages-de 2.11:";;
esac
cat <<\_ACEOF
......@@ -1289,7 +1289,7 @@ Optional Features:
--disable-silent-rules verbose build output (undo: "make V=0")
--enable-distribution=DIST
Enable translations for specific distribution.
[default=debian].
[default=debian-unstable].
Report bugs to the package provider.
_ACEOF
......@@ -1354,7 +1354,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
manpages-de configure 2.9
manpages-de configure 2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1371,7 +1371,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by manpages-de $as_me 2.9, which was
It was created by manpages-de $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2235,7 +2235,7 @@ fi
# Define the identity of the package.
PACKAGE='manpages-de'
VERSION='2.9'
VERSION='2.11'
cat >>confdefs.h <<_ACEOF
......@@ -2334,16 +2334,7 @@ fi
if test "${enable_distribution+set}" = set; then :
enableval=$enable_distribution;
else
enable_distribution="debian"
fi
# Handle the distribution and set up the upstream directory name
if test "x$enable_distribution" = "xdebian"; then :
upstream="primary"
else
upstream="secondary-$enable_distribution"
enable_distribution="debian-unstable"
fi
......@@ -2358,7 +2349,7 @@ $as_echo "$enable_distribution" >&6; }
# own translations in an upstream directory
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that \"$enable_distribution\" has own translations" >&5
$as_echo_n "checking that \"$enable_distribution\" has own translations... " >&6; }
if test -d "upstream/$upstream"; then :
if test -d "upstream/$enable_distribution"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
......@@ -2369,6 +2360,8 @@ $as_echo "no" >&6; }
fi
distribution=$enable_distribution
# Check that po4a is available on the system
# Extract the first word of "po4a", so it can be a program name with args.
......@@ -2971,7 +2964,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by manpages-de $as_me 2.9, which was
This file was extended by manpages-de $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -3024,7 +3017,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
manpages-de config.status 2.9
manpages-de config.status 2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -15,28 +15,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_INIT(manpages-de, [2.9])
AC_INIT(manpages-de, [2.11])
AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip])
# Add option for selection of distribution
AC_ARG_ENABLE([distribution],
AS_HELP_STRING([--enable-distribution=DIST],
[Enable translations for specific distribution. @<:@default=debian@:>@.]
[Enable translations for specific distribution. @<:@default=debian-unstable@:>@.]
),
,
[enable_distribution="debian"]
[enable_distribution="debian-unstable"]
)
# Handle the distribution and set up the upstream directory name
AS_IF([test "x$enable_distribution" = "xdebian"],
dnl Special case: Debian uses the name "primary".
[upstream="primary"],
dnl All other cases: Prepend "secondary-" to the name.
[upstream="secondary-$enable_distribution"]
)
AC_SUBST([upstream])
# Show the wanted distribution
AC_MSG_CHECKING([name of wanted distribution])
AC_MSG_RESULT([$enable_distribution])
......@@ -44,13 +35,14 @@ AC_MSG_RESULT([$enable_distribution])
# Check if the wanted distribution has
# own translations in an upstream directory
AC_MSG_CHECKING([that "$enable_distribution" has own translations])
AS_IF([test -d "upstream/$upstream"],
AS_IF([test -d "upstream/$enable_distribution"],
[AC_MSG_RESULT([yes])],
[
AC_MSG_RESULT([no])
AC_MSG_ERROR([there are no translations for "$enable_distribution".])
]
)
AC_SUBST([distribution], [$enable_distribution])
# Check that po4a is available on the system
AC_PATH_PROG([po4a], [po4a], [no])
......
#!/bin/sh
#
# Copyright © 2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2017-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -23,14 +23,14 @@ if [ -z "$distribution" ]; then
fi
# Safety net
if [ -d "upstream/secondary-$distribution" ]; then
if [ -d "upstream/$distribution" ]; then
echo "The distribution '$distribution' already exists."
exit
fi
# Create the upstream directory
mkdir "upstream/secondary-$distribution"
cd "upstream/secondary-$distribution"
mkdir "upstream/$distribution"
cd "upstream/$distribution"
touch links.txt
touch update-manpages.sh
chmod +x update-manpages.sh
......@@ -40,7 +40,7 @@ git commit -m "Add skeleton for new distribution '$distribution'"
echo "Done."
echo "Please edit this script:"
echo
echo " upstream/secondary-$distribution/update-manpages.sh"
echo " upstream/$distribution/update-manpages.sh"
echo
echo "See upstream/README.md for details."
echo "When ready, run the second part of this setup script."
#!/bin/sh
#
# Copyright © 2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2017-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -23,7 +23,7 @@ if [ -z "$distribution" ]; then
fi
# Safety net
if [ ! -d "upstream/secondary-$distribution" ]; then
if [ ! -d "upstream/$distribution" ]; then
echo "The distribution '$distribution' does not exist."
echo "Please start with the first part of this script."
exit
......@@ -31,7 +31,7 @@ fi
# Make sure that the update-manpages.sh script has been run
# Start with clean directories and no leftover links.txt
cd "upstream/secondary-$distribution"
cd "upstream/$distribution"
rm -rf man* links.txt
./update-manpages.sh
# Sort the file links.txt
......@@ -43,46 +43,22 @@ git add .
git commit -m "Add manpages for '$distribution'"
cd ../..
# Create the po directory
cd "po"
mkdir "secondary-$distribution"
cp -r primary/* secondary-$distribution
git add secondary-$distribution
git commit -m "Copy all translations from primary to secondary-$distribution"
cd ..
# Create the templates directory
# Create the templates
cd "templates"
mkdir "secondary-$distribution"
./update-templates.sh
if [ ! -d "common-secondary" ]; then
# Create a new secondary directory from primary
mkdir "common-secondary"
cp common-primary/* common-secondary
fi
./update-all-templates.sh
git add man*
git commit -m "Add templates for new distribution '$distribution'"
./create-common-templates.sh
git add common-secondary/*
git add common/*
git commit -m "Add common templates for new distribution '$distribution'"
cd ..
# Create the common po directory
# Update po files
cd "po"
if [ ! -d "common-secondary" ]; then
# Create a new secondary directory from primary
mkdir "common-secondary"
cp common-primary/* common-secondary
fi
compendium=$(mktemp)
msgcat secondary-$distribution/man*/*po > "$compendium"
for pofile in common-secondary/*po; do
# Find the pot file by adding the letter 't'
potfile="../templates/$pofile""t"
msgmerge --previous --compendium "$compendium" "$pofile" "$potfile" > tmp.po
# Remove obsolete strings
msgattrib --force-po --no-obsolete tmp.po > "$pofile"
done
git add common-secondary
git commit -m "Fill up common translations from manpages"
rm -f "$compendium" tmp.po
./update-translations.sh
git add man*
git commit -m "Update .po files for new distribution '$distribution'"
./update-common.sh
git add common/*
git commit -m "Update common .po files for new distribution '$distribution'"
cd ..
manpages-de (2.11-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
- Manpages now have a correct translator credit. Closes: #897919
-- Dr. Tobias Quathamer <toddy@debian.org> Tue, 12 Feb 2019 22:15:27 +0100
manpages-de (2.11-1) unstable; urgency=medium
* New upstream version 2.11
- Update lintian overrides
- Update copyright script
* Use debhelper-compat (= 12)
* Update d/copyright
-- Dr. Tobias Quathamer <toddy@debian.org> Wed, 06 Feb 2019 21:28:51 +0100
manpages-de (2.10-2) unstable; urgency=medium
* Add Breaks+Replaces: login (<< 1:4.5-1.1).
The package 'login' shipped de/man1/su.1.gz in stretch,
which is now included in manpages-de.
Thanks to Andreas Beckmann <anbe@debian.org> (Closes: #919198)
-- Dr. Tobias Quathamer <toddy@debian.org> Mon, 14 Jan 2019 10:41:17 +0100
manpages-de (2.10-1) unstable; urgency=medium
* New upstream version 2.10
- Add another lintian override for archlinux
* Update Standards-Version to 4.3.0, no changes needed
* Update d/copyright
-- Dr. Tobias Quathamer <toddy@debian.org> Sun, 13 Jan 2019 00:34:59 +0100
manpages-de (2.9-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Dr. Tobias Quathamer <toddy@debian.org>
Build-Depends: debhelper (>= 10)
Build-Depends-Indep: po4a
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Homepage: https://manpages-de-team.pages.debian.net/manpages-de/
Vcs-Git: https://salsa.debian.org/debian/manpages-de.git
Vcs-Browser: https://salsa.debian.org/debian/manpages-de
......@@ -14,7 +14,8 @@ Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: man-browser, manpages
Breaks: manpages-de-dev (<< 2.3-2)
Replaces: login (<< 1:4.5-1.1)
Breaks: manpages-de-dev (<< 2.3-2), login (<< 1:4.5-1.1)
Description: German manpages
This package contains the Linux manual pages translated into German.
The following sections are included:
......
This source diff could not be displayed because it is too large. You can view the blob instead.
# This manpage is dual-licensed
manpages-de source: license-problem-non-free-RFC upstream/primary/man7/uri.7
manpages-de source: license-problem-non-free-RFC upstream/secondary-debian-stretch/man7/uri.7
manpages-de source: license-problem-non-free-RFC upstream/archlinux/man7/uri.7
manpages-de source: license-problem-non-free-RFC upstream/debian-stretch/man7/uri.7
manpages-de source: license-problem-non-free-RFC upstream/debian-unstable/man7/uri.7
......@@ -10,7 +10,7 @@ translator_names = []
translator_files = []
# Generate a list of all translations
for filename in glob.iglob("../po/*/man?/*po"):
for filename in glob.iglob("../po/man*/*po"):
# Strip the leading two dots and slash
short_filename = filename[3:]
# Read in the translators
......
# Makefile for manpages-de
#
# Copyright © 2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2017-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -15,47 +15,40 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Use only primary and secondary with [ps] selection,
# in order to filter out the common-* directories
pofiles = $(sort $(wildcard $(srcdir)/[ps]*/man*/*.po))
# Filter out the 'common' directory
pofiles = $(sort $(wildcard $(srcdir)/man*/*.po))
manpages = $(patsubst %.po,%, $(pofiles))
current_pofiles = $(sort $(wildcard $(srcdir)/$(upstream)/man*/*.po))
current_manpages = $(patsubst %.po,%, $(current_pofiles))
MOSTLYCLEANFILES = $(manpages)
# Common rules for all manpage sections
%: %.po
$(srcdir)/generate-manpage.sh $@
$(srcdir)/generate-manpage.sh $(distribution) $@
# Generate all localized manpages for given distribution
all-local: $(current_manpages)
# Generate all manpages for every distribution
all-manpages: $(manpages)
all-local: $(manpages)
# Install localized manpages for given distribution
install-data-hook: $(current_manpages)
for directory in $(srcdir)/$(upstream)/man*; do \
install-data-hook: $(manpages)
for directory in $(srcdir)/$(distribution)/man*; do \
mansection=$$(basename $$directory) ; \
$(mkinstalldirs) $(DESTDIR)$(mandir)/de/$$mansection ; \
done
for manpage in $(current_manpages); do \
for manpage in $(manpages); do \
filename=$$(basename $$manpage) ; \
mansection=$$(basename $$(dirname $$manpage)) ; \
$(INSTALL_DATA) $$manpage $(DESTDIR)$(mandir)/de/$$mansection ; \
$(INSTALL_DATA) $(distribution)/$$manpage $(DESTDIR)$(mandir)/de/$$mansection ; \
gzip --best $(DESTDIR)$(mandir)/de/$$mansection/$$filename ; \
done
perl $(top_srcdir)/create-links.pl $(DESTDIR)$(mandir)/de \
$(top_srcdir)/upstream/$(upstream)/links.txt
$(top_srcdir)/upstream/$(distribution)/links.txt
# Uninstall localized manpages for given distribution
uninstall-hook:
for link in $$(cut -d" " -f2 $(top_srcdir)/upstream/$(upstream)/links.txt); do \
for link in $$(cut -d" " -f2 $(top_srcdir)/upstream/$(distribution)/links.txt); do \
rm -f $(DESTDIR)$(mandir)/de/$$link ; \
done
for manpage in $(current_manpages); do \
for manpage in $(manpages); do \
filename=$$(basename $$manpage) ; \
mansection=$$(basename $$(dirname $$manpage)) ; \
rm -f $(DESTDIR)$(mandir)/de/$$mansection/$$filename.gz ; \
......
......@@ -16,7 +16,7 @@
# Makefile for manpages-de
#
# Copyright © 2017 Dr. Tobias Quathamer <toddy@debian.org>
# Copyright © 2017-2019 Dr. Tobias Quathamer <toddy@debian.org>
#
# 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
......@@ -179,6 +179,7 @@ build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
distribution = @distribution@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
......@@ -208,14 +209,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
upstream = @upstream@
# Use only primary and secondary with [ps] selection,
# in order to filter out the common-* directories
pofiles = $(sort $(wildcard $(srcdir)/[ps]*/man*/*.po))
# Filter out the 'common' directory
pofiles = $(sort $(wildcard $(srcdir)/man*/*.po))
manpages = $(patsubst %.po,%, $(pofiles))
current_pofiles = $(sort $(wildcard $(srcdir)/$(upstream)/man*/*.po))
current_manpages = $(patsubst %.po,%, $(current_pofiles))
MOSTLYCLEANFILES = $(manpages)
all: all-am
......@@ -408,35 +405,32 @@ uninstall-am:
# Common rules for all manpage sections
%: %.po
$(srcdir)/generate-manpage.sh $@
$(srcdir)/generate-manpage.sh $(distribution) $@
# Generate all localized manpages for given distribution
all-local: $(current_manpages)
# Generate all manpages for every distribution
all-manpages: $(manpages)