[devscripts] 02/02: releasing package devscripts 2.16.2~bpo8+1
James McCoy
jamessan at debian.org
Fri Apr 1 01:55:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch jessie-backports
in repository devscripts.
commit 6462800ea245c554333c764388eef793a1e6ec10
Author: James McCoy <jamessan at debian.org>
Date: Thu Mar 31 21:30:42 2016 -0400
releasing package devscripts 2.16.2~bpo8+1
Signed-off-by: James McCoy <jamessan at debian.org>
---
README | 2 +-
debian/changelog | 8 ++++++++
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, 29 insertions(+), 21 deletions(-)
diff --git a/README b/README
index 59d8dd9..9994149 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 diffoscope package.
+ For a deeper comparison one can use the debbindiff package.
[wdiff, patchutils]
- debi: Installs the current package by using the setuid root debpkg
diff --git a/debian/changelog b/debian/changelog
index 1029641..1615d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.16.2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ + Revert debbindiff → diffoscope change, since diffoscope isn't in
+ jessie(-backports).
+
+ -- James McCoy <jamessan at debian.org> Thu, 31 Mar 2016 21:28:11 -0400
+
devscripts (2.16.2) unstable; urgency=medium
[ Osamu Aoki ]
diff --git a/debian/control b/debian/control
index 79fe355..9670de2 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,7 @@ Recommends: apt,
Suggests: bsd-mailx | mailx,
build-essential,
cvs-buildpackage,
- diffoscope,
+ debbindiff,
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 diffoscope package for deep comparisons.
+ added and removed files. Use the debbindiff 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 ee11bc2..f852ab0 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<diffoscope> tool."
+"files you can use the B<debbindiff> 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<diffoscope> benutzen."
+"das Werkzeug B<debbindiff> 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<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
msgstr ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(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 diffoscope package for deep comparisons. [wdiff, patchutils]"
+"files. Use the debbindiff 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 »diffoscope«. [wdiff, patchutils]"
+"das Paket »debbindiff«. [wdiff, patchutils]"
#. type: IP
#: ../scripts/devscripts.1:69
diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot
index 8da4057..bd2e8a7 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<diffoscope> tool."
+"files you can use the B<debbindiff> 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<diffoscope>(1)"
+"B<devscripts.conf>(5), B<debbindiff>(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 diffoscope package for deep comparisons. [wdiff, patchutils]"
+"files. Use the debbindiff package for deep comparisons. [wdiff, patchutils]"
msgstr ""
#. type: IP
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index 770156b..760a3e3 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<diffoscope> tool."
+"files you can use the B<debbindiff> 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<diffoscope> peut être utilisé."
+"B<debbindiff> 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<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
msgstr ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(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 diffoscope package for deep comparisons. [wdiff, patchutils]"
+"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 (utilisez B<diffoscope> pour une comparaison plus précise de "
+"ou supprimés (utilisez B<debbindiff> pour une comparaison plus précise de "
"paquets) [wdiff, patchutils]"
#. type: IP
diff --git a/scripts/debdiff.1 b/scripts/debdiff.1
index 3c7340f..14df1dd 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 \fBdiffoscope\fR tool.
+use the \fBdebbindiff\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 diffoscope (1)
+.BR debbindiff (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 ab49633..6c0654f 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 diffoscope package for deeper comparisons of .deb files.
+Use the debbindiff 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