[Forensics-changes] [ed2k-hash] 01/01: Imported Debian patch 0.3.3+deb2-2
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Thu Mar 5 13:48:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository ed2k-hash.
commit 7f7782b27e2d4f0d6a796ee46869e2629fb62dae
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Mar 2 20:19:34 2015 -0300
Imported Debian patch 0.3.3+deb2-2
---
debian/changelog | 40 ++++++++++
debian/compat | 2 +-
debian/control | 12 +--
debian/copyright | 157 +++++++---------------------------------
debian/manpages | 1 +
debian/patches/fix-autoconf | 19 +++++
debian/patches/fix-gcc-warnings | 31 ++++++++
debian/patches/series | 2 +
debian/rules | 66 ++++-------------
debian/source/format | 1 +
debian/watch | 3 +-
11 files changed, 145 insertions(+), 189 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 747b01c..617953e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+ed2k-hash (0.3.3+deb2-2) experimental; urgency=medium
+
+ * Team upload.
+ * Acknowledge NMU. Thanks to Anibal Monsalve Salazar. (Closes: #737998)
+ * Migrations:
+ - debian/rules to new (reduced) format.
+ - DebSrc to 3.0 version.
+ - DH level to 9.
+ - Using dh-autoreconf now.
+ * debian/control:
+ - Added the 'forensics' word to long description.
+ - Build-Depends field:
+ ~ Added dh-autoreconf.
+ ~ Changed from automake1.11 and autoconf2.59 to automake and
+ autoconf.
+ ~ Removed autotools-dev.
+ - Bumped Standards-Version to 3.9.6.
+ - Removed the leading artiche from short description.
+ - Updated the Vcs-* fields.
+ * debian/copyright:
+ - Removed some unnecessary copyright notices (exceptions declared by
+ FSF).
+ - Updated the header of the file.
+ - Updated the packaging copyright information.
+ * debian/manpages: added to install the manpage.
+ * debian/patches/:
+ - Added fix-autoconf to fix/modernize autoconf and avoid the current
+ FTBFS status.
+ - Added fix-gcc-warnings to fix some warnings sent by GCC.
+ * debian/rules:
+ - Created override_dh_clean to remove some files kept by upstream and
+ to undo the configure.{ac,in} rename.
+ - Created override_dh_autoreconf to rename configure.in to configure.ac
+ before build.
+ - Created override_dh_auto_configure to make available the config.guess,
+ config.sub and install-sh files.
+ * debian/watch: fixed and improved.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 02 Mar 2015 20:19:34 -0300
+
ed2k-hash (0.3.3+deb2-1.1) unstable; urgency=medium
* Non-maintainer upload
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index b112a26..e91bb80 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,19 @@ Section: utils
Priority: optional
Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, automake1.11, autoconf2.59, libtool
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), dh-autoreconf, automake, autoconf, libtool
+Standards-Version: 3.9.6
Homepage: http://ed2k-tools.sourceforge.net/ed2k_hash.shtml
-Vcs-Browser: http://git.debian.org/?p=forensics/ed2k_hash.git
-Vcs-Git: git://git.debian.org/forensics/ed2k_hash.git
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/ed2k-hash.git
+Vcs-Git: git://anonscm.debian.org/forensics/ed2k-hash.git
Package: ed2k-hash
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: A tool for generating ed2k-links
+Description: tool for generating ed2k-links
This tool is useful for people who want to know the ed2k-links of files they
are not currently sharing, or who want the ed2k-links for all files in certain
directories etc. You can hash single files, multiple files, whole directories,
or whole directory trees.
+ .
+ ed2k-hash can be used for several activities, as forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index 3f346a3..20ffa41 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,147 +1,40 @@
-Name: ed2k-hash
-Source: http://sourceforge.net/projects/ed2k-tools/files/ed2k_hash/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ed2k-hash
+Source: http://sf.net/projects/ed2k-tools
Files: *
-Copyright: 2002, Tim-Philipp Müller <t.i.m at orange.net>
-X-Contributors: Jerome Laheurte <jerome at fraca7.homeunix.net>
- Magnus <offense at home.se>
+Copyright: 2002 Tim-Philipp Müller <t.i.m at orange.net>
License: GPL-2+
- 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 2
- of the License.
- .
- This program 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+
+Files: ed2k_hash/md4.c
+ ed2k_hash/md4.h
+Copyright: 1990-1992 RSA Data Security
+License: RSA-license
Files: debian/*
-Copyright: 2009, Tiago Bortoletto Vaz <tiago at debian-ba.org>
+Copyright: 2009 Tiago Bortoletto Vaz <tiago at debian.org>
+ 2014 Anibal Monsalve Salazar <anibal at debian.org>
+ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-Files: acinclude.m4
- aclocal.m4
-Copyright: 1997, Janos Farkas <chexum at shadow.banki.hu>
- 1997-1999, Stephan Kulow <coolo at kde.org>
- 1996-2001, Free Software Foundation
-License: LGPL-2+
- This file is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+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
+ (at your option) any later version.
.
- This library is distributed in the hope that it will be useful,
+ 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
- Library General Public License for more details.
+ 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 Library General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 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 Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2 file.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-Files: configure
-Copyright: 1992-1996, Free Software Foundation
-License:
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: admin/ylwrap
-Copyright: 1996-1999, Free Software Foundation
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: admin/missing
-Copyright: 1996-2000, Free Software Foundation
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: admin/ltmain.sh
- admin/ltconfig
- admin/ltcf-gcj.sh
- admin/ltcf-cxx.sh
- admin/ltcf-c.sh
- admin/libtool.m4.in
-Copyright: 1996-2001, Free Software Foundation
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: admin/mkinstalldirs
-Copyright: 1993, Noah Friedman <friedman at prep.ai.mit.edu>
-License: Public domain
-
-Files: admin/install-sh
-Copyright: 1991, Massachusetts Institute of Technology
-License:
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of M.I.T. not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission. M.I.T. makes no representations about the
- suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
-Files: admin/depcomp
-Copyright: 1999-2000, Free Software Foundation
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: admin/configure.in.min
-Copyright: 2001, Stephan Kulow <coolo at kde.org>
-License: LGPL-2+
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2 file.
-
-Files: admin/config.sub
- admin/config.guess
-Copyright: 1992-2001, Free Software Foundation
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: admin/acinclude.m4.in
-Copyright: 1994-1998, Free Software Foundation
- 1997, Janos Farkas <chexum at shadow.banki.hu>
- 1997-1999, Stephan Kulow <coolo at kde.org>
-License: LGPL-2+
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2 file.
-
-Files: configure.in
-Copyright: 2001, Stephan Kulow <coolo at kde.org>
-License: LGPL-2+
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2 file.
-
-Files: Makefile.in
-Copyright: 1994-2001, Free Software Foundation
-License:
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
-
-Files: ed2k_hash/md4.c
- ed2k_hash/md4.h
-Copyright: 1990-1992, RSA Data Security
-License:
+License: RSA-license
License to copy and use this software is granted provided that it
is identified as the "RSA Data Security, Inc. MD4 Message-Digest
Algorithm" in all material mentioning or referencing this software
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..bc7e831
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/ed2k_hash.1
diff --git a/debian/patches/fix-autoconf b/debian/patches/fix-autoconf
new file mode 100644
index 0000000..346c72a
--- /dev/null
+++ b/debian/patches/fix-autoconf
@@ -0,0 +1,19 @@
+Description: add some lines to fix the autoconf and avoid the FTBFS.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-03
+Index: ed2k-hash-0.3.3+deb2/configure.in
+===================================================================
+--- ed2k-hash-0.3.3+deb2.orig/configure.in
++++ ed2k-hash-0.3.3+deb2/configure.in
+@@ -26,6 +26,11 @@ dnl Process this file with autoconf to p
+
+ AC_INIT(acinclude.m4) dnl a source file from your sub dir
+
++dnl Debian - fix configure.in/ac
++LT_INIT
++AC_CONFIG_MACRO_DIR([m4])
++AC_PROG_CXX
++
+ dnl This is so we can use kde-common
+ AC_CONFIG_AUX_DIR(admin)
+
diff --git a/debian/patches/fix-gcc-warnings b/debian/patches/fix-gcc-warnings
new file mode 100644
index 0000000..eeb6030
--- /dev/null
+++ b/debian/patches/fix-gcc-warnings
@@ -0,0 +1,31 @@
+Description: fix some GCC warnings.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-03
+Index: ed2k-hash-0.3.3+deb2/ed2k_hash/options.c
+===================================================================
+--- ed2k-hash-0.3.3+deb2.orig/ed2k_hash/options.c
++++ ed2k-hash-0.3.3+deb2/ed2k_hash/options.c
+@@ -22,6 +22,9 @@
+ #include "options.h"
+ #include "ui.h"
+
++// [FIX] options.c:63:6: warning: incompatible implicit declaration of built-in function ‘strlen’
++#include <string.h>
++
+ int option_htmllink = 0; /* wrap html link around ed2k-link */
+ int option_htmlfull = 0; /* print path component as well in html link */
+ int option_verbose = 0; /* be verbose */
+Index: ed2k-hash-0.3.3+deb2/ed2k_hash/cl_ui.c
+===================================================================
+--- ed2k-hash-0.3.3+deb2.orig/ed2k_hash/cl_ui.c
++++ ed2k-hash-0.3.3+deb2/ed2k_hash/cl_ui.c
+@@ -25,6 +25,9 @@
+ #include "options.h"
+ #include "processfile.h"
+
++// [FIX] cl_ui.c:97:21: warning: incompatible implicit declaration of built-in function ‘strlen’
++#include <string.h>
++
+ /* ui_init
+ *
+ */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..034cc4c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-gcc-warnings
+fix-autoconf
diff --git a/debian/rules b/debian/rules
index f32c96c..215c46c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,23 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f admin/config.sub
- rm -f admin/config.guess
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
- [ ! -f Makefile ] || $(MAKE) distclean
+%:
+ dh $@ --with autoreconf
+override_dh_clean:
+ rm -f config.guess config.log config.sub install-sh missing
+ if [ -f configure.ac ]; then mv -f configure.ac configure.in; fi
dh_clean
-config.status: configure
- dh_testdir
- cp -f /usr/share/misc/config.sub admin/config.sub
- cp -f /usr/share/misc/config.guess admin/config.guess
- autoreconf --force
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
+override_dh_autoreconf:
+ mv -f configure.in configure.ac
+ dh_autoreconf
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/ed2k-hash install
-
-binary: binary-arch
-
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installman debian/ed2k_hash.1
- dh_lintian
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
+override_dh_auto_configure:
+ ln -s admin/config.guess .
+ ln -s admin/config.sub .
+ ln -s admin/install-sh .
+ ln -s admin/missing .
+ dh_auto_configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index a89d56a..435d93d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://sf.net/ed2k-tools/ed2k-hash_(.+)\.tar\.gz
+opts=dversionmangle=s/\+deb[0-9]*$// \
+http://sf.net/ed2k-tools/ed2k-hash_(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/ed2k-hash.git
More information about the forensics-changes
mailing list