[Forensics-changes] [ssdeep] 01/01: Imported Debian patch 2.13-3
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Dec 5 13:09:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository ssdeep.
commit 81ab2b272119cacfa28798c1657be164528cdd51
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Tue Nov 29 20:03:49 2016 -0200
Imported Debian patch 2.13-3
---
debian/changelog | 21 +++++++++
debian/compat | 2 +-
debian/control | 16 +++----
debian/copyright | 54 +++++++++++-----------
debian/{libfuzzy2.docs => libfuzzy-dev.docs} | 0
debian/libfuzzy-dev.install | 1 +
.../patches/10_fix-spelling-final-executable.patch | 16 +++++++
debian/patches/series | 1 +
debian/rules | 2 +-
debian/watch | 4 +-
10 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 41d510c..a357943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ssdeep (2.13-3) 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:
+ - Fixed the licensing for some files.
+ - Updated the packaging copyright years.
+ * debian/libfuzzy2.docs: renamed to libfuzzy-dev.docs.
+ * debian/libfuzzy-dev.install: added the libfuzzy.a.
+ * debian/patches/10_fix-spelling-final-executable.patch: created.
+ * debian/rules: removed the '--with autoreconf' because it is default
+ in DH 10.
+ * debian/watch:
+ - Bumped to version 4.
+ - Fixed the searching.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Tue, 29 Nov 2016 20:03:49 -0200
+
ssdeep (2.13-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 807f054..07cc399 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: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 9), dh-autoreconf
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10), dh-autoreconf
+Standards-Version: 3.9.8
Homepage: http://ssdeep.sf.net
-Vcs-Browser: https://anonscm.debian.org/cgit/forensics/ssdeep.git
-Vcs-Git: git://anonscm.debian.org/forensics/ssdeep.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/ssdeep.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/ssdeep.git
Package: ssdeep
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
Description: recursive piecewise hashing tool
ssdeep is a tool for recursive computing and matching of Context Triggered
@@ -29,7 +29,7 @@ Description: recursive piecewise hashing tool
Package: libfuzzy2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Breaks: ssdeep (<< 2.6)
Replaces: ssdeep (<< 2.6)
@@ -51,7 +51,7 @@ Package: libfuzzy2-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, libfuzzy-dev (= ${binary:Version})
+Depends: libfuzzy-dev (= ${binary:Version}), ${misc:Depends}
Multi-Arch: same
Description: recursive piecewise hashing tool (debugging symbols)
ssdeep is a tool for recursive computing and matching of Context Triggered
@@ -69,7 +69,7 @@ Description: recursive piecewise hashing tool (debugging symbols)
Package: libfuzzy-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libfuzzy2 (= ${binary:Version})
+Depends: libfuzzy2 (= ${binary:Version}), ${misc:Depends}
Breaks: ssdeep (<< 2.6)
Replaces: ssdeep (<< 2.6)
Multi-Arch: same
diff --git a/debian/copyright b/debian/copyright
index 7958dcb..5b5b702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,16 @@ Source: http://ssdeep.sf.net
Files: *
Copyright: 2002 Andrew Tridgell <tridge at samba.org>
- 2006-2010 ManTech CFIA <http://www.mantech.com/>
+ 2006-2010 ManTech International Corporation
2008-2015 Jesse Kornblum <research at jessekornblum.com>
- 2012-2013 Kyrus
+ 2012 Kyrus
2013-2014 Facebook
- 2013-2014 Helmut Grohne <helmut at subdivi.de>
+ 2013 Helmut Grohne <helmut at subdivi.de>
License: GPL-2+
-Files: main.cpp
+Files: filedata.cpp
+ filedata.h
+ main.cpp
Copyright: 2010 ManTech International Corporation
2012 Kyrus
2013-2014 Facebook
@@ -19,14 +21,14 @@ License: GPL-2
Files: cycles.cpp
dig.cpp
-Copyright: none
-License: public-domain or GPL-2 or GPL-3
+Copyright: 2013-2015 Jesse Kornblum <research at jessekornblum.com>
+License: public-domain
Files: edit_dist.c
edit_dist.h
-Copyright: 2014 kikairoya <kikairoya at gmail.com>
- 2014 Jesse Kornblum <research at jessekornblum.com>
-License: boost-software-license
+Copyright: 2014 Jesse Kornblum <research at jessekornblum.com>
+ 2014 kikairoya <kikairoya at gmail.com>
+License: boost-software-license or GPL-2 or GPL-3
Files: debian/*
Copyright: 2008-2010 Daniel Baumann <daniel at debian.org>
@@ -34,7 +36,7 @@ Copyright: 2008-2010 Daniel Baumann <daniel at debian.org>
2009-2012 Michael Prokop <mika at debian.org>
2011 Julien Valroff <julien at debian.org>
2014 Helmut Grohne <helmut at subdivi.de>
- 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
+ 2015-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
License: GPL-2+
License: GPL-2 or GPL-2+
@@ -62,22 +64,6 @@ License: public-domain
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-License: GPL-3
- This program 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, version 3 of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
License: boost-software-license
Boost Software License - Version 1.0 - August 17th, 2003
.
@@ -102,3 +88,19 @@ License: boost-software-license
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+License: GPL-3
+ This program 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, version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/libfuzzy2.docs b/debian/libfuzzy-dev.docs
similarity index 100%
rename from debian/libfuzzy2.docs
rename to debian/libfuzzy-dev.docs
diff --git a/debian/libfuzzy-dev.install b/debian/libfuzzy-dev.install
index 3d5683d..881f6a5 100644
--- a/debian/libfuzzy-dev.install
+++ b/debian/libfuzzy-dev.install
@@ -1,2 +1,3 @@
/usr/include/*
/usr/lib/*/libfuzzy*.so
+usr/lib/*/libfuzzy.a
\ No newline at end of file
diff --git a/debian/patches/10_fix-spelling-final-executable.patch b/debian/patches/10_fix-spelling-final-executable.patch
new file mode 100644
index 0000000..8da0573
--- /dev/null
+++ b/debian/patches/10_fix-spelling-final-executable.patch
@@ -0,0 +1,16 @@
+Description: fix a spelling error in final executable.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-11-29
+Index: ssdeep-2.13/main.cpp
+===================================================================
+--- ssdeep-2.13.orig/main.cpp
++++ ssdeep-2.13/main.cpp
+@@ -53,7 +53,7 @@ static void usage(void)
+ print_status ("-v - Verbose mode. Displays filename as its being processed");
+ print_status ("-r - Recursive mode");
+
+- print_status ("-s - Silent mode; all errors are supressed");
++ print_status ("-s - Silent mode; all errors are suppressed");
+ print_status ("-b - Uses only the bare name of files; all path information omitted");
+ print_status ("-l - Uses relative paths for filenames");
+ print_status ("-c - Prints output in CSV format");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0c1d257
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_fix-spelling-final-executable.patch
diff --git a/debian/rules b/debian/rules
index af5e67e..108b1e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_strip:
dh_strip --dbg-package=libfuzzy2-dbg
diff --git a/debian/watch b/debian/watch
index 7fd7d5e..18e9fe1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://sf.net/ssdeep/ssdeep-(\d\S+)\.tar\.(?:bz2|gz|xz)
+version=4
+http://sf.net/ssdeep/ssdeep-(\d[\d\.]+).*\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/ssdeep.git
More information about the forensics-changes
mailing list