Merge branch 'master' into maint-2.20

Conflicts:
	debian/changelog

7 files changed, 35 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index c74a33e..5cf885c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ dctrl-tools (2.20.1) UNRELEASED; urgency=low
   [ David Prévot ]
   * Initial German manpages translation, thanks to Chris Leick (closes:
     #651218).
+  * man pages order in SEE ALSO, thanks to Chris Leick (closes: #651219).
 
- -- Antti-Juhani Kaijanaho <ajk@debian.org>  Wed, 07 Dec 2011 18:10:16 +0200
+ -- David Prévot <taffit@debian.org>  Wed, 07 Dec 2011 11:56:51 -0400
 
 dctrl-tools (2.20) unstable; urgency=low
 
diff --git a/man/grep-dctrl.1.cp b/man/grep-dctrl.1.cp
index 50bad56..0cb31df 100644
--- a/man/grep-dctrl.1.cp
+++ b/man/grep-dctrl.1.cp
@@ -678,11 +678,11 @@ package
 .BR debian\-policy .
 Also available in the Debian website.
 .PP
-.BR ara (1),
 .BR apt\-cache (1),
-.BR dpkg (8),
+.BR ara (1),
 .BR dpkg\-awk (1),
-.BR sgrep (1)
+.BR sgrep (1),
+.BR dpkg (8)
 \" Local variables:
 \" mode: nroff
 \" End:
diff --git a/man/po4a/add_de/de.add b/man/po4a/add_de/de.add
index 0e12934..69d895f 100644
--- a/man/po4a/add_de/de.add
+++ b/man/po4a/add_de/de.add
@@ -16,5 +16,5 @@ oder als Fehlerbericht an das Paket
 
 Sie können mit dem folgenden Befehl das englische 
 Original anzeigen
-.RB "« " "man -L C"
-.IR "section page_de_man" " »."
+.RB » "man -L C"
+.IR "Abschnitt deutsche_Handbuchseite" «.
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 697191b..39d6893 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools 2.19\n"
 "Report-Msgid-Bugs-To: dctrl-tools@packages.debian.org\n"
-"POT-Creation-Date: 2011-12-06 19:01-0400\n"
+"POT-Creation-Date: 2011-12-07 11:47-0400\n"
 "PO-Revision-Date: 2011-12-06 21:12+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -726,10 +726,9 @@ msgstr "Verschiedenes"
 
 #. type: IP
 #: man/grep-dctrl.1.cp:332
-#, fuzzy, no-wrap
-#| msgid "B<grep-dctrl>(1)"
+#, no-wrap
 msgid "B<--ensure-dctrl>"
-msgstr "B<grep-dctrl>(1)"
+msgstr "B<--ensure-dctrl>"
 
 #. type: Plain text
 #: man/grep-dctrl.1.cp:340
@@ -743,10 +742,9 @@ msgstr ""
 
 #. type: IP
 #: man/grep-dctrl.1.cp:340
-#, fuzzy, no-wrap
-#| msgid "B<--lt>"
+#, no-wrap
 msgid "B<--compat>"
-msgstr "B<--lt>"
+msgstr "B<--compat>"
 
 #. type: Plain text
 #: man/grep-dctrl.1.cp:344
@@ -1647,11 +1645,10 @@ msgstr ""
 "Debian-Richtlinien-Handbuch (Debian Policy Manual) – herausgegeben als "
 "Debian-Paket B<debian-policy> – außerdem auf der Debian-Website verfügbar"
 
-# FIXME wrong order
 #. type: Plain text
 #: man/grep-dctrl.1.cp:686
-msgid "B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<sgrep>(1)"
-msgstr "B<ara>(1), B<apt-cache>(1), B<dpkg-awk>(1), B<sgrep>(1), B<dpkg>(8)"
+msgid "B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<sgrep>(1), B<dpkg>(8)"
+msgstr "B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<sgrep>(1), B<dpkg>(8)"
 
 #. type: TH
 #: man/join-dctrl.1:1
@@ -2498,10 +2495,9 @@ msgstr ""
 "der Name des Verzeichnisses, in dem temporäre Dateien erstellt werden. "
 "Vorgabe ist I</tmp>."
 
-# FIXME wrong order
 #. type: Plain text
 #: man/sync-available.8:63
-msgid "B<apt>(8), B<dpkg>(8), B<dselect>(8), B<grep-available>(1)"
+msgid "B<grep-available>(1), B<apt>(8), B<dpkg>(8), B<dselect>(8)"
 msgstr "B<grep-available>(1), B<apt>(8), B<dpkg>(8), B<dselect>(8)"
 
 #. type: TH
@@ -2786,12 +2782,11 @@ msgstr ""
 "Das Programm B<tbl-dctrl> und diese Handbuchseite wurden von Antti-Juhani "
 "Kaijanaho  geschrieben."
 
-# FIXME wrong order
 #. type: Plain text
 #: man/tbl-dctrl.1:222
 msgid ""
-"B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<dpkg-query>(1), "
-"B<grep-dctrl>(1), B<sort-dctrl>(1)"
+"B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<dpkg-query>(1), B<grep-dctrl>"
+"(1), B<sort-dctrl>(1), B<dpkg>(8)"
 msgstr ""
 "B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<dpkg-query>(1), B<grep-dctrl>"
 "(1), B<sort-dctrl>(1), B<dpkg>(8)"
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index f949f55..0637f62 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools\n"
-"POT-Creation-Date: 2011-12-06 19:01-0400\n"
+"POT-Creation-Date: 2011-12-07 11:47-0400\n"
 "PO-Revision-Date: 2011-05-05 11:43-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -721,10 +721,9 @@ msgstr "Divers"
 
 #. type: IP
 #: man/grep-dctrl.1.cp:332
-#, fuzzy, no-wrap
-#| msgid "B<grep-dctrl>(1)"
+#, no-wrap
 msgid "B<--ensure-dctrl>"
-msgstr "B<grep-dctrl>(1)"
+msgstr "B<--ensure-dctrl>"
 
 #. type: Plain text
 #: man/grep-dctrl.1.cp:340
@@ -738,10 +737,9 @@ msgstr ""
 
 #. type: IP
 #: man/grep-dctrl.1.cp:340
-#, fuzzy, no-wrap
-#| msgid "B<--lt>"
+#, no-wrap
 msgid "B<--compat>"
-msgstr "B<--lt>"
+msgstr "B<--compat>"
 
 #. type: Plain text
 #: man/grep-dctrl.1.cp:344
@@ -1637,8 +1635,8 @@ msgstr ""
 
 #. type: Plain text
 #: man/grep-dctrl.1.cp:686
-msgid "B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<sgrep>(1)"
-msgstr "B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<sgrep>(1)"
+msgid "B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<sgrep>(1), B<dpkg>(8)"
+msgstr "B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<sgrep>(1), B<dpkg>(8)"
 
 #. type: TH
 #: man/join-dctrl.1:1
@@ -2481,8 +2479,8 @@ msgstr ""
 
 #. type: Plain text
 #: man/sync-available.8:63
-msgid "B<apt>(8), B<dpkg>(8), B<dselect>(8), B<grep-available>(1)"
-msgstr "B<apt>(8), B<dpkg>(8), B<dselect>(8), B<grep-available>(1)"
+msgid "B<grep-available>(1), B<apt>(8), B<dpkg>(8), B<dselect>(8)"
+msgstr "B<grep-available>(1), B<apt>(8), B<dpkg>(8), B<dselect>(8)"
 
 #. type: TH
 #: man/tbl-dctrl.1:1
@@ -2766,11 +2764,11 @@ msgstr ""
 #. type: Plain text
 #: man/tbl-dctrl.1:222
 msgid ""
-"B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<dpkg-query>(1), "
-"B<grep-dctrl>(1), B<sort-dctrl>(1)"
+"B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<dpkg-query>(1), B<grep-dctrl>"
+"(1), B<sort-dctrl>(1), B<dpkg>(8)"
 msgstr ""
-"B<ara>(1), B<apt-cache>(1), B<dpkg>(8), B<dpkg-awk>(1), B<dpkg-query>(1), "
-"B<grep-dctrl>(1), B<sort-dctrl>(1)"
+"B<apt-cache>(1), B<ara>(1), B<dpkg-awk>(1), B<dpkg-query>(1), B<grep-dctrl>"
+"(1), B<sort-dctrl>(1), B<dpkg>(8)"
 
 #~ msgid "2007-10-27"
 #~ msgstr "2007-10-27"
diff --git a/man/sync-available.8 b/man/sync-available.8
index ad8adfa..ed0eccf 100644
--- a/man/sync-available.8
+++ b/man/sync-available.8
@@ -57,7 +57,7 @@ The name of the directory where temporary files are created.  Default is
 The program and this manual page were written by Antti-Juhani
 Kaijanaho <ajk@debian.org>.
 .SH SEE ALSO
+.BR grep\-available (1),
 .BR apt (8),
 .BR dpkg (8),
-.BR dselect (8),
-.BR grep\-available (1)
+.BR dselect (8)
diff --git a/man/tbl-dctrl.1 b/man/tbl-dctrl.1
index d8a1690..6c12240 100644
--- a/man/tbl-dctrl.1
+++ b/man/tbl-dctrl.1
@@ -212,11 +212,11 @@ The
 .B tbl\-dctrl
 program and this manual page were written by Antti-Juhani Kaijanaho.
 .SH "SEE ALSO"
-.BR ara (1),
 .BR apt\-cache (1),
-.BR dpkg (8),
+.BR ara (1),
 .BR dpkg\-awk (1),
 .BR dpkg\-query (1),
 .BR grep\-dctrl (1),
-.BR sort\-dctrl (1)
+.BR sort\-dctrl (1),
+.BR dpkg (8)