From: Peter Pentchev <roam@ringlet.net>
Date: Mon, 21 Jun 2010 10:12:14 +0000 (+0000)
Subject: Merge trunk/ rev. 5078, branches/debian/ rev. 5080: Debian has stat.st_mtim
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1545f71b241c8bcb81024f88e2c09a84f416d7;p=people%2Fms%2Fdma.git

Merge trunk/ rev. 5078, branches/debian/ rev. 5080: Debian has stat.st_mtim
as a timespec.
---

diff --git a/changelog b/changelog
index cfb427f..ed072be 100644
--- 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
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 b7e12de..c563b26 100644
--- 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