← Back to branch summary

~ubuntu-branches/ubuntu/hardy/exim4/hardy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/36_pcre.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Marc Haber
  • Date: 2005-07-02 06:08:34 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050702060834-qk17pd52kb9nt3bj
Tags: 4.52-1
http://bugs.debian.org/315775
* new upstream version 4.51. (mh)
  * adapt 70_remove_exim-users_references
  * remove 37_gnutlsparams
  * adapt 36_pcre
  * adapt 31_eximmanpage
* fix package priorities to have them in sync with override again. (mh)
* Fix error in nb (Norwegian) translation.
  Thanks to Helge Hafting. (mh). Closes: #315775
* Standards-Version: 3.6.2, no changes needed. (mh)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/36_pcre.dpatch
20
20
exit 0
21
21
                                    
22
22
@DPATCH@
23
 
diff -urNad /tmp/exim/exim/OS/Makefile-Base exim/OS/Makefile-Base
24
 
--- /tmp/exim/exim/OS/Makefile-Base     Wed Mar 31 13:57:42 2004
25
 
+++ exim/OS/Makefile-Base       Wed Mar 31 14:20:19 2004
26
 
@@ -94,7 +94,7 @@
 
23
diff -urNad --exclude=CVS --exclude=.svn ./OS/Makefile-Base /tmp/dpep-work.3lzcyA/exim4/OS/Makefile-Base
 
24
--- ./OS/Makefile-Base  2005-07-01 11:09:15.000000000 +0000
 
25
+++ /tmp/dpep-work.3lzcyA/exim4/OS/Makefile-Base        2005-07-02 05:38:21.000000000 +0000
 
26
@@ -103,7 +103,7 @@
27
27
 # This is the real default target for all the various exim binaries and
28
28
 # scripts, once the configuring stuff is done.
29
29
 
32
32
         exigrep eximstats exipick exiqgrep exiqsumm \
33
33
         transport-filter.pl convert4r3 convert4r4 \
34
34
         exim_checkaccess \
35
 
@@ -295,7 +295,7 @@
36
 
         store.o string.o tls.o tod.o transport.o tree.o verify.o \
37
 
         local_scan.o $(EXIM_PERL)
 
35
@@ -314,7 +314,7 @@
 
36
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
 
37
         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
38
38
 
39
39
-exim:   pcre/libpcre.a lookups/lookups.a auths/auths.a \
40
40
+exim:   lookups/lookups.a auths/auths.a \
41
41
         routers/routers.a transports/transports.a \
42
42
         $(OBJ_EXIM) version.c
43
43
        @echo " "
44
 
@@ -304,7 +304,7 @@
45
 
        $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
 
44
@@ -325,7 +325,7 @@
46
45
        rm -f exim
47
 
        $(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
 
46
        @echo "$(LNCC) -o exim"
 
47
        $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
48
48
-         pcre/libpcre.a \
49
49
+         -lpcre \
50
50
          routers/routers.a transports/transports.a lookups/lookups.a \
51
51
          auths/auths.a \
52
52
          $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
53
 
@@ -406,12 +406,12 @@
 
53
@@ -429,14 +429,14 @@
54
54
 
55
55
 OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
56
56
 
57
57
-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
58
58
+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
59
59
             ../exim_monitor/em_version.c
60
 
        $(CC) -o em_version.o -c \
 
60
        @echo "$(CC) exim_monitor/em_version.c"
 
61
        $(FE)$(CC) -o em_version.o -c \
61
62
          $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
62
 
        $(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
 
63
        @echo "$(LNCC) -o eximon.bin"
 
64
        $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
63
65
-       $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
64
66
+       $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
65
67
          $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
66
68
        @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
67
69
          echo $(STRIP_COMMAND) eximon.bin; \
68
 
diff -urNad /tmp/exim/exim/exim_monitor/em_hdr.h exim/exim_monitor/em_hdr.h
69
 
--- /tmp/exim/exim/exim_monitor/em_hdr.h        Wed Mar 31 13:57:55 2004
70
 
+++ exim/exim_monitor/em_hdr.h  Wed Mar 31 14:18:27 2004
71
 
@@ -85,7 +85,7 @@
 
70
diff -urNad --exclude=CVS --exclude=.svn ./exim_monitor/em_hdr.h /tmp/dpep-work.3lzcyA/exim4/exim_monitor/em_hdr.h
 
71
--- ./exim_monitor/em_hdr.h     2005-07-01 11:09:15.000000000 +0000
 
72
+++ /tmp/dpep-work.3lzcyA/exim4/exim_monitor/em_hdr.h   2005-07-02 05:36:35.000000000 +0000
 
73
@@ -87,7 +87,7 @@
72
74
 
73
75
 /* Regular expression include */
74
76
 
77
79
 
78
80
 /* Includes from the main source of Exim. We need to have MAXPACKET defined for
79
81
 the benefit of structs.h. One of these days I should tidy up this interface so
80
 
diff -urNad /tmp/exim/exim/src/exim.h exim/src/exim.h
81
 
--- /tmp/exim/exim/src/exim.h   Wed Mar 31 13:57:59 2004
82
 
+++ exim/src/exim.h     Wed Mar 31 14:18:27 2004
83
 
@@ -368,7 +368,7 @@
 
82
diff -urNad --exclude=CVS --exclude=.svn ./src/exim.h /tmp/dpep-work.3lzcyA/exim4/src/exim.h
 
83
--- ./src/exim.h        2005-07-01 11:09:15.000000000 +0000
 
84
+++ /tmp/dpep-work.3lzcyA/exim4/src/exim.h      2005-07-02 05:36:35.000000000 +0000
 
85
@@ -414,7 +414,7 @@
84
86
 
85
87
 /* The header from the PCRE regex package */
86
88