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

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

    Date: Sunday, March 2, 2008 @ 13:05:06
  Author: brettp-guest
Revision: 4685

Update bash completion patch for latest svn

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/02_bash_completion.diff

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2008-03-02 11:24:06 UTC (rev 4684)
+++ packages/python-django/trunk/debian/changelog	2008-03-02 13:05:06 UTC (rev 4685)
@@ -1,3 +1,10 @@
+python-django (0.97~svn7189-1) experimental; urgency=low
+
+  * New upstream snapshot including bash completion fix
+    Closes: #450913
+
+ -- Brett Parker <iDunno at sommitrealweird.co.uk>  Sun, 02 Mar 2008 12:59:03 +0000
+
 python-django (0.97~svn7047-2) experimental; urgency=low
 
   [ Brett Parker ]

Modified: packages/python-django/trunk/debian/patches/02_bash_completion.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-03-02 11:24:06 UTC (rev 4684)
+++ packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-03-02 13:05:06 UTC (rev 4685)
@@ -1,6 +1,7 @@
---- extras/django_bash_completion_orig	2007-03-25 21:34:33.101350407 +0100
-+++ extras/django_bash_completion	2007-03-25 21:37:58.997083736 +0100
-@@ -54,7 +54,8 @@
+--- 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
@@ -10,20 +11,25 @@
 +              ${COMP_WORDS[0]} == django-admin ||
                ${COMP_WORDS[0]} == ./manage.py ||
                ${COMP_WORDS[0]} == manage.py ) )
-@@ -68,5 +69,8 @@
+           ||
+@@ -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) &&
-+            ( 
-+                ( $( basename ${COMP_WORDS[1]} ) == django-admin.py) ||
-+                ( $( basename ${COMP_WORDS[1]} ) == django-admin)
-+            ) &&
+             ( $( 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
  
-@@ -143,5 +147,5 @@
+         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