[Forensics-changes] [recoverdm] 01/01: Import Debian changes 0.20-4

[Joao Eriberto Mota Filho]

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

eriberto pushed a commit to branch debian
in repository recoverdm.

commit 5141726b2e2207016f33f1f3881426374543b3a8
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Wed Jan 25 21:18:18 2017 -0200

    Import Debian changes 0.20-4
    
    recoverdm (0.20-4) unstable; urgency=medium
    
      * Team upload.
      * Bumped DH level to 10.
      * debian/control:
          - Bumped Standards-Version to 3.9.8.
          - Updated the Vcs-Git field to use https instead of git.
      * debian/copyright: updated the packaging copyright years.
      * debian/patches/:
          - fix-makefile: renamed to 10_fix-makefile.patch.
          - 20_fix-typo-binary.patch: added to fix a typo in final binary.
      * debian/watch: bumped to version 4.
---
 debian/changelog                                       | 15 +++++++++++++++
 debian/compat                                          |  2 +-
 debian/control                                         | 10 +++++-----
 debian/copyright                                       |  2 +-
 debian/manpages                                        |  2 +-
 debian/patches/{fix-makefile => 10_fix-makefile.patch} |  0
 debian/patches/20_fix-typo-binary.patch                | 16 ++++++++++++++++
 debian/patches/series                                  |  3 ++-
 debian/watch                                           |  2 +-
 9 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75d7b83..afad33b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+recoverdm (0.20-4) unstable; urgency=medium
+
+  * Team upload.
+  * Bumped DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Updated the Vcs-Git field to use https instead of git.
+  * debian/copyright: updated the packaging copyright years.
+  * debian/patches/:
+      - fix-makefile: renamed to 10_fix-makefile.patch.
+      - 20_fix-typo-binary.patch: added to fix a typo in final binary.
+  * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 25 Jan 2017 21:18:18 -0200
+
 recoverdm (0.20-3) 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 740ee45..245b2d2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ 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)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
 Homepage: http://www.vanheusden.com/recoverdm
-Vcs-Browser: https://anonscm.debian.org/cgit/forensics/recoverdm.git
-Vcs-Git: git://anonscm.debian.org/forensics/recoverdm.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/recoverdm.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/recoverdm.git
 
 Package: recoverdm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: recover files on disks with damaged sectors
  recoverdm recover disks with bad sectors. You can recover files as well
  complete devices. In case it finds sectors which simply cannot be recovered,
diff --git a/debian/copyright b/debian/copyright
index cbb6c05..8845a9b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2008      Christophe Monniez <christophe.monniez at fccu.be>
            2008-2009 Daniel Baumann <daniel at debian.org>
-           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
+           2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/manpages b/debian/manpages
index 9db2d57..6664825 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-debian/manpage/recoverdm.1
 debian/manpage/mergebad.1
+debian/manpage/recoverdm.1
diff --git a/debian/patches/fix-makefile b/debian/patches/10_fix-makefile.patch
similarity index 100%
rename from debian/patches/fix-makefile
rename to debian/patches/10_fix-makefile.patch
diff --git a/debian/patches/20_fix-typo-binary.patch b/debian/patches/20_fix-typo-binary.patch
new file mode 100644
index 0000000..e69b86e
--- /dev/null
+++ b/debian/patches/20_fix-typo-binary.patch
@@ -0,0 +1,16 @@
+Description: fix a typo in final binary.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2017-01-25
+Index: recoverdm-0.20/recoverdm.c
+===================================================================
+--- recoverdm-0.20.orig/recoverdm.c
++++ recoverdm-0.20/recoverdm.c
+@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
+ 					}
+ 				}
+ 
+-				printf("Tried reading %d times, failed doing that. Skiping %d blocks...\n", n_retries, skip_value);
++				printf("Tried reading %d times, failed doing that. Skipping %d blocks...\n", n_retries, skip_value);
+ 
+ 				if (lseek64(fdin, curpos + (off64_t)block_size*skip_value, SEEK_SET) == -1)
+ 				{
diff --git a/debian/patches/series b/debian/patches/series
index 4f20ff2..ed4823b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-fix-makefile
+10_fix-makefile.patch
+20_fix-typo-binary.patch
diff --git a/debian/watch b/debian/watch
index b0d650c..3909970 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://www.vanheusden.com/recoverdm recoverdm-(\d\S+)\.(?:tgz|tar\.(?:bz2|gz|xz))

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