Commit b8e0eb6f authored by Tobias Quathamer's avatar Tobias Quathamer

New upstream version 2.11

parent 4c4dafac

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*
......
# 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.10.
# 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.10'
PACKAGE_STRING='manpages-de 2.10'
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.10 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.10:";;
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.10
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.10, 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.10'
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.10, 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.10
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.10])
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."