[debhelper-devel] [debhelper] 01/01: Add a dash in --no-scripts and --only-scripts for consistency
Niels Thykier
nthykier at moszumanska.debian.org
Sat Oct 1 16:41:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit e9ee7898595b965cd67004f7e17b7549183d2989
Author: Niels Thykier <niels at thykier.net>
Date: Sat Oct 1 16:40:17 2016 +0000
Add a dash in --no-scripts and --only-scripts for consistency
Signed-off-by: Niels Thykier <niels at thykier.net>
---
Debian/Debhelper/Dh_Getopt.pm | 2 ++
debian/changelog | 5 +++++
dh_icons | 2 +-
dh_installcatalogs | 2 +-
dh_installdebconf | 2 +-
dh_installemacsen | 2 +-
dh_installinit | 6 +++---
dh_installmenu | 2 +-
dh_installmodules | 2 +-
dh_installwm | 2 +-
dh_makeshlibs | 6 +++---
dh_ucf | 2 +-
dh_usrlocal | 2 +-
man/po4a/po/de.po | 14 +++++++-------
man/po4a/po/debhelper.pot | 8 ++++----
man/po4a/po/es.po | 16 ++++++++--------
man/po4a/po/fr.po | 20 ++++++++++----------
man/po4a/po/pt.po | 16 ++++++++--------
18 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 181a88d..22ef536 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -112,8 +112,10 @@ sub getoptions {
"n" => \$dh{NOSCRIPTS},
"noscripts" => \$dh{NOSCRIPTS},
+ "no-scripts" => \$dh{NOSCRIPTS},
"o" => \$dh{ONLYSCRIPTS},
"onlyscripts" => \$dh{ONLYSCRIPTS},
+ "only-scripts" => \$dh{ONLYSCRIPTS},
"X=s" => \&AddExclude,
"exclude=s" => \&AddExclude,
diff --git a/debian/changelog b/debian/changelog
index c70cd24..868aa34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ debhelper (10+unreleased) UNRELEASED; urgency=medium
* debhelper-obsolete-compat.pod: Add a manpage for the
upgrade checklist for all obsolete/removed compat levels.
Thanks to Jakub Wilk for the suggestion.
+ * Dh_Getopt,dh_*: Rename --onlyscripts to --only-scripts and
+ --noscripts to --no-scripts for consistency with other
+ options. The old variants are accepted for compatibility.
+ Thanks to Raphaël Hertzog for the suggestion.
+ (Closes: #838446)
-- Niels Thykier <niels at thykier.net> Wed, 14 Sep 2016 06:07:02 +0000
diff --git a/dh_icons b/dh_icons
index b6caaf3..73f6c15 100755
--- a/dh_icons
+++ b/dh_icons
@@ -32,7 +32,7 @@ These commands are inserted into the maintainer scripts by L<dh_installdeb(1)>.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify maintainer scripts.
diff --git a/dh_installcatalogs b/dh_installcatalogs
index bb45db9..1a863d5 100755
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -52,7 +52,7 @@ start with F</usr/share/sgml/>.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<postrm>/F<prerm> scripts nor add an
activation trigger.
diff --git a/dh_installdebconf b/dh_installdebconf
index 686c7bc..bf601eb 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -63,7 +63,7 @@ For this to work, your package should build-depend on F<po-debconf>.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postrm> script.
diff --git a/dh_installemacsen b/dh_installemacsen
index 26a2fc7..aac15a1 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -55,7 +55,7 @@ build directory. Use B<--priority> to use a different priority than 50.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<prerm> scripts.
diff --git a/dh_installinit b/dh_installinit
index 812b03d..f5c96dc 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -61,11 +61,11 @@ by systemd.)
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<postrm>/F<prerm> scripts.
-=item B<-o>, B<--onlyscripts>
+=item B<-o>, B<--only-scripts>
Only modify F<postinst>/F<postrm>/F<prerm> scripts, do not actually install
any init script, default files, upstart job or systemd service file. May be
@@ -78,7 +78,7 @@ to use this with B<-p> to limit, which packages are affected by the
call. Example:
override_dh_installinit:
- dh_installinit -pfoo --onlyscripts
+ dh_installinit -pfoo --only-scripts
dh_installinit --remaining
=item B<-R>, B<--restart-after-upgrade>
diff --git a/dh_installmenu b/dh_installmenu
index ba69905..a2c5910 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -46,7 +46,7 @@ in the package build directory.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<postrm> scripts.
diff --git a/dh_installmodules b/dh_installmodules
index b4b2e67..068f56d 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -40,7 +40,7 @@ Installed to etc/modprobe.d/I<package>.conf in the package build directory.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<preinst>/F<postinst>/F<postrm> scripts.
diff --git a/dh_installwm b/dh_installwm
index 2cceeae..bf0e5a6 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -42,7 +42,7 @@ Set the priority of the window manager. Default is 20, which is too low for
most window managers; see the Debian Policy document for instructions on
calculating the correct value.
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<prerm> scripts. Turns this command into a no-op.
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 87a84ac..4c39387 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -81,10 +81,10 @@ maintainer screws up then they won't break. The flip side is that packages
might end up with dependencies that are too tight and so find it harder to
be upgraded.
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not add the "ldconfig" trigger even if it seems like the package
-might need it. The option is called B<--noscripts> for historical
+might need it. The option is called B<--no-scripts> for historical
reasons as B<dh_makeshlibs> would previously generate maintainer
scripts that called B<ldconfig>.
@@ -278,7 +278,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
}
- # Historically, --noscripts would disable the creation of
+ # Historically, --no-scripts would disable the creation of
# maintscripts for calling ldconfig.
if (! $dh{NOSCRIPTS} && $need_ldconfig) {
autotrigger($package, 'activate-noawait', 'ldconfig');
diff --git a/dh_ucf b/dh_ucf
index 0978a53..a96b3e8 100755
--- a/dh_ucf
+++ b/dh_ucf
@@ -39,7 +39,7 @@ A dependency on ucf will be generated in B<${misc:Depends}>.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<postrm> scripts. Turns this command into a no-op.
diff --git a/dh_usrlocal b/dh_usrlocal
index b21d11f..4bf6ab8 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -40,7 +40,7 @@ directories in F</usr/local>.
=over 4
-=item B<-n>, B<--noscripts>
+=item B<-n>, B<--no-scripts>
Do not modify F<postinst>/F<prerm> scripts.
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 01faa27..f71b8a4 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -4074,8 +4074,8 @@ msgstr ""
#: dh_icons:35 dh_installcatalogs:55 dh_installdebconf:66 dh_installemacsen:58
#: dh_installinit:64 dh_installmenu:49 dh_installmodules:43 dh_installwm:45
#: dh_makeshlibs:84 dh_usrlocal:43
-msgid "B<-n>, B<--noscripts>"
-msgstr "B<-n>, B<--noscripts>"
+msgid "B<-n>, B<--no-scripts>"
+msgstr "B<-n>, B<--no-scripts>"
#. type: textblock
#: dh_icons:37
@@ -5826,8 +5826,8 @@ msgstr "ändert keine F<postinst>-/F<postrm>/F<prerm>-Skripte."
#. type: =item
#: dh_installinit:68
-msgid "B<-o>, B<--onlyscripts>"
-msgstr "B<-o>, B<--onlyscripts>"
+msgid "B<-o>, B<--only-scripts>"
+msgstr "B<-o>, B<--only-scripts>"
#. type: textblock
#: dh_installinit:70
@@ -5860,12 +5860,12 @@ msgstr ""
#, no-wrap
msgid ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
msgstr ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
@@ -7343,7 +7343,7 @@ msgstr ""
#: dh_makeshlibs:86
msgid ""
"Do not add the \"ldconfig\" trigger even if it seems like the package might "
-"need it. The option is called B<--noscripts> for historical reasons as "
+"need it. The option is called B<--no-scripts> for historical reasons as "
"B<dh_makeshlibs> would previously generate maintainer scripts that called "
"B<ldconfig>."
msgstr ""
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index accb132..8a0495d 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -2989,7 +2989,7 @@ msgstr ""
#. type: =item
#: dh_icons:35 dh_installcatalogs:55 dh_installdebconf:66 dh_installemacsen:58 dh_installinit:64 dh_installmenu:49 dh_installmodules:43 dh_installwm:45 dh_makeshlibs:84 dh_usrlocal:43
-msgid "B<-n>, B<--noscripts>"
+msgid "B<-n>, B<--no-scripts>"
msgstr ""
#. type: textblock
@@ -4377,7 +4377,7 @@ msgstr ""
#. type: =item
#: dh_installinit:68
-msgid "B<-o>, B<--onlyscripts>"
+msgid "B<-o>, B<--only-scripts>"
msgstr ""
#. type: textblock
@@ -4402,7 +4402,7 @@ msgstr ""
#, no-wrap
msgid ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
msgstr ""
@@ -5561,7 +5561,7 @@ msgstr ""
#: dh_makeshlibs:86
msgid ""
"Do not add the \"ldconfig\" trigger even if it seems like the package might "
-"need it. The option is called B<--noscripts> for historical reasons as "
+"need it. The option is called B<--no-scripts> for historical reasons as "
"B<dh_makeshlibs> would previously generate maintainer scripts that called "
"B<ldconfig>."
msgstr ""
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index cec5012..eea9f9c 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -4253,8 +4253,8 @@ msgstr ""
#: dh_icons:35 dh_installcatalogs:55 dh_installdebconf:66 dh_installemacsen:58
#: dh_installinit:64 dh_installmenu:49 dh_installmodules:43 dh_installwm:45
#: dh_makeshlibs:84 dh_usrlocal:43
-msgid "B<-n>, B<--noscripts>"
-msgstr "B<-n>, B<--noscripts>"
+msgid "B<-n>, B<--no-scripts>"
+msgstr "B<-n>, B<--no-scripts>"
# type: textblock
#. type: textblock
@@ -6145,8 +6145,8 @@ msgstr "No modifica los scripts F<postinst>/F<postrm>/F<prerm>."
# type: =item
#. type: =item
#: dh_installinit:68
-msgid "B<-o>, B<--onlyscripts>"
-msgstr "B<-o>, B<--onlyscripts>"
+msgid "B<-o>, B<--only-scripts>"
+msgstr "B<-o>, B<--only-scripts>"
#. type: textblock
#: dh_installinit:70
@@ -6181,7 +6181,7 @@ msgstr ""
#, no-wrap
msgid ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
msgstr ""
@@ -7834,7 +7834,7 @@ msgstr ""
#: dh_makeshlibs:86
msgid ""
"Do not add the \"ldconfig\" trigger even if it seems like the package might "
-"need it. The option is called B<--noscripts> for historical reasons as "
+"need it. The option is called B<--no-scripts> for historical reasons as "
"B<dh_makeshlibs> would previously generate maintainer scripts that called "
"B<ldconfig>."
msgstr ""
@@ -9673,12 +9673,12 @@ msgstr ""
#~ msgid ""
#~ "If no upstart job file is installed in the target directory when "
-#~ "B<dh_installinit --onlyscripts> is called, this program will assume that "
+#~ "B<dh_installinit --only-scripts> is called, this program will assume that "
#~ "an init script is being installed and not provide the compatibility "
#~ "symlinks or upstart dependencies."
#~ msgstr ""
#~ "Si no se instala ninguna tarea de upstart en el directorio destino al "
-#~ "invocar B<dh_installinit --onlyscripts>, el programa supondrá que se está "
+#~ "invocar B<dh_installinit --only-scripts>, el programa supondrá que se está "
#~ "instalando un script de init, y no ofrecerá los enlaces simbólicos de "
#~ "compatibilidad o dependencias de upstart."
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index f1d99eb..da03ebc 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -4383,8 +4383,8 @@ msgstr ""
#: dh_icons:35 dh_installcatalogs:55 dh_installdebconf:66 dh_installemacsen:58
#: dh_installinit:64 dh_installmenu:49 dh_installmodules:43 dh_installwm:45
#: dh_makeshlibs:84 dh_usrlocal:43
-msgid "B<-n>, B<--noscripts>"
-msgstr "B<-n>, B<--noscripts>"
+msgid "B<-n>, B<--no-scripts>"
+msgstr "B<-n>, B<--no-scripts>"
# type: textblock
#. type: textblock
@@ -6345,8 +6345,8 @@ msgstr ""
# type: =item
#. type: =item
#: dh_installinit:68
-msgid "B<-o>, B<--onlyscripts>"
-msgstr "B<-o>, B<--onlyscripts>"
+msgid "B<-o>, B<--only-scripts>"
+msgstr "B<-o>, B<--only-scripts>"
# type: textblock
#. type: textblock
@@ -6380,12 +6380,12 @@ msgstr ""
#, no-wrap
msgid ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
msgstr ""
" override_dh_installinit:\n"
-"\tdh_installinit -ptoto --onlyscripts\n"
+"\tdh_installinit -ptoto --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
@@ -8065,12 +8065,12 @@ msgstr ""
#: dh_makeshlibs:86
msgid ""
"Do not add the \"ldconfig\" trigger even if it seems like the package might "
-"need it. The option is called B<--noscripts> for historical reasons as "
+"need it. The option is called B<--no-scripts> for historical reasons as "
"B<dh_makeshlibs> would previously generate maintainer scripts that called "
"B<ldconfig>."
msgstr ""
"N'ajoutez pas l'action différée (« trigger ») même s'il semble que le paquet "
-"en a besoin. L'option est nommée B<--noscripts> pour des raisons historiques "
+"en a besoin. L'option est nommée B<--no-scripts> pour des raisons historiques "
"car B<dh_makeshlibs> générait précédemment un script de maintenance qui "
"appelait B<ldconfig>."
@@ -9968,12 +9968,12 @@ msgstr ""
# type: textblock
#~ msgid ""
#~ "If no upstart job file is installed in the target directory when "
-#~ "B<dh_installinit --onlyscripts> is called, this program will assume that "
+#~ "B<dh_installinit --only-scripts> is called, this program will assume that "
#~ "an init script is being installed and not provide the compatibility "
#~ "symlinks or upstart dependencies."
#~ msgstr ""
#~ "Si aucun fichier de tâche upstart n'est installé dans le répertoire cible "
-#~ "quand B<dh_installinit --onlyscripts> est invoqué, ce programme considère "
+#~ "quand B<dh_installinit --only-scripts> est invoqué, ce programme considère "
#~ "qu'un script init est en cours d'installation et ne fournit pas les liens "
#~ "symboliques de compatibilité, ni de dépendances envers upstart."
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index bca0d90..2da5dc3 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -4021,8 +4021,8 @@ msgstr ""
#: dh_icons:35 dh_installcatalogs:55 dh_installdebconf:66 dh_installemacsen:58
#: dh_installinit:64 dh_installmenu:49 dh_installmodules:43 dh_installwm:45
#: dh_makeshlibs:84 dh_usrlocal:43
-msgid "B<-n>, B<--noscripts>"
-msgstr "B<-n>, B<--noscripts>"
+msgid "B<-n>, B<--no-scripts>"
+msgstr "B<-n>, B<--no-scripts>"
#. type: textblock
#: dh_icons:37
@@ -5770,8 +5770,8 @@ msgstr "Não modifique os scripts F<postinst>/F<postrm>/F<prerm>."
#. type: =item
#: dh_installinit:68
-msgid "B<-o>, B<--onlyscripts>"
-msgstr "B<-o>, B<--onlyscripts>"
+msgid "B<-o>, B<--only-scripts>"
+msgstr "B<-o>, B<--only-scripts>"
#. type: textblock
#: dh_installinit:70
@@ -5804,12 +5804,12 @@ msgstr ""
#, no-wrap
msgid ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
msgstr ""
" override_dh_installinit:\n"
-"\tdh_installinit -pfoo --onlyscripts\n"
+"\tdh_installinit -pfoo --only-scripts\n"
"\tdh_installinit --remaining\n"
"\n"
@@ -7288,12 +7288,12 @@ msgstr ""
#: dh_makeshlibs:86
msgid ""
"Do not add the \"ldconfig\" trigger even if it seems like the package might "
-"need it. The option is called B<--noscripts> for historical reasons as "
+"need it. The option is called B<--no-scripts> for historical reasons as "
"B<dh_makeshlibs> would previously generate maintainer scripts that called "
"B<ldconfig>."
msgstr ""
"Não adiciona o trigger \"ldconfig\" mesmo que parece que o pacote possa "
-"precisar dele. A opção é chamada B<--noscripts> por razões históricas pois o "
+"precisar dele. A opção é chamada B<--no-scripts> por razões históricas pois o "
"B<dh_makeshlibs> previamente gerava scripts do mantenedor que chamavam "
"B<ldconfig>."
--
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