[Pkg-mailman-hackers] Pkg-mailman commit - rev 123 - branches/pkg-split/core/debian

[Bernd S. Brentrup]

Author: bsb
Date: 2004-05-07 12:35:15 -0600 (Fri, 07 May 2004)
New Revision: 123

Added:
   branches/pkg-split/core/debian/mailman-bin.links
Modified:
   branches/pkg-split/core/debian/control
   branches/pkg-split/core/debian/rules
Log:
debian/control: fix pre-depends.
debian/rules: various changes logged in previous commits.
debian/mailman-bin.links: provide compatibility symlink.


Modified: branches/pkg-split/core/debian/control
===================================================================
--- branches/pkg-split/core/debian/control	2004-05-07 18:28:40 UTC (rev 122)
+++ branches/pkg-split/core/debian/control	2004-05-07 18:35:15 UTC (rev 123)
@@ -9,7 +9,7 @@
 Package: mailman
 Architecture: all
 Pre-Depends: python (>= 2.3)
-Depends: mailman-bin (= ${Source-Version}), mailman-i18n (= ${Source-Version}) | mailman-en (= ${Source-Version}), python (>= 2.3), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), ucf (>= 1.05), pwgen
+Depends: mailman-bin (= ${Source-Version}), mailman-i18n (= ${Source-Version}) | mailman-en (= ${Source-Version}), logrotate, cron (>= 3.0pl1-42), exim4 | mail-transport-agent, apache | httpd, debconf (>= 1.4.16), ucf (>= 1.05), pwgen, python-bsddb3
 Conflicts: suidmanager (<< 0.50), sendmail (<< 8.12.6)
 Recommends: base-passwd (>= 1.3.0)
 Suggests: mailman-doc (= ${Source-Version}), mailman-spamassassin | mailman-spamprobe, mailman-savannah, mailman-clamav
@@ -42,6 +42,7 @@
 
 Package: mailman-i18n
 Architecture: all
+Pre-Depends: python (>= 2.3)
 Depends: mailman (= ${Source-Version}), ucf (>= 1.05), debconf (>= 1.4.16)
 Conflicts: mailman (<= 2.1.4-4), mailman-en
 Replaces: mailman (<= 2.1.4-4), mailman-en
@@ -52,6 +53,7 @@
 
 Package: mailman-en
 Architecture: all
+Pre-Depends: python (>= 2.3)
 Depends: mailman (= ${Source-Version}), ucf (>= 1.05), debconf (>= 1.4.16)
 Conflicts: mailman (<= 2.1.4-4), mailman-i18n
 Replaces: mailman (<= 2.1.4-4), mailman-i18n

Added: branches/pkg-split/core/debian/mailman-bin.links
===================================================================
--- branches/pkg-split/core/debian/mailman-bin.links	2004-05-07 18:28:40 UTC (rev 122)
+++ branches/pkg-split/core/debian/mailman-bin.links	2004-05-07 18:35:15 UTC (rev 123)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/mailman/mail/mailman var/lib/mailman/mail/mailman

Modified: branches/pkg-split/core/debian/rules
===================================================================
--- branches/pkg-split/core/debian/rules	2004-05-07 18:28:40 UTC (rev 122)
+++ branches/pkg-split/core/debian/rules	2004-05-07 18:35:15 UTC (rev 123)
@@ -27,18 +27,20 @@
 	mkdir -p debian/tmp/usr/share/images/mailman
 	$(MAKE) doinstall DESTDIR=$$(pwd)/debian/tmp \
 		prefix=/usr/lib/$(package) \
-		var_prefix=/var/lib/$(package) \
 		icondir=/usr/share/images/mailman \
 		ICONDIR=/usr/share/images/mailman
 	touch build
 
-debian/po/templates.pot: debian/templates
+debian/po/templates.pot: debian/po/POTFILES.in debian/mailman.templates \
+		debian/mailman-en.templates debian/mailman-i18n.templates
 	@debconf-updatepo
 
 Makefile:
 	autoconf
-	./configure --prefix=/var/lib/$(package) --with-username=list \
-		--with-groupname=list \
+	./configure --prefix=/var/lib/$(package) \
+		--exec-prefix=/usr/lib/$(package) \
+		--with-var-prefix=/var/lib/$(package) \
+		--with-username=list --with-groupname=list \
 		--with-mail-gid=daemon --with-cgi-gid=www-data \
 		--without-permcheck --with-mailhost=localhost \
 		--with-urlhost=localhost
@@ -93,6 +95,8 @@
 		debian/mailman-i18n/usr/share/doc/mailman-i18n
 	# Mailman/Post.py may be run as a script
 	chmod a+x debian/mailman/usr/share/mailman/Mailman/Post.py
+	# Remove irrelevant READMEs
+	rm -f debian/mailman/usr/share/doc/mailman/README.{BSD,MACOSX}
 
 	dh_link --indep
 	dh_compress --indep