[27003] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25884 - trunk/debathena/third/nmh

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 3 10:36:54 2013

Date: Wed, 3 Apr 2013 10:36:46 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304031436.r33EakmS006804@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2013-04-03 10:36:46 -0400 (Wed, 03 Apr 2013)
New Revision: 25884

Modified:
   trunk/debathena/third/nmh/debathenify-nmh
Log:
Handle nmh 1.5

Modified: trunk/debathena/third/nmh/debathenify-nmh
===================================================================
--- trunk/debathena/third/nmh/debathenify-nmh	2013-04-02 19:01:36 UTC (rev 25883)
+++ trunk/debathena/third/nmh/debathenify-nmh	2013-04-03 14:36:46 UTC (rev 25884)
@@ -2,23 +2,38 @@
 set -e
 
 name=nmh
-daversionappend=debathena2
+daversionappend=debathena3
 
 dir=$(cd "$(dirname "$0")"; pwd)
 
 hack_package () {
-    cp -a "$dir/nmh-mbx_close.dpatch" debian/patches/
+    if [ -s "debian/patches/00list" ] && \
+       [ -n "$(tail -c 1 debian/patches/00list)" ]; then
+	# Upstream sometimes doesn't end in a newline
+	echo >> debian/patches/00list
+    fi
+    if dpkg --compare-versions "$version" lt 1.5~; then
+	cp -a "$dir/nmh-mbx_close.dpatch" debian/patches/
+	echo nmh-mbx_close.dpatch >> debian/patches/00list
+    fi
     cp -a "$dir/nmh-mhshow_pager.dpatch" debian/patches/
-    echo nmh-mbx_close.dpatch >> debian/patches/00list
     echo nmh-mhshow_pager.dpatch >> debian/patches/00list
-    append_description <<EOF
+    if [ -f "debian/patches/nmh-mbx_close.dpatch" ]; then
+	append_description <<EOF
  .
  This package was rebuilt for the Debathena project. It adds a patch
  to to avoid losing mail if close() fails (as it can in AFS if you run
  over quota) when writing mailbox files, and a patch to wrap output
  from MIME mail in a pager.
 EOF
-    add_changelog 'Avoid losing mail if close() fails, as it can in AFS.'
+	add_changelog 'Avoid losing mail if close() fails, as it can in AFS.'
+    else
+	append_description <<EOF
+ .
+ This package was rebuilt for the Debathena project. It adds a patch
+ to wrap output from MIME mail in a pager.
+EOF
+    fi
     add_changelog 'Wrap as much output from MIME mail in the moreproc as possible.'
     add_debathena_provides
     munge_sections


home help back first fref pref prev next nref lref last post