[23402] in Source-Commits
/svn/athena r23056 - trunk/third/nmh/debian
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Wed Jul 2 22:55:35 2008
Date: Wed, 2 Jul 2008 22:54:44 -0400 (EDT)
From: broder@MIT.EDU
Message-Id: <200807030254.WAA13135@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2008-07-02 22:54:44 -0400 (Wed, 02 Jul 2008)
New Revision: 23056
Modified:
trunk/third/nmh/debian/changelog
trunk/third/nmh/debian/control
trunk/third/nmh/debian/control.in
trunk/third/nmh/debian/rules
Log:
Propogate changes to debathena-nmh made in SIPB's source tree.
Modified: trunk/third/nmh/debian/changelog
===================================================================
--- trunk/third/nmh/debian/changelog 2008-07-02 23:44:02 UTC (rev 23055)
+++ trunk/third/nmh/debian/changelog 2008-07-03 02:54:44 UTC (rev 23056)
@@ -1,3 +1,23 @@
+debathena-nmh (1.0+athena9.4.34-0debathena3) unstable; urgency=low
+
+ * Prefer debathena-msmtp-mta rather than nullmailer for
+ mail-transport-agent.
+
+ -- Tim Abbott <tabbott@mit.edu> Tue, 22 Apr 2008 15:40:09 -0400
+
+debathena-nmh (1.0+athena9.4.34-0debathena2) unstable; urgency=low
+
+ [ Tim Abbott ]
+ * Fix configure issues: make sure /usr/lib/sendmail exists on build
+ machine by Build-Depends: mail-transport-agent.
+ * Add dependency on metamail.
+
+ [ Anders Kaseorg ]
+ * Set DEB_OPT_FLAG = -O0, to work around a segfault at uip/mhlsbr.c:904
+ reported by mitchb.
+
+ -- Tim Abbott <tabbott@mit.edu> Mon, 14 Apr 2008 15:56:17 -0400
+
debathena-nmh (1.0+athena9.4.34-0debathena1) unstable; urgency=low
* Initial release.
Modified: trunk/third/nmh/debian/control
===================================================================
--- trunk/third/nmh/debian/control 2008-07-02 23:44:02 UTC (rev 23055)
+++ trunk/third/nmh/debian/control 2008-07-03 02:54:44 UTC (rev 23056)
@@ -2,12 +2,12 @@
Section: debathena/mail
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), libkrb5-dev, libhesiod-dev, libncurses-dev, libdb-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), libkrb5-dev, libhesiod-dev, libncurses-dev, libdb-dev, debathena-msmtp-mta | nullmailer | mail-transport-agent
Standards-Version: 3.7.2
Package: debathena-nmh
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attachandrun, debianutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attachandrun, debianutils, metamail
Conflicts: nmh
Description: The NMH mail handling system
NMH used to be the standard mail handling system on Athena.
Modified: trunk/third/nmh/debian/control.in
===================================================================
--- trunk/third/nmh/debian/control.in 2008-07-02 23:44:02 UTC (rev 23055)
+++ trunk/third/nmh/debian/control.in 2008-07-03 02:54:44 UTC (rev 23056)
@@ -2,12 +2,12 @@
Section: debathena/mail
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, libkrb5-dev, libhesiod-dev, libncurses-dev, libdb-dev
+Build-Depends: @cdbs@, libkrb5-dev, libhesiod-dev, libncurses-dev, libdb-dev, debathena-msmtp-mta | nullmailer | mail-transport-agent
Standards-Version: 3.7.2
Package: debathena-nmh
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attachandrun, debianutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attachandrun, debianutils, metamail
Conflicts: nmh
Description: The NMH mail handling system
NMH used to be the standard mail handling system on Athena.
Modified: trunk/third/nmh/debian/rules
===================================================================
--- trunk/third/nmh/debian/rules 2008-07-02 23:44:02 UTC (rev 23055)
+++ trunk/third/nmh/debian/rules 2008-07-03 02:54:44 UTC (rev 23056)
@@ -6,6 +6,8 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEB_OPT_FLAG = -O0 # Work around a segfault at uip/mhlsbr.c:904.
+
CPPFLAGS += -DLINUX_STDIO
CFLAGS += -DLINUX_STDIO # Sarge cdbs doesn't support CPPFLAGS.
DEB_CONFIGURE_EXTRA_FLAGS += --enable-nmh-pop --enable-nmh-debug --with-krb4=$(shell krb5-config --prefix krb4) --with-hesiod --with-mts=sendmail --with-editor=emacs --with-editor=/usr/bin/sensible-editor --with-pager=/usr/bin/sensible-pager
