← Back to branch summary

~ubuntu-branches/ubuntu/hardy/xxdiff/hardy

« back to all changes in this revision

Viewing changes to old/in-core-diff/diffutils-2.7.patch

  • Committer: Bazaar Package Importer
  • Author(s): Tomas Pospisek
  • Date: 2005-03-29 08:43:56 UTC
  • mfrom: (1.2.1 upstream) (2.1.2 hoary)
  • Revision ID: james.westby@ubuntu.com-20050329084356-nkwv8jf18nc7u5qf
Tags: 1:3.1-3
re-upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
old/in-core-diff/diffutils-2.7.patch
 
1
diff --exclude=CVS -6 -Naur diffutils-2.7/config.hin /home/blais/tmp/diffutils-2.7/config.hin
 
2
--- diffutils-2.7/config.hin    2001-09-30 19:10:23.000000000 -0400
 
3
+++ /home/blais/tmp/diffutils-2.7/config.hin    1994-09-28 20:51:31.000000000 -0400
 
4
@@ -1,10 +1,8 @@
 
5
 /* config.hin.  Generated automatically from configure.in by autoheader.  */
 
6
 
 
7
-#include "../src/diffutils_hack.h"
 
8
-
 
9
 /* Define if using alloca.c.  */
 
10
 #undef C_ALLOCA
 
11
 
 
12
 /* Define if the closedir function returns void instead of int.  */
 
13
 #undef CLOSEDIR_VOID
 
14
 
 
15
diff --exclude=CVS -6 -Naur diffutils-2.7/diff.c /home/blais/tmp/diffutils-2.7/diff.c
 
16
--- diffutils-2.7/diff.c        2004-01-20 14:32:42.034468584 -0500
 
17
+++ /home/blais/tmp/diffutils-2.7/diff.c        1994-09-22 12:47:00.000000000 -0400
 
18
@@ -222,13 +222,13 @@
 
19
   {"help", 0, 0, 141},
 
20
   {"binary", 0, 0, 142},
 
21
   {0, 0, 0, 0}
 
22
 };
 
23
 
 
24
 int
 
25
-diffutils_diff_main (argc, argv)
 
26
+main (argc, argv)
 
27
      int argc;
 
28
      char *argv[];
 
29
 {
 
30
   int val;
 
31
   int c;
 
32
   int prev = -1;
 
33
diff --exclude=CVS -6 -Naur diffutils-2.7/diff3.c /home/blais/tmp/diffutils-2.7/diff3.c
 
34
--- diffutils-2.7/diff3.c       2001-10-01 15:26:49.000000000 -0400
 
35
+++ /home/blais/tmp/diffutils-2.7/diff3.c       1994-10-01 01:14:15.000000000 -0400
 
36
@@ -220,13 +220,13 @@
 
37
 
 
38
 /*
 
39
  * Main program.  Calls diff twice on two pairs of input files,
 
40
  * combines the two diffs, and outputs them.
 
41
  */
 
42
 int
 
43
-diffutils_diff3_main (argc, argv)
 
44
+main (argc, argv)
 
45
      int argc;
 
46
      char **argv;
 
47
 {
 
48
   int c, i;
 
49
   int mapping[3];
 
50
   int rev_mapping[3];
 
51
diff --exclude=CVS -6 -Naur diffutils-2.7/diffutils.pro /home/blais/tmp/diffutils-2.7/diffutils.pro
 
52
--- diffutils-2.7/diffutils.pro 2001-09-25 16:40:19.000000000 -0400
 
53
+++ /home/blais/tmp/diffutils-2.7/diffutils.pro 1969-12-31 19:00:00.000000000 -0500
 
54
@@ -1,48 +0,0 @@
 
55
-TEMPLATE       = app
 
56
-
 
57
-CONFIG         += qt warn_on release
 
58
-
 
59
-# for windows:
 
60
-win32-msvc:TMAKE_CXXFLAGS = -GX -DWINDOWS
 
61
-
 
62
-HEADERS = \
 
63
-       cmpbuf.h \
 
64
-       diff.h \
 
65
-       fnmatch.h \
 
66
-       getopt.h \
 
67
-       regex.h \
 
68
-       system.h
 
69
-
 
70
-SOURCES = \
 
71
-       alloca.c \
 
72
-       analyze.c \
 
73
-       cmp.c \
 
74
-       cmpbuf.c \
 
75
-       context.c \
 
76
-       diff.c \
 
77
-       diff3.c \
 
78
-       dir.c \
 
79
-       ed.c \
 
80
-       error.c \
 
81
-       fnmatch.c \
 
82
-       getopt.c \
 
83
-       getopt1.c \
 
84
-       ifdef.c \
 
85
-       io.c \
 
86
-       memchr.c \
 
87
-       normal.c \
 
88
-       regex.c \
 
89
-       sdiff.c \
 
90
-       side.c \
 
91
-       util.c \
 
92
-       version.c \
 
93
-       waitpid.c \
 
94
-       xmalloc.c
 
95
-
 
96
-TARGET         = diffutils
 
97
-
 
98
-DEPENDPATH=
 
99
-
 
100
-INCLUDEPATH=.
 
101
-
 
102
-REQUIRES=large-config