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

[Laszlo Boszormenyi]

Author: gcs-guest
Date: 2004-03-28 13:12:43 -0700 (Sun, 28 Mar 2004)
New Revision: 37

Modified:
   trunk/debian/config
   trunk/debian/control
   trunk/debian/postinst
Log:
Small fixes to Siggy's work on -2:
- be silent on qmail-to-mailman.py install as well
- multiselect should depend on a debconf version which supports it
- if it's a fresh install (and /etc/mailman/mm_cfg.py is not yet present,
  then do not try to get the enabled languages, as list_list will fail)


Modified: trunk/debian/config
===================================================================
--- trunk/debian/config	2004-03-25 18:11:39 UTC (rev 36)
+++ trunk/debian/config	2004-03-28 20:12:43 UTC (rev 37)
@@ -18,7 +18,7 @@
   done | sort | uniq
 }
 
-if [ -x "/usr/sbin/list_lists" ]; then
+if [ -f "/etc/mailman/mm_cfg.py" -a -x "/usr/sbin/list_lists" ]; then
   echo -n "Looking for enabled languages (this may take some time) ..."
   used_languages="$(get_used_languages)"
   echo " done."

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2004-03-25 18:11:39 UTC (rev 36)
+++ trunk/debian/control	2004-03-28 20:12:43 UTC (rev 37)
@@ -8,7 +8,7 @@
 
 Package: mailman
 Architecture: any
-Depends: ${shlibs:Depends}, python (>= 2.2.2.91-1), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf, ucf (>= 0.28), pwgen
+Depends: ${shlibs:Depends}, python (>= 2.2.2.91-1), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 0.2.26), ucf (>= 0.28), pwgen
 Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6)
 Recommends: base-passwd (>= 1.3.0)
 Suggests: spamassassin, python2.2-korean-codecs | python2.3-korean-codecs, python-japanese-codecs

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2004-03-25 18:11:39 UTC (rev 36)
+++ trunk/debian/postinst	2004-03-28 20:12:43 UTC (rev 37)
@@ -116,7 +116,7 @@
     # Done with site language stuff
 
     # Don't forget the qmail specific stuff (but why support non-free?)
-    ucf --debconf-ok --three-way ${mm_dist}/qmail-to-mailman.py ${mm_etc}/qmail-to-mailman.py
+    ucf --debconf-ok --three-way ${mm_dist}/qmail-to-mailman.py ${mm_etc}/qmail-to-mailman.py 2>/dev/null
     # Upon install ucf leaves a duplicate in .dpkg-dist (Bug #238730), remove it
     cmp -s ${mm_etc}/qmail-to-mailman.py ${mm_etc}/qmail-to-mailman.py.dpkg-dist \
       && rm ${mm_etc}/qmail-to-mailman.py.dpkg-dist