4 files changed, 199 insertions, 185 deletions

diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 728302b12e0c..6b8e7c3d1492 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	django
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	www python
 MASTER_SITES=	http://media.djangoproject.com/releases/${PORTVERSION}/ \
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Django-${PORTVERSION}-final
+DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -22,8 +21,6 @@ USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Django
-PYDISTUTILS_PKGVERSION=	1.0_final
-PYDISTUTILS_EGGINFO=	Django-${PORTVERSION}_final-${PYTHON_VERSION:S/thon//}.egg-info
 
 CONFLICTS=	py2[0-9]-django-devel-[0-9]*
 
diff --git a/www/py-django/distinfo b/www/py-django/distinfo
index 7cf641a563b0..9173503abff1 100644
--- a/www/py-django/distinfo
+++ b/www/py-django/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Django-1.0.2-final.tar.gz) = 89353e3749668778f1370d2e444f3adc
-SHA256 (python/Django-1.0.2-final.tar.gz) = 50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
-SIZE (python/Django-1.0.2-final.tar.gz) = 4649433
+MD5 (python/Django-1.1.tar.gz) = b2d75b4457a39c405fa2b36bf826bf6b
+SHA256 (python/Django-1.1.tar.gz) = 578338be3288eff853039ad498297decdc3bb20265a0c4dee09efdf8e267c900
+SIZE (python/Django-1.1.tar.gz) = 5609609
diff --git a/www/py-django/files/patch-sphinx b/www/py-django/files/patch-sphinx
deleted file mode 100644
index 8a120c052a77..000000000000
--- a/www/py-django/files/patch-sphinx
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./docs/_ext/djangodocs.py.orig	2008-11-19 13:44:34.000000000 +0800
-+++ ./docs/_ext/djangodocs.py	2009-05-21 23:41:11.495238717 +0800
-@@ -6,10 +6,16 @@
- import docutils.transforms
- import sphinx
- import sphinx.addnodes
--import sphinx.builder
-+try:
-+    from sphinx import builders
-+except ImportError:
-+    import sphinx.builder as builders
- import sphinx.directives
- import sphinx.environment
--import sphinx.htmlwriter
-+try:
-+    import sphinx.writers.html as sphinx_htmlwriter
-+except ImportError:
-+    import sphinx.htmlwriter as sphinx_htmlwriter
- 
- def setup(app):
-     app.add_crossref_type(
-@@ -42,7 +48,7 @@
-         directivename = "django-admin-option",
-         rolename      = "djadminopt",
-         indextemplate = "pair: %s; django-admin command-line option",
--        parse_node    = lambda env, sig, signode: sphinx.directives.parse_option_desc(signode, sig),
-+        parse_node    = parse_django_adminopt_node,
-     )
-     app.add_transform(SuppressBlockquotes)
-     
-@@ -71,7 +77,7 @@
-             if len(node.children) == 1 and isinstance(node.children[0], self.suppress_blockquote_child_nodes):
-                 node.replace_self(node.children[0])
- 
--class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
-+class DjangoHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
-     """
-     Django-specific reST to HTML tweaks.
-     """
-@@ -94,10 +100,10 @@
-     #
-     def visit_literal_block(self, node):
-         self.no_smarty += 1
--        sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
-+        sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
-         
-     def depart_literal_block(self, node):
--        sphinx.htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node) 
-+        sphinx_htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node) 
-         self.no_smarty -= 1
-         
-     #
-@@ -132,7 +138,7 @@
-     # This is different on docutils 0.5 vs. 0.4...
-     
-     # The docutils 0.4 override.
--    if hasattr(sphinx.htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title'):
-+    if hasattr(sphinx_htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title'):
-         def start_tag_with_title(self, node, tagname, **atts):
-             node = {
-                 'classes': node.get('classes', []), 
-@@ -145,7 +151,7 @@
-         def visit_section(self, node):
-             old_ids = node.get('ids', [])
-             node['ids'] = ['s-' + i for i in old_ids]
--            sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
-+            sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
-             node['ids'] = old_ids
- 
- def parse_django_admin_node(env, sig, signode):
-@@ -155,6 +161,25 @@
-     signode += sphinx.addnodes.desc_name(title, title)
-     return sig
- 
-+def parse_django_adminopt_node(env, sig, signode):
-+    """A copy of sphinx.directives.CmdoptionDesc.parse_signature()"""
-+    from sphinx import addnodes
-+    from sphinx.directives.desc import option_desc_re
-+    count = 0
-+    firstname = ''
-+    for m in option_desc_re.finditer(sig):
-+        optname, args = m.groups()
-+        if count:
-+            signode += addnodes.desc_addname(', ', ', ')
-+        signode += addnodes.desc_name(optname, optname)
-+        signode += addnodes.desc_addname(args, args)
-+        if not count:
-+            firstname = optname
-+        count += 1
-+    if not firstname:
-+        raise ValueError
-+    return firstname
-+
- def monkeypatch_pickle_builder():
-     import shutil
-     from os import path
-@@ -183,12 +208,12 @@
- 
-         # copy the environment file from the doctree dir to the output dir
-         # as needed by the web app
--        shutil.copyfile(path.join(self.doctreedir, sphinx.builder.ENV_PICKLE_FILENAME),
--                        path.join(self.outdir, sphinx.builder.ENV_PICKLE_FILENAME))
-+        shutil.copyfile(path.join(self.doctreedir, builders.ENV_PICKLE_FILENAME),
-+                        path.join(self.outdir, builders.ENV_PICKLE_FILENAME))
- 
-         # touch 'last build' file, used by the web application to determine
-         # when to reload its environment and clear the cache
--        open(path.join(self.outdir, sphinx.builder.LAST_BUILD_FILENAME), 'w').close()
-+        open(path.join(self.outdir, builders.LAST_BUILD_FILENAME), 'w').close()
- 
--    sphinx.builder.PickleHTMLBuilder.handle_finish = handle_finish
-+    builders.PickleHTMLBuilder.handle_finish = handle_finish
-     
---- ./docs/_templates/layout.html.orig	2008-11-19 13:44:33.000000000 +0800
-+++ ./docs/_templates/layout.html	2009-05-21 23:41:17.886376469 +0800
-@@ -1,6 +1,6 @@
- {% extends "!layout.html" %}
- 
--{%- macro secondnav %}
-+{%- macro secondnav() %}
-   {%- if prev %}
-     &laquo; <a href="{{ prev.link|e }}" title="{{ prev.title|e }}">previous</a> 
-     {{ reldelim2 }}
-@@ -84,4 +84,4 @@
- {% block relbar2 %}{% endblock %}
- {% block sidebar1 %}{% endblock %}
- {% block sidebar2 %}{% endblock %}
--{% block footer %}{% endblock %}
-\ No newline at end of file
-+{% block footer %}{% endblock %}
diff --git a/www/py-django/pkg-plist b/www/py-django/pkg-plist
index 9ce80ce5ce47..96bd318af745 100644
--- a/www/py-django/pkg-plist
+++ b/www/py-django/pkg-plist
@@ -35,6 +35,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/models.py
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/models.pyc
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/models.pyo
+%%PYTHON_SITELIBDIR%%/django/conf/app_template/tests.py
+%%PYTHON_SITELIBDIR%%/django/conf/app_template/tests.pyc
+%%PYTHON_SITELIBDIR%%/django/conf/app_template/tests.pyo
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/views.py
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/views.pyc
 %%PYTHON_SITELIBDIR%%/django/conf/app_template/views.pyo
@@ -213,6 +216,10 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sr/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sr/LC_MESSAGES/djangojs.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sr/LC_MESSAGES/djangojs.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
+%%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
+%%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sv/LC_MESSAGES/django.mo
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sv/LC_MESSAGES/django.po
 %%PYTHON_SITELIBDIR%%/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
@@ -275,6 +282,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/actions.py
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/actions.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/actions.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/filterspecs.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/filterspecs.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/filterspecs.pyo
@@ -285,11 +295,8 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/changelists.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/dashboard.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/forms.css
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/global.css
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/layout.css
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/ie.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/login.css
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/null.css
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/patch-iewin.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/rtl.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/css/widgets.css
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/img/admin/arrow-down.gif
@@ -340,6 +347,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/img/gis/move_vertex_on.png
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/SelectBox.js
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/SelectFilter2.js
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/actions.js
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/admin/CollapsedFieldsets.js
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
@@ -361,6 +369,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/sites.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/404.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/500.html
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/actions.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/app_index.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/auth/user/add_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -371,6 +380,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/change_list_results.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/date_hierarchy.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/delete_confirmation.html
+%%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/delete_selected_confirmation.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/edit_inline/stacked.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/edit_inline/tabular.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/filter.html
@@ -499,10 +509,16 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/forms.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/remote_user.py
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/remote_user.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/remote_user.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/login.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/tokens.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/urls.py
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/urls.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/urls.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/views.py
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/views.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/views.pyo
@@ -533,6 +549,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/models.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/comments/moderation.py
+%%PYTHON_SITELIBDIR%%/django/contrib/comments/moderation.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/comments/moderation.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/signals.py
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/signals.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/comments/signals.pyo
@@ -593,6 +612,12 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/middleware.py
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/middleware.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/csrf/middleware.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/models.py
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/models.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/models.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/tests.py
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/tests.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/csrf/tests.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/databrowse/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/databrowse/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/databrowse/__init__.pyo
@@ -751,21 +776,39 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/postgis/query.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/postgis/query.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/postgis/query.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/__init__.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/__init__.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/adaptor.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/adaptor.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/adaptor.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/creation.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/creation.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/creation.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/field.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/field.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/field.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/models.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/models.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/models.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/query.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/query.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite/query.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/util.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/util.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/util.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/aggregates.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/aggregates.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/aggregates.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/fields/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/fields/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/fields/__init__.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/manager.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/manager.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/manager.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/mixin.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/mixin.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/mixin.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/proxy.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/proxy.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/proxy.pyo
@@ -775,9 +818,18 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/aggregates.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/aggregates.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/aggregates.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/conversion.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/conversion.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/conversion.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/query.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/query.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/query.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/subqueries.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/subqueries.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/subqueries.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/where.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/where.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql/where.pyo
@@ -793,6 +845,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/base.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/base.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/base.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/datasource.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/datasource.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/datasource.pyo
@@ -844,6 +899,24 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/srs.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/srs.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/srs.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_driver.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_driver.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_driver.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_ds.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_ds.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_ds.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_envelope.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_envelope.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_envelope.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_geom.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_geom.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_geom.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_srs.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_srs.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests/test_srs.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/__init__.pyo
@@ -859,12 +932,33 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/error.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/error.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/error.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometries.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometries.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometries.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/factory.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/factory.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/factory.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometry.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometry.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/geometry.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/io.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/io.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/io.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/libgeos.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/libgeos.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/libgeos.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/linestring.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/linestring.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/linestring.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/mutable_list.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/mutable_list.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/mutable_list.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/point.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/point.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/point.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/polygon.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/polygon.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/polygon.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prepared.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prepared.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prepared.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/__init__.pyo
@@ -877,15 +971,36 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/geom.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/geom.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/geom.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/io.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/io.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/io.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/misc.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/misc.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/misc.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/predicates.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/predicates.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/predicates.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/prepared.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/prepared.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/prepared.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/topology.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/topology.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes/topology.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos_mutation.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos_mutation.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_geos_mutation.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_io.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_io.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_io.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_mutable_list.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_mutable_list.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests/test_mutable_list.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/management/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/management/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/management/__init__.pyo
@@ -944,13 +1059,27 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/openlayers.js
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/osm.html
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin/osm.js
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/js/google-map.js
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/google-map.html
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/google-map.js
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/google-multi.js
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/google-single.js
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml/base.kml
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml/placemarks.kml
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/sitemaps/geo_sitemap.xml
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/cities/cities.dbf
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/cities/cities.prj
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/cities/cities.shp
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/cities/cities.shx
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/counties/counties.dbf
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/counties/counties.shp
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/counties/counties.shx
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/interstates/interstates.dbf
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/interstates/interstates.prj
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/interstates/interstates.shp
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/interstates/interstates.shx
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.dbf
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.prj
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point/test_point.shp
@@ -988,17 +1117,23 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.mysql.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.oracle.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.postgresql_psycopg2.sql
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/city.sqlite3.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/co.wkt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/country.mysql.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/country.postgresql_psycopg2.sql
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/country.sqlite3.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/ks.wkt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/nz.wkt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/state.mysql.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/state.postgresql_psycopg2.sql
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/state.sqlite3.sql
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql/tx.wkt
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_feeds.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_regress.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_regress.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_regress.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_sitemaps.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_sitemaps.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/test_sitemaps.pyo
@@ -1017,23 +1152,15 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities/cities.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties/counties.shx
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.dbf
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.prj
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.shp
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates/interstates.shx
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/models.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests_mysql.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests_mysql.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/tests_mysql.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/__init__.pyo
@@ -1046,30 +1173,12 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/tests_mysql.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/tests_mysql.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp/tests_mysql.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_driver.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_driver.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_driver.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_ds.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_ds.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_ds.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_envelope.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_envelope.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_envelope.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_geom.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_geom.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_geom.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_srs.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_srs.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_gdal_srs.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoforms.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoforms.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoforms.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoip.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoip.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geoip.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geos.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geos.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_geos.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_measure.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_measure.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_measure.pyo
@@ -1178,6 +1287,15 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cl/forms.py
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cl/forms.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cl/forms.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/__init__.py
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/__init__.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/cz_regions.py
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/cz_regions.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/cz_regions.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/forms.py
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/forms.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz/forms.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/de/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/de/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/de/__init__.pyo
@@ -1403,6 +1521,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cache.py
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cache.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cache.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cached_db.py
+%%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cached_db.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/cached_db.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/db.py
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/db.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/sessions/backends/db.pyo
@@ -1540,6 +1661,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/core/files/uploadhandler.py
 %%PYTHON_SITELIBDIR%%/django/core/files/uploadhandler.pyc
 %%PYTHON_SITELIBDIR%%/django/core/files/uploadhandler.pyo
+%%PYTHON_SITELIBDIR%%/django/core/files/utils.py
+%%PYTHON_SITELIBDIR%%/django/core/files/utils.pyc
+%%PYTHON_SITELIBDIR%%/django/core/files/utils.pyo
 %%PYTHON_SITELIBDIR%%/django/core/handlers/__init__.py
 %%PYTHON_SITELIBDIR%%/django/core/handlers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/core/handlers/__init__.pyo
@@ -1786,6 +1910,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/db/backends/postgresql_psycopg2/introspection.py
 %%PYTHON_SITELIBDIR%%/django/db/backends/postgresql_psycopg2/introspection.pyc
 %%PYTHON_SITELIBDIR%%/django/db/backends/postgresql_psycopg2/introspection.pyo
+%%PYTHON_SITELIBDIR%%/django/db/backends/signals.py
+%%PYTHON_SITELIBDIR%%/django/db/backends/signals.pyc
+%%PYTHON_SITELIBDIR%%/django/db/backends/signals.pyo
 %%PYTHON_SITELIBDIR%%/django/db/backends/sqlite3/__init__.py
 %%PYTHON_SITELIBDIR%%/django/db/backends/sqlite3/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/db/backends/sqlite3/__init__.pyo
@@ -1807,9 +1934,15 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/db/models/__init__.py
 %%PYTHON_SITELIBDIR%%/django/db/models/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/db/models/aggregates.py
+%%PYTHON_SITELIBDIR%%/django/db/models/aggregates.pyc
+%%PYTHON_SITELIBDIR%%/django/db/models/aggregates.pyo
 %%PYTHON_SITELIBDIR%%/django/db/models/base.py
 %%PYTHON_SITELIBDIR%%/django/db/models/base.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/base.pyo
+%%PYTHON_SITELIBDIR%%/django/db/models/expressions.py
+%%PYTHON_SITELIBDIR%%/django/db/models/expressions.pyc
+%%PYTHON_SITELIBDIR%%/django/db/models/expressions.pyo
 %%PYTHON_SITELIBDIR%%/django/db/models/fields/__init__.py
 %%PYTHON_SITELIBDIR%%/django/db/models/fields/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/fields/__init__.pyo
@@ -1849,12 +1982,18 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/__init__.py
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/__init__.pyo
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/aggregates.py
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/aggregates.pyc
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/aggregates.pyo
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/constants.py
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/constants.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/constants.pyo
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/datastructures.py
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/datastructures.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/datastructures.pyo
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/expressions.py
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/expressions.pyc
+%%PYTHON_SITELIBDIR%%/django/db/models/sql/expressions.pyo
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/query.py
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/query.pyc
 %%PYTHON_SITELIBDIR%%/django/db/models/sql/query.pyo
@@ -2059,6 +2198,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/utils/http.py
 %%PYTHON_SITELIBDIR%%/django/utils/http.pyc
 %%PYTHON_SITELIBDIR%%/django/utils/http.pyo
+%%PYTHON_SITELIBDIR%%/django/utils/importlib.py
+%%PYTHON_SITELIBDIR%%/django/utils/importlib.pyc
+%%PYTHON_SITELIBDIR%%/django/utils/importlib.pyo
 %%PYTHON_SITELIBDIR%%/django/utils/itercompat.py
 %%PYTHON_SITELIBDIR%%/django/utils/itercompat.pyc
 %%PYTHON_SITELIBDIR%%/django/utils/itercompat.pyo
@@ -2235,6 +2377,7 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/fi
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/es
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/de
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cz
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/cl
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/ch
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/localflavor/ca
@@ -2247,9 +2390,6 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/humanize
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/utils
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/relatedapp
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/interstates
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/counties
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap/cities
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/layermap
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/sql
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp
@@ -2257,11 +2397,13 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_vrt
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_poly
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/test_point
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/interstates
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/counties
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data/cities
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/data
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/sitemaps
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/kml
-@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google/js
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/google
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis/admin
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/templates/gis
@@ -2272,14 +2414,17 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/maps
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/management/commands
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/management
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/tests
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos/prototypes
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/geos
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/tests
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal/prototypes
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/gdal
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/forms
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/sql
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models/fields
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/models
+@dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/spatialite
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/postgis
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/oracle
 @dirrm %%PYTHON_SITELIBDIR%%/django/contrib/gis/db/backend/mysql
@@ -2349,6 +2494,8 @@ bin/django-admin.py
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/ta
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sv/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sv
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sr_Latn
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sr/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sr
 @dirrm %%PYTHON_SITELIBDIR%%/django/conf/locale/sl/LC_MESSAGES