[devscripts] 01/01: Suggest debbindiff for deep .deb comparisons

[Paul Wise]

This is an automated email from the git hooks/post-receive script.

pabs pushed a commit to branch master
in repository devscripts.

commit 22b4112f554b3b7cfae30d71e3ecd3f35fa4b882
Author: Paul Wise <pabs at debian.org>
Date:   Sun Oct 19 17:35:32 2014 +0800

    Suggest debbindiff for deep .deb comparisons
---
 README             | 1 +
 debian/changelog   | 6 ++++++
 debian/control     | 4 +++-
 scripts/debdiff.1  | 3 +++
 scripts/debdiff.pl | 2 ++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 503cfc3..85e19c8 100644
--- a/README
+++ b/README
@@ -86,6 +86,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.
   [wdiff, patchutils]
 
 - debi: Installs the current package by using the setuid root debpkg
diff --git a/debian/changelog b/debian/changelog
index e61bddc..4f9eab7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+devscripts (2.14.11) UNRELEASED; urgency=medium
+
+  * Suggest debbindiff for deep .deb comparisons
+
+ -- Paul Wise <pabs at debian.org>  Sun, 19 Oct 2014 17:27:24 +0800
+
 devscripts (2.14.10) unstable; urgency=medium
 
   * Fix all the other calls to dpkg-architecture in devscripts.
diff --git a/debian/control b/debian/control
index cc96e02..5cda9f3 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,7 @@ Recommends: at,
 Suggests: bsd-mailx | mailx,
           build-essential,
           cvs-buildpackage,
+          debbindiff,
           devscripts-el,
           gnuplot,
           gpgv,
@@ -127,7 +128,8 @@ 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 [wdiff, patchutils]
+    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
   - debrelease: wrapper around dupload or dput [dupload | dput, ssh-client]
diff --git a/scripts/debdiff.1 b/scripts/debdiff.1
index 27dd1d3..3e9b3b2 100644
--- a/scripts/debdiff.1
+++ b/scripts/debdiff.1
@@ -21,6 +21,8 @@ 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 \fBwdiff\fR program.
+If you want a deeper comparison of two Debian package files you can
+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.
@@ -218,6 +220,7 @@ be 255.
 .BR interdiff (1),
 .BR wdiff (1),
 .BR devscripts.conf (5)
+.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 b29348e..7984945 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -95,6 +95,8 @@ Valid options are:
 
 Default settings modified by devscripts configuration files:
 $modified_conf_msg
+
+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