Merge lp:~barry/ubuntu/natty/compizconfig-python/bug-687419-2 into lp:ubuntu/natty/compizconfig-python

[Barry Warsaw]

Fixes the ftbfs by forcing the buildsystem to python_distutils. This ignores the Makefile, which is incorrect (python setup.py build does not support the --prefix argument), and isn't necessary anyway.

[Sebastien Bacher (seb128)]

Thanks Barry, I've merged that but to lp:~compiz/compizconfig-python/ubuntu which is the vcs indicated in the control file and by apt-get source, closing the merge request by hand then, next time please check if there is a vcs defined for the source ;-)

[Barry Warsaw (barry)]

On Jan 21, 2011, at 04:16 PM, Sebastien Bacher wrote:

>Thanks Barry, I've merged that but to lp:~compiz/compizconfig-python/ubuntu
>which is the vcs indicated in the control file and by apt-get source, closing
>the merge request by hand then, next time please check if there is a vcs
>defined for the source ;-)

Thanks. Yes, this is something we should teach the UDD toolset about.
Thanks, I'll file a bug.

[Barry Warsaw (barry)]

bug 706031

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-09 18:10:48 +0000
+++ debian/changelog	2011-01-13 05:27:58 +0000
@@ -1,3 +1,13 @@
+compizconfig-python (0.9.2.1-0ubuntu2) natty; urgency=low
+
+  * debian/rules: Simplify, and force the buildsystem to
+    python_distutils so that the Makefile is ignored.  It isn't
+    correct because 'python setup.py build' does not accept the
+    --prefix option, and it isn't needed anyway because dh_python2
+    does the right thing.  (LP: #687419)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 13 Jan 2011 00:19:16 -0500
+
 compizconfig-python (0.9.2.1-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/rules'
--- debian/rules	2010-11-09 18:10:48 +0000
+++ debian/rules	2011-01-13 05:27:58 +0000
@@ -3,16 +3,4 @@
 DESTDIR=$(CURDIR)/debian/python-compizconfig
 
 %:
-	dh $@ --with python2
-
-override_dh_clean:
-	dh_clean
-	rm -f installed_files src/compizconfig.c
-
-override_dh_auto_build:
-	echo "skip"
-
-override_dh_auto_install:
-	python setup.py install --root=$(DESTDIR) --prefix=/usr --install-lib=/usr/lib/python2.6/dist-packages
-	python setup.py install --root=$(DESTDIR) --prefix=/usr --install-lib=/usr/lib/python2.7/dist-packages
-
+	dh $@ --with python2 --buildsystem python_distutils