Imported Upstream version 2.6.7.1

diff --git a/NEWS b/NEWS
index 0a24333..5d45764 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+man-db 2.6.7.1 (10 April 2014)
+==============================
+
+Major changes since man-db 2.6.7:
+
+       Fixes:
+       ------
+
+       o Remove test suite dependency on realpath(1).
+
 man-db 2.6.7 (10 April 2014)
 ============================
 

diff --git a/configure b/configure
index 7715fac..576e7c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for man-db 2.6.7.
+# Generated by GNU Autoconf 2.69 for man-db 2.6.7.1.
 #
 # Report bugs to <cjwatson@debian.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='man-db'
 PACKAGE_TARNAME='man-db'
-PACKAGE_VERSION='2.6.7'
-PACKAGE_STRING='man-db 2.6.7'
+PACKAGE_VERSION='2.6.7.1'
+PACKAGE_STRING='man-db 2.6.7.1'
 PACKAGE_BUGREPORT='cjwatson@debian.org'
 PACKAGE_URL=''
 
@@ -2218,7 +2218,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 man-db 2.6.7 to adapt to many kinds of systems.
+\`configure' configures man-db 2.6.7.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2288,7 +2288,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of man-db 2.6.7:";;
+     short | recursive ) echo "Configuration of man-db 2.6.7.1:";;
    esac
   cat <<\_ACEOF
 
@@ -2467,7 +2467,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-man-db configure 2.6.7
+man-db configure 2.6.7.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3176,7 +3176,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 man-db $as_me 2.6.7, which was
+It was created by man-db $as_me 2.6.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4122,7 +4122,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='man-db'
- VERSION='2.6.7'
+ VERSION='2.6.7.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13211,7 +13211,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 # Define below date and version information to be put into man pages etc.
 date=2014-04-10
-roff_version=`echo 2.6.7 | sed 's/-/\\-/g'`
+roff_version=`echo 2.6.7.1 | sed 's/-/\\-/g'`
 
 # We have to be a bit naughty here and supply options.
 # The autoconf literature states that only features that can be separately
@@ -43221,7 +43221,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 man-db $as_me 2.6.7, which was
+This file was extended by man-db $as_me 2.6.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -43287,7 +43287,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="\\
-man-db config.status 2.6.7
+man-db config.status 2.6.7.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 2fe8534..215d9c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 m4_pattern_forbid([^MAN_])
 
 # Initialise and check we're in the correct directory.
-AC_INIT([man-db], [2.6.7], [cjwatson@debian.org])
+AC_INIT([man-db], [2.6.7.1], [cjwatson@debian.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.11 -Wall -Wno-override -Werror foreign dist-xz no-dist-gzip parallel-tests])
 AM_MAINTAINER_MODE

diff --git a/docs/man-db.lsm b/docs/man-db.lsm
index 5b19ee9..e26875b 100644 (file)
--- a/docs/man-db.lsm
+++ b/docs/man-db.lsm
@@ -1,6 +1,6 @@
 Begin4
 Title:         man-db
-Version:       2.6.7
+Version:       2.6.7.1
 Entered-date:  2014-04-10
 Description:   This package provides the man command. This utility is
                the primary way of examining the on-line help files
@@ -19,7 +19,7 @@ Author:               jwe@che.utexas.edu (John W Eaton)
                cjwatson@debian.org (Colin Watson)
 Maintained-by: cjwatson@debian.org (Colin Watson)
 Primary-site:  http://savannah.nongnu.org/download/man-db/
-               1.4M man-db-2.6.7.tar.xz
+               1.4M man-db-2.6.7.1.tar.xz
 Alternate-site:        ftp://ftp.debian.org/debian/pool/main/m/man-db/
 Platforms:     Requires GNU groff 1.16.
                Optionally uses GDBM or Berkeley DB (any version with 1.85

diff --git a/po/ca.po b/po/ca.po
index d7a1794..70cb724 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.0-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2011-04-11 22:39+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"

diff --git a/po/cs.po b/po/cs.po
index 6ab0e9f..10961b7 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2012-04-07 19:04+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"

diff --git a/po/da.po b/po/da.po
index b4d43d8..a2abe35 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2012-03-17 23:42+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

diff --git a/po/de.po b/po/de.po
index 05d344e..e9209a5 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2012-04-25 21:22-0700\n"
 "Last-Translator: Arun Persaud <arun@nubati.net>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"

diff --git a/po/eo.po b/po/eo.po
index 5a1243c..1376142 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2013-02-19 13:10-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"

diff --git a/po/es.po b/po/es.po
index 792b06f..f1531e5 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.3.20\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2002-07-03 21:52+0200\n"
 "Last-Translator: David Martínez <ender@debian.org>\n"
 "Language-Team: debian-l10n-spanish@lists.debian.org\n"

diff --git a/po/fi.po b/po/fi.po
index 2eb1dbb..72d5dbd 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.4.2-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2004-01-25 15:07+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"

diff --git a/po/fr.po b/po/fr.po
index a0213fd..1a410ae 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2012-02-06 14:43-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"

diff --git a/po/id.po b/po/id.po
index 4987eaa..05b14d6 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.5.6-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2009-09-08 19:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"

diff --git a/po/it.po b/po/it.po
index 8d3e54c..16a441d 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.4.3\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2005-12-10 17:30+0100\n"
 "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n"
 "Language-Team: Italian <tp@linux.it>\n"

diff --git a/po/ja.po b/po/ja.po
index e4412eb..c666d69 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db-2.6.5\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2013-06-27 19:41+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"

diff --git a/po/man-db.pot b/po/man-db.pot
index 3bc1915..39f9a51 100644 (file)
--- a/po/man-db.pot
+++ b/po/man-db.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: man-db 2.6.7\n"
+"Project-Id-Version: man-db 2.6.7.1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/nl.po b/po/nl.po
index 591a0d1..0e5a7c5 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db-2.5.7-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2009-11-16 08:36+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"

diff --git a/po/pl.po b/po/pl.po
index 27c77c0..7d2114c 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2013-02-03 20:23+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 15dc778..0a79baf 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.4.1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2003-02-22 18:45-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"

diff --git a/po/ro.po b/po/ro.po
index e736cdc..cf0ea1c 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.4.2-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2003-10-27 08:40+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"

diff --git a/po/ru.po b/po/ru.po
index b6f715c..57fd3fd 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.1-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2012-02-06 20:46+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"

diff --git a/po/sr.po b/po/sr.po
index ddf4111..b857165 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.6-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2014-01-16 09:51+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"

diff --git a/po/sv.po b/po/sv.po
index 2d6da16..8c1755e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.5.0-pre2\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2007-09-17 16:57+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

diff --git a/po/vi.po b/po/vi.po
index 0582d2f..26cabfc 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.6.6-pre1\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2014-01-12 16:01+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6193c61..cf5ef71 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.5.1-pre2\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-04-10 02:19+0100\n"
+"POT-Creation-Date: 2014-04-10 03:29+0100\n"
 "PO-Revision-Date: 2008-01-16 17:49-0600\n"
 "Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."

diff --git a/src/tests/mandb-7 b/src/tests/mandb-7
index f628b02..e080328 100755 (executable)
--- a/src/tests/mandb-7
+++ b/src/tests/mandb-7
@@ -12,9 +12,10 @@ fake_config /usr/share/man
 mkdir -p "$tmpdir/usr/share/man"
 mkdir -p "$tmpdir/usr/dir/man"
 mkdir -p "$tmpdir/var/cache/man"
-echo "MANDATORY_MANPATH        " $(realpath $tmpdir/usr/share/man) > "$tmpdir/manpath.config"
-echo "MANDATORY_MANPATH        " $(realpath $tmpdir/usr/dir/man) >> "$tmpdir/manpath.config"
-echo "MANDB_MAP " $(realpath $tmpdir/usr/share/man) $(realpath $tmpdir/var/cache/man) >> "$tmpdir/manpath.config"
+realtmpdir="$(pwd -P)/$tmpdir"
+echo "MANDATORY_MANPATH        $realtmpdir/usr/share/man" > "$tmpdir/manpath.config"
+echo "MANDATORY_MANPATH        $realtmpdir/usr/dir/man" >> "$tmpdir/manpath.config"
+echo "MANDB_MAP $realtmpdir/usr/share/man $realtmpdir/var/cache/man" >> "$tmpdir/manpath.config"
 
 write_page test 1 "$tmpdir/usr/share/man/man1/test.1" UTF-8 '' '' \
        'test \- simple mandb test'