[Forensics-changes] [SCM] debian-forensics/ext3grep branch, debian, updated. debian/0.10.1-3-17-g9592fdd

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 46cb9ff55b8f923801404585624785bec7a22968
Merge: 4bfb49585acffc6ce384ad4cbab0c3891d1e1eea 497a00038e0aacffe0b48bb245fd6521889859cd
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 23 14:08:42 2011 +0200

    Merge branch 'upstream' into debian
    
    Conflicts:
    	aclocal.m4
    	configure
    	configure.ac
    	src/commandline.cc
    	src/restore.cc

diff --combined debian/changelog
index 68a28d4,0000000..4cfc61d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,111 -1,0 +1,112 @@@
- ext3grep (0.10.1-4) unstable; urgency=low
++ext3grep (0.10.2-1) unstable; urgency=low
 +
 +  * Team Upload.
 +
 +  [ Daniel Baumann ]
 +  * Removing old lintian overrides leftover.
 +  * Minimizing rules file.
 +  * Adding autotools handling in rules that doesn't get done by dh automatically.
 +
 +  [ Christophe Monniez ]
 +  * Fixing debian watch file.
 +
 +  [ Julien Valroff ]
++  * New upstream release
 +  * Remove useless lintian override: use Team Upload changelog entry 
 +
-  -- Julien Valroff <julien at debian.org>  Sat, 23 Jul 2011 14:03:13 +0200
++ -- Julien Valroff <julien at debian.org>  Sat, 23 Jul 2011 14:08:17 +0200
 +
 +ext3grep (0.10.1-3) unstable; urgency=low
 +
 +  * Updating package to standards version 3.8.2.
 +  * Adding lintian overrides.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 09 Jul 2009 11:50:30 +0200
 +
 +ext3grep (0.10.1-2) unstable; urgency=low
 +
 +  * Passing flags to configure as arguments.
 +  * Prefixing debhelper files with package name.
 +  * Adding myself to copyright.
 +  * Upgrading package to standards 3.8.1.
 +  * Tidy rules file.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 21:08:53 +0200
 +
 +ext3grep (0.10.1-1) unstable; urgency=low
 +
 +  * Merging upstream version 0.10.1.
 +
 + -- Daniel Baumann <daniel at debian.org>  Fri, 19 Dec 2008 23:21:00 +0100
 +
 +ext3grep (0.10.0-1) unstable; urgency=low
 +
 +  * Merging upstream version 0.10.0.
 +  * Replacing obsolete dh_clean -k with dh_prep.
 +
 + -- Daniel Baumann <daniel at debian.org>  Fri, 28 Nov 2008 09:16:00 +0100
 +
 +ext3grep (0.9.0-1) unstable; urgency=low
 +
 +  [ Daniel Baumann ]
 +  * Rewording author section in the manpage, also adding reference to
 +    ext3grep upstream author.
 +  * Removing imported whitespace at EOL in changelog.
 +  * Removing imported whitespace at EOF in control.
 +  * Polishing formating of the manpage.
 +  * Using package long description in manpage.
 +  * Updating vcs fields.
 +  * Regenerating changelog for 0.6.0-1 and 0.8.0-1 from git commit log.
 +  * Updating download url in copyright file.
 +  * Merging upstream version 0.9.0. (Closes: #501018)
 +
 + -- Luca Bruno <lucab at debian.org>  Fri, 17 Oct 2008 21:54:42 +0200
 +
 +ext3grep (0.8.0-1) unstable; urgency=low
 +
 +  [ Luca Bruno ]
 +  * Imported Upstream version 0.7.0:
 +
 +  [ Rich Ercolani ]
 +  * Imported Upstream version 0.8.0
 +    - Allow inode_size_ to be larger than sizeof(Inode) (Closes: #491621)
 +  * Config --disable-optimization changed to --disable-optimize in this version
 +
 +  [ Luca Bruno ]
 +  * Removed all big-endian arch, as ext3grep won't work there
 +
 + -- Rich Ercolani <rercola at acm.jhu.edu>  Fri, 15 Aug 2008 01:41:12 -0400
 +
 +ext3grep (0.6.0-1) unstable; urgency=low
 +
 +  [ Rich Ercolani ]
 +  * Initial release (Closes: #470813).
 +
 +  [ Luca Bruno ]
 +  * Now maintained within the Debian Forensics team
 +  * Added the Vcs-Git related tag
 +
 +  [ Daniel Baumann ]
 +  * Updating package to debhelper 7.
 +  * Sorting control fields.
 +  * Removing unneded build-dependencies to essential packages.
 +  * Adding soname independent build-depends alternative for libncurses5-dev.
 +  * Updating to standards 3.8.0.
 +  * Using punct rather than double-backslash for empty lines in package
 +    long-description.
 +  * Removing cruft from watch file.
 +  * Reordering rules file.
 +  * Moving manpage into sub-directory of debian/.
 +  * Rewriting copyright file in machine-interpretable format.
 +  * Using NEWS file as changelog.
 +  * Removing unused dirs debhelper file.
 +  * Forgot to remove manpage file in old location.
 +  * Rewrapping and reformating manpage.
 +  * Adding copyright notice for src/kernel-jbd.h to copyright file.
 +  * Sorting vcs fields in control.
 +
 +  [ Luca Bruno ]
 +  * Added missing pkg-config build-dep
 +  * Removing -dbg package (for now)
 +
 + -- Rich Ercolani <rercola at acm.jhu.edu>  Fri, 14 Mar 2008 22:19:59 -0400

-- 
debian-forensics/ext3grep