[Pkg-mailman-hackers] Pkg-mailman commit - rev 232 - trunk/debian

[Lionel Elie Mamane]

Author: lmamane-guest
Date: 2005-11-20 15:49:54 +0000 (Sun, 20 Nov 2005)
New Revision: 232

Modified:
   trunk/debian/changelog
   trunk/debian/postinst
Log:
 - No security update: urgency low.
 - Adapt to the md5sum from coreutils, rather than the one from dpkg.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-15 00:52:36 UTC (rev 231)
+++ trunk/debian/changelog	2005-11-20 15:49:54 UTC (rev 232)
@@ -1,4 +1,4 @@
-mailman (2.1.5-10) UNRELEASED; urgency=high
+mailman (2.1.5-10) UNRELEASED; urgency=low
 
   * Merge with 2.1.5-8ubuntu2:
     Python 2.4 compatibility patch in bounce handling.
@@ -12,8 +12,9 @@
   * Bump up Standards-Version to 3.6.2
   * Add vietnamese translation (closes: #312673)
   * Apply corrections to german translation (closes: #313800)
+  * Adapt to the md5sum in dpkg or coreutils automatically (closes: #340036)
 
- -- Lionel Elie Mamane <lmamane at debian.org>  Tue, 15 Nov 2005 01:49:06 +0100
+ -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 20 Nov 2005 16:43:51 +0100
 
 mailman (2.1.5-9) unstable; urgency=medium
 

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2005-11-15 00:52:36 UTC (rev 231)
+++ trunk/debian/postinst	2005-11-20 15:49:54 UTC (rev 232)
@@ -14,6 +14,14 @@
 DIRLIST="/usr/lib/mailman/Mailman /usr/lib/mailman/bin /usr/lib/mailman/cron /usr/lib/mailman/scripts"
 PYLIBDIR="/usr/lib/python`python -c 'import sys; print sys.version[:3]'`"
 
+if md5sum -c /dev/null 2>/dev/null; [ "$?" = 3 ]; then
+    # We are using dpkg's md5sum
+    md5sum="md5sum -v"
+else
+    # We are using coreutils' md5sum (hopefully)
+    md5sum=md5sum
+fi
+
 if [ "$1" = "configure" ]; then
 
     mm_etc=/etc/mailman
@@ -57,7 +65,11 @@
         grep ${mm_etc}/$lang/ /var/lib/ucf/hashfile >${md5sums} || true
         if [ -s ${md5sums} ]; then
           # Language files are under ucf control, check md5sums
-          for file in $(md5sum -c -v ${md5sums} 2>&1 | egrep "OK$" | sed -e 's/ *OK//'); do 
+          # LEM: The ":\?" is there to accomodate both md5sum from dpkg (in sarge)
+          #      and md5sum from coreutils (in etch and onwards).
+          #      It breaks with md5sum-from-dpkg if a filename ends with ":",
+          #      but this is not expected to happen.
+          for file in $(${md5sum} -c ${md5sums} 2>&1 | egrep "OK$" | sed -e 's/:\? *OK$//'); do 
             ucf --debconf-ok --purge ${file}
             rm -f ${file} ${file}.dpkg-dist
             echo -n . >&2