[Forensics-changes] [memdump] 01/12: Update patch to avoid FTBFS when the kernel major version changes.

[Raphaël Hertzog]

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

hertzog pushed a commit to branch debian
in repository memdump.

commit 002a8fb44b39311fa1a9bb1968e64cf72401c07e
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue Jul 28 09:23:06 2015 +0200

    Update patch to avoid FTBFS when the kernel major version changes.
    
    Closes: #790261
---
 debian/changelog               |  8 ++++++++
 debian/patches/02-linux3.patch | 32 +++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65a1472..ba7de6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+memdump (1.01-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update patch to avoid FTBFS when the kernel major version changes.
+    Closes: #790261
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Tue, 28 Jul 2015 09:20:35 +0200
+
 memdump (1.01-6.1) unstable; urgency=low
 
   * Non-maintainer upload
diff --git a/debian/patches/02-linux3.patch b/debian/patches/02-linux3.patch
index f94c678..fcf7f1a 100644
--- a/debian/patches/02-linux3.patch
+++ b/debian/patches/02-linux3.patch
@@ -1,14 +1,28 @@
-Index: memdump/makedefs
-===================================================================
---- memdump.orig/makedefs	2012-09-27 23:21:13.827478312 +0200
-+++ memdump/makedefs	2012-09-27 23:21:36.407016917 +0200
-@@ -32,7 +32,8 @@
- 		;;
-   Linux.2.4*)   DEFS="-DLINUX2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+Description: Support all Linux versions
+ The Makefile defines different compile time options depending on the
+ current kernel version. When written, the 2.4 kernel was special
+ cased as a very recent kernel. Now it should be really handled as
+ the default case... and the old default case for pre-2.4 kernel
+ can be dropped.
+ .
+ This is what this patch does. Since upstream is dead, this patch
+ can't be forwarded anywhere.
+Author: Raphaël Hertzog <hertzog at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-07-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/makedefs
++++ b/makedefs
+@@ -30,9 +30,7 @@ SunOS.5.[0-5]*)	DEFS="-DSUNOS5 -DUSE_PRE
+     SunOS.5*)	DEFS="-DSUNOS5 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ 		RANLIB=":"
  		;;
+-  Linux.2.4*)   DEFS="-DLINUX2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+-		;;
 -    Linux.2*)   DEFS="-DLINUX2"
-+  Linux.2.6*|\
-+   Linux.3.*)   DEFS="-DLINUX2"
++  Linux.*)      DEFS="-DLINUX2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  		;;
  	GNU*)   DEFS="-DLINUX2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  		;;

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