[Python-modules-commits] r13558 - in packages/ldaptor/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, June 23, 2010 @ 14:28:41
  Author: jwilk
Revision: 13558

Don't hardcode ?\226?\128?\152site-packages?\226?\128?\153 in debian/*.install, debian/rules (closes: #586884). Thanks to Angel Abad for the bug report and the initial patch.

Modified:
  packages/ldaptor/trunk/debian/changelog
  packages/ldaptor/trunk/debian/ldaptor-webui.install
  packages/ldaptor/trunk/debian/python-ldaptor.install
  packages/ldaptor/trunk/debian/rules

Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog	2010-06-23 13:57:14 UTC (rev 13557)
+++ packages/ldaptor/trunk/debian/changelog	2010-06-23 14:28:41 UTC (rev 13558)
@@ -1,3 +1,11 @@
+ldaptor (0.0.43+debian1-3) UNRELEASED; urgency=low
+
+  * Don't hardcode ‘site-packages’ in debian/*.install, debian/rules
+    (closes: #586884). Thanks to Angel Abad for the bug report and the initial
+    patch.
+
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 23 Jun 2010 16:21:06 +0200
+
 ldaptor (0.0.43+debian1-2) unstable; urgency=low
 
   * add debian/patches/04_replace_string_exceptions_585240_585298_.patch

Modified: packages/ldaptor/trunk/debian/ldaptor-webui.install
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.install	2010-06-23 13:57:14 UTC (rev 13557)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.install	2010-06-23 14:28:41 UTC (rev 13558)
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/ldaptor-webui
-debian/tmp/usr/lib/python*/site-packages/ldaptor/apps/webui
+debian/tmp/usr/lib/python*/*-packages/ldaptor/apps/webui
 debian/tmp/usr/share/locale/*/*/ldaptor-webui.mo

Modified: packages/ldaptor/trunk/debian/python-ldaptor.install
===================================================================
--- packages/ldaptor/trunk/debian/python-ldaptor.install	2010-06-23 13:57:14 UTC (rev 13557)
+++ packages/ldaptor/trunk/debian/python-ldaptor.install	2010-06-23 14:28:41 UTC (rev 13558)
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/python*/site-packages/ldaptor/*.py
-debian/tmp/usr/lib/python*/site-packages/ldaptor/protocols
-debian/tmp/usr/lib/python*/site-packages/ldaptor/samba
-debian/tmp/usr/lib/python*/site-packages/ldaptor/test
+debian/tmp/usr/lib/python*/*-packages/ldaptor/*.py
+debian/tmp/usr/lib/python*/*-packages/ldaptor/protocols
+debian/tmp/usr/lib/python*/*-packages/ldaptor/samba
+debian/tmp/usr/lib/python*/*-packages/ldaptor/test
 debian/global.cfg etc/ldaptor
 ldaptor.schema etc/ldaptor

Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules	2010-06-23 13:57:14 UTC (rev 13557)
+++ packages/ldaptor/trunk/debian/rules	2010-06-23 14:28:41 UTC (rev 13558)
@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+endif
+
 #DEB_PYTHON_SYSTEM=pysupport
 PYDEFAULT=$(shell pyversions -d)
 
@@ -10,10 +16,10 @@
 override_dh_install:
 	dh_install
 	rm -rf \
-	  debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/apps/webui \
-	  debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/test/test_webui.py \
+	  debian/python-ldaptor/usr/lib/python*/*-packages/ldaptor/apps/webui \
+	  debian/python-ldaptor/usr/lib/python*/*-packages/ldaptor/test/test_webui.py \
 	  debian/ldaptor-utils/usr/bin/ldaptor-webui
-	PYTHONPATH=$(CURDIR)/debian/python-ldaptor/usr/lib/$(PYDEFAULT)/site-packages \
+	PYTHONPATH=$(CURDIR)/debian/python-ldaptor/$(py_libdir $(PYDEFAULT)) \
 	  trial --tbformat=emacs --reporter=text ldaptor
 
 override_dh_auto_build: doc-stamp