[Forensics-changes] [hashdeep] 01/01: Import Debian patch 4.4-3

Mon Oct 17 19:37:47 UTC 2016

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

giovani-guest pushed a commit to branch debian
in repository hashdeep.

commit aca4bf91049999c585f3f61cd5049bf78192712c
Author: Giovani Augusto Ferreira <giovani at riseup.net>
Date:   Thu Sep 22 10:54:38 2016 -0300

    Import Debian patch 4.4-3
---
 debian/changelog                                   | 23 ++++++++++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 12 +++++------
 debian/copyright                                   |  1 +
 debian/hashdeep.README.Debian                      |  8 --------
 debian/hashdeep.links                              | 10 ++++++++++
 .../{fix-FTBFS-Hurd => fix-FTBFS-Hurd.patch}       |  0
 .../patches/{fix-manpages => fix-manpages.patch}   | 16 ++++++++++++---
 debian/patches/series                              |  4 ++--
 debian/watch                                       |  2 +-
 10 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 363b20e..0f6b1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+hashdeep (4.4-3) unstable; urgency=medium
+
+  * New co-maintainer.
+  * Update DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Fixed a typo in Long Description.
+      - Updated the Vcs-* fields.
+  * debian/copyright:
+      - Added myself in debian packaging block.
+  * debian/hashdeep.links:
+      - Added to enable multi-call for md5deep and others.
+        (Closes: #795053, LP: #1525217, #1577293)
+  * debian/hashdeep.README.Debian:
+      - Removed because the executables links have been restored.
+  * debian/patches:
+      - Added the '.patch' extension to all patches.
+      - Updated fix-manpages.patch to fix a typo too
+  * debian/watch
+      - Bumped to version 4.
+
+ -- Giovani Augusto Ferreira <giovani at riseup.net>  Thu, 22 Sep 2016 10:54:38 -0300
+
 hashdeep (4.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 67092b5..4d05734 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: hashdeep
 Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
-Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 9), dh-autoreconf
-Standards-Version: 3.9.6
+Uploaders: Giovani Augusto Ferreira <giovani at riseup.net>
+Build-Depends: debhelper (>=10), dh-autoreconf
+Standards-Version: 3.9.8
 Homepage: http://md5deep.sf.net
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/hashdeep.git
-Vcs-Git: git://anonscm.debian.org/forensics/hashdeep.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/hashdeep.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/hashdeep.git
 
 Package: hashdeep
 Architecture: any
@@ -25,7 +25,7 @@ Description: recursively compute hashsums or piecewise hashings
    * The tools can display those that match the list or those that
      does not match;
    * It can  display a time estimation when processing large files.
-   * It can do piecewise hashing (hashing input files in arbitrary
+   * It can do piecewise hashing (hash input files in arbitrary
      sized blocks).
  .
  This package is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index 9adce46..557e015 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,6 +42,7 @@ Copyright: 2008-2009 Daniel Baumann <daniel at debian.org>
            2009-2012 Michael Prokop <mika at debian.org>
            2011-2012 Julien Valroff <julien at debian.org>
            2015      Joao Eriberto Mota Filho <eriberto at debian.org>
+           2016      Giovani Augusto Ferreira <giovani at riseup.net>
 License: GPL-2+
 
 
diff --git a/debian/hashdeep.README.Debian b/debian/hashdeep.README.Debian
deleted file mode 100644
index 613ef47..0000000
--- a/debian/hashdeep.README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-hashdeep for Debian
--------------------
-
-In the paste, hashdeep, called md5deep, had several executable files. All
-these files (sha1deep, sha256deep, etc) were symlinks to md5deep. Since
-4.4-1 Debian revision, only the hashdeep is installed.
-
- -- Joao Eriberto Mota Filho <eriberto at debian.org>  Fri, 12 Jun 2015 19:56:33 +0200
diff --git a/debian/hashdeep.links b/debian/hashdeep.links
new file mode 100644
index 0000000..0e28d79
--- /dev/null
+++ b/debian/hashdeep.links
@@ -0,0 +1,10 @@
+usr/bin/hashdeep usr/bin/md5deep
+usr/bin/hashdeep usr/bin/sha1deep
+usr/bin/hashdeep usr/bin/sha256deep
+usr/bin/hashdeep usr/bin/tigerdeep
+usr/bin/hashdeep usr/bin/whirlpooldeep
+usr/share/man/man1/hashdeep.1.gz usr/share/man/man1/md5deep.1.gz
+usr/share/man/man1/hashdeep.1.gz usr/share/man/man1/sha1deep.1.gz
+usr/share/man/man1/hashdeep.1.gz usr/share/man/man1/sha256deep.1.gz
+usr/share/man/man1/hashdeep.1.gz usr/share/man/man1/tigerdeep.1.gz
+usr/share/man/man1/hashdeep.1.gz usr/share/man/man1/whirlpooldeep.1.gz
diff --git a/debian/patches/fix-FTBFS-Hurd b/debian/patches/fix-FTBFS-Hurd.patch
similarity index 100%
rename from debian/patches/fix-FTBFS-Hurd
rename to debian/patches/fix-FTBFS-Hurd.patch
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages.patch
similarity index 81%
rename from debian/patches/fix-manpages
rename to debian/patches/fix-manpages.patch
index 70d5ed6..5a8d2d7 100644
--- a/debian/patches/fix-manpages
+++ b/debian/patches/fix-manpages.patch
@@ -1,6 +1,7 @@
-Description: fix some hyphen used as minus sign in manpages.
+Description: fix some hyphen used as minus sign and a few typos in manpages.
 Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2015-06-12
+        Giovani Augusto Ferreira <giovani at riseup.net>
+Last-Update: 2016-09-22
 Index: hashdeep-4.4/man/hashdeep.1
 ===================================================================
 --- hashdeep-4.4.orig/man/hashdeep.1
@@ -38,12 +39,21 @@ Index: hashdeep-4.4/man/hashdeep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  
+@@ -172,7 +172,7 @@ e \- Windows PE executables
+ 
+ .TP
+ \fB\-s\fR
+-Enables silent mode. All error messages are supressed.
++Enables silent mode. All error messages are suppressed.
+ 
+ 
+ .TP
 @@ -259,7 +259,7 @@ file with Wordpad (which can display Uni
  
  Currently the file name of a file containing known hashes may not be
  specified as a unicode filename, but you can specify the name using
 -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
-+tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
++tab completion or an asterisk (e.g. md5deep \-m *.txt where there is
  only one file with a .txt extension).
  
  .SH RETURN VALUE
diff --git a/debian/patches/series b/debian/patches/series
index 3066f48..14be520 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix-manpages
-fix-FTBFS-Hurd
+fix-manpages.patch
+fix-FTBFS-Hurd.patch
diff --git a/debian/watch b/debian/watch
index 50ef469..939cdf8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 http://sf.net/md5deep/md5deep-(\d\S+)\.tar\.(?:bz2|gz|xz)
 https://github.com/jessek/hashdeep/releases .*/archive/(?:release|v)?-?(\d\S+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/hashdeep.git

