Bug#547809: bauble: manipulates site-packages/ directly, failing with Python 2.6

2009-11-19 Thread Giacomo A. Catenazzi

ACK the patch and the NMU.

Thanks!
I really had to solve myself the bugs (and a lot earlier).

ciao
cate



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#547809: bauble: manipulates site-packages/ directly, failing with Python 2.6

2009-11-18 Thread Jonathan Wiltshire
tags 547809 + patch
thanks

I propose the attached patch, which uses setup.py to install stuff rather
than doing it manually in bauble.install. It already uses python-support so
that makes it nice and easy; --install-layout=deb isn't an option because
it is a private module.

debdiff comparison is exact and the package builds and installs correctly.


-- 
Jonathan Wiltshire

1024D: 0xDB800B52 / 4216 F01F DCA9 21AC F3D3  A903 CA6B EA3E DB80 0B52
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51
diff -u bauble-0.9.3/debian/rules bauble-0.9.3/debian/rules
--- bauble-0.9.3/debian/rules
+++ bauble-0.9.3/debian/rules
@@ -24,6 +24,11 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
+	python setup.py install --root=$(CURDIR)/debian/bauble \
+		--install-lib=/usr/share \
+		--install-scripts=/usr/bin \
+		--install-data=/usr
+	rm -rf $(CURDIR)/debian/bauble/usr/share/*.egg-info
 # do installation manually:
 	dh_install
 
diff -u bauble-0.9.3/debian/changelog bauble-0.9.3/debian/changelog
--- bauble-0.9.3/debian/changelog
+++ bauble-0.9.3/debian/changelog
@@ -1,3 +1,10 @@
+bauble (0.9.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 
+
+ -- Jonathan Wiltshire deb...@jwiltshire.org.uk  Wed, 18 Nov 2009 10:11:51 +
+
 bauble (0.9.3-1) unstable; urgency=low
 
   [ Giacomo Catenazzi ]
diff -u bauble-0.9.3/debian/bauble.install bauble-0.9.3/debian/bauble.install
--- bauble-0.9.3/debian/bauble.install
+++ bauble-0.9.3/debian/bauble.install
@@ -1,7 +1 @@
-bdist/usr/bin usr
-bdist/usr/lib/python2.5/site-packages/bauble usr/share
-bdist/usr/share/icons usr/share
-bdist/usr/share/locale usr/share
-bdist/usr/share/pixmaps usr/share
-bdist/usr/share/applications/bauble.desktop usr/share/applications
 bauble/images/bauble.xpm usr/share/pixmaps


signature.asc
Description: Digital signature