[Forensics-changes] [scalpel] 01/01: Imported Debian patch 1.60-4
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Wed Nov 16 13:45:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository scalpel.
commit f7a53447b859694e5e9be577d204076d5bfa1dcf
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sat Nov 12 23:21:47 2016 -0200
Imported Debian patch 1.60-4
---
debian/changelog | 20 ++++++++++++++
debian/compat | 2 +-
debian/control | 12 ++++-----
debian/copyright | 18 +++++++------
.../{Makefile => 10_add-GCC-hardening.patch} | 0
.../{fix-config-path => 20_fix-config.patch} | 0
...rror_message => 30_improve-error-message.patch} | 0
debian/patches/40_fix-spelling.patch | 31 ++++++++++++++++++++++
debian/patches/series | 7 ++---
debian/watch | 3 +--
10 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c35f51..bac6ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+scalpel (1.60-4) unstable; urgency=medium
+
+ * 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:
+ - Added a new additional email address for upstream.
+ - Dropped dot-zero from GPL license short name.
+ - Updated the packaging copyright years.
+ * debian/patches/:
+ - Added 40_fix-spelling.patch to fix a spelling error in final binary.
+ - Changes:
+ ~ Makefile: renamed to 10_add-GCC-hardening.patch.
+ ~ fix-config-path: renamed to 20_fix-config.patch.
+ ~ improve_error_message: renamed to 30_improve-error-message.patch.
+ * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sat, 12 Nov 2016 23:21:47 -0200
+
scalpel (1.60-3) unstable; urgency=medium
* Upload to unstable.
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 169c562..f72d1c1 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: Joao Eriberto Mota Filho <eriberto at debian.org>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
Homepage: http://www.digitalforensicssolutions.com/Scalpel
-Vcs-Git: git://anonscm.debian.org/forensics/scalpel.git
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/scalpel.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/scalpel.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/scalpel.git
Package: scalpel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: fast filesystem-independent file recovery
scalpel is a fast file carver that reads a database of header and footer
definitions and extracts matching files from a set of image files or raw
@@ -21,4 +21,4 @@ Description: fast filesystem-independent file recovery
exFAT, NTFS, Ext2, Ext3, Ext4, JFS, XFS, ReiserFS, raw partitions, etc.
.
scalpel is a complete rewrite of the Foremost 0.69 file carver and is
- useful for both digital forensics investigation and file recovery.
+ useful for both digital forensics investigations and file recovery.
diff --git a/debian/copyright b/debian/copyright
index 83a33f3..e6ac5c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,22 @@ Source: http://www.digitalforensicssolutions.com/Scalpel
Comment: dead upstream link in current homepage.
Files: *
-Copyright: 2005-2006 by Golden G. Richard III <golden at digitalforensicssolutions.com, golden at cs.uno.edu>
-License: GPL-2.0+
+Copyright: 2005-2006 Golden G. Richard III <golden at digitalforensicssolutions.com,
+ golden at cs.uno.edu,
+ goldenrichard at gmail.com>
+License: GPL-2+
Files: base_name.c
dirname.h
-Copyright: 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-License: GPL-2.0+
+Copyright: 1990-2001 Free Software Foundation, Inc.
+License: GPL-2+
Files: debian/*
-Copyright: 2006 Danny van der Meeren <danny at illogic.nl>
- 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
-License: GPL-2.0+
+Copyright: 2006 Danny van der Meeren <danny at illogic.nl>
+ 2015-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-2+
-License: GPL-2.0+
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
diff --git a/debian/patches/Makefile b/debian/patches/10_add-GCC-hardening.patch
similarity index 100%
rename from debian/patches/Makefile
rename to debian/patches/10_add-GCC-hardening.patch
diff --git a/debian/patches/fix-config-path b/debian/patches/20_fix-config.patch
similarity index 100%
rename from debian/patches/fix-config-path
rename to debian/patches/20_fix-config.patch
diff --git a/debian/patches/improve_error_message b/debian/patches/30_improve-error-message.patch
similarity index 100%
rename from debian/patches/improve_error_message
rename to debian/patches/30_improve-error-message.patch
diff --git a/debian/patches/40_fix-spelling.patch b/debian/patches/40_fix-spelling.patch
new file mode 100644
index 0000000..e3fae26
--- /dev/null
+++ b/debian/patches/40_fix-spelling.patch
@@ -0,0 +1,31 @@
+Description: fix a spelling error in final binary.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-11-12
+Index: scalpel-1.60/files.c
+===================================================================
+--- scalpel-1.60.orig/files.c
++++ scalpel-1.60/files.c
+@@ -49,20 +49,20 @@ int outputDirectoryOK(char *dir) {
+ if (mkdir(dir,newDirectoryMode)) {
+ #endif
+
+- fprintf (stderr,"An error occured while trying to create %s - %s\n",
++ fprintf (stderr,"An error occurred while trying to create %s - %s\n",
+ dir,strerror(errno));
+ return FALSE;
+ }
+
+ // try to open directory
+ if ((temp = opendir(dir)) == NULL) {
+- fprintf (stderr,"An error occured while trying to open %s - %s\n",
++ fprintf (stderr,"An error occurred while trying to open %s - %s\n",
+ dir,strerror(errno));
+ return FALSE;
+ }
+ }
+ else {
+- fprintf (stderr,"An error occured while trying to open %s - %s\n",
++ fprintf (stderr,"An error occurred while trying to open %s - %s\n",
+ dir,strerror(errno));
+ return FALSE;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 70a7d11..057131a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-Makefile
-fix-config-path
-improve_error_message
+10_add-GCC-hardening.patch
+20_fix-config.patch
+30_improve-error-message.patch
+40_fix-spelling.patch
diff --git a/debian/watch b/debian/watch
index dc866cd..601c0af 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-version=3
-# Currently, no releases available at original upstream homepage.
+version=4
opts=dversionmangle=s/.*/0.No-Release/ \
https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/scalpel.git
More information about the forensics-changes
mailing list