Bug#547810: ccsm: diff for NMU version 0.8.4-1.1

[Stefano Zacchiroli <zack@debian.org>]

tags 547810 + pending
thanks

Dear maintainer,

I've prepared an NMU for ccsm (versioned as 0.8.4-1.1) and uploaded it
to DELAYED/3. Please feel free to tell me if I should delay it longer.

The patch is the one proposed, but using "*-packages" to be more
resilient to changes.

Regards.

-- 
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime

diff -u ccsm-0.8.4/debian/install ccsm-0.8.4/debian/install
--- ccsm-0.8.4/debian/install
+++ ccsm-0.8.4/debian/install
@@ -1,5 +1,5 @@
 usr/bin/ccsm
-usr/lib/python*/site-packages/ccm/*.py
+usr/lib/python*/*-packages/ccm/*.py
 usr/share/applications/ccsm.desktop
 usr/share/ccsm/images/*.png
 usr/share/locale/*/LC_MESSAGES
diff -u ccsm-0.8.4/debian/changelog ccsm-0.8.4/debian/changelog
--- ccsm-0.8.4/debian/changelog
+++ ccsm-0.8.4/debian/changelog
@@ -1,3 +1,11 @@
+ccsm (0.8.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with python 2.6 and up, based on a patch from Jonathan
+    Wiltshire (Closes: #547810)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 03 Mar 2010 09:39:17 +0100
+
 ccsm (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
diff -u ccsm-0.8.4/debian/control ccsm-0.8.4/debian/control
--- ccsm-0.8.4/debian/control
+++ ccsm-0.8.4/debian/control
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Sean Finney <seanius@debian.org>
-Build-Depends: debhelper (>= 5), python (>= 2.5.4-1~), python-support, quilt, intltool
+Build-Depends: debhelper (>= 5), python (>= 2.5.4-1~), python-support (>= 0.90), quilt, intltool
 Standards-Version: 3.8.1
 Section: x11
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/ccsm.git