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

[Thorsten Glaser]

Author: tg
Date: 2011-08-11 07:24:32 +0000 (Thu, 11 Aug 2011)
New Revision: 684

Removed:
   trunk/debian/pyversions
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
apply patch from Barry Warsaw to switch to dh_python2


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2011-08-11 07:21:34 UTC (rev 683)
+++ trunk/debian/changelog	2011-08-11 07:24:32 UTC (rev 684)
@@ -5,9 +5,11 @@
     configured to run with a remote MTA (closes: #616292).
 
   [ Thorsten Glaser ]
-  * Add myself to Uploaders, as suggested by Thijs
+  * Add myself to Uploaders, as suggested by Thijs.
+  * Apply patch from Barry Warsaw to switch from python-support
+    to dh_python2. (LP: #788514) (Closes: #637398)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 11 Aug 2011 09:20:54 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 11 Aug 2011 09:23:12 +0200
 
 mailman (1:2.1.14-1) unstable; urgency=medium
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2011-08-11 07:21:34 UTC (rev 683)
+++ trunk/debian/control	2011-08-11 07:24:32 UTC (rev 684)
@@ -6,12 +6,12 @@
  Thijs Kinkhorst <thijs at debian.org>,
  Thorsten Glaser <tg at mirbsd.de>,
  Hector Garcia <hector at debian.org>
-Build-Depends: debhelper (>= 7), autoconf, python-dev, python-support
+Build-Depends: debhelper (>= 7), autoconf, python-dev (>= 2.6.6-3~)
 Standards-Version: 3.9.1
 Homepage: http://www.list.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mailman/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mailman/trunk
-XS-Python-Version: current
+X-Python-Version: >= 2.4
 
 Package: mailman
 Architecture: any
@@ -20,7 +20,6 @@
  logrotate, cron, ucf, pwgen, lsb-base, apache2 | httpd
 Recommends: exim4 | mail-transport-agent
 Suggests: spamassassin, lynx, listadmin
-XB-Python-Version: ${python:Versions}
 Description: Powerful, web-based mailing list manager
  The GNU Mailing List Manager, which manages email discussion lists
  much like Majordomo and Smartmail. Unlike most similar products,
@@ -33,4 +32,3 @@
  has all of the features you expect from such a product, plus
  integrated support for the web (including web based archiving),
  automated bounce handling and integrated spam prevention.
-

Deleted: trunk/debian/pyversions
===================================================================
--- trunk/debian/pyversions	2011-08-11 07:21:34 UTC (rev 683)
+++ trunk/debian/pyversions	2011-08-11 07:24:32 UTC (rev 684)
@@ -1 +0,0 @@
-2.4-

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2011-08-11 07:21:34 UTC (rev 683)
+++ trunk/debian/rules	2011-08-11 07:24:32 UTC (rev 684)
@@ -23,7 +23,7 @@
 
 build: build-stamp
 build-stamp: Makefile debian/po/templates.pot
-	$(MAKE) 
+	$(MAKE)
 	sed 's, at VERSION@,$(VERSION),g' < debian/preinst.in > debian/preinst
 	touch build-stamp
 
@@ -178,7 +178,7 @@
 	chmod 0644 debian/mailman/usr/lib/$(package)/cron/{crontab.in,paths.py}
 
 #	Python Policy
-	dh_pysupport -a `find debian/mailman/usr/lib/mailman/Mailman/ -type d`
+	dh_python2 -a $$(find debian/mailman/usr/lib/mailman/Mailman/ -type d)
 
 	install -d debian/mailman/usr/share/python/runtime.d
 	install debian/mailman.rtupdate debian/mailman/usr/share/python/runtime.d
@@ -187,7 +187,7 @@
 	egrep -rslZ '^#!(.*)python' debian/mailman/usr/lib/mailman | xargs -0 chmod a+x --
 	find debian/mailman/usr/share/doc/mailman -name "*.html" -exec chmod -x {} \;
 	find debian/mailman/usr/share/doc/mailman -name "*.txt" -exec chmod -x {} \;
-       
+
         # Create the /var/lo{g,ck} links last, and wih ln -s, because they need to be
 	# absolute links. Relative links cause trouble for people making multiple levels,
 	# e.g. when /var/log is symlinked to somewhere else. They need to be last because
@@ -197,7 +197,7 @@
 	rmdir debian/mailman/var/lib/$(package)/locks
 	ln -s /var/lock/mailman debian/mailman/var/lib/$(package)/locks
 	# remove the log directory and link it to /var/log/mailman
-	rmdir debian/mailman/var/lib/$(package)/logs 
+	rmdir debian/mailman/var/lib/$(package)/logs
 	ln -s /var/log/mailman debian/mailman/var/lib/$(package)/logs
 	chown root:list debian/mailman/var/log/mailman
 	chmod 2770 debian/mailman/var/log/mailman