* merge in experimental changes:

    * create exim4-dev package for sa-exim and other packages. Closes: #401462
    * fix broken usage of DPATCH_WORKDIR (dpatch-edit-patch didn't
      work with tarballed upstream)
      * don't use DPATCH_WORKDIR any more
      * modify patches to apply to build-tree
    * remove leftover debugging output from debian/patches/00_unpack.dpatch


svn path=/exim/trunk/; revision=1862

19 files changed, 104 insertions, 67 deletions

diff --git a/debian/changelog b/debian/changelog
index 070cb0d..98455b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,15 @@ exim4 (4.63-12.0) UNRELEASED; urgency=low
     Thanks to Eugeniy Meshcheryakov and Yanovych Borys. Closes: #404481
   * Update sl (Slovenian) translation of debconf templates.
     Thanks to Matej Kovacic. Closes: #404481
-
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Mon, 25 Dec 2006 18:14:25 +0100
+  * merge in experimental changes:
+    * create exim4-dev package for sa-exim and other packages. Closes: #401462
+    * fix broken usage of DPATCH_WORKDIR (dpatch-edit-patch didn't
+      work with tarballed upstream)
+      * don't use DPATCH_WORKDIR any more
+      * modify patches to apply to build-tree
+    * remove leftover debugging output from debian/patches/00_unpack.dpatch
+
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Tue,  2 Jan 2007 13:58:42 +0100
 
 exim4 (4.63-12) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 000a685..90ad314 100644
--- a/debian/control
+++ b/debian/control
@@ -345,3 +345,30 @@ Description: debugging symbols for the exim MTA (v4) packages
  .
  Upstream URL: http://www.exim.org/
 
+Package: exim4-dev
+Architecture: any
+Priority: extra
+Description: header files for the exim MTA (v4) packages
+ Exim (v4) is a mail transport agent. This package contains header
+ files that can be used to compile code that is then dynamically linked
+ to exim's local_scan interface.
+ .
+ The Debian exim4 packages have their own web page,
+ http://pkg-exim4.alioth.debian.org/. There is also a Debian-specific
+ FAQ list. Information about the way the Debian packages are
+ configured can be found in
+ /usr/share/doc/exim4-base/README.Debian.gz, which additionally contains
+ information about the way the Debian binary packages are built. The
+ very extensive upstream documentation is shipped in
+ /usr/share/doc/exim4-base/spec.txt.gz. To repeat the debconf-driven
+ configuration process in a standard setup, invoke dpkg-reconfigure
+ exim4-config. There is a Debian-centered mailing list,
+ pkg-exim4-users@lists.alioth.debian.org. Please ask Debian-specific
+ questions there, and only write to the upstream exim-users mailing
+ list if you are sure that your question is not Debian-specific. You
+ can find the subscription web page on
+ http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
+ .
+ exim is a drop-in replacement for sendmail/mailq/rsmtp.
+ .
+ Upstream URL: http://www.exim.org/
diff --git a/debian/exim4-dev.install b/debian/exim4-dev.install
new file mode 100644
index 0000000..41fb18b
--- /dev/null
+++ b/debian/exim4-dev.install
@@ -0,0 +1,4 @@
+build-tree/src/local_scan.h usr/include/exim4
+build-tree/src/store.h usr/include/exim4
+build-tree/src/mytypes.h usr/include/exim4
+build-tree/build-exim4-daemon-heavy/config.h usr/include/exim4
diff --git a/debian/exim4-dev.links b/debian/exim4-dev.links
new file mode 100644
index 0000000..a9615bd
--- /dev/null
+++ b/debian/exim4-dev.links
@@ -0,0 +1,2 @@
+usr/share/doc/exim4-base/changelog.gz usr/share/doc/exim4-dev/changelog.gz
+usr/share/doc/exim4-base/README.Debian.gz usr/share/doc/exim4-dev/README.Debian.gz
diff --git a/debian/patches/00_unpack.dpatch b/debian/patches/00_unpack.dpatch
index e4e33fa..9c95794 100755
--- a/debian/patches/00_unpack.dpatch
+++ b/debian/patches/00_unpack.dpatch
@@ -13,11 +13,6 @@ dpatch_patch ()
 	if [ -e src/exim.c ]; then
 		# we have classical layout of an unpacked upstream tree
 		mkdir -p build-tree
-		echo bla
-		pwd
-		find . -mindepth 1 -maxdepth 1 \
-		  -name debian -prune -o \
-		  -name build-tree -o -print
 		find . -mindepth 1 -maxdepth 1 \
 		  -name debian -prune -o \
 		  -name build-tree -o -print0 | \
diff --git a/debian/patches/30_dontoverridecflags.dpatch b/debian/patches/30_dontoverridecflags.dpatch
index 8b77719..98ab98e 100644
--- a/debian/patches/30_dontoverridecflags.dpatch
+++ b/debian/patches/30_dontoverridecflags.dpatch
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad trunk~/OS/Makefile-Linux trunk/OS/Makefile-Linux
---- trunk~/OS/Makefile-Linux	2005-10-04 08:55:28.000000000 +0000
-+++ trunk/OS/Makefile-Linux	2005-10-04 09:51:56.000000000 +0000
+--- trunk~/build-tree/OS/Makefile-Linux	2005-10-04 08:55:28.000000000 +0000
++++ trunk/build-tree/OS/Makefile-Linux	2005-10-04 09:51:56.000000000 +0000
 @@ -9,7 +9,7 @@
  CHOWN_COMMAND=look_for_it
  CHGRP_COMMAND=look_for_it
diff --git a/debian/patches/31_eximmanpage.dpatch b/debian/patches/31_eximmanpage.dpatch
index 7eef8b0..c3106e4 100755
--- a/debian/patches/31_eximmanpage.dpatch
+++ b/debian/patches/31_eximmanpage.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/doc/exim.8 trunk/doc/exim.8
---- trunk~/doc/exim.8	2006-04-28 10:32:23.000000000 +0000
-+++ trunk/doc/exim.8	2006-06-21 19:13:12.000000000 +0000
+--- trunk~/build-tree/doc/exim.8	2006-04-28 10:32:23.000000000 +0000
++++ trunk/build-tree/doc/exim.8	2006-06-21 19:13:12.000000000 +0000
 @@ -1,8 +1,8 @@
 -.TH EXIM 8
 +.TH EXIM4 8
diff --git a/debian/patches/32_exim4.dpatch b/debian/patches/32_exim4.dpatch
index 2e82286..ee99aa5 100755
--- a/debian/patches/32_exim4.dpatch
+++ b/debian/patches/32_exim4.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad /tmp/exim4-4.32/OS/Makefile-Linux exim4-4.32/OS/Makefile-Linux
---- /tmp/exim4-4.32/OS/Makefile-Linux	Fri Apr 16 13:16:03 2004
-+++ exim4-4.32/OS/Makefile-Linux	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/OS/Makefile-Linux	Fri Apr 16 13:16:03 2004
++++ exim4-4.32/build-tree/OS/Makefile-Linux	Fri Apr 16 13:16:04 2004
 @@ -23,7 +23,7 @@
  EXIWHAT_PS_ARG=ax
  EXIWHAT_EGREP_ARG='/exim( |$$)'
@@ -18,8 +18,8 @@ diff -urNad /tmp/exim4-4.32/OS/Makefile-Linux exim4-4.32/OS/Makefile-Linux
  
  # End
 diff -urNad /tmp/exim4-4.32/src/exicyclog.src exim4-4.32/src/exicyclog.src
---- /tmp/exim4-4.32/src/exicyclog.src	Wed Mar 31 14:44:15 2004
-+++ exim4-4.32/src/exicyclog.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/exicyclog.src	Wed Mar 31 14:44:15 2004
++++ exim4-4.32/build-tree/src/exicyclog.src	Fri Apr 16 13:16:04 2004
 @@ -115,7 +115,7 @@
  
  st='	 '
@@ -30,8 +30,8 @@ diff -urNad /tmp/exim4-4.32/src/exicyclog.src exim4-4.32/src/exicyclog.src
  spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
  log_file_path=`$exim_path -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
 diff -urNad /tmp/exim4-4.32/src/exim_checkaccess.src exim4-4.32/src/exim_checkaccess.src
---- /tmp/exim4-4.32/src/exim_checkaccess.src	Wed Mar 31 14:44:15 2004
-+++ exim4-4.32/src/exim_checkaccess.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/exim_checkaccess.src	Wed Mar 31 14:44:15 2004
++++ exim4-4.32/build-tree/src/exim_checkaccess.src	Fri Apr 16 13:16:04 2004
 @@ -53,7 +53,7 @@
  
  st='	 '
@@ -42,8 +42,8 @@ diff -urNad /tmp/exim4-4.32/src/exim_checkaccess.src exim4-4.32/src/exim_checkac
  
  #########################################################################
 diff -urNad /tmp/exim4-4.32/src/eximon.src exim4-4.32/src/eximon.src
---- /tmp/exim4-4.32/src/eximon.src	Wed Mar 31 14:44:15 2004
-+++ exim4-4.32/src/eximon.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/eximon.src	Wed Mar 31 14:44:15 2004
++++ exim4-4.32/build-tree/src/eximon.src	Fri Apr 16 13:16:04 2004
 @@ -64,7 +64,7 @@
  
  st='	 '
@@ -54,8 +54,8 @@ diff -urNad /tmp/exim4-4.32/src/eximon.src exim4-4.32/src/eximon.src
  SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
  LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
 diff -urNad /tmp/exim4-4.32/src/exinext.src exim4-4.32/src/exinext.src
---- /tmp/exim4-4.32/src/exinext.src	Fri Apr 16 12:38:56 2004
-+++ exim4-4.32/src/exinext.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/exinext.src	Fri Apr 16 12:38:56 2004
++++ exim4-4.32/build-tree/src/exinext.src	Fri Apr 16 13:16:04 2004
 @@ -90,7 +90,7 @@
    exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
  fi
@@ -75,8 +75,8 @@ diff -urNad /tmp/exim4-4.32/src/exinext.src exim4-4.32/src/exinext.src
  
    while (<DATA>)
 diff -urNad /tmp/exim4-4.32/src/exiqgrep.src exim4-4.32/src/exiqgrep.src
---- /tmp/exim4-4.32/src/exiqgrep.src	Wed Mar 31 14:44:15 2004
-+++ exim4-4.32/src/exiqgrep.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/exiqgrep.src	Wed Mar 31 14:44:15 2004
++++ exim4-4.32/build-tree/src/exiqgrep.src	Fri Apr 16 13:16:04 2004
 @@ -21,7 +21,7 @@
  use Getopt::Std;
  
@@ -87,8 +87,8 @@ diff -urNad /tmp/exim4-4.32/src/exiqgrep.src exim4-4.32/src/exiqgrep.src
  my %id;
  my %opt;
 diff -urNad /tmp/exim4-4.32/src/exiwhat.src exim4-4.32/src/exiwhat.src
---- /tmp/exim4-4.32/src/exiwhat.src	Wed Mar 31 14:44:15 2004
-+++ exim4-4.32/src/exiwhat.src	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/exiwhat.src	Wed Mar 31 14:44:15 2004
++++ exim4-4.32/build-tree/src/exiwhat.src	Fri Apr 16 13:16:04 2004
 @@ -82,7 +82,7 @@
  
  st='	 '
@@ -99,8 +99,8 @@ diff -urNad /tmp/exim4-4.32/src/exiwhat.src exim4-4.32/src/exiwhat.src
  process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"`
  
 diff -urNad /tmp/exim4-4.32/src/globals.c exim4-4.32/src/globals.c
---- /tmp/exim4-4.32/src/globals.c	Fri Apr 16 12:38:56 2004
-+++ exim4-4.32/src/globals.c	Fri Apr 16 13:16:04 2004
+--- /tmp/exim4-4.32/build-tree/src/globals.c	Fri Apr 16 12:38:56 2004
++++ exim4-4.32/build-tree/src/globals.c	Fri Apr 16 13:16:04 2004
 @@ -436,7 +436,7 @@
  
  gid_t   exim_gid               = EXIM_GID;
diff --git a/debian/patches/33_eximon.binary.dpatch b/debian/patches/33_eximon.binary.dpatch
index 111390f..3ebdfd6 100755
--- a/debian/patches/33_eximon.binary.dpatch
+++ b/debian/patches/33_eximon.binary.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad 30.tmp/OS/eximon.conf-Default 30/OS/eximon.conf-Default
---- 30.tmp/OS/eximon.conf-Default	Mon Dec 30 10:14:03 2002
-+++ 30/OS/eximon.conf-Default	Mon Dec 30 10:15:04 2002
+--- 30.tmp/build-tree/OS/eximon.conf-Default	Mon Dec 30 10:14:03 2002
++++ 30/build-tree/OS/eximon.conf-Default	Mon Dec 30 10:15:04 2002
 @@ -5,7 +5,7 @@
  # The name of the eximon binary, usually the same as the eximon script,
  # with .bin stuck on the end.
diff --git a/debian/patches/34_eximstatsmanpage.dpatch b/debian/patches/34_eximstatsmanpage.dpatch
index 8c802b9..58f8dad 100755
--- a/debian/patches/34_eximstatsmanpage.dpatch
+++ b/debian/patches/34_eximstatsmanpage.dpatch
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad 30.tmp/src/eximstats.src 30/src/eximstats.src
---- 30.tmp/src/eximstats.src	Wed Dec 18 11:28:01 2002
-+++ 30/src/eximstats.src	Sun Jan 12 14:50:23 2003
+--- 30.tmp/build-tree/src/eximstats.src	Wed Dec 18 11:28:01 2002
++++ 30/build-tree/src/eximstats.src	Sun Jan 12 14:50:23 2003
 @@ -277,6 +277,10 @@
   make test
   make install
diff --git a/debian/patches/35_install.dpatch b/debian/patches/35_install.dpatch
index 02102c2..317114c 100755
--- a/debian/patches/35_install.dpatch
+++ b/debian/patches/35_install.dpatch
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad trunk~/scripts/exim_install trunk/scripts/exim_install
---- trunk~/scripts/exim_install	2005-11-28 10:57:32.000000000 +0000
-+++ trunk/scripts/exim_install	2006-02-22 11:57:57.000000000 +0000
+--- trunk~/build-tree/scripts/exim_install	2005-11-28 10:57:32.000000000 +0000
++++ trunk/build-tree/scripts/exim_install	2006-02-22 11:57:57.000000000 +0000
 @@ -218,8 +218,9 @@
    # The exim binary is handled specially
  
diff --git a/debian/patches/36_pcre.dpatch b/debian/patches/36_pcre.dpatch
index 4fe01e6..a9bf601 100755
--- a/debian/patches/36_pcre.dpatch
+++ b/debian/patches/36_pcre.dpatch
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad --exclude=CVS --exclude=.svn ./OS/Makefile-Base /tmp/dpep-work.3lzcyA/exim4/OS/Makefile-Base
---- ./OS/Makefile-Base	2005-07-01 11:09:15.000000000 +0000
-+++ /tmp/dpep-work.3lzcyA/exim4/OS/Makefile-Base	2005-07-02 05:38:21.000000000 +0000
+--- ./build-tree/OS/Makefile-Base	2005-07-01 11:09:15.000000000 +0000
++++ /tmp/dpep-work.3lzcyA/exim4/build-tree/OS/Makefile-Base	2005-07-02 05:38:21.000000000 +0000
 @@ -103,7 +103,7 @@
  # This is the real default target for all the various exim binaries and
  # scripts, once the configuring stuff is done.
@@ -54,8 +54,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./OS/Makefile-Base /tmp/dpep-work.3lzcy
  	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
  	  echo $(STRIP_COMMAND) eximon.bin; \
 diff -urNad --exclude=CVS --exclude=.svn ./exim_monitor/em_hdr.h /tmp/dpep-work.3lzcyA/exim4/exim_monitor/em_hdr.h
---- ./exim_monitor/em_hdr.h	2005-07-01 11:09:15.000000000 +0000
-+++ /tmp/dpep-work.3lzcyA/exim4/exim_monitor/em_hdr.h	2005-07-02 05:36:35.000000000 +0000
+--- ./build-tree/exim_monitor/em_hdr.h	2005-07-01 11:09:15.000000000 +0000
++++ /tmp/dpep-work.3lzcyA/exim4/build-tree/exim_monitor/em_hdr.h	2005-07-02 05:36:35.000000000 +0000
 @@ -87,7 +87,7 @@
  
  /* Regular expression include */
@@ -66,8 +66,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./exim_monitor/em_hdr.h /tmp/dpep-work.
  /* Includes from the main source of Exim. We need to have MAXPACKET defined for
  the benefit of structs.h. One of these days I should tidy up this interface so
 diff -urNad --exclude=CVS --exclude=.svn ./src/exim.h /tmp/dpep-work.3lzcyA/exim4/src/exim.h
---- ./src/exim.h	2005-07-01 11:09:15.000000000 +0000
-+++ /tmp/dpep-work.3lzcyA/exim4/src/exim.h	2005-07-02 05:36:35.000000000 +0000
+--- ./build-tree/src/exim.h	2005-07-01 11:09:15.000000000 +0000
++++ /tmp/dpep-work.3lzcyA/exim4/build-tree/src/exim.h	2005-07-02 05:36:35.000000000 +0000
 @@ -414,7 +414,7 @@
  
  /* The header from the PCRE regex package */
diff --git a/debian/patches/37_upstream-patch-384015-add_headers.dpatch b/debian/patches/37_upstream-patch-384015-add_headers.dpatch
index 6aa26e0..df120c7 100755
--- a/debian/patches/37_upstream-patch-384015-add_headers.dpatch
+++ b/debian/patches/37_upstream-patch-384015-add_headers.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/src/filter.c trunk/src/filter.c
---- trunk~/src/filter.c	2006-07-31 14:19:48.000000000 +0000
-+++ trunk/src/filter.c	2006-08-21 11:46:31.000000000 +0000
+--- trunk~/build-tree/src/filter.c	2006-07-31 14:19:48.000000000 +0000
++++ trunk/build-tree/src/filter.c	2006-08-21 11:46:31.000000000 +0000
 @@ -2186,7 +2186,6 @@
                    string_printing(s), command_list[commands->command]);
                  return FF_ERROR;
diff --git a/debian/patches/40_boolean_redefine_protect.dpatch b/debian/patches/40_boolean_redefine_protect.dpatch
index 1625aaf..550aa85 100644
--- a/debian/patches/40_boolean_redefine_protect.dpatch
+++ b/debian/patches/40_boolean_redefine_protect.dpatch
@@ -11,8 +11,8 @@
 
 @DPATCH@
 diff -urNad 40.tmp/src/mytypes.h 40/src/mytypes.h
---- 40.tmp/src/mytypes.h	Sun Dec 29 14:31:27 2002
-+++ 40/src/mytypes.h	Sun Dec 29 14:40:41 2002
+--- 40.tmp/build-tree/src/mytypes.h	Sun Dec 29 14:31:27 2002
++++ 40/build-tree/src/mytypes.h	Sun Dec 29 14:40:41 2002
 @@ -14,9 +14,17 @@
  #define MYTYPES_H
  
diff --git a/debian/patches/50_localscan_dlopen.dpatch b/debian/patches/50_localscan_dlopen.dpatch
index b6409f0..c936303 100644
--- a/debian/patches/50_localscan_dlopen.dpatch
+++ b/debian/patches/50_localscan_dlopen.dpatch
@@ -11,8 +11,8 @@
 
 @DPATCH@
 diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME
---- exim-4.14-0/src/EDITME	Tue Mar 11 04:20:18 2003
-+++ exim-4.14-1/src/EDITME	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/build-tree/src/EDITME	Tue Mar 11 04:20:18 2003
++++ exim-4.14-1/build-tree/src/EDITME	Sun Mar 23 15:34:15 2003
 @@ -388,6 +388,20 @@
  
  
@@ -35,8 +35,8 @@ diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME
  # documentation. Other forms are available separately. If you want to install
  # the documentation in "info" format, first fetch the Texinfo documentation
 diff -urNad 50_localscan_dlopen.tmp/src/config.h.defaults 50_localscan_dlopen/src/config.h.defaults
---- 50_localscan_dlopen.tmp/src/config.h.defaults	Sun Dec 29 11:55:42 2002
-+++ 50_localscan_dlopen/src/config.h.defaults	Sun Dec 29 11:56:44 2002
+--- 50_localscan_dlopen.tmp/build-tree/src/config.h.defaults	Sun Dec 29 11:55:42 2002
++++ 50_localscan_dlopen/build-tree/src/config.h.defaults	Sun Dec 29 11:56:44 2002
 @@ -17,6 +17,8 @@
  #define AUTH_PLAINTEXT
  #define AUTH_SPA
@@ -47,8 +47,8 @@ diff -urNad 50_localscan_dlopen.tmp/src/config.h.defaults 50_localscan_dlopen/sr
  
  #define CONFIGURE_FILE
 diff -urN exim-4.14-0/src/globals.c exim-4.14-1/src/globals.c
---- exim-4.14-0/src/globals.c	Tue Mar 11 04:20:20 2003
-+++ exim-4.14-1/src/globals.c	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/build-tree/src/globals.c	Tue Mar 11 04:20:20 2003
++++ exim-4.14-1/build-tree/src/globals.c	Sun Mar 23 15:34:15 2003
 @@ -103,6 +103,9 @@
  uschar *tls_verify_hosts       = NULL;
  #endif
@@ -60,8 +60,8 @@ diff -urN exim-4.14-0/src/globals.c exim-4.14-1/src/globals.c
  /* Input-reading functions for messages, so we can use special ones for
  incoming TCP/IP. The defaults use stdin. We never need these for any
 diff -urN exim-4.14-0/src/globals.h exim-4.14-1/src/globals.h
---- exim-4.14-0/src/globals.h	Tue Mar 11 04:20:20 2003
-+++ exim-4.14-1/src/globals.h	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/build-tree/src/globals.h	Tue Mar 11 04:20:20 2003
++++ exim-4.14-1/build-tree/src/globals.h	Sun Mar 23 15:34:15 2003
 @@ -67,6 +67,9 @@
  extern uschar *tls_verify_hosts;       /* Mandatory client verification */
  #endif
@@ -73,8 +73,8 @@ diff -urN exim-4.14-0/src/globals.h exim-4.14-1/src/globals.h
  /* Input-reading functions for messages, so we can use special ones for
  incoming TCP/IP. */
 diff -urN exim-4.14-0/src/local_scan.c exim-4.14-1/src/local_scan.c
---- exim-4.14-0/src/local_scan.c	Tue Mar 11 04:20:20 2003
-+++ exim-4.14-1/src/local_scan.c	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/build-tree/src/local_scan.c	Tue Mar 11 04:20:20 2003
++++ exim-4.14-1/build-tree/src/local_scan.c	Sun Mar 23 15:34:15 2003
 @@ -5,60 +5,131 @@
  /* Copyright (c) University of Cambridge 1995 - 2003 */
  /* See the file NOTICE for conditions of use and distribution. */
@@ -255,8 +255,8 @@ diff -urN exim-4.14-0/src/local_scan.c exim-4.14-1/src/local_scan.c
  
  /* End of local_scan.c */
 diff -urN exim-4.14-0/src/local_scan.h exim-4.14-1/src/local_scan.h
---- exim-4.14-0/src/local_scan.h	Tue Mar 11 04:20:20 2003
-+++ exim-4.14-1/src/local_scan.h	Sun Mar 23 15:34:57 2003
+--- exim-4.14-0/build-tree/src/local_scan.h	Tue Mar 11 04:20:20 2003
++++ exim-4.14-1/build-tree/src/local_scan.h	Sun Mar 23 15:34:57 2003
 @@ -71,6 +71,15 @@
  
  #define SPOOL_DATA_START_OFFSET (MESSAGE_ID_LENGTH+3)
@@ -274,8 +274,8 @@ diff -urN exim-4.14-0/src/local_scan.h exim-4.14-1/src/local_scan.h
  /* Structure definitions that are documented as visible in the function. */
  
 diff -urN exim-4.14-0/src/readconf.c exim-4.14-1/src/readconf.c
---- exim-4.14-0/src/readconf.c	Tue Mar 11 04:20:22 2003
-+++ exim-4.14-1/src/readconf.c	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/build-tree/src/readconf.c	Tue Mar 11 04:20:22 2003
++++ exim-4.14-1/build-tree/src/readconf.c	Sun Mar 23 15:34:15 2003
 @@ -182,6 +182,9 @@
    { "local_from_prefix",        opt_stringptr,   &local_from_prefix },
    { "local_from_suffix",        opt_stringptr,   &local_from_suffix },
diff --git a/debian/patches/60_convert4r4.dpatch b/debian/patches/60_convert4r4.dpatch
index 89cbfc7..5b9696c 100755
--- a/debian/patches/60_convert4r4.dpatch
+++ b/debian/patches/60_convert4r4.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad ./src/convert4r4.src /tmp/dpep-work.3QROYQ/trunk/src/convert4r4.src
---- ./src/convert4r4.src	2005-02-17 14:49:11.000000000 +0000
-+++ /tmp/dpep-work.3QROYQ/trunk/src/convert4r4.src	2005-02-18 13:54:40.931927408 +0000
+--- ./build-tree/src/convert4r4.src	2005-02-17 14:49:11.000000000 +0000
++++ /tmp/dpep-work.3QROYQ/trunk/build-tree/src/convert4r4.src	2005-02-18 13:54:40.931927408 +0000
 @@ -653,6 +653,32 @@
  
  print STDERR "Runtime configuration file converter for Exim release 4.\n";
diff --git a/debian/patches/70_remove_exim-users_references.dpatch b/debian/patches/70_remove_exim-users_references.dpatch
index 46e2a01..fc46235 100755
--- a/debian/patches/70_remove_exim-users_references.dpatch
+++ b/debian/patches/70_remove_exim-users_references.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad --exclude=CVS --exclude=.svn ./README /tmp/dpep-work.91Y2SF/exim4/README
---- ./README	2005-07-01 11:09:15.000000000 +0000
-+++ /tmp/dpep-work.91Y2SF/exim4/README	2005-07-02 05:44:22.000000000 +0000
+--- ./build-tree/README	2005-07-01 11:09:15.000000000 +0000
++++ /tmp/dpep-work.91Y2SF/exim4/build-tree/README	2005-07-02 05:44:22.000000000 +0000
 @@ -16,8 +16,16 @@
  older book may be helpful for the background, but a lot of the detail has
  changed, so it is likely to be confusing to newcomers.
@@ -28,8 +28,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./README /tmp/dpep-work.91Y2SF/exim4/RE
  A copy of the Exim FAQ should be available from the same source that you used
  to obtain the Exim distribution. Additional formats for the documentation
 diff -urNad --exclude=CVS --exclude=.svn ./src/eximstats.src /tmp/dpep-work.91Y2SF/exim4/src/eximstats.src
---- ./src/eximstats.src	2005-07-02 05:44:21.000000000 +0000
-+++ /tmp/dpep-work.91Y2SF/exim4/src/eximstats.src	2005-07-02 05:44:22.000000000 +0000
+--- ./build-tree/src/eximstats.src	2005-07-02 05:44:21.000000000 +0000
++++ /tmp/dpep-work.91Y2SF/exim4/build-tree/src/eximstats.src	2005-07-02 05:44:22.000000000 +0000
 @@ -471,8 +471,7 @@
  
  =head1 AUTHOR
diff --git a/debian/patches/80_disable_rsa_export.dpatch b/debian/patches/80_disable_rsa_export.dpatch
index fcd3a60..9fadf16 100644
--- a/debian/patches/80_disable_rsa_export.dpatch
+++ b/debian/patches/80_disable_rsa_export.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad exim4-4.63~/src/tls-gnu.c exim4-4.63/src/tls-gnu.c
---- exim4-4.63~/src/tls-gnu.c	2006-07-31 16:19:48.000000000 +0200
-+++ exim4-4.63/src/tls-gnu.c	2006-10-08 21:58:54.000000000 +0200
+--- exim4-4.63~/build-tree/src/tls-gnu.c	2006-07-31 16:19:48.000000000 +0200
++++ exim4-4.63/build-tree/src/tls-gnu.c	2006-10-08 21:58:54.000000000 +0200
 @@ -23,7 +23,6 @@
  
  #define UNKNOWN_NAME "unknown"
diff --git a/debian/rules b/debian/rules
index 05bb3ef..587f1e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
 
 BUILDDIR=$(shell pwd)/build-tree
-DPATCH_WORKDIR=$(BUILDDIR)
+#DPATCH_WORKDIR=$(BUILDDIR)
 
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
@@ -69,12 +69,14 @@ basedaemonpackages=exim4-daemon-light
 combinedadbgpackage=exim4-base eximon4
 combinedidbgpackage=exim4-config exim4
 exim4dbg=exim4-dbg
+exim4dev=exim4-dev
 extraadbgpackage=$(basedaemonpackages) $(extradaemonpackages)
 else
 basedaemonpackages=""
 combinedadbgpackage=""
 combinedidbgpackage=""
 exim4dbg=""
+exim4dev=""
 extraadbgpackage=$(extradaemonpackages)
 endif
 
@@ -85,7 +87,7 @@ endif
 
 
 # list of all arch dependent packages to be built
-buildpackages=$(combinedadbgpackage) $(extraadbgpackage) $(addsuffix -dbg,$(extraadbgpackage)) $(exim4dbg)
+buildpackages=$(combinedadbgpackage) $(extraadbgpackage) $(addsuffix -dbg,$(extraadbgpackage)) $(exim4dbg) $(exim4dev)
 # generate -pexim4-base -peximon4 ... commandline for debhelper
 dhbuildpackages=$(addprefix -p,$(buildpackages))
 dhcombinedadbgpackage=$(addprefix -p,$(combinedadbgpackage))