[devscripts] 02/03: Revert replacing diffoscope references with debbindiff.
James McCoy
jamessan at debian.org
Thu May 25 03:55:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch jessie-backports
in repository devscripts.
commit 0fda716cafb1b52a996d430f576197874f0b8a1c
Author: James McCoy <jamessan at debian.org>
Date: Wed May 24 23:35:22 2017 -0400
Revert replacing diffoscope references with debbindiff.
diffoscope is available in jessie-backports now, so this deviation from
Stretch's devscripts is no longer necessary.
This reverts commit 6462800ea245c554333c764388eef793a1e6ec10.
---
README | 2 +-
debian/changelog | 8 ++++++++
debian/control | 3 +--
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, 28 insertions(+), 21 deletions(-)
diff --git a/README b/README
index f772246..2e514c1 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 5a15ade..87e51b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.17.5~bpo8+1) UNRELEASED; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Revert diffoscope → debbindiff change from 2.16.2~bpo8+1, since diffoscope
+ is in jessie-backports now.
+
+ -- James McCoy <jamessan at debian.org> Wed, 24 May 2017 23:36:57 -0400
+
devscripts (2.17.5) unstable; urgency=medium
* Create GNUPGHOME in /tmp to fix CI failures due to long path names.
diff --git a/debian/control b/debian/control
index c69bc77..52b774e 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,6 @@ Suggests: adequate,
build-essential,
check-all-the-things,
cvs-buildpackage,
- debbindiff,
devscripts-el,
diffoscope,
disorderfs,
@@ -152,7 +151,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 730beb8..284c83d 100644
--- a/po4a/po/de.po
+++ b/po4a/po/de.po
@@ -9048,7 +9048,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 "
@@ -9059,7 +9059,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."
+"Sie das Werkzeug B<diffoscope> benutzen."
#. type: Plain text
#: ../scripts/debdiff.1:29
@@ -9665,10 +9665,10 @@ msgstr ""
#: ../scripts/debdiff.1:241
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:246
@@ -13043,11 +13043,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 bf6e28b..27696aa 100644
--- a/po4a/po/devscripts.pot
+++ b/po4a/po/devscripts.pot
@@ -6937,7 +6937,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
@@ -7421,7 +7421,7 @@ msgstr ""
#: ../scripts/debdiff.1:241
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
@@ -10057,7 +10057,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 4f48ce9..d679ba0 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -9057,7 +9057,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 "
@@ -9067,7 +9067,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
@@ -9689,10 +9689,10 @@ msgstr ""
#: ../scripts/debdiff.1:241
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:246
@@ -13085,10 +13085,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 46a019a..bf3c77f 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
<dirson at 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
More information about the devscripts-devel
mailing list