Bug#687487: pre-approve unblock: manpages-de/1.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear release managers,
I'd like to upload a new upstream version of the German translation of
various manpages. I've added a check in the configure script to ensure
that the required program "po4a" is installed on the system. Would you
accept such a change for a freeze exception as well? If not, I'd revert
that patch upstream and release a version with translation updates only.
The patch in question is attached to this mail.
Regards,
Tobias
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQUZfsAAoJEIP9HEaC0TjgaVAP/2xNsoj2N5uWNPt5YU4GDbIz
oEx0pRxqkqICyx68OzcTug2IM4T8tETzjTUojVzC57u4DuYaYMmZxefYeXZcivYP
N25Bsskm6vD+dv4FPol5YD45k+q0CUwLAfoRBXrMRv0OFHjRZwl5+wOKgZzRt5y3
PNQaklO6I0dZvzkKQo0yujF5dyXMmf1DhAmZDHN0t9OxtPrjVezBe1GI4AwWwXjH
fWstxzJ3r6mOQQNUIRSMBT9GjvYPAAKcvn4ZOYeRw5NAc1CN61kRQbZNdsETsMDe
7bctWwazrs7ftvYHBNYCeEz3j8nJ5yaXXA+ihWprPA0mBlsMFhAqQDKNiT4Spy+E
fnxXJW2nZ1y9ExQgXAisatkGnFftZDhUMK5RvIAEcjuVhDrvdQbWyF1AHgp0W7qO
rfvhgL+PKpFWnW7efwAoKp30E+T3aesB1qk9EDxoKe2KqbDLZFrfw8o9gwEe3Xb4
hFkoP2G6egfOUYoXmlNgbEiqstHqhLc8VIbqm811vYIbakaCUllAhYB3xFQrT+4f
/egv4I2QBK5ZOwA/dmlrFwSZXq1PLpZvHJ3q/wB9ZkPT9GIVwRreJ7M9Cor94u59
faV8bz2EcMNdq2zWqVUhHvNBmymIq4riiBMNm1yMJUWSuZh9urW0mbDJMz9JPv0n
28qVwyXS43KwWvjWU6wg
=kk8h
-----END PGP SIGNATURE-----
>From eef73f6a92749648def27aa1b7facec449603730 Mon Sep 17 00:00:00 2001
From: Tobias Quathamer <toddy@debian.org>
Date: Mon, 16 Jul 2012 00:37:34 +0200
Subject: [PATCH] During ./configure, check that po4a is available on the
system
---
CHANGES | 5 +++++
Makefile.in | 1 +
configure | 47 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 ++++++
english/Makefile.in | 1 +
english/links/Makefile.in | 1 +
po/Makefile.in | 1 +
po/man1/Makefile.in | 1 +
po/man2/Makefile.in | 1 +
po/man3/Makefile.in | 1 +
po/man4/Makefile.in | 1 +
po/man5/Makefile.in | 1 +
po/man6/Makefile.in | 1 +
po/man7/Makefile.in | 1 +
po/man8/Makefile.in | 1 +
15 files changed, 70 insertions(+)
diff --git a/CHANGES b/CHANGES
index ec8ca0a..791eff3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+UNRELEASED
+
+ * During ./configure, check that po4a is available on the system.
+
+
Version 1.1
Fri Jun 29 14:11:32 CEST 2012
diff --git a/Makefile.in b/Makefile.in
index 4452a03..d592d57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -180,6 +180,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/configure b/configure
index fa4a719..1ee6512 100755
--- a/configure
+++ b/configure
@@ -564,6 +564,7 @@ PACKAGE_URL=''
ac_subst_vars='LTLIBOBJS
LIBOBJS
ac_enable_download
+po4a
am__untar
am__tar
AMTAR
@@ -2189,6 +2190,52 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# Check that po4a is available on the system
+# Extract the first word of "po4a", so it can be a program name with args.
+set dummy po4a; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_po4a+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $po4a in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_po4a="$po4a" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_po4a="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_po4a" && ac_cv_path_po4a="no"
+ ;;
+esac
+fi
+po4a=$ac_cv_path_po4a
+if test -n "$po4a"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $po4a" >&5
+$as_echo "$po4a" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$po4a" = "xno"; then
+ as_fn_error $? "You need to install po4a" "$LINENO" 5
+fi
+
# Support the downloading of manpages from Debian
# Check whether --enable-download was given.
if test "${enable_download+set}" = set; then :
diff --git a/configure.ac b/configure.ac
index cc50e62..6a13154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,12 @@ AC_INIT(manpages-de, [1.1])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+# Check that po4a is available on the system
+AC_PATH_PROG([po4a], [po4a], [no])
+if test "x$po4a" = "xno"; then
+ AC_MSG_ERROR([You need to install po4a])
+fi
+
# Support the downloading of manpages from Debian
AC_ARG_ENABLE(
[download],
diff --git a/english/Makefile.in b/english/Makefile.in
index b17510e..6cdc945 100644
--- a/english/Makefile.in
+++ b/english/Makefile.in
@@ -162,6 +162,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/english/links/Makefile.in b/english/links/Makefile.in
index 1bc38bd..d4b3598 100644
--- a/english/links/Makefile.in
+++ b/english/links/Makefile.in
@@ -122,6 +122,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/Makefile.in b/po/Makefile.in
index bbae1d5..78e190c 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -162,6 +162,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man1/Makefile.in b/po/man1/Makefile.in
index 8841b38..8d423b6 100644
--- a/po/man1/Makefile.in
+++ b/po/man1/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man2/Makefile.in b/po/man2/Makefile.in
index 6e36514..2e957e9 100644
--- a/po/man2/Makefile.in
+++ b/po/man2/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man3/Makefile.in b/po/man3/Makefile.in
index ef7e4a7..ef8d2a2 100644
--- a/po/man3/Makefile.in
+++ b/po/man3/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man4/Makefile.in b/po/man4/Makefile.in
index 74afa39..156b081 100644
--- a/po/man4/Makefile.in
+++ b/po/man4/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man5/Makefile.in b/po/man5/Makefile.in
index 963c79a..f1a2d59 100644
--- a/po/man5/Makefile.in
+++ b/po/man5/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man6/Makefile.in b/po/man6/Makefile.in
index ddf8988..ad8db05 100644
--- a/po/man6/Makefile.in
+++ b/po/man6/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man7/Makefile.in b/po/man7/Makefile.in
index a2d65d4..edf0595 100644
--- a/po/man7/Makefile.in
+++ b/po/man7/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
diff --git a/po/man8/Makefile.in b/po/man8/Makefile.in
index 1794e60..f35beb2 100644
--- a/po/man8/Makefile.in
+++ b/po/man8/Makefile.in
@@ -125,6 +125,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+po4a = @po4a@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
--
1.7.9.5
Reply to: