[Python-modules-commits] r12100 - in packages/nevow/trunk/debian (changelog rules)

[bernat at users.alioth.debian.org]

    Date: Tuesday, March 2, 2010 @ 20:24:29
  Author: bernat
Revision: 12100

Fix another FTBFS: setuptools with Python 2.6 waits for dist-packages
while CDBS still install in site-packages...

Modified:
  packages/nevow/trunk/debian/changelog
  packages/nevow/trunk/debian/rules

Modified: packages/nevow/trunk/debian/changelog
===================================================================
--- packages/nevow/trunk/debian/changelog	2010-03-02 20:21:28 UTC (rev 12099)
+++ packages/nevow/trunk/debian/changelog	2010-03-02 20:24:29 UTC (rev 12100)
@@ -9,7 +9,9 @@
     (everything matching **/*.{tpl,xhtml}).
   * In the above patch, alter glossary.xhtml to use H2 tag instead of
     H3. This closes: #564375.
-  * Fix an FTBFS with Python 2.6 because of the way unittests are run.
+  * Fix an FTBFS with Python 2.6 because of the way unittests are
+    run. Also fix a bad interaction between CDBS, setuptools and Python
+    2.6 in debian/rules.
 
  -- Vincent Bernat <bernat at debian.org>  Tue, 02 Mar 2010 20:37:21 +0100
 

Modified: packages/nevow/trunk/debian/rules
===================================================================
--- packages/nevow/trunk/debian/rules	2010-03-02 20:21:28 UTC (rev 12099)
+++ packages/nevow/trunk/debian/rules	2010-03-02 20:24:29 UTC (rev 12100)
@@ -18,6 +18,10 @@
 
 TOPMODULES:=nevow formless
 install/python-nevow::
+	# CDBS and setuptools seems not to be friends with Python 2.6. Move plugins by hand.
+	[ ! -d debian/$(cdbs_curpkg)/usr/twisted ] || \
+		mv debian/$(cdbs_curpkg)/usr/twisted \
+			debian/$(cdbs_curpkg)/usr/lib/$(shell pyversions -d)/site-packages
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# Run tests
 	ln -s ../../../doc \