[Forensics-changes] [magicrescue] 01/01: Imported Debian patch 1.1.9-4

[Joao Eriberto Mota Filho]

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

eriberto pushed a commit to branch debian
in repository magicrescue.

commit 7bc0ee4f766c9c21a86ac66bed8be3973de94bfc
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sat Nov 12 20:50:51 2016 -0200

    Imported Debian patch 1.1.9-4
---
 debian/changelog | 16 ++++++++++++++++
 debian/compat    |  2 +-
 debian/control   | 18 +++++++++---------
 debian/copyright |  2 +-
 debian/rules     | 10 +++++++++-
 debian/watch     |  3 ++-
 6 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac806da..cd9477f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+magicrescue (1.1.9-4) unstable; urgency=medium
+
+  * Bumped DH level to 10.
+  * The upstream homepage is offline.
+  * debian/control: removed gimp-xcf from long description.
+  * debian/copyright: added an extra email address for upstream.
+  * debian/rules:
+      - Added DEB_CFLAGS_MAINT_APPEND and DEB_LDFLAGS_MAINT_APPEND variables
+        to improve the GCC hardening.
+      - Created the override_dh_install target to remove the recipe gimp-xcf,
+        no longer possible because of a removed dependency. (Closes: #567968)
+  * debian/watch: using a fake site to explain about the current status of
+    the original upstream homepage.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sat, 12 Nov 2016 20:50:51 -0200
+
 magicrescue (1.1.9-3) unstable; urgency=medium
 
   * debian/control:
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 3d4b4be..d159f2b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 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
+Build-Depends: debhelper (>= 10), libgdbm-dev
 Standards-Version: 3.9.8
 Homepage: http://www.itu.dk/people/jobr/magicrescue
 Vcs-Git: https://anonscm.debian.org/git/forensics/magicrescue.git
@@ -11,16 +11,16 @@ Vcs-Browser: https://anonscm.debian.org/git/forensics/magicrescue.git
 
 Package: magicrescue
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         dcraw,
+Depends: dcraw,
          flac,
          libjpeg-turbo-progs,
          mpg123,
          sqlite3,
          unzip,
-         zip
-Description: recovers files by looking for magic bytes
+         zip,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: recover 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"
  (file patterns) in file contents, so it can be used both as an undelete
@@ -30,9 +30,9 @@ Description: recovers files by looking for magic bytes
  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 the following
- 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 and zip.
+ recipes: avi, canon-cr2, elf, flac, gpl, gzip, jpeg-exif, jpeg-jfif,
+ mbox, mbox-mozilla-inbox, mbox-mozilla-sent, mp3-id3v1, mp3-id3v2,
+ msoffice, nikon-raw, perl, png, ppm, sqlite and zip.
  .
  This package provides magicrescue, dupemap and magicsort commands.
  magicrescue is a carver and is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index c816738..628e8d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: magicrescue
 Source: http://www.itu.dk/people/jobr/magicrescue
 
 Files: *
-Copyright: 2004-2009 Jonas Jensen <jbj at knef.dk>
+Copyright: 2004-2009 Jonas Jensen <jonas.jensen at gmail.com, jbj at knef.dk>
 License: GPL-2+
 
 Files: tools/laola.pl
diff --git a/debian/rules b/debian/rules
index d8309f6..db9d73c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,14 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS  = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND  = -fPIE
+export DEB_LDFLAGS_MAINT_APPEND = -pie -fPIE
 
 %:
 	dh $@
+
+# Remove the recipe gimp-xcf. See #567968.
+override_dh_install:
+	dh_install
+	rm -f $(CURDIR)/debian/magicrescue/usr/share/magicrescue/recipes/gimp-xcf
+	rm -f $(CURDIR)/debian/magicrescue/usr/lib/magicrescue/tools/gimp-resave.pl
diff --git a/debian/watch b/debian/watch
index 0d504bb..92389a4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-http://www.itu.dk/people/jobr/magicrescue release/magicrescue-(\d\S+)\.tar\.(?:bz2|gz|xz)
+opts=dversionmangle=s/.*/0.No-Site/ \
+https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz

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