[Pkg-mailman-hackers] Pkg-mailman commit - rev 612 - trunk/debian
Thijs Kinkhorst
thijs at alioth.debian.org
Mon Mar 2 21:05:55 UTC 2009
Author: thijs
Date: 2009-03-02 21:05:55 +0000 (Mon, 02 Mar 2009)
New Revision: 612
Modified:
trunk/debian/postinst
trunk/debian/rules
Log:
remove various obsoletisms related to ancient package versions or long fixed bugs
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2009-03-02 20:39:23 UTC (rev 611)
+++ trunk/debian/postinst 2009-03-02 21:05:55 UTC (rev 612)
@@ -16,14 +16,6 @@
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
@@ -67,11 +59,7 @@
md5sums=$(tempfile --prefix=mm_${lang})
grep "^[[:xdigit:]]{32}[[:space:]]\+${mm_etc}/$lang/" /var/lib/ucf/hashfile >${md5sums} || true
# Language files are under ucf control, check md5sums
- # 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 | sed -n 's/:\? *OK$//p'); 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
printf . >&2
@@ -95,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
@@ -107,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
@@ -164,12 +144,6 @@
fi
fi
- # Remove obsolete stop symlinks from runlevel 0 and 6.
- # this code can be removed after lenny.
- if dpkg --compare-versions "$2" lt "1:2.1.11-1"; then
- rm -f /etc/rc0.d/K20mailman /etc/rc6.d/K20mailman
- fi
-
fi
db_stop || true
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-03-02 20:39:23 UTC (rev 611)
+++ trunk/debian/rules 2009-03-02 21:05:55 UTC (rev 612)
@@ -33,11 +33,7 @@
@debconf-updatepo
Makefile:
- if [ -x /usr/bin/autoconf2.50 ]; then \
- autoconf2.50; \
- else \
- autoconf; \
- fi
+ autoconf
./configure --prefix=/var/lib/$(package) --with-username=list \
--with-groupname=list \
--with-mail-gid=daemon --with-cgi-gid=www-data \
@@ -46,6 +42,7 @@
clean: unpatch
dh_testdir
+ dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
rm -rf build-stamp Makefile debian/ucffiles debian/mailman.postinst.ucf
rm -f debian/mailman.postrm.ucf
@@ -53,15 +50,17 @@
dh_clean
chmod +x debian/{prerm,postinst}
-binary-indep: checkroot build
+binary-indep: build
dh_testdir
+ dh_testroot
# There are no architecture-independent files to be uploaded
# generated by this package. If there were any they would be
# made here.
-binary-arch: checkroot build
+binary-arch: build
dh_testdir
+ dh_testroot
chmod +x debian/unicodify_archives.py
dh_install
dh_installdirs
@@ -108,10 +107,6 @@
# reinstallations - see the preinst script
echo "$(VERSION)" > debian/mailman/var/lib/$(package)/.version
- # move the pending subscriptions database so it doesnt overwrite the
- # old one when installing
-
-
dh_installlogrotate
install -m 0644 debian/mm_cfg.py debian/mailman/usr/lib/mailman/Mailman/mm_cfg.py.dist
@@ -205,40 +200,11 @@
chmod g+w debian/mailman/var/lock/mailman
dh_installdeb
-
-# echo 'if [ "$$1" = purge ]; then' >> debian/mailman.postrm.ucf
-# for f in `cat debian/ucffiles`; do \
-# echo -e "\techo Removing $$f" >> debian/mailman.postrm.ucf; \
-# echo -e "\tucf --debconf-ok --purge $$f" >> debian/mailman.postrm.ucf ; \
-# done
-# echo 'fi' >> debian/mailman.postrm.ucf
-
-# echo 'if [ "$$1" = "configure" ]; then'>> debian/mailman.postinst.ucf
-# for dir in $$(for f in $$(cat debian/ucffiles); do dirname "$$f" ; done | sort | uniq); do echo -e "\tmkdir -p $$dir" >> debian/mailman.postinst.ucf ; done
-
-# echo -e "\techo -n 'Checking/installing config files (this takes time)': " >> debian/mailman.postinst.ucf
-# for f in `cat debian/ucffiles`; do \
-# echo -e "\techo -n ." >> debian/mailman.postinst.ucf ; \
-# echo -e "\tucf `echo $$f | sed s,/etc/mailman,/usr/share/mailman,` $$f < /dev/tty > /dev/tty" >> debian/mailman.postinst.ucf ; \
-# done
-# echo 'fi' >> debian/mailman.postinst.ucf
-# echo -e "\techo \" done!\"" >> debian/mailman.postinst.ucf
-
-# perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postinst.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postinst
-# perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postrm.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postrm
-
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-
-# Below here is fairly generic really
-
binary: binary-indep binary-arch
-checkroot:
- dh_testdir
- dh_testroot
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean
More information about the Pkg-mailman-hackers
mailing list