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

[Thijs Kinkhorst]

Author: thijs
Date: 2008-07-23 11:22:46 +0000 (Wed, 23 Jul 2008)
New Revision: 556

Modified:
   trunk/debian/postinst
Log:
remove handling of ucf bug which has been long fixed


Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2008-07-23 11:15:56 UTC (rev 555)
+++ trunk/debian/postinst	2008-07-23 11:22:46 UTC (rev 556)
@@ -83,9 +83,6 @@
         printf . >&2
         langfile=${lang}/${file}
         ucf --debconf-ok --three-way ${mm_dist}/${langfile} ${mm_etc}/${langfile} 2>/dev/null
-        # Upon install ucf leaves a duplicate in .dpkg-dist (Bug #238730), remove it
-        cmp -s ${mm_etc}/${langfile} ${mm_etc}/${langfile}.dpkg-dist \
-          && rm ${mm_etc}/${langfile}.dpkg-dist
       done
       printf " done.\n" >&2
     done
@@ -95,11 +92,6 @@
     ucf --debconf-ok --three-way ${mm_dist}/qmail-to-mailman.py ${mm_etc}/qmail-to-mailman.py 2>/dev/null
     # Install postfix-to-mailman.py as well
     ucf --debconf-ok --three-way ${mm_dist}/postfix-to-mailman.py ${mm_etc}/postfix-to-mailman.py 2>/dev/null
-    # Upon install ucf leaves a duplicate in .dpkg-dist (Bug #238730), remove it
-    for file in qmail-to-mailman.py postfix-to-mailman.py; do
-      cmp -s ${mm_etc}/${file} ${mm_etc}/${file}.dpkg-dist \
-        && rm ${mm_etc}/${file}.dpkg-dist
-    done
 
     # Configure Mailman crontab