[Python-modules-commits] r6177 - in packages/python-django/trunk/debian/patches (2 files)

[netzwurm at users.alioth.debian.org]

    Date: Thursday, August 14, 2008 @ 01:16:58
  Author: netzwurm
Revision: 6177

Dropping patches the right way.

Deleted:
  packages/python-django/trunk/debian/patches/01_add_shebang.diff
  packages/python-django/trunk/debian/patches/02_bash_completion.diff

Deleted: packages/python-django/trunk/debian/patches/01_add_shebang.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_add_shebang.diff	2008-08-14 00:50:13 UTC (rev 6176)
+++ packages/python-django/trunk/debian/patches/01_add_shebang.diff	2008-08-14 01:16:58 UTC (rev 6177)
@@ -1,20 +0,0 @@
-Forwarded-Upstream: not yet
-Author: Raphael Hertzog <hertzog at debian.org>
-Comment:
- Since django/bin/profiling/gather_profile_stats.py is installed as an
- executable, it must have a shebang line to really be a working executable.
- .
- It's the only file matching django/bin/*.py that lacks the shebang line.
- .
- Without this patch lintian complains:
- W: python-django: executable-not-elf-or-script ./usr/share/python-support/python-django/django/bin/profiling/gather_profile_stats.py
- .
- The problem has been mentioned upstream in http://code.djangoproject.com/ticket/7268
-
---- 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
- 

Deleted: packages/python-django/trunk/debian/patches/02_bash_completion.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-08-14 00:50:13 UTC (rev 6176)
+++ packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-08-14 01:16:58 UTC (rev 6177)
@@ -1,45 +0,0 @@
-Forwarded-Upstream: http://code.djangoproject.com/ticket/7268
-Author: Brett Parker <iDunno at sommitrealweird.co.uk>
-Comment: 
- This change is required to make command line completion work for the
- django-admin command. Upstream only recognizes django-admin.py and not
- the variant without extension.
- .
- It's a Debian-specific modification to install django-admin.py as
- /usr/bin/django-admin so this makes this patch also Debian specific.
-
---- extras/django_bash_completion_orig
-+++ extras/django_bash_completion
-@@ -53,9 +53,10 @@ _django_completion()
-     action_shell_opts="--plain"
-     action_runfcgi_opts="host port socket method maxspare minspare maxchildren daemonize pidfile workdir"
- 
--    if [[ # django-admin.py, ./manage, manage.py
-+    if [[ # django-admin.py, django-admin, ./manage, manage.py
-           ( ${COMP_CWORD} -eq 1 &&
-             ( ${COMP_WORDS[0]} == django-admin.py ||
-+              ${COMP_WORDS[0]} == django-admin ||
-               ${COMP_WORDS[0]} == ./manage.py ||
-               ${COMP_WORDS[0]} == manage.py ) )
-           ||
-@@ -68,6 +69,11 @@ _django_completion()
-           ( ${COMP_CWORD} -eq 2 &&
-             ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
-             ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) &&
-+            ( -r ${COMP_WORDS[1]} ) ) 
-+          ||
-+          ( ${COMP_CWORD} -eq 2 &&
-+            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
-+            ( $( basename -- ${COMP_WORDS[1]} ) == django-admin) &&
-             ( -r ${COMP_WORDS[1]} ) ) ]] ; then
- 
-         case ${cur} in
-@@ -142,7 +148,7 @@ _django_completion()
-     fi
- }
- 
--complete -F _django_completion django-admin.py manage.py
-+complete -F _django_completion django-admin.py manage.py django-admin
- 
- # Support for multiple interpreters.
- unset pythons