diff -Nru devscripts-2.14.11/debian/changelog devscripts-2.15.1/debian/changelog --- devscripts-2.14.11/debian/changelog 2014-12-04 04:03:56.000000000 +0000 +++ devscripts-2.15.1/debian/changelog 2015-01-01 14:51:28.000000000 +0000 @@ -1,3 +1,13 @@ +devscripts (2.15.1) unstable; urgency=medium + + [ Julien Cristau ] + * grep-excuses: update URLs to use https://release.debian.org/ + + [ David Prévot ] + * French translation update + + -- James McCoy Thu, 01 Jan 2015 09:50:36 -0500 + devscripts (2.14.11) unstable; urgency=medium [ Paul Wise ] diff -Nru devscripts-2.14.11/po4a/po/de.po devscripts-2.15.1/po4a/po/de.po --- devscripts-2.14.11/po4a/po/de.po 2014-12-04 04:03:56.000000000 +0000 +++ devscripts-2.15.1/po4a/po/de.po 2015-01-01 14:51:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: devscripts 2.14.6\n" "Report-Msgid-Bugs-To: devscripts@packages.debian.org\n" -"POT-Creation-Date: 2014-12-01 23:44-0500\n" +"POT-Creation-Date: 2014-12-23 08:54-0400\n" "PO-Revision-Date: 2014-09-23 21:32+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: de \n" @@ -4099,6 +4099,7 @@ #. type: TP #: ../scripts/cowpoke.1:121 +#, no-wrap msgid "B<--sign=>I" msgstr "B<--sign=>I" diff -Nru devscripts-2.14.11/po4a/po/devscripts.pot devscripts-2.15.1/po4a/po/devscripts.pot --- devscripts-2.14.11/po4a/po/devscripts.pot 2014-12-04 04:05:18.000000000 +0000 +++ devscripts-2.15.1/po4a/po/devscripts.pot 2015-01-01 14:53:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-12-01 23:44-0500\n" +"POT-Creation-Date: 2014-12-23 08:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru devscripts-2.14.11/po4a/po/fr.po devscripts-2.15.1/po4a/po/fr.po --- devscripts-2.14.11/po4a/po/fr.po 2014-12-04 04:03:56.000000000 +0000 +++ devscripts-2.15.1/po4a/po/fr.po 2015-01-01 14:51:28.000000000 +0000 @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: devscripts\n" -"POT-Creation-Date: 2014-12-01 23:44-0500\n" -"PO-Revision-Date: 2014-09-22 20:53-0400\n" +"POT-Creation-Date: 2014-12-23 08:54-0400\n" +"PO-Revision-Date: 2014-12-23 08:45-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" "Language: fr\n" @@ -4106,41 +4106,35 @@ #. type: TP #: ../scripts/cowpoke.1:121 +#, no-wrap msgid "B<--sign=>I" msgstr "B<--sign=>I" #. type: Plain text #: ../scripts/cowpoke.1:125 -#, fuzzy -#| msgid "" -#| "This option will override any B specified for a chroot in the " -#| "cowpoke configuration files." msgid "" "Specify the key to sign packages with. This will override any B " "specified for a chroot in the cowpoke configuration files." msgstr "" -"Cette option remplacera toutes les B indiquées pour un chroot " -"dans les fichiers de configuration de B." +"Indiquer la clef à utiliser pour signer les paquets. Cela remplacera toutes " +"les B indiquées pour un chroot dans les fichiers de " +"configuration de B." #. type: TP #: ../scripts/cowpoke.1:126 -#, fuzzy, no-wrap -#| msgid "B<--dupload>, B<--dput>" +#, no-wrap msgid "B<--upload=>I" -msgstr "B<--dupload>, B<--dput>" +msgstr "B<--upload=>I" #. type: Plain text #: ../scripts/cowpoke.1:130 -#, fuzzy -#| msgid "" -#| "This option will override any B specified for a chroot in the " -#| "cowpoke configuration files." msgid "" "Specify the dput queue to upload signed packages to. This will override any " "B specified for a chroot in the cowpoke configuration files." msgstr "" -"Cette option remplacera toutes les B indiquées pour un chroot " -"dans les fichiers de configuration de B." +"Indiquer la I dput à utiliser pour envoyer les paquets signés. Cela " +"remplacera toutes les B indiquées pour un chroot dans les " +"fichiers de configuration de B." #. type: Plain text #: ../scripts/cowpoke.1:134 @@ -4314,15 +4308,6 @@ #. type: Plain text #: ../scripts/cowpoke.1:194 -#, fuzzy -#| msgid "" -#| "If this option is set, it is expected to contain the gpg key ID to pass " -#| "to B(1) if the packages are to be remotely signed. You will be " -#| "prompted to confirm whether you wish to sign the packages after all " -#| "builds are complete. If this option is unset or an empty string, no " -#| "attempt to sign packages will be made. It may be overridden on an " -#| "I and I specific basis using the " -#| "IB<_>IB<_SIGN_KEYID> option described below." msgid "" "If this option is set, it is expected to contain the gpg key ID to pass to " "B(1) if the packages are to be remotely signed. You will be " @@ -4339,7 +4324,8 @@ "ou si elle contient une chaîne vide, aucune tentative de signature ne sera " "effectuée. Elle peut être remplacée de façon spécifique à une " "Iitecture et une Iribution avec l’option " -"IB<_>IB<_SIGN_KEYID> décrite ci-dessous." +"IB<_>IB<_SIGN_KEYID> décrite ci-dessous, ou par invocation avec " +"l’option B<--sign> en ligne de commande." #. type: TP #: ../scripts/cowpoke.1:195 @@ -4350,16 +4336,6 @@ # NOTE: "them" => packages #. type: Plain text #: ../scripts/cowpoke.1:206 -#, fuzzy -#| msgid "" -#| "If this option is set, it is expected to contain a 'host' specification " -#| "for B(1) which will be used to upload them after they are signed. " -#| "You will be prompted to confirm whether you wish to upload the packages " -#| "after they are signed. If this option is unset or an empty string, no " -#| "attempt to upload packages will be made. If B is not set, " -#| "this option will be ignored entirely. It may be overridden on an I " -#| "and I specific basis using the IB<_>IB<_UPLOAD_QUEUE> " -#| "option described below." msgid "" "If this option is set, it is expected to contain a 'host' specification for " "B(1) which will be used to upload them after they are signed. You " @@ -4378,7 +4354,7 @@ "Si B n'est pas activée, cette option sera complètement ignorée. " "Elle peut être remplacée de façon spécifique à une Iitecture et une " "Iribution avec l’option IB<_>IB<_UPLOAD_QUEUE> décrite ci-" -"dessous." +"dessous, ou par invocation avec l’option B<--upload> en ligne de commande." #. type: TP #: ../scripts/cowpoke.1:208 @@ -4652,8 +4628,8 @@ "An optional arch and dist specific override for the global B " "option." msgstr "" -"Un remplacement facultatif de l’option B globale, spécifique à une " -"Iitecture et une Iribution." +"Un remplacement facultatif de l’option B globale, spécifique à " +"une Iitecture et une Iribution." #. type: TP #: ../scripts/cowpoke.1:312 @@ -8903,16 +8879,6 @@ #. type: Plain text #: ../scripts/debdiff.1:26 -#, fuzzy -#| msgid "" -#| "B takes the names of two Debian package files (I<.deb>s or I<." -#| "udeb>s) on the command line and compares their contents (considering only " -#| "the files in the main package, not the maintenance scripts). It shows " -#| "which files have been introduced and which removed between the two " -#| "package files, and is therefore useful for spotting files which may have " -#| "been inadvertently lost between revisions of the package. It also checks " -#| "the file owners and permissions, and compares the control files of the " -#| "two packages using the B program." msgid "" "B takes the names of two Debian package files (I<.deb>s or I<." "udeb>s) on the command line and compares their contents (considering only " @@ -8931,7 +8897,8 @@ "pointer les fichiers perdus par inadvertance entre deux versions d'un " "paquet. Il vérifie également les permissions et propriétaires des fichiers " "et compare le fichier control des deux paquets à l'aide du programme " -"B." +"B. Pour une comparaison plus précise de deux paquets Debian, l’outil " +"B peut être utilisé." #. type: Plain text #: ../scripts/debdiff.1:29 @@ -9503,7 +9470,7 @@ "conf>(5), B(1)" msgstr "" "B(1), B(1), B(1), B(1), B(5), B" +"conf>(5), B(1)" #. type: Plain text #: ../scripts/debdiff.1:229 @@ -12821,16 +12788,13 @@ #. type: Plain text #: ../scripts/devscripts.1:69 -#, fuzzy -#| msgid "" -#| "compare two versions of a Debian package to check for added and removed " -#| "files [wdiff, patchutils]" msgid "" "compare two versions of a Debian package to check for added and removed " "files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]" msgstr "" "comparer deux versions d'un paquet Debian pour vérifier les fichiers ajoutés " -"ou supprimés [wdiff, patchutils]" +"ou supprimés (utilisez B pour une comparaison plus précise de " +"paquets) [wdiff, patchutils]" #. type: IP #: ../scripts/devscripts.1:69 diff -Nru devscripts-2.14.11/scripts/grep-excuses.pl devscripts-2.15.1/scripts/grep-excuses.pl --- devscripts-2.14.11/scripts/grep-excuses.pl 2014-12-04 04:03:56.000000000 +0000 +++ devscripts-2.15.1/scripts/grep-excuses.pl 2015-01-01 14:51:28.000000000 +0000 @@ -46,7 +46,7 @@ my $progname = basename($0); my $modified_conf_msg; -my $url='http://ftp-master.debian.org/testing/update_excuses.html.gz'; +my $url='https://release.debian.org/britney/update_excuses.html.gz'; # No longer use these - see bug#309802 my $cachedir = $ENV{'HOME'}."/.devscripts_cache/"; @@ -92,7 +92,7 @@ } while( my $package=shift ) { - my $dump = `w3m -dump -cols $columns "http://release.debian.org/migration/testing.pl?package=$package"`; + my $dump = `w3m -dump -cols $columns "https://release.debian.org/migration/testing.pl?package=$package"`; $dump =~ s/^.*?(?=Checking)//s; $dump =~ s/^\[.*//ms; print($dump);