Mon Nov 3 19:06:22 UTC 2014

This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository magicrescue.

commit 65767d3dc7c462865798ec46782e45c0c8103c80
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Mon Nov 3 17:04:50 2014 -0200

      * New upstream release. (Closes: #633554)
      * New maintainer and co-maintainer. Thanks a lot to Varun Hiremath and
          Torsten Werner for the previous work around this package.
      * Migrations:
          - DH level from 7 to 9.
          - CDBS to pure DH.
          - Copyright to 1.0 format.
          - Standards-Version from 3.8.3 to 3.9.6.
      * Removed the useless files debian/{stamp-autotools,stamp-autotools-files,
          stamp-makefile-build,stamp-makefile-install}.
      * debian/control:
          - Added to Depends field: dcraw, flac, mpg123, sqlite3, unzip, zip.
          - Moved dependency libjpeg-progs from Recommends field to Depends.
            (LP: #91442)
          - Improved the long description.
          - Updated the upstream homepage.
          - VCS now in collab-maint.
      * debian/copyright:
          - Updated the upstream homepage.
          - Updated the upstream and packaging copyright information.
      * debian/docs: removed the README file. All useful information are in manpage.
      * debian/intall: created to install the new file debian/recipes/sqlite.
      * debian/lintian-overrides: added to override a false positive.
      * debian/patches/:
          - Added some fields in header of the pre_configure patch.
          - Added the magicrescue.1 patch. (Closes: #759369)
          - Extracted the changes of the tools/laola.pl from pre-configure patch.
            These lines, now, are in (new) laola.pl patch.
          - Renamed from pre_configure.patch to pre_configure.
      * debian/README.Debian: added to explain about the 'recipes'.
      * debian/recipes/sqlite: added as new recipe. Thanks a lot to Eric Pozharski.
          (Closes: #730007)
      * debian/rules: added the DEB_BUILD_MAINT_OPTIONS variable to fix the issues
          pointed by blhc.
      * debian/watch: updated and improved.
---
 debian/README.Debian                               |  7 +++
 debian/changelog                                   | 40 ++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 45 +++++++++++++---
 debian/copyright                                   | 63 ++++++++++++----------
 debian/docs                                        |  1 -
 debian/install                                     |  1 +
 debian/lintian-overrides                           |  3 ++
 debian/patches/laola.pl                            | 14 +++++
 debian/patches/magicrescue.1                       | 24 +++++++++
 .../patches/{pre_configure.patch => pre_configure} | 32 +++++------
 debian/patches/series                              |  4 +-
 debian/recipes/sqlite                              | 11 ++++
 debian/rules                                       | 10 ++--
 debian/watch                                       |  3 +-
 15 files changed, 196 insertions(+), 64 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..e8e146e
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,7 @@
+magicrescue for Debian
+----------------------
+
+You can create new recipes and put them in /usr/share/magicrescue/recipes.
+See the manpage to more details.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 03 Nov 2014 10:01:09 -0200.
diff --git a/debian/changelog b/debian/changelog
index 8459521..35838ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+magicrescue (1.1.9-1) unstable; urgency=medium
+
+  * New upstream release. (Closes: #633554)
+  * New maintainer and co-maintainer. Thanks a lot to Varun Hiremath and
+      Torsten Werner for the previous work around this package.
+  * Migrations:
+      - DH level from 7 to 9.
+      - CDBS to pure DH.
+      - Copyright to 1.0 format.
+      - Standards-Version from 3.8.3 to 3.9.6.
+  * Removed the useless files debian/{stamp-autotools,stamp-autotools-files,
+      stamp-makefile-build,stamp-makefile-install}.
+  * debian/control:
+      - Added to Depends field: dcraw, flac, mpg123, sqlite3, unzip, zip.
+      - Moved dependency libjpeg-progs from Recommends field to Depends.
+        (LP: #91442)
+      - Improved the long description.
+      - Updated the upstream homepage.
+      - VCS now in collab-maint.
+  * debian/copyright:
+      - Updated the upstream homepage.
+      - Updated the upstream and packaging copyright information.
+  * debian/docs: removed the README file. All useful information are in manpage.
+  * debian/intall: created to install the new file debian/recipes/sqlite.
+  * debian/lintian-overrides: added to override a false positive.
+  * debian/patches/:
+      - Added some fields in header of the pre_configure patch.
+      - Added the magicrescue.1 patch. (Closes: #759369)
+      - Extracted the changes of the tools/laola.pl from pre-configure patch.
+        These lines, now, are in (new) laola.pl patch.
+      - Renamed from pre_configure.patch to pre_configure.
+  * debian/README.Debian: added to explain about the 'recipes'.
+  * debian/recipes/sqlite: added as new recipe. Thanks a lot to Eric Pozharski.
+      (Closes: #730007)
+  * debian/rules: added the DEB_BUILD_MAINT_OPTIONS variable to fix the issues
+      pointed by blhc.
+  * debian/watch: updated and improved.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 29 Oct 2014 14:41:43 -0200
+
 magicrescue (1.1.8-1) unstable; urgency=low
 
   * New upstream release (Closes: #558091)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2df2177..394d311 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,49 @@
 Source: magicrescue
 Section: utils
 Priority: optional
-Maintainer: Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, libgdbm-dev
-Standards-Version: 3.8.3
-Homepage: http://jbj.rapanden.dk/magicrescue/
-Vcs-Svn: https://bollin.googlecode.com/svn/magicrescue/trunk/
-Vcs-Browser: http://bollin.googlecode.com/svn/magicrescue/trunk/
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
+Build-Depends: debhelper (>= 9), libgdbm-dev
+Standards-Version: 3.9.6
+Homepage: http://www.itu.dk/people/jobr/magicrescue
+Vcs-Git: git://anonscm.debian.org/collab-maint/magicrescue.git
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/magicrescue.git
 
 Package: magicrescue
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libjpeg-progs
+Depends: ${shlibs:Depends}, ${misc:Depends}, dcraw, flac, libjpeg-progs,
+         mpg123, sqlite3, unzip, zip
 Description: recovers files by looking for magic bytes
  Magic Rescue scans a block device for file types it knows how to recover
  and calls an external program to extract them. It looks at "magic bytes"
  in file contents, so it can be used both as an undelete utility and for
  recovering a corrupted drive or partition. As long as the file data is
  there, it will find it.
+ .
+ Magic Rescue uses files called 'recipes'. These files have strings and
+ commands to identify and extract data from devices or forensics images.
+ So, you can write your own recipes. Currently, there are these recipes:
+ .
+    * avi
+    * canon-cr2
+    * elf
+    * flac
+    * gimp-xcf
+    * gpl
+    * gzip
+    * jpeg-exif
+    * jpeg-jfif
+    * mbox
+    * mbox-mozilla-inbox
+    * mbox-mozilla-sent
+    * mp3-id3v1
+    * mp3-id3v2
+    * msoffice
+    * nikon-raw
+    * perl
+    * png
+    * ppm
+    * sqlite
+    * zip
+ .
+ This program is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index ea52f3d..cd70d67 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,34 @@
-This package was debianized by Varun Hiremath <varun at debian.org> on
-Fri, 25 Aug 2006 23:59:00 +0530.
-
-It was downloaded from <http://jbj.rapanden.dk/magicrescue/>
-
-Upstream Authors: 
-
-Jonas Jensen <jbj at knef.dk>,
-Martin Schwartz
-
-Copyright: 
-
-© 2004-2006 Jonas Jensen <jbj at knef.dk>,
-© 1996,1997 Martin Schwartz
-      
-License:
-
-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 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.
-
-The Debian packaging is © 2006, Varun Hiremath <varun at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: magicrescue
+Source: http://www.itu.dk/people/jobr/magicrescue
+
+Files: *
+Copyright: 2004-2009 Jonas Jensen <jbj at knef.dk>
+License: GPL-2.0+
+
+Files: tools/laola.pl
+Copyright: 1996-1997 Martin Schwartz
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2006-2009 Torsten Werner <twerner at debian.org>
+                     Varun Hiremath <varun at debian.org>
+           2014      Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ 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 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 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
index 50bd824..edc0071 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
 NEWS
-README
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..ec39b06
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/recipes/sqlite	usr/share/magicrescue/recipes
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..8484afa
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,3 @@
+# A false positive. This is a recipe for magicrescue to
+# search for license files.
+magicrescue: extra-license-file usr/share/magicrescue/recipes/gpl
diff --git a/debian/patches/laola.pl b/debian/patches/laola.pl
new file mode 100644
index 0000000..3687128
--- /dev/null
+++ b/debian/patches/laola.pl
@@ -0,0 +1,14 @@
+Description: Add PERL as processor for file.
+Author: Torsten Werner <twerner at debian.org>,
+        Varun Hiremath <varun at debian.org>
+Last-Update: 2006-09-01
+Index: magicrescue-1.1.4/tools/laola.pl
+===================================================================
+--- magicrescue-1.1.4.orig/tools/laola.pl	2004-04-30 19:47:27.000000000 +0200
++++ magicrescue-1.1.4/tools/laola.pl	2006-10-06 00:26:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#
++#!/usr/bin/env perl
+ # $Id: laola.pl,v 0.5.1.5 1997/07/01 00:06:42 schwartz Rel $
+ #
+ # laola.pl, LAOLA filesystem. 
diff --git a/debian/patches/magicrescue.1 b/debian/patches/magicrescue.1
new file mode 100644
index 0000000..2f63cb3
--- /dev/null
+++ b/debian/patches/magicrescue.1
@@ -0,0 +1,24 @@
+Description: adjustments to Debian reality.
+Author: Joao Eriberto Mota Filho
+Last-Update: 2014-11-03
+Comments: closes #759369.
+Index: magicrescue-1.1.9/doc/magicrescue.1
+===================================================================
+--- magicrescue-1.1.9.orig/doc/magicrescue.1
++++ magicrescue-1.1.9/doc/magicrescue.1
+@@ -184,13 +184,12 @@ for in the first place.
+ Mandatory.  Recipe name, file, or directory.  Specify this as either a plain
+ name (e.g.  \f(CW\*(C`jpeg\-jfif\*(C'\fR) or a path (e.g. \fIrecipes/jpeg\-jfif\fR).  If it doesn't
+ find such a file in the current directory, it will look in \fI./recipes\fR and
+-\&\fIPREFIX/share/magicrescue/recipes\fR, where \fI\s-1PREFIX\s0\fR is the path you installed
+-to, e.g. \fI/usr/local\fR.
++\&\fI/usr/share/magicrescue/recipes\fR.
+ .Sp
+ If \fIrecipe\fR is a directory, all files in that directory will be treated as
+ recipes.
+ .Sp
+-Browse the \fIPREFIX/share/magicrescue/recipes\fR directory to see what recipes
++Browse the \fI/usr/share/magicrescue/recipes\fR directory to see what recipes
+ are available.  A recipe is a text file, and you should read the comments
+ inside it before using it.  Either use the recipe as it is or copy it somewhere
+ and modify it.
diff --git a/debian/patches/pre_configure.patch b/debian/patches/pre_configure
similarity index 70%
rename from debian/patches/pre_configure.patch
rename to debian/patches/pre_configure
index 16b15cf..05d154e 100644
--- a/debian/patches/pre_configure.patch
+++ b/debian/patches/pre_configure
@@ -1,9 +1,21 @@
-Description: Add support for DESTDIR in Makefile
-Index: magicrescue-1.1.4/Makefile.in
+Description: Add support for DESTDIR in Makefile.
+Author: Torsten Werner <twerner at debian.org>,
+        Varun Hiremath <varun at debian.org>
+Last-Update: 2006-09-01
+Index: magicrescue-1.1.9/Makefile.in
 ===================================================================
---- magicrescue-1.1.4.orig/Makefile.in	2004-08-15 00:36:37.000000000 +0200
-+++ magicrescue-1.1.4/Makefile.in	2006-10-06 00:27:47.000000000 +0200
-@@ -57,34 +57,26 @@
+--- magicrescue-1.1.9.orig/Makefile.in
++++ magicrescue-1.1.9/Makefile.in
+@@ -37,7 +37,7 @@ tools/textextract: $(TEXTEXTRACT_OBJS)
+ 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ 
+ .o:
+-	$(CC) -o $@ $(LDFLAGS) $<
++	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $<
+ 
+ .pod.1:
+ 	pod2man --release "$(RELEASE)" --center "Magic Rescue" $< $@
+@@ -57,34 +57,26 @@ docs-clean:
  maintainer-clean: distclean docs-clean
  
  install: all
@@ -50,13 +62,3 @@ Index: magicrescue-1.1.4/Makefile.in
  
  .PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs
  
-Index: magicrescue-1.1.4/tools/laola.pl
-===================================================================
---- magicrescue-1.1.4.orig/tools/laola.pl	2004-04-30 19:47:27.000000000 +0200
-+++ magicrescue-1.1.4/tools/laola.pl	2006-10-06 00:26:35.000000000 +0200
-@@ -1,4 +1,4 @@
--#
-+#!/usr/bin/env perl
- # $Id: laola.pl,v 0.5.1.5 1997/07/01 00:06:42 schwartz Rel $
- #
- # laola.pl, LAOLA filesystem. 
diff --git a/debian/patches/series b/debian/patches/series
index 520431c..c3f44d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-pre_configure.patch
+magicrescue.1
+pre_configure
+laola.pl
diff --git a/debian/recipes/sqlite b/debian/recipes/sqlite
new file mode 100644
index 0000000..3739fe5
--- /dev/null
+++ b/debian/recipes/sqlite
@@ -0,0 +1,11 @@
+# Extracts sqlite databases
+# Author: Eric Pozharski <whynot at pozharski.name>
+# See #730007
+#
+0 string SQLite format 3\x00
+extension sqlite
+
+# Result will be "CREATE TABLE"'s and "INSERT INTO"'s
+allow_overlap -1
+#min_output_file 1024
+command dd bs=1M count=16 of="$1.with-trash" 2>/dev/null; sqlite3 -init /dev/null "$1.with-trash" .dump >"$1" ; rm -f "$1.with-trash"
diff --git a/debian/rules b/debian/rules
index 508769b..d8309f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# workaround for dash:
-export PATH := $(PATH):.
-
-get-orig-source:
-	-uscan --upstream-version 0 --rename
+%:
+	dh $@
diff --git a/debian/watch b/debian/watch
index ffbe25e..651085e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-http://jbj.rapanden.dk/magicrescue/release/magicrescue-(.*)\.tar\.gz
-
+http://www.itu.dk/people/jobr/magicrescue release/magicrescue-(\d\S+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/magicrescue.git

