[Python-modules-commits] r1603 - in /packages/python-django/trunk/debian: changelog rules

[brettp-guest at users.alioth.debian.org]

Author: brettp-guest
Date: Sun Dec 10 12:55:03 2006
New Revision: 1603

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1603
Log:
make bin directory usable again

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

Modified: packages/python-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/debian/changelog?rev=1603&op=diff
==============================================================================
--- packages/python-django/trunk/debian/changelog (original)
+++ packages/python-django/trunk/debian/changelog Sun Dec 10 12:55:03 2006
@@ -5,7 +5,11 @@
 
   [ Brett Parker ]
   * Made manage.py get a shebang with the version of python
-    used when running django-admin
+    used when running django-admin (closes: #401616)
+  * Moved bin to /usr/lib/python-django/bin and added a symlink
+    from python-support/python-django/django/bin to it
+  * Changed shebangs on the bin scripts to use the default version
+    of python (i.e. /usr/bin/python)
 
  -- Brett Parker <iDunno at sommitrealweird.co.uk>  Tue,  5 Dec 2006 16:39:26 +0000
 

Modified: packages/python-django/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/debian/rules?rev=1603&op=diff
==============================================================================
--- packages/python-django/trunk/debian/rules (original)
+++ packages/python-django/trunk/debian/rules Sun Dec 10 12:55:03 2006
@@ -11,6 +11,14 @@
 
 binary-post-install/python-django::
 	# Remove python shebang on some files
-	perl -pi -e 's|^#!/usr/bin/env python.*$$||' debian/python-django/usr/share/python-support/python-django/django/bin/*.py debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
+	perl -pi -e 's|^#!/usr/bin/env python.*$$||' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
+	# Move the bin directory to /usr/lib/python-django/bin, and change the
+	# scripts to use /usr/bin/python
+	mkdir -p debian/python-django/usr/lib/python-django
+	mv debian/python-django/usr/share/python-support/python-django/django/bin debian/python-django/usr/lib/python-django
+	perl -pi -e 's|^#!/usr/bin/env python(.*)$$|#!/usr/bin/python$1|' debian/python-django/usr/lib/python-django/bin/*.py
+	chmod 755 debian/python-django/usr/lib/python-django/bin/{profiling/,}*.py
+	chmod 644 debian/python-django/usr/lib/python-django/bin/{profiling/,}__init__.py
+	dh_link usr/lib/python-django/bin usr/share/python-support/python-django/django/bin
 	# Rename djando-admin.py to djando-admin
 	mv debian/python-django/usr/bin/django-admin.py debian/python-django/usr/bin/django-admin