[Python-modules-commits] r13542 - in packages/pyicu/trunk/debian (changelog control rules)

[bzed at users.alioth.debian.org]

    Date: Tuesday, June 22, 2010 @ 19:08:39
  Author: bzed
Revision: 13542

Stop setup.py from isntalling files into /usr/local.

Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/control
  packages/pyicu/trunk/debian/rules

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2010-06-22 14:40:52 UTC (rev 13541)
+++ packages/pyicu/trunk/debian/changelog	2010-06-22 19:08:39 UTC (rev 13542)
@@ -1,8 +1,8 @@
-pyicu (0.9-3) experimental; urgency=low
+pyicu (0.9-3) unstable; urgency=low
 
-  * Upload to experimental to give the new libicu a try.
+  * Stop setup.py from isntalling files into /usr/local.
 
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 24 Feb 2010 13:50:18 +0100
+ -- Bernd Zeimetz <bzed at debian.org>  Tue, 22 Jun 2010 20:59:32 +0200
 
 pyicu (0.9-2) unstable; urgency=low
 

Modified: packages/pyicu/trunk/debian/control
===================================================================
--- packages/pyicu/trunk/debian/control	2010-06-22 14:40:52 UTC (rev 13541)
+++ packages/pyicu/trunk/debian/control	2010-06-22 19:08:39 UTC (rev 13542)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>
-Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.4.4-3), python-all-dbg (>= 2.4.4-3), python-support (>= 0.4), libicu-dev (>= 4.3.4)
+Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.4.4-3), python-all-dbg (>= 2.4.4-3), python-support (>= 0.4), libicu-dev
 Build-Conflicts: python-pyicu
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyicu/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyicu/trunk/

Modified: packages/pyicu/trunk/debian/rules
===================================================================
--- packages/pyicu/trunk/debian/rules	2010-06-22 14:40:52 UTC (rev 13541)
+++ packages/pyicu/trunk/debian/rules	2010-06-22 19:08:39 UTC (rev 13542)
@@ -6,7 +6,15 @@
 PKGNAME:=python-pyicu
 PYVERS:=$(shell pyversions -vr)
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+endif
 
+
 include /usr/share/dpatch/dpatch.make
 
 build: patch build-stamp
@@ -53,8 +61,8 @@
 	dh_installdirs
 	set -e; \
 	for py in $(PYVERS); do  \
-	    python$$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME) ;\
-	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKGNAME)-dbg ;\
+	    python$$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME) --prefix=/usr $(py_setup_install_args) ;\
+	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKGNAME)-dbg --prefix=/usr $(py_setup_install_args) ;\
 	done
 	find $(CURDIR)/debian/$(PKGNAME)-dbg -name "*.pyc" -print0 | xargs -0 rm -f
 	find $(CURDIR)/debian/$(PKGNAME)-dbg -name "*.py" -print0 | xargs -0 rm -f