[Python-modules-commits] r14768 - in packages/python-django/trunk/debian (changelog rules)

[evgeni at users.alioth.debian.org]

    Date: Thursday, October 28, 2010 @ 10:40:26
  Author: evgeni
Revision: 14768

Include python.mk conditionally as explained in its header.
Helps backports to Lenny which has no python.mk.
Closes: #601608

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/rules

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-10-28 10:34:52 UTC (rev 14767)
+++ packages/python-django/trunk/debian/changelog	2010-10-28 10:40:26 UTC (rev 14768)
@@ -3,8 +3,11 @@
   * Team upload.
   * Disable model tests that require an internet connection.
     Closes: #601070
+  * Include python.mk conditionally as explained in its header.
+    Helps backports to Lenny which has no python.mk.
+    Closes: #601608
 
- -- Evgeni Golov <evgeni at debian.org>  Thu, 28 Oct 2010 12:34:00 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Thu, 28 Oct 2010 12:37:15 +0200
 
 python-django (1.2.3-1) unstable; urgency=low
 

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2010-10-28 10:34:52 UTC (rev 14767)
+++ packages/python-django/trunk/debian/rules	2010-10-28 10:40:26 UTC (rev 14768)
@@ -1,7 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/python/python.mk
+-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
 
+
 PREFIX = debian/python-django
 DJANGO_DIR = $(PREFIX)/$(call py_libdir_sh,`pyversions -d`)/django