svgalib: corrected patch and typo in PRE_BUILD

3 files changed, 9 insertions, 6 deletions

diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index 23b39f9392..86915ca1a7 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,6 @@
+2006-07-06 Robin Cook
+	* PRE_BUILD: fix patch line
+
 2006-07-01 Robin Cook
 	* PRE_BUILD: add appling patch for kernel 2.6.17
 
diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index 3a4777e115..e7b49400fc 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -11,7 +11,7 @@ sedit "s:\$(shell uname -r):$KER:g"                                  \
 # Apply patchs for kernel versions 2.6.15* and newer
 KER=${KER:0:6}                                                       &&
 if [[ ${KER//\./} > 2616 ]]; then
-   patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.17.diff
+   patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.17.diff
 elif [[ ${KER//\./} > 2614 ]]; then
    patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff
 fi                                                                   &&
diff --git a/display/svgalib/svgalib_helper-2.6.17.diff b/display/svgalib/svgalib_helper-2.6.17.diff
index f8e2f4801a..e0da45d6f2 100644
--- a/display/svgalib/svgalib_helper-2.6.17.diff
+++ b/display/svgalib/svgalib_helper-2.6.17.diff
@@ -1,6 +1,6 @@
 diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/Makefile svgalib_helper/Makefile
 --- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/Makefile	2005-12-16 14:53:10.000000000 +0200
-+++ svgalib_helper/Makefile	2006-05-20 15:31:04.000000000 +0300
++++ kernel/svgalib_helper/Makefile	2006-05-20 15:31:04.000000000 +0300
 @@ -1,8 +1,6 @@
  
  SVGALIB_HELPER_MAJOR=209
@@ -33,7 +33,7 @@ diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/Makefile svgal
  
 diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/dkms.conf svgalib_helper/dkms.conf
 --- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/dkms.conf	2005-12-17 21:30:55.000000000 +0200
-+++ svgalib_helper/dkms.conf	2006-01-12 19:49:00.000000000 +0200
++++ kernel/svgalib_helper/dkms.conf	2006-01-12 19:49:00.000000000 +0200
 @@ -5,5 +5,5 @@
  
  BUILT_MODULE_NAME="svgalib_helper"
@@ -43,7 +43,7 @@ diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/dkms.conf svga
  AUTOINSTALL="yes"
 diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h svgalib_helper/kernel26compat.h
 --- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h	2005-11-05 00:33:00.000000000 +0200
-+++ svgalib_helper/kernel26compat.h	2006-05-20 15:17:13.000000000 +0300
++++ kernel/svgalib_helper/kernel26compat.h	2006-05-20 15:17:13.000000000 +0300
 @@ -36,6 +36,11 @@
  #  define KERNEL_2_6
  # endif
@@ -92,7 +92,7 @@ diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat
 +#endif
 diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/main.c svgalib_helper/main.c
 --- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/main.c	2005-12-16 20:17:57.000000000 +0200
-+++ svgalib_helper/main.c	2006-01-12 20:17:53.000000000 +0200
++++ kernel/svgalib_helper/main.c	2006-01-12 20:17:53.000000000 +0200
 @@ -731,7 +731,6 @@
  			kfree(sh_pci_devs[i]);
  		}
@@ -111,7 +111,7 @@ diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/main.c svgalib
  #ifdef CONFIG_DEVFS_FS
 diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/vgaversion.h svgalib_helper/vgaversion.h
 --- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/vgaversion.h	2005-12-16 20:18:04.000000000 +0200
-+++ svgalib_helper/vgaversion.h	2005-12-24 00:25:39.000000000 +0200
++++ kernel/svgalib_helper/vgaversion.h	2005-12-24 00:25:39.000000000 +0200
 @@ -1,2 +1,2 @@
 -int vga_version=0x1924;
 -static char versionstr[32]="1.9.24";