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

[bam at users.alioth.debian.org]

    Date: Thursday, June 26, 2014 @ 01:30:24
  Author: bam
Revision: 29520

Move non-py files to python-django-common.

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

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2014-06-25 20:13:44 UTC (rev 29519)
+++ packages/python-django/trunk/debian/control	2014-06-26 01:30:24 UTC (rev 29520)
@@ -15,7 +15,7 @@
 
 Package: python-django
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-django-common
+Depends: ${misc:Depends}, ${python:Depends}, python-django-common (= ${binary:Version})
 Recommends: libjs-jquery
 Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
 Description: High-level Python web development framework
@@ -42,7 +42,7 @@
 
 Package: python3-django
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python-django-common
+Depends: ${misc:Depends}, ${python3:Depends}, python-django-common (= ${binary:Version})
 Recommends: libjs-jquery
 Suggests: python3-psycopg2, python3-psycopg, python3-mysqldb, python3-flup, python3-sqlite, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
 Description: High-level Python web development framework

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2014-06-25 20:13:44 UTC (rev 29519)
+++ packages/python-django/trunk/debian/rules	2014-06-26 01:30:24 UTC (rev 29520)
@@ -57,5 +57,23 @@
 			ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
 	done
 
+override_dh_python3:
+	dh_python3
+	find debian/python3-django/usr/lib/python3/dist-packages/ -type f -not -name '*.py' | \
+	(while read file; do \
+		relname=$${file##debian/python3-django/usr/lib/python3/dist-packages/}; \
+		reldirname=$$(dirname $$relname); \
+		mkdir -p debian/python-django-common/usr/share/python-django-common/$$reldirname; \
+		mv $$file debian/python-django-common/usr/share/python-django-common/$$reldirname/; \
+		ln -sf /usr/share/python-django-common/$$relname $$file; \
+		if test -e debian/python-django/usr/share/pyshared/$$relname; then \
+		    rm debian/python-django/usr/share/pyshared/$$relname; \
+		    ln -sf /usr/share/python-django-common/$$relname debian/python-django/usr/share/pyshared/$$relname; \
+		else \
+		    rm debian/python-django/usr/lib/python2.7/dist-packages/$$relname; \
+		    ln -sf /usr/share/python-django-common/$$relname debian/python-django/usr/lib/python2.7/dist-packages/$$relname; \
+		fi \
+	done)
+
 override_dh_compress:
 	dh_compress -X.js -Xobjects.inv