[debhelper-devel] [debhelper] 02/04: debhelper.pod: Subst recommended compat version into examples
Niels Thykier
nthykier at moszumanska.debian.org
Wed Jul 5 16:15:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit d2ca3a7f964eb915035c4526baa92325d3f6dbd7
Author: Niels Thykier <niels at thykier.net>
Date: Wed Jul 5 16:06:42 2017 +0000
debhelper.pod: Subst recommended compat version into examples
Signed-off-by: Niels Thykier <niels at thykier.net>
---
Makefile | 9 ++++++---
debhelper.pod | 8 ++++----
debian/changelog | 2 ++
man/po4a/po/de.po | 16 ++++++++--------
man/po4a/po/es.po | 24 ++++++++++++------------
man/po4a/po/fr.po | 16 ++++++++--------
man/po4a/po/ja.po | 16 ++++++++--------
man/po4a/po/pt.po | 16 ++++++++--------
8 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index fd3aa1a..6e5b5f6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ else
TEST_JOBS = 1
endif
+# Figure out the `current debhelper version.
+VERSION=$(shell dpkg-parsechangelog -SVersion)
+
# This generates a list of synopses of debhelper commands, and substitutes
# it in to the #LIST# line on the man page fed to it on stdin. Must be passed
# parameters of all the executables or pod files to get the synopses from.
@@ -37,16 +40,16 @@ MAKEMANLIST=$(PERL) -e ' \
} \
} \
END { \
+ my $$recommended_compat = $(VERSION); \
+ $$recommended_compat =~ s{\..*}{}; \
while (<STDIN>) { \
s/\#LIST\#/$$list/; \
s/\#LIST_DEPRECATED\#/$$list_deprecated/; \
+ s/\#RECOMMEDED_COMPAT\#/$$recommeded_compat/; \
print; \
}; \
}'
-# Figure out the `current debhelper version.
-VERSION=$(shell dpkg-parsechangelog -SVersion)
-
PERLLIBDIR=$(shell $(PERL) -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper
PREFIX=/usr
diff --git a/debhelper.pod b/debhelper.pod
index c8b93cb..f8eefe5 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -277,15 +277,15 @@ it modifies its behavior in various ways. The compatibility level is
specified in the F<debian/compat> file and the file must be present.
Tell debhelper what compatibility level to use by writing a number to
-F<debian/compat>. For example, to use v9 mode:
+F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:
- % echo 9 > debian/compat
+ % echo #RECOMMEDED_COMPAT# > debian/compat
Your package will also need a versioned build dependency on a version of
debhelper equal to (or greater than) the compatibility level your package
-uses. So for compatibility level 9, ensure debian/control has:
+uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:
- Build-Depends: debhelper (>= 9)
+ Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)
Unless otherwise indicated, all debhelper documentation assumes that you
are using the most recent compatibility level, and in most cases does not
diff --git a/debian/changelog b/debian/changelog
index 040f849..ee9c3f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debhelper (10.6.3) UNRELEASED; urgency=medium
* Makefile: Use "dpkg-parsechangelog -S" rather than
"dpkg-parsechangelog | grep".
+ * debhelper.pod: Use substitution to ensure examples always use the
+ recommended compatibility level.
-- Niels Thykier <niels at thykier.net> Wed, 05 Jul 2017 15:51:48 +0000
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 9450a1a..9ee9614 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -771,20 +771,20 @@ msgstr ""
#: debhelper.pod:279
msgid ""
"Tell debhelper what compatibility level to use by writing a number to "
-"F<debian/compat>. For example, to use v9 mode:"
+"F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:"
msgstr ""
"Schreiben Sie eine Zahl nach F<debian/compat>, um Debhelper mitzuteilen, "
-"welche Kompatibilitätsstufe es nutzen soll. Um beispielsweise den Modus V9 "
+"welche Kompatibilitätsstufe es nutzen soll. Um beispielsweise den Modus V#RECOMMEDED_COMPAT# "
"zu benutzen, geben Sie Folgendes ein:"
#. type: verbatim
#: debhelper.pod:282
#, no-wrap
msgid ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
#. type: textblock
@@ -792,21 +792,21 @@ msgstr ""
msgid ""
"Your package will also need a versioned build dependency on a version of "
"debhelper equal to (or greater than) the compatibility level your package "
-"uses. So for compatibility level 9, ensure debian/control has:"
+"uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:"
msgstr ""
"Ihr Paket wird außerdem eine Bauabhängigkeit mit Versionspflege auf eine "
"Debhelper-Version benötigen, die gleich (oder größer) als die ist, die von "
"der Kompatibilitätsstufe Ihres Pakets verwandt wird. Daher müssen Sie für "
-"Kompatibilitätsstufe 9 sicherstellen, dass debian/control Folgendes hat:"
+"Kompatibilitätsstufe #RECOMMEDED_COMPAT# sicherstellen, dass debian/control Folgendes hat:"
#. type: verbatim
#: debhelper.pod:288
#, no-wrap
msgid ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
#. type: textblock
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index c271f9b..6266ece 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -875,20 +875,20 @@ msgstr ""
#| "F<debian/compat>. For example, to turn on v9 mode:"
msgid ""
"Tell debhelper what compatibility level to use by writing a number to "
-"F<debian/compat>. For example, to use v9 mode:"
+"F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:"
msgstr ""
"Para especificar a debhelper qué nivel de compatibilidad debe utilizar, "
-"escriba un número en F<debian/compat>. Por ejemplo, para activar el modo v9:"
+"escriba un número en F<debian/compat>. Por ejemplo, para activar el modo v#RECOMMEDED_COMPAT#:"
# type: verbatim
#. type: verbatim
#: debhelper.pod:282
#, no-wrap
msgid ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
# type: textblock
@@ -897,12 +897,12 @@ msgstr ""
msgid ""
"Your package will also need a versioned build dependency on a version of "
"debhelper equal to (or greater than) the compatibility level your package "
-"uses. So for compatibility level 9, ensure debian/control has:"
+"uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:"
msgstr ""
"El paquete también requiere como dependencia de construcción («build-"
"depend») una versión de debhelper igual o mayor que el nivel de "
"compatibilidad de debhelper que utiliza el paquete. Por ejemplo, para "
-"utilizar el nivel de compatibilidad 9, compruebe que «debian/control» "
+"utilizar el nivel de compatibilidad #RECOMMEDED_COMPAT#, compruebe que «debian/control» "
"contiene lo siguiente:"
# type: verbatim
@@ -910,10 +910,10 @@ msgstr ""
#: debhelper.pod:288
#, no-wrap
msgid ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
# type: textblock
@@ -1685,13 +1685,13 @@ msgstr ""
#: debhelper.pod:757
#, fuzzy, no-wrap
#| msgid ""
-#| " % echo 9 > debian/compat\n"
+#| " % echo #RECOMMEDED_COMPAT# > debian/compat\n"
#| "\n"
msgid ""
" % echo beta-tester > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
#. type: textblock
@@ -1704,13 +1704,13 @@ msgstr ""
#: debhelper.pod:761
#, fuzzy, no-wrap
#| msgid ""
-#| " Build-Depends: debhelper (>= 9)\n"
+#| " Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
#| "\n"
msgid ""
" Build-Depends: debhelper (>= 9.20160815~)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
#. type: textblock
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 29ae9ec..99a20c6 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -831,21 +831,21 @@ msgstr ""
#: debhelper.pod:279
msgid ""
"Tell debhelper what compatibility level to use by writing a number to "
-"F<debian/compat>. For example, to use v9 mode:"
+"F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:"
msgstr ""
"Pour indiquer à debhelper le niveau de compatibilité à utiliser il faut "
"placer un nombre dans F<debian/compat>. Par exemple, pour exploiter la "
-"version 9 :"
+"version #RECOMMEDED_COMPAT# :"
# type: verbatim
#. type: verbatim
#: debhelper.pod:282
#, no-wrap
msgid ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
# type: textblock
@@ -854,11 +854,11 @@ msgstr ""
msgid ""
"Your package will also need a versioned build dependency on a version of "
"debhelper equal to (or greater than) the compatibility level your package "
-"uses. So for compatibility level 9, ensure debian/control has:"
+"uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:"
msgstr ""
"Le paquet nécessitera aussi une version de debhelper dans les dépendances de "
"construction au moins égale au niveau de compatibilité utilisée pour la "
-"construction du paquet. Ainsi, si le paquet emploie le niveau 9 de "
+"construction du paquet. Ainsi, si le paquet emploie le niveau #RECOMMEDED_COMPAT# de "
"compatibilité, F<debian/control> devra contenir :"
# type: verbatim
@@ -866,10 +866,10 @@ msgstr ""
#: debhelper.pod:288
#, no-wrap
msgid ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
# type: textblock
diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po
index 3460ffa..33d5ce7 100644
--- a/man/po4a/po/ja.po
+++ b/man/po4a/po/ja.po
@@ -752,19 +752,19 @@ msgstr ""
#: debhelper.pod:279
msgid ""
"Tell debhelper what compatibility level to use by writing a number to "
-"F<debian/compat>. For example, to use v9 mode:"
+"F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:"
msgstr ""
"数字を F<debian/compat> に記述して、debhelper にどの互換性レベルを使うかを教"
-"えます。例えば、v9 モードを使うには次の様にします:"
+"えます。例えば、v#RECOMMEDED_COMPAT# モードを使うには次の様にします:"
#. type: verbatim
#: debhelper.pod:282
#, no-wrap
msgid ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
#. type: textblock
@@ -772,20 +772,20 @@ msgstr ""
msgid ""
"Your package will also need a versioned build dependency on a version of "
"debhelper equal to (or greater than) the compatibility level your package "
-"uses. So for compatibility level 9, ensure debian/control has:"
+"uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:"
msgstr ""
"パッケージは、利用する互換性レベルと同じ (あるいはそれ以上) のバージョンの "
-"debhelper プログラムをビルド依存として設定する必要があります。互換性レベル 9 "
+"debhelper プログラムをビルド依存として設定する必要があります。互換性レベル #RECOMMEDED_COMPAT# "
"の場合、debian/control ファイルが以下の様になっていることを確認してください:"
#. type: verbatim
#: debhelper.pod:288
#, no-wrap
msgid ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
#. type: textblock
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index df94a62..95f8b64 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -763,19 +763,19 @@ msgstr ""
#: debhelper.pod:279
msgid ""
"Tell debhelper what compatibility level to use by writing a number to "
-"F<debian/compat>. For example, to use v9 mode:"
+"F<debian/compat>. For example, to use v#RECOMMEDED_COMPAT# mode:"
msgstr ""
"Diz ao debhelper qual nível de compatibilidade deve usar ao escrever um "
-"número em F<debian/compat>. Por exemplo, para usar o modo v9:"
+"número em F<debian/compat>. Por exemplo, para usar o modo v#RECOMMEDED_COMPAT#:"
#. type: verbatim
#: debhelper.pod:282
#, no-wrap
msgid ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
msgstr ""
-" % echo 9 > debian/compat\n"
+" % echo #RECOMMEDED_COMPAT# > debian/compat\n"
"\n"
#. type: textblock
@@ -783,21 +783,21 @@ msgstr ""
msgid ""
"Your package will also need a versioned build dependency on a version of "
"debhelper equal to (or greater than) the compatibility level your package "
-"uses. So for compatibility level 9, ensure debian/control has:"
+"uses. So for compatibility level #RECOMMEDED_COMPAT#, ensure debian/control has:"
msgstr ""
"O seu pacote também vai precisar de uma dependência de compilação de versão "
"de uma versão do debhelper igual (ou maior que) ao nível de compatibilidade "
-"que o seu pacote usa. Portanto para nível de compatibilidade 9, certifique-"
+"que o seu pacote usa. Portanto para nível de compatibilidade #RECOMMEDED_COMPAT#, certifique-"
"se que debian/control tem:"
#. type: verbatim
#: debhelper.pod:288
#, no-wrap
msgid ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
msgstr ""
-" Build-Depends: debhelper (>= 9)\n"
+" Build-Depends: debhelper (>= #RECOMMEDED_COMPAT#)\n"
"\n"
#. type: textblock
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list