[Python-modules-commits] r1612 - in /packages/python-django/trunk/debian: changelog patches/02_add_shebang.diff patches/02_add_shebang_to_manage.py.diff rules

[hertzog at users.alioth.debian.org]

Author: hertzog
Date: Sat Dec 16 11:24:13 2006
New Revision: 1612

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1612
Log:
Rework the problem of executables scripts according to my own taste.

Added:
    packages/python-django/trunk/debian/patches/02_add_shebang.diff
Removed:
    packages/python-django/trunk/debian/patches/02_add_shebang_to_manage.py.diff
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=1612&op=diff
==============================================================================
--- packages/python-django/trunk/debian/changelog (original)
+++ packages/python-django/trunk/debian/changelog Sat Dec 16 11:24:13 2006
@@ -6,12 +6,12 @@
   [ Brett Parker ]
   * Made manage.py get a shebang with the version of python
     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)
+  * Created a convenience /usr/lib/python-django/bin symlink.
 
- -- Brett Parker <iDunno at sommitrealweird.co.uk>  Tue,  5 Dec 2006 16:39:26 +0000
+  [ Raphael Hertzog ]
+  * Adapted Brett's work to better fit my views of the packaging.
+
+ -- Raphael Hertzog <hertzog at debian.org>  Sat, 16 Dec 2006 11:03:20 +0100
 
 python-django (0.95-1) unstable; urgency=low
 

Added: packages/python-django/trunk/debian/patches/02_add_shebang.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/debian/patches/02_add_shebang.diff?rev=1612&op=file
==============================================================================
--- packages/python-django/trunk/debian/patches/02_add_shebang.diff (added)
+++ packages/python-django/trunk/debian/patches/02_add_shebang.diff Sat Dec 16 11:24:13 2006
@@ -1,0 +1,14 @@
+--- django/bin/daily_cleanup.py.orig	2006-12-16 11:02:04.000000000 +0100
++++ django/bin/daily_cleanup.py	2006-12-16 11:02:19.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ "Daily cleanup file"
+ 
+ from django.db import backend, connection, transaction
+--- django/bin/profiling/gather_profile_stats.py.orig	2006-12-16 11:15:38.000000000 +0100
++++ django/bin/profiling/gather_profile_stats.py	2006-12-16 11:15:55.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ """
+ gather_profile_stats.py /path/to/dir/of/profiles
+ 

Modified: packages/python-django/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-django/trunk/debian/rules?rev=1612&op=diff
==============================================================================
--- packages/python-django/trunk/debian/rules (original)
+++ packages/python-django/trunk/debian/rules Sat Dec 16 11:24:13 2006
@@ -10,15 +10,15 @@
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
 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/conf/project_template/manage.py
-	# Move the bin directory to /usr/lib/python-django/bin, and change the
-	# scripts to use /usr/bin/python
+	# Use default python shebang
+	perl -pi -e 's|^#!/usr/bin/env python.*$$|#!/usr/bin/python|' debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
+	# Ensure executability of some scripts that are copied to projects
+	# (or used within projects)
+	chmod 755 debian/python-django/usr/share/python-support/python-django/django/conf/project_template/manage.py
+	chmod 755 debian/python-django/usr/share/python-support/python-django/django/bin/[^_]*.py
+	chmod 755 debian/python-django/usr/share/python-support/python-django/django/bin/profiling/[^_]*.py
+	# Create convenience symlink
 	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
+	dh_link usr/share/python-support/python-django/django/bin usr/lib/python-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