This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit fe6149c8db6a8443150d2fc5b81a8dbd24dc27c0 Author: James McCoy <james...@debian.org> Date: Tue Mar 15 20:41:03 2016 -0400 Replace references to debbindiff with diffoscope Signed-off-by: James McCoy <james...@debian.org> --- README | 2 +- debian/changelog | 1 + debian/control | 4 ++-- po4a/po/de.po | 12 ++++++------ po4a/po/devscripts.pot | 6 +++--- po4a/po/fr.po | 12 ++++++------ scripts/debdiff.1 | 4 ++-- scripts/debdiff.pl | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/README b/README index c4d4558..b796b5d 100644 --- a/README +++ b/README @@ -87,7 +87,7 @@ And now, in mostly alphabetical order, the scripts: reports on any difference found in their file lists. Useful for ensuring that no files were inadvertently lost between versions. Can also examine two .dsc files and report on the changes between source versions. - For a deeper comparison one can use the debbindiff package. + For a deeper comparison one can use the diffoscope package. [wdiff, patchutils] - debi: Installs the current package by using the setuid root debpkg diff --git a/debian/changelog b/debian/changelog index 2c4255b..12c61a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ devscripts (2.16.2) UNRELEASED; urgency=medium * grep-excuses: + Report excuses even when autoremoval info isn't reachable. (Closes: #816723) + * Replace references to debbindiff with diffoscope. (Closes: #818299) [ Johannes Schauer ] * build-rdeps: diff --git a/debian/control b/debian/control index 9e860f6..f9a2a81 100644 --- a/debian/control +++ b/debian/control @@ -77,7 +77,7 @@ Recommends: apt, Suggests: bsd-mailx | mailx, build-essential, cvs-buildpackage, - debbindiff, + diffoscope, devscripts-el, dose-extra (>= 4.0), gnuplot, @@ -136,7 +136,7 @@ Description: scripts to make the life of a Debian Package maintainer easier basing commit message on changelog [cvs | darcs | subversion | svk | tla | bzr | git-core | mercurial, libtimedate-perl] - debdiff: compare two versions of a Debian package to check for - added and removed files. Use the debbindiff package for deep comparisons. + added and removed files. Use the diffoscope package for deep comparisons. [wdiff, patchutils] - debi: install a just-built package - debpkg: dpkg wrapper to be able to manage/test packages without su diff --git a/po4a/po/de.po b/po4a/po/de.po index bf93a1a..c84c409 100644 --- a/po4a/po/de.po +++ b/po4a/po/de.po @@ -8869,7 +8869,7 @@ msgid "" "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<wdiff> program. If you want a deeper comparison of two Debian package " -"files you can use the B<debbindiff> tool." +"files you can use the B<diffoscope> tool." msgstr "" "B<debdiff> nimmt die Namen zweier Debian-Pakete (I<.deb>s oder I<.udeb>s) " "auf der Befehlszeile entgegen und vergleicht ihren Inhalt (dabei werden nur " @@ -8880,7 +8880,7 @@ msgstr "" "gingen. Es prüft außerdem die Dateibesitzer und Zugriffsrechte und " "vergleicht die Steuerdateien der beiden Pakete mittels des Programms " "B<wdiff>. Falls Sie zwei Debian-Pakete genauer vergleichen wollen, können Sie " -"das Werkzeug B<debbindiff> benutzen." +"das Werkzeug B<diffoscope> benutzen." #. type: Plain text #: ../scripts/debdiff.1:29 @@ -9455,10 +9455,10 @@ msgstr "" #: ../scripts/debdiff.1:224 msgid "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts." -"conf>(5), B<debbindiff>(1)" +"conf>(5), B<diffoscope>(1)" msgstr "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts." -"conf>(5), B<debbindiff>(1)" +"conf>(5), B<diffoscope>(1)" #. type: Plain text #: ../scripts/debdiff.1:229 @@ -12785,11 +12785,11 @@ msgstr "I<debdiff>(1)" #: ../scripts/devscripts.1:69 msgid "" "compare two versions of a Debian package to check for added and removed " -"files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]" +"files. Use the diffoscope package for deep comparisons. [wdiff, patchutils]" msgstr "" "vergleicht zwei Versionen eines Debian-Pakets, um es auf hinzugefügte oder " "entfernte Dateien hin zu untersuchen. Verwenden Sie für genauere Vergleiche " -"das Paket »debbindiff«. [wdiff, patchutils]" +"das Paket »diffoscope«. [wdiff, patchutils]" #. type: IP #: ../scripts/devscripts.1:69 diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index ea986af..83f973e 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -6790,7 +6790,7 @@ msgid "" "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<wdiff> program. If you want a deeper comparison of two Debian package " -"files you can use the B<debbindiff> tool." +"files you can use the B<diffoscope> tool." msgstr "" #. type: Plain text @@ -7254,7 +7254,7 @@ msgstr "" #: ../scripts/debdiff.1:224 msgid "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), " -"B<devscripts.conf>(5), B<debbindiff>(1)" +"B<devscripts.conf>(5), B<diffoscope>(1)" msgstr "" #. type: Plain text @@ -9849,7 +9849,7 @@ msgstr "" #: ../scripts/devscripts.1:69 msgid "" "compare two versions of a Debian package to check for added and removed " -"files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]" +"files. Use the diffoscope package for deep comparisons. [wdiff, patchutils]" msgstr "" #. type: IP diff --git a/po4a/po/fr.po b/po4a/po/fr.po index 7f45735..1ba7213 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -8888,7 +8888,7 @@ msgid "" "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<wdiff> program. If you want a deeper comparison of two Debian package " -"files you can use the B<debbindiff> tool." +"files you can use the B<diffoscope> tool." msgstr "" "B<debdiff> prend en argument le nom de deux paquets Debian (fichiers I<.deb> " "ou I<.udeb>) et compare leur contenu (en comparant uniquement les fichiers " @@ -8898,7 +8898,7 @@ msgstr "" "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<wdiff>. Pour une comparaison plus précise de deux paquets Debian, l’outil " -"B<debbindiff> peut être utilisé." +"B<diffoscope> peut être utilisé." #. type: Plain text #: ../scripts/debdiff.1:29 @@ -9467,10 +9467,10 @@ msgstr "" #: ../scripts/debdiff.1:224 msgid "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts." -"conf>(5), B<debbindiff>(1)" +"conf>(5), B<diffoscope>(1)" msgstr "" "B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts." -"conf>(5), B<debbindiff>(1)" +"conf>(5), B<diffoscope>(1)" #. type: Plain text #: ../scripts/debdiff.1:229 @@ -12790,10 +12790,10 @@ msgstr "B<debdiff>(1)" #: ../scripts/devscripts.1:69 msgid "" "compare two versions of a Debian package to check for added and removed " -"files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]" +"files. Use the diffoscope package for deep comparisons. [wdiff, patchutils]" msgstr "" "comparer deux versions d'un paquet Debian pour vérifier les fichiers ajoutés " -"ou supprimés (utilisez B<debbindiff> pour une comparaison plus précise de " +"ou supprimés (utilisez B<diffoscope> pour une comparaison plus précise de " "paquets) [wdiff, patchutils]" #. type: IP diff --git a/scripts/debdiff.1 b/scripts/debdiff.1 index 14df1dd..3c7340f 100644 --- a/scripts/debdiff.1 +++ b/scripts/debdiff.1 @@ -22,7 +22,7 @@ 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 \fBwdiff\fR program. If you want a deeper comparison of two Debian package files you can -use the \fBdebbindiff\fR tool. +use the \fBdiffoscope\fR tool. .PP If no arguments are given, \fBdebdiff\fR tries to compare the content of the current source directory with the last version of the package. @@ -237,7 +237,7 @@ be 255. .BR interdiff (1), .BR wdiff (1), .BR devscripts.conf (5), -.BR debbindiff (1) +.BR diffoscope (1) .SH AUTHOR \fBdebdiff\fR was originally written as a shell script by Yann Dirson <dir...@debian.org> and rewritten in Perl with many more features by diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl index 6c0654f..ab49633 100755 --- a/scripts/debdiff.pl +++ b/scripts/debdiff.pl @@ -98,7 +98,7 @@ Valid options are: Default settings modified by devscripts configuration files: $modified_conf_msg -Use the debbindiff package for deeper comparisons of .deb files. +Use the diffoscope package for deeper comparisons of .deb files. EOF } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list devscripts-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel