summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJohn Wright <john@johnwright.org>2009-07-25 11:11:40 +0200
committerJohn Wright <jsw@debian.org>2009-07-25 13:56:11 +0200
commitb7ce40230455eb375ee87733ddbc9533c26b5a11 (patch)
treec034103a9bc373254043a8c07b2f2ebe949d4fd3 /debian/patches
parentbf43c35f9a43449ff7f4d7938fa2737edfc5a672 (diff)
Switch to quilt from dpatch
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/00list2
-rw-r--r--debian/patches/linux-2.6.31-amd64.patch (renamed from debian/patches/02-Add_x86_64_linux-2.6.31.patch)12
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/use-install-in-makefile.patch (renamed from debian/patches/01_fix_makefile.dpatch)7
4 files changed, 8 insertions, 15 deletions
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9e444a2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_makefile.dpatch
-02-Add_x86_64_linux-2.6.31.patch
diff --git a/debian/patches/02-Add_x86_64_linux-2.6.31.patch b/debian/patches/linux-2.6.31-amd64.patch
index 326454e..7f6160a 100644
--- a/debian/patches/02-Add_x86_64_linux-2.6.31.patch
+++ b/debian/patches/linux-2.6.31-amd64.patch
@@ -1,11 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-##
-## Patch: http://sourceforge.net/tracker/index.php?func=detail&aid=2819382&group_id=178938&atid=887141
-##
-## DP: make it work on amd64 for 2.6.31
+Add support for amd64 on 2.6.31
-@DPATCH@
+Patch by Ken'ichi Ohmichi to support 2.6.31 on amd64 (kernel memory
+layout changed)
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=2819382&group_id=178938&atid=887141
diff -rpuN a/makedumpfile.h b/makedumpfile.h
--- a/makedumpfile.h 2009-07-08 16:22:16.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..75a0520
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use-install-in-makefile.patch
+linux-2.6.31-amd64.patch
diff --git a/debian/patches/01_fix_makefile.dpatch b/debian/patches/use-install-in-makefile.patch
index ff00c89..36cecff 100644
--- a/debian/patches/01_fix_makefile.dpatch
+++ b/debian/patches/use-install-in-makefile.patch
@@ -1,10 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_makefile.dpatch by <egon@top>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+Use install instead of cp in Makefile
-@DPATCH@
diff -urNad makedumpfile-1.3.3~/Makefile makedumpfile-1.3.3/Makefile
--- makedumpfile-1.3.3~/Makefile 2009-04-20 08:26:23.000000000 +0200
+++ makedumpfile-1.3.3/Makefile 2009-06-23 13:23:37.538753532 +0200