modifying package: ctalk-0.0.29a 20071220 again

ctalk/ctalk.patch

@@ -110,15 +110,9 @@ Index: ctalk-0.0.29/src/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-<<<<<<< ctalk.patch
-Index: ctpp-1.0.26/ctpp/Makefile.in
---- ctpp-1.0.26/ctpp/Makefile.in.orig	2007-09-12 14:36:28 +0200
-+++ ctpp-1.0.26/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
-=======
 Index: ctpp-1.0.27/ctpp/Makefile.in
 --- ctpp-1.0.27/ctpp/Makefile.in.orig	2007-09-12 14:36:28 +0200
 +++ ctpp-1.0.27/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
->>>>>>> 1.25
 @@ -121,7 +121,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -128,15 +122,9 @@ Index: ctpp-1.0.27/ctpp/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-<<<<<<< ctalk.patch
-Index: ctpp-1.0.26/ctpp/builtins.c
---- ctpp-1.0.26/ctpp/builtins.c.orig	2007-09-04 06:14:05 +0200
-+++ ctpp-1.0.26/ctpp/builtins.c	2007-09-18 07:49:32 +0200
-=======
 Index: ctpp-1.0.27/ctpp/builtins.c
 --- ctpp-1.0.27/ctpp/builtins.c.orig	2007-09-04 06:14:05 +0200
 +++ ctpp-1.0.27/ctpp/builtins.c	2007-09-18 07:49:32 +0200
->>>>>>> 1.25
 @@ -80,11 +80,12 @@
     *  config file included above.  See the comments in 
     *  config/linux-gnu-x86.c
@@ -163,15 +151,9 @@ Index: ctpp-1.0.27/ctpp/builtins.c
 +#endif
    return FALSE;
  }
-<<<<<<< ctalk.patch
-Index: ctpp-1.0.26/ctpp/ccompat.c
---- ctpp-1.0.26/ctpp/ccompat.c.orig	2007-09-04 06:14:05 +0200
-+++ ctpp-1.0.26/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
-=======
 Index: ctpp-1.0.27/ctpp/ccompat.c
 --- ctpp-1.0.27/ctpp/ccompat.c.orig	2007-09-04 06:14:05 +0200
 +++ ctpp-1.0.27/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
->>>>>>> 1.25
 @@ -53,8 +53,10 @@
  
  char cpp_subdir[FILENAME_MAX];
@@ -192,15 +174,9 @@ Index: ctpp-1.0.27/ctpp/ccompat.c
  
    /* Try to find out what the compiler target is.  It may not 
       be the same as the autoconf $host.
-<<<<<<< ctalk.patch
-Index: ctpp-1.0.26/ctpp/i_opt.c
---- ctpp-1.0.26/ctpp/i_opt.c.orig	2007-08-27 03:18:27 +0200
-+++ ctpp-1.0.26/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
-=======
 Index: ctpp-1.0.27/ctpp/i_opt.c
 --- ctpp-1.0.27/ctpp/i_opt.c.orig	2007-08-27 03:18:27 +0200
 +++ ctpp-1.0.27/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
->>>>>>> 1.25
 @@ -30,6 +30,8 @@
  #include <stdlib.h>
  #include <string.h>
@@ -210,15 +186,9 @@ Index: ctpp-1.0.27/ctpp/i_opt.c
  #include "ctpp.h"
  
  extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
-<<<<<<< ctalk.patch
-Index: ctpp-1.0.26/libctpp/lex.c
---- ctpp-1.0.26/libctpp/lex.c.orig	2007-08-27 03:04:06 +0200
-+++ ctpp-1.0.26/libctpp/lex.c	2007-09-18 07:49:32 +0200
-=======
 Index: ctpp-1.0.27/libctpp/lex.c
 --- ctpp-1.0.27/libctpp/lex.c.orig	2007-08-27 03:04:06 +0200
 +++ ctpp-1.0.27/libctpp/lex.c	2007-09-18 07:49:32 +0200
->>>>>>> 1.25
 @@ -26,6 +26,8 @@
  #include <string.h>
  #include <ctype.h>