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

[hertzog at users.alioth.debian.org]

    Date: Monday, May 19, 2008 @ 21:42:21
  Author: hertzog
Revision: 5358

* New upstream snapshot. Closes: #409565, #481051
  - Include an XSS security fix (CVE-2008-2302). Closes: #481164
* Drop debian/patches/04_pg_version_fix.diff as another fix
  has been committed upstream (see http://code.djangoproject.com/ticket/6433
  and http://code.djangoproject.com/changeset/7415).
* Add some headers to the remaining patches.

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/01_add_shebang.diff
  packages/python-django/trunk/debian/patches/02_bash_completion.diff
  packages/python-django/trunk/debian/patches/03_manpage.diff
Deleted:
  packages/python-django/trunk/debian/patches/04_pg_version_fix.diff

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2008-05-19 21:13:04 UTC (rev 5357)
+++ packages/python-django/trunk/debian/changelog	2008-05-19 21:42:21 UTC (rev 5358)
@@ -1,3 +1,14 @@
+python-django (0.97~svn7534-1) experimental; urgency=low
+
+  * New upstream snapshot. Closes: #409565, #481051
+    - Include an XSS security fix (CVE-2008-2302). Closes: #481164
+  * Drop debian/patches/04_pg_version_fix.diff as another fix
+    has been committed upstream (see http://code.djangoproject.com/ticket/6433
+    and http://code.djangoproject.com/changeset/7415).
+  * Add some headers to the remaining patches.
+
+ -- Raphael Hertzog <hertzog at debian.org>  Mon, 19 May 2008 23:41:50 +0200
+
 python-django (0.97~svn7189-1) experimental; urgency=low
 
   * New upstream snapshot including bash completion fix

Modified: packages/python-django/trunk/debian/patches/01_add_shebang.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_add_shebang.diff	2008-05-19 21:13:04 UTC (rev 5357)
+++ packages/python-django/trunk/debian/patches/01_add_shebang.diff	2008-05-19 21:42:21 UTC (rev 5358)
@@ -1,3 +1,16 @@
+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 @@

Modified: packages/python-django/trunk/debian/patches/02_bash_completion.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-05-19 21:13:04 UTC (rev 5357)
+++ packages/python-django/trunk/debian/patches/02_bash_completion.diff	2008-05-19 21:42:21 UTC (rev 5358)
@@ -1,3 +1,13 @@
+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()

Modified: packages/python-django/trunk/debian/patches/03_manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/03_manpage.diff	2008-05-19 21:13:04 UTC (rev 5357)
+++ packages/python-django/trunk/debian/patches/03_manpage.diff	2008-05-19 21:42:21 UTC (rev 5358)
@@ -1,3 +1,11 @@
+Forwarded-Upstream: not needed
+Author: Brett Parker <iDunno at sommitrealweird.co.uk>
+Comment:
+ Update the manual page to speak of django-admin instead of
+ django-admin.py as that's the name used by the Debian package.
+ .
+ This is a Debian specific patch.
+
 --- docs/man/django-admin.1.orig	2007-09-08 10:47:27.516890257 +0100
 +++ docs/man/django-admin.1	2007-09-08 10:48:01.822845242 +0100
 @@ -1,9 +1,9 @@

Deleted: packages/python-django/trunk/debian/patches/04_pg_version_fix.diff
===================================================================
--- packages/python-django/trunk/debian/patches/04_pg_version_fix.diff	2008-05-19 21:13:04 UTC (rev 5357)
+++ packages/python-django/trunk/debian/patches/04_pg_version_fix.diff	2008-05-19 21:42:21 UTC (rev 5358)
@@ -1,26 +0,0 @@
---- django/db/backends/postgresql/operations.py.orig
-+++ django/db/backends/postgresql/operations.py
-@@ -12,7 +12,22 @@ class DatabaseOperations(BaseDatabaseOperations):
-             from django.db import connection
-             cursor = connection.cursor()
-             cursor.execute("SELECT version()")
--            self._postgres_version = [int(val) for val in cursor.fetchone()[0].split()[1].split('.')]
-+            version_parts = cursor.fetchone()[0].split()[1].split('.')
-+            postgres_version = []
-+            for part in version_parts:
-+                if part.isdigit():
-+                    postgres_version.append(int(part))
-+                else:
-+                    digit = ""
-+                    for c in part:
-+                        if c.isdigit():
-+                            digit += c
-+                        else:
-+                            break
-+                    if digit != "":
-+                        postgres_version.append(int(digit))
-+                    break
-+            self._postgres_version = postgres_version
-         return self._postgres_version
-     postgres_version = property(_get_postgres_version)
-