- Update to 1.2.4

9 files changed, 30 insertions, 69 deletions

diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 03d3cc08c91a..1e3bb857156b 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	django
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	www python
 MASTER_SITES=	http://media.djangoproject.com/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -69,12 +69,6 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
-pre-patch:
-.if defined(WITH_DOCS)
-	${MKDIR} ${WRKSRC}/docs/_theme/djangodocs
-	${MKDIR} ${WRKSRC}/docs/_theme/static
-.endif
-
 post-build:
 .if defined(WITH_DOCS)
 .	if defined(NOPORTDOCS)
diff --git a/www/py-django/distinfo b/www/py-django/distinfo
index f8d2b7dd8ed6..4f31a656bfd7 100644
--- a/www/py-django/distinfo
+++ b/www/py-django/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.2.3.tar.gz) = cb830f6038b78037647150d977f6cd5cf2bfd731f1788ecf8758a03c213a0f84
-SIZE (python/Django-1.2.3.tar.gz) = 6306760
+SHA256 (python/Django-1.2.4.tar.gz) = 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381
+SIZE (python/Django-1.2.4.tar.gz) = 6357270
diff --git a/www/py-django/pkg-plist b/www/py-django/pkg-plist
index cc676aaf0d1a..15de0a6f4111 100644
--- a/www/py-django/pkg-plist
+++ b/www/py-django/pkg-plist
@@ -817,7 +817,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/prepopulated_fields_js.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/search_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/submit_line.html
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/template_validator.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_done.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_form.html
@@ -856,9 +855,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.py
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyo
@@ -960,7 +956,9 @@ bin/django-admin.py
 %%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/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/login.html
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_change_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_complete.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_confirm.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_done.html
@@ -1413,6 +1411,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.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
@@ -1575,6 +1576,7 @@ bin/django-admin.py
 %%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/geometries.json.gz
 %%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
@@ -1592,9 +1594,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyo
@@ -1619,7 +1618,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json.gz
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyo
@@ -1651,9 +1650,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyo
 %%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
@@ -1684,9 +1680,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyo
diff --git a/www/py-django12/Makefile b/www/py-django12/Makefile
index 03d3cc08c91a..1e3bb857156b 100644
--- a/www/py-django12/Makefile
+++ b/www/py-django12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	django
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	www python
 MASTER_SITES=	http://media.djangoproject.com/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -69,12 +69,6 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
-pre-patch:
-.if defined(WITH_DOCS)
-	${MKDIR} ${WRKSRC}/docs/_theme/djangodocs
-	${MKDIR} ${WRKSRC}/docs/_theme/static
-.endif
-
 post-build:
 .if defined(WITH_DOCS)
 .	if defined(NOPORTDOCS)
diff --git a/www/py-django12/distinfo b/www/py-django12/distinfo
index f8d2b7dd8ed6..4f31a656bfd7 100644
--- a/www/py-django12/distinfo
+++ b/www/py-django12/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.2.3.tar.gz) = cb830f6038b78037647150d977f6cd5cf2bfd731f1788ecf8758a03c213a0f84
-SIZE (python/Django-1.2.3.tar.gz) = 6306760
+SHA256 (python/Django-1.2.4.tar.gz) = 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381
+SIZE (python/Django-1.2.4.tar.gz) = 6357270
diff --git a/www/py-django12/pkg-plist b/www/py-django12/pkg-plist
index cc676aaf0d1a..15de0a6f4111 100644
--- a/www/py-django12/pkg-plist
+++ b/www/py-django12/pkg-plist
@@ -817,7 +817,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/prepopulated_fields_js.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/search_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/submit_line.html
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/template_validator.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_done.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_form.html
@@ -856,9 +855,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.py
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyo
@@ -960,7 +956,9 @@ bin/django-admin.py
 %%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/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/login.html
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_change_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_complete.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_confirm.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_done.html
@@ -1413,6 +1411,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.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
@@ -1575,6 +1576,7 @@ bin/django-admin.py
 %%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/geometries.json.gz
 %%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
@@ -1592,9 +1594,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyo
@@ -1619,7 +1618,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json.gz
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyo
@@ -1651,9 +1650,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyo
 %%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
@@ -1684,9 +1680,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyo
diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile
index 03d3cc08c91a..1e3bb857156b 100644
--- a/www/py-django13/Makefile
+++ b/www/py-django13/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	django
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	www python
 MASTER_SITES=	http://media.djangoproject.com/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -69,12 +69,6 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 PORTDOCS=	*
 .endif
 
-pre-patch:
-.if defined(WITH_DOCS)
-	${MKDIR} ${WRKSRC}/docs/_theme/djangodocs
-	${MKDIR} ${WRKSRC}/docs/_theme/static
-.endif
-
 post-build:
 .if defined(WITH_DOCS)
 .	if defined(NOPORTDOCS)
diff --git a/www/py-django13/distinfo b/www/py-django13/distinfo
index f8d2b7dd8ed6..4f31a656bfd7 100644
--- a/www/py-django13/distinfo
+++ b/www/py-django13/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.2.3.tar.gz) = cb830f6038b78037647150d977f6cd5cf2bfd731f1788ecf8758a03c213a0f84
-SIZE (python/Django-1.2.3.tar.gz) = 6306760
+SHA256 (python/Django-1.2.4.tar.gz) = 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381
+SIZE (python/Django-1.2.4.tar.gz) = 6357270
diff --git a/www/py-django13/pkg-plist b/www/py-django13/pkg-plist
index cc676aaf0d1a..15de0a6f4111 100644
--- a/www/py-django13/pkg-plist
+++ b/www/py-django13/pkg-plist
@@ -817,7 +817,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/prepopulated_fields_js.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/search_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/submit_line.html
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/admin/template_validator.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_done.html
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/templates/registration/password_change_form.html
@@ -856,9 +855,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/views/main.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.py
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/admin/views/template.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.py
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/admin/widgets.pyo
@@ -960,7 +956,9 @@ bin/django-admin.py
 %%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/logged_out.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/login.html
+%%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_change_form.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_complete.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_confirm.html
 %%PYTHON_SITELIBDIR%%/django/contrib/auth/tests/templates/registration/password_reset_done.html
@@ -1413,6 +1411,9 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/regex.pyo
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.py
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.pyc
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/geometry/test_data.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
@@ -1575,6 +1576,7 @@ bin/django-admin.py
 %%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/geometries.json.gz
 %%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
@@ -1592,9 +1594,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/data.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/distapp/models.pyo
@@ -1619,7 +1618,7 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/feeds.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json
+%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/fixtures/initial_data.json.gz
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geoapp/models.pyo
@@ -1651,9 +1650,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geogapp/tests.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/geometries.pyo
 %%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
@@ -1684,9 +1680,6 @@ bin/django-admin.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/test_spatialrefsys.pyo
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.py
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyc
-%%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/urls.pyo
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.py
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyc
 %%PYTHON_SITELIBDIR%%/django/contrib/gis/tests/utils.pyo