[Forensics-changes] [ext3grep] 03/03: Imported Debian patch 0.10.2-2
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Mar 8 06:45:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository ext3grep.
commit cee15e4672cf36e00434de45187372396e439b63
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Mar 8 00:09:07 2015 -0300
Imported Debian patch 0.10.2-2
---
debian/changelog | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
debian/compat | 2 +-
debian/control | 24 +++++++++++++-----------
debian/copyright | 44 +++++++++++++++++++++++++++-----------------
debian/rules | 8 ++------
debian/watch | 2 +-
6 files changed, 92 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2ddcc27..a4b44de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,32 @@
-ext3grep (0.10.2-1) unstable; urgency=low
+ext3grep (0.10.2-2) experimental; urgency=medium
+
+ * Team upload.
+ * Ack NMU. Thanks to Konstantinos Margaritis. (Closes: #604656)
+ * Updated DH level to 9.
+ * debian/control:
+ - Added the 'forensics' word to long description.
+ - Bumped Standards-Version to 3.9.6.
+ - Changed the Architecture field to 'any'. It will allow
+ a real test for current situation in all architectures.
+ (Closes: #728541)
+ - Changed the Priority field from 'extra' to 'optional'.
+ - Updated the Vcs-* fields.
+ * debian/copyright:
+ - Added 'Stanislaw T. Findeisen' to file.
+ - Updated the file header.
+ - Updated the GPL license text.
+ - Updated the packaging and upstream copyright for names
+ and years.
+ * debian/rules:
+ - Added the DEB_BUILD_MAINT_OPTIONS variable to fix the
+ issues pointed by blhc.
+ - Removed the override_dh_auto_configure target to allow
+ the GCC hardening.
+ * debian/watch: improved.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 08 Mar 2015 00:09:07 -0300
+
+ext3grep (0.10.2-1) UNRELEASED; urgency=low
* Team Upload.
@@ -13,12 +41,12 @@ ext3grep (0.10.2-1) unstable; urgency=low
[ Julien Valroff ]
* New upstream release (Closes: #589372)
- * Remove useless lintian override: use Team Upload changelog entry
- * Use autotools-dev
- * Bump standards version to 3.9.2 (no changes needed)
- * Bump debhelper compat to 8
- * Fix VCS-* fields
- * Switch to 3.0 (quilt) source package format
+ * Remove useless lintian override: use Team Upload changelog entry
+ * Use autotools-dev
+ * Bump standards version to 3.9.2 (no changes needed)
+ * Bump debhelper compat to 8
+ * Fix VCS-* fields
+ * Switch to 3.0 (quilt) source package format
* Update copyright file as per current DEP-5
* Add sh4 to arch list - thanks to Nobuhiro Iwamatsu <iwamatsu at debian.org>
(Closes: #617447)
@@ -28,6 +56,19 @@ ext3grep (0.10.2-1) unstable; urgency=low
-- Julien Valroff <julien at debian.org> Sat, 10 Dec 2011 08:54:47 +0100
+ext3grep (0.10.1-3.2) unstable; urgency=low
+
+ * Fix FTBFS (Closes: #634412)
+ + some versions of the ext2 headers call a field s_frags_per_group and some
+ call it s_clusters_per_group, define one to the other so the code works
+ with both
+ + i_reseved2 has been split into two fields in recent versions of the
+ headers, use the "hurd" side of the union to continue to access it in
+ one piece
+ * Add sh4 to arch list. (Closes: #617447)
+
+ -- Peter Michael Green <plugwash at debian.org> Thu, 07 Jun 2012 20:02:02 +0000
+
ext3grep (0.10.1-3.1) unstable; urgency=low
* NMU, added armhf to arch list. (Closes: #604656)
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 3589edd..7ef1b4b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,20 @@
Source: ext3grep
Section: admin
-Priority: extra
+Priority: optional
Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
Uploaders: Luca Bruno <lucab at debian.org>, Rich Ercolani <rercola at acm.jhu.edu>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, e2fslibs-dev, libncurses5 | libncurses-dev, pkg-config
-Standards-Version: 3.9.2
-Homepage: http://code.google.com/p/ext3grep/
-Vcs-Browser: http://git.debian.org/?p=forensics/ext3grep.git
-Vcs-Git: git://git.debian.org/git/forensics/ext3grep.git
+Build-Depends: debhelper (>= 9), autotools-dev, e2fslibs-dev, libncurses5 | libncurses-dev, pkg-config
+Standards-Version: 3.9.6
+Homepage: http://code.google.com/p/ext3grep
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/ext3grep.git
+Vcs-Git: git://anonscm.debian.org/forensics/ext3grep.git
Package: ext3grep
-Architecture: alpha amd64 arm armel armhf i386 ia64 mipsel sh4
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Tool to help recover deleted files on ext3 filesystems
- ext3grep is a simple tool intended to aid anyone who accidentally deletes a
- file on an ext3 filesystem, only to find that they wanted it shortly
- thereafter.
+Description: tool to help recover deleted files on ext3 filesystems
+ ext3grep is a simple tool intended to aid anyone who accidentally
+ deletes a file on an ext3 filesystem, only to find that they wanted
+ it shortly thereafter.
+ .
+ This package is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index c8b3780..84f9e47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,45 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
-Upstream-Contact: Carlo Wood <carlo at alinoe.com>
-Source: http://code.google.com/p/ext3grep/downloads/list
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ext3grep
+Source: http://code.google.com/p/ext3grep
Files: *
-Copyright: 2008 Carlo Wood <carlo at alinoe.com>
+Copyright: 2008-2010 Carlo Wood <carlo at alinoe.com>
License: GPL-2+
Files: src/kernel-jbd.h
Copyright: 1998-2000 Red Hat, Inc
License: GPL-2+
+Files: src/endian_conversion.h
+ src/indirect_blocks.cc
+Copyright: 1998 Carlo Wood <carlo at alinoe.com>
+ 1998 Stanislaw T. Findeisen <sf181257 at students mimuw edu pl>
+License: GPL-2+
+
Files: debian/*
-Copyright: 2008-2009 Rich Ercolani <rercola at acm.jhu.edu>
- 2008-2009 Daniel Baumann <daniel at debian.org>
- 2011 Julien Valroff <julien at debian.org>
+Copyright: 2008 Luca Bruno <lucab at debian.org>
+ 2008 Rich Ercolani <rercola at acm.jhu.edu>
+ 2008-2011 Daniel Baumann <daniel at debian.org>
+ 2011 Christophe Monniez <christophe.monniez at fccu.be>
+ 2011 Konstantinos Margaritis <markos at debian.org>
+ 2011 Julien Valroff <julien at debian.org>
+ 2012 Peter Michael Green <plugwash at debian.org>
+ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
License: GPL-2+
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; either version 2
- of the License, or (at your option) any later version.
+ 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 program 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
+ 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.
+ along with this program. If not, see <http://www.gnu.org/licenses/>
.
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-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".
diff --git a/debian/rules b/debian/rules
index 93165f3..a6b9e8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,10 @@
#!/usr/bin/make -f
+# export DH_VERBOSE=1
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- EXTRA += --enable-debug --disable-optimize
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --with autotools_dev
-override_dh_auto_configure:
- dh_auto_configure -- $(EXTRA) LDFLAGS="-Wl,-z,defs"
-
override_dh_installchangelogs:
dh_installchangelogs NEWS
diff --git a/debian/watch b/debian/watch
index 40684fb..64d7536 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://code.google.com/p/ext3grep/downloads/list detail\?name=ext3grep-(.*).tar.gz.*
+http://code.google.com/p/ext3grep/downloads/list detail\?name=ext3grep-(\d\S+)\.tar\.(?:bz2|gz|xz).*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/ext3grep.git
More information about the forensics-changes
mailing list