[Forensics-changes] [scrounge-ntfs] 01/01: Imported Debian patch 0.9-8

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Tue Jan 10 03:26:42 UTC 2017


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

eriberto pushed a commit to branch debian
in repository scrounge-ntfs.

commit 8cdbf17619e87e1e10ed0cb661d2735850f794b1
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue Jan 10 01:11:13 2017 -0200

    Imported Debian patch 0.9-8
---
 debian/changelog                                   | 19 ++++++++--
 debian/compat                                      |  2 +-
 debian/control                                     | 10 +++---
 debian/copyright                                   | 42 +++++++++++-----------
 .../{01-fix-manpage => 01_fix-manpage.patch}       |  0
 ...-fix-help-message => 02_fix-help-message.patch} |  0
 .../{03-fix-max-size => 03_fix-max-size.patch}     |  0
 ...e-add-option => 04_clean-code-add-option.patch} |  0
 debian/patches/series                              |  8 ++---
 debian/rules                                       |  2 +-
 debian/watch                                       |  2 +-
 11 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b06d395..e9a09ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+scrounge-ntfs (0.9-8) unstable; urgency=medium
+
+  * Team upload.
+  * Bumped DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Updated the Vcs-* fields to use https instead of http and git.
+  * debian/copyright: updated the packaging copyright years.
+  * debian/patches/: added a patch suffix to all patches.
+  * debian/rules: removed the '--with autoreconf' because it is default
+    in DH 10.
+  * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 10 Jan 2017 01:11:13 -0200
+
 scrounge-ntfs (0.9-7) unstable; urgency=medium
 
   * Team upload.
@@ -30,7 +45,7 @@ scrounge-ntfs (0.9-7) unstable; urgency=medium
           ~ Updated the upstream e-mail address.
       - 02-fix-help-message: added to fix the program name in its help. Thanks
         to Nelson A. de Oliveira <naoliv at debian.org>. (Closes: #650649)
-      - 03-fix-max-size: added to allow disks grather than 2TB. Thanks to
+      - 03-fix-max-size: added to allow disks greater than 2TB. Thanks to
         doug Springer <gpib at rickyrockrat.net> (Closes: #690802, LP: #1067814)
       - 04-clean-code-add-option: added but disabled. With this patch, the
         program didn't work fine.
@@ -57,7 +72,7 @@ scrounge-ntfs (0.9-5) unstable; urgency=low
   * Replacing obsolete dh_clean -k with dh_prep.
   * Prefixing debhelper files with package name.
   * Passing flags directly to configure.
-  * Updating year in copyrigth file.
+  * Updating year in copyright file.
   * Updating to standards 3.8.1.
   * Tidy rules file.
 
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 883cbe5..c6225ef 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Juan Angulo Moreno <juan at apuntale.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10), dh-autoreconf
+Standards-Version: 3.9.8
 Homepage: http://thewalter.net/stef/software/scrounge/
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/scrounge-ntfs.git
-Vcs-Git: git://anonscm.debian.org/forensics/scrounge-ntfs.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/scrounge-ntfs.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/scrounge-ntfs.git
 
 Package: scrounge-ntfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Data recovery program for NTFS filesystems
  Scrounge NTFS is a data recovery program for NTFS filesystems. It reads each
  block of the hard disk and try to rebuild the original filesystem tree into
diff --git a/debian/copyright b/debian/copyright
index 243aa11..0008ec2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,36 +14,36 @@ Files: debian/*
 Copyright: 2008 Juan Angulo Moreno <juan at apuntale.com>
            2008-2009 Daniel Baumann <daniel at debian.org>
            2010      Christophe Monniez <christophe.monniez at fccu.be>
-           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
+           2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
 License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
  are met:
  .
-     * Redistributions of source code must retain the above 
-       copyright notice, this list of conditions and the 
+     * Redistributions of source code must retain the above
+       copyright notice, this list of conditions and the
        following disclaimer.
-     * Redistributions in binary form must reproduce the 
-       above copyright notice, this list of conditions and 
-       the following disclaimer in the documentation and/or 
+     * Redistributions in binary form must reproduce the
+       above copyright notice, this list of conditions and
+       the following disclaimer in the documentation and/or
        other materials provided with the distribution.
-     * The names of contributors to this software may not be 
-       used to endorse or promote products derived from this 
+     * The names of contributors to this software may not be
+       used to endorse or promote products derived from this
        software without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  DAMAGE.
 
 License: public-domain
diff --git a/debian/patches/01-fix-manpage b/debian/patches/01_fix-manpage.patch
similarity index 100%
rename from debian/patches/01-fix-manpage
rename to debian/patches/01_fix-manpage.patch
diff --git a/debian/patches/02-fix-help-message b/debian/patches/02_fix-help-message.patch
similarity index 100%
rename from debian/patches/02-fix-help-message
rename to debian/patches/02_fix-help-message.patch
diff --git a/debian/patches/03-fix-max-size b/debian/patches/03_fix-max-size.patch
similarity index 100%
rename from debian/patches/03-fix-max-size
rename to debian/patches/03_fix-max-size.patch
diff --git a/debian/patches/04-clean-code-add-option b/debian/patches/04_clean-code-add-option.patch
similarity index 100%
rename from debian/patches/04-clean-code-add-option
rename to debian/patches/04_clean-code-add-option.patch
diff --git a/debian/patches/series b/debian/patches/series
index a54a423..81f5d4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-01-fix-manpage
-02-fix-help-message
-03-fix-max-size
+01_fix-manpage.patch
+02_fix-help-message.patch
+03_fix-max-size.patch
 
 # This patch was proposed via #789806. However, it didn't work.
-# 04-clean-code-add-option
+# 04_clean-code-add-option.patch
diff --git a/debian/rules b/debian/rules
index 63844c9..d8309f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf
+	dh $@
diff --git a/debian/watch b/debian/watch
index 0253a77..d789c5a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://thewalter.net/stef/software/scrounge scrounge-ntfs-(\d\S+)\.(?:zip|tar\.(?:bz2|gz|xz))

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



More information about the forensics-changes mailing list