[Pkg-mailman-hackers] Pkg-mailman commit - rev 377 - branches/2.1.8/debian

[Hector Garcia]

Author: hector
Date: 2006-09-19 19:42:14 +0000 (Tue, 19 Sep 2006)
New Revision: 377

Modified:
   branches/2.1.8/debian/README.Debian
   branches/2.1.8/debian/changelog
   branches/2.1.8/debian/mailman.init
   branches/2.1.8/debian/postinst
   branches/2.1.8/debian/rules
Log:
Merging revisions 342 to 348 from trunk

Modified: branches/2.1.8/debian/README.Debian
===================================================================
--- branches/2.1.8/debian/README.Debian	2006-09-19 19:03:11 UTC (rev 376)
+++ branches/2.1.8/debian/README.Debian	2006-09-19 19:42:14 UTC (rev 377)
@@ -31,7 +31,7 @@
 
 Since suexec forbids execution of CGIs with gid < 50 and www-data (the default
 for mailman cgi) is 33, you should execute the cgi with a gid of 50-99 or 65534.
-It cannot be any other gid since mailman cgi check that gid < 100 and != 65534.
+It cannot be any other gid since mailman cgi check that gid < 100 or == 65534.
 
 Savannah
 --------
@@ -92,4 +92,4 @@
 /var/lib/mailman/bin/change_pw to generate new ones and email them to
 the admins and moderators.
 
- -- Lionel Elie Mamane <lmamane at debian.org>, Sun Dec 25 13:20:37 2005
+ -- Lionel Elie Mamane <lmamane at debian.org>, dim, 27 aoû 2006 19:08:42 +0200

Modified: branches/2.1.8/debian/changelog
===================================================================
--- branches/2.1.8/debian/changelog	2006-09-19 19:03:11 UTC (rev 376)
+++ branches/2.1.8/debian/changelog	2006-09-19 19:42:14 UTC (rev 377)
@@ -10,8 +10,11 @@
     non-debconf prompting and two debconf templates.
   * Only use ucf on purge when it's available.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Tue, 22 Aug 2006 02:09:00 +0200
+  [ Matej Vela ]
+  * Rearrange find options in debian/postinst to prevent warnings.
 
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 22 Aug 2006 02:19:15 +0200
+
 mailman (1:2.1.8-2) unstable; urgency=low
 
   [ Thijs Kinkhorst ]

Modified: branches/2.1.8/debian/mailman.init
===================================================================
--- branches/2.1.8/debian/mailman.init	2006-09-19 19:03:11 UTC (rev 376)
+++ branches/2.1.8/debian/mailman.init	2006-09-19 19:42:14 UTC (rev 377)
@@ -39,7 +39,7 @@
 
 case "$1" in
   start)
-    if [ "$(/var/lib/mailman/bin/list_lists -b | grep ^mailman$ )" = "" ]; then
+    if /var/lib/mailman/bin/list_lists -b | fgrep -qx mailman; then
         log_warning_msg "Site list for mailman (usually named mailman) missing."
         log_warning_msg "Please create it; until then, mailman will refuse to start."
         exit 0;

Modified: branches/2.1.8/debian/postinst
===================================================================
--- branches/2.1.8/debian/postinst	2006-09-19 19:03:11 UTC (rev 376)
+++ branches/2.1.8/debian/postinst	2006-09-19 19:42:14 UTC (rev 377)
@@ -46,7 +46,7 @@
 
     # At present ALL directories in /etc/mailman are language directories
     # but this may change in the future, better check.
-    for dir in $(find ${mm_etc} -type d -maxdepth 1 -mindepth 1 | sed -e "s;^${mm_etc}/;;g"); do
+    for dir in $(find ${mm_etc} -maxdepth 1 -mindepth 1 -type d -printf '%P\n'); do
       if [ -f ${mm_dist}/${dir}/options.html ]; then
         old_languages="${old_languages} ${dir}"
       fi
@@ -68,7 +68,7 @@
           #      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 
+          for file in $(${md5sum} -c ${md5sums} 2>&1 | sed -n 's/:\? *OK$//p'); do 
             ucf --debconf-ok --purge ${file}
             rm -f ${file} ${file}.dpkg-dist
             echo -n . >&2
@@ -160,7 +160,7 @@
 
     if [ -e /etc/mailman/mm_cfg.py ]; then
         db_get mailman/default_server_language || true
-        if [ ${RET} ]; then
+        if [ -n "$RET" ]; then
             default_server_language=${RET}
             sed -e s/DEFAULT_SERVER_LANGUAGE.*=.*\'..\'/DEFAULT_SERVER_LANGUAGE\ =\ \'${default_server_language}\'/ ${mm_etc}/mm_cfg.py > ${mm_etc}/mm_cfg.py.$$
             mv -f ${mm_etc}/mm_cfg.py.$$ ${mm_etc}/mm_cfg.py

Modified: branches/2.1.8/debian/rules
===================================================================
--- branches/2.1.8/debian/rules	2006-09-19 19:03:11 UTC (rev 376)
+++ branches/2.1.8/debian/rules	2006-09-19 19:42:14 UTC (rev 377)
@@ -50,7 +50,6 @@
 	rm -rf build-stamp Makefile debian/ucffiles debian/mailman.postinst.ucf
 	rm -f debian/mailman.postrm.ucf
 	dh_clean
-	rm -rf $$(find . -name "*~")
 	chmod +x debian/{prerm,postinst}
 
 binary-indep:	checkroot build
@@ -168,7 +167,7 @@
 	mv `find debian/mailman/etc/mailman -mindepth 1 -maxdepth 1 -type d` debian/mailman/usr/share/mailman
 	cp build/contrib/qmail-to-mailman.py debian/mailman/usr/share/mailman
 
-	find debian/mailman/usr/share/mailman -type f | sed 's,debian/mailman/usr/share/mailman,/etc/mailman,' > debian/ucffiles
+	find debian/mailman/usr/share/mailman -type f -printf '/etc/mailman/%P\n' > debian/ucffiles
 
 	dh_link etc/mailman/qmail-to-mailman.py usr/lib/mailman/bin/qmail-to-mailman.py