Merge trunk/ rev. 5078, branches/debian/ rev. 5080: Debian has stat.st_mtim

as a timespec.

diff --git a/changelog b/changelog
index cfb427f750b8a91fa0f471fd0cab677802d4d357..ed072be072afbf2834b8cfdd4841c049bfa72c37 100644 (file)
--- a/changelog
+++ b/changelog
@@ -5,9 +5,7 @@ dma (0.0.2010.06.17-1) unstable; urgency=low
   * New upstream version:
     - adapt the rules file to use the GNU Makefile instead of the BSD one
     - drop pmake from Build-Depends
-    - update the 01-debian-build patch:
-      - no longer patch the BSD Makefile, we use the GNU one now
-      - remove the compatibility shims implemented upstream in a different way
+    - remove the 01-debian-build patch, overtaken by upstream changes
     - in the 03-debian-locations patch, make the Debian defaults actual
       defaults for the dma binary, not just in the dma.conf file
     - adapt the 04-debian-setgid patch for the GNU Makefile

diff --git a/patches/01-debian-build.patch b/patches/01-debian-build.patch
deleted file mode 100644 (file)
index e91ee84..0000000
--- a/patches/01-debian-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Several fixes to make dma build on Debian.
- - use mtime instead of mtimespec.
-Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
-Forwarded: not-needed
-Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-18
-
---- a/dma.c
-+++ b/dma.c
-@@ -295,7 +295,7 @@
-                       exit(1);
-               }
-               if (gettimeofday(&now, NULL) == 0 &&
--                  (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
-+                  (now.tv_sec - st.st_mtime > MAX_TIMEOUT)) {
-                       asprintf(__DECONST(void *, &errmsg),
-                                "Could not deliver for the last %d seconds. Giving up.",
-                                MAX_TIMEOUT);

diff --git a/patches/series b/patches/series
index b7e12dedcef4396f8405824ddf584de5a16d287a..c563b2642bb6953cbf1279744df926381b60d61a 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-01-debian-build.patch
 03-debian-locations.patch
 04-debian-setgid.patch
 09-typos.patch