From 8fae029d1c07210ef80a0b8edbf46f0348ed4566 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 8 Apr 2013 20:39:16 +0000
Subject: [PATCH] Changes 2.3.6: Bug fixes and Django 1.5 compatibility.

---
 www/py-django-cms/Makefile                    |  4 ++--
 www/py-django-cms/distinfo                    |  9 ++++----
 .../patches/patch-cms_____init____.py         | 21 -------------------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 www/py-django-cms/patches/patch-cms_____init____.py

diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 02b7b4a6b310..fbb4bb1b9676 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/12/09 20:32:37 adam Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/08 20:39:16 adam Exp $
 
-DISTNAME=	django-cms-2.3.5
+DISTNAME=	django-cms-2.3.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/d/django-cms/
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index 6452dd9c1896..0a2cd472b959 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2013/04/01 12:31:23 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/04/08 20:39:16 adam Exp $
 
-SHA1 (django-cms-2.3.5.tar.gz) = 6f8326cbc024b721d5ae3b95cbecd0cad90163eb
-RMD160 (django-cms-2.3.5.tar.gz) = 8a5a38105307c6dee8d8d076bd0b98a597893328
-Size (django-cms-2.3.5.tar.gz) = 3696175 bytes
-SHA1 (patch-cms_____init____.py) = 52b93489fc15272edc8256e9682de1642baab14c
+SHA1 (django-cms-2.3.6.tar.gz) = 1e8f8c0fca91b1d90e1b773eced3f7f768ef1341
+RMD160 (django-cms-2.3.6.tar.gz) = 442b8b0bb7ae5e05ec635d4fbe609ee02ee7b923
+Size (django-cms-2.3.6.tar.gz) = 3753134 bytes
diff --git a/www/py-django-cms/patches/patch-cms_____init____.py b/www/py-django-cms/patches/patch-cms_____init____.py
deleted file mode 100644
index 13c1a422877e..000000000000
--- a/www/py-django-cms/patches/patch-cms_____init____.py
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cms_____init____.py,v 1.1 2013/04/01 12:31:23 joerg Exp $
-
---- cms/__init__.py.orig	2013-03-31 16:23:04.000000000 +0000
-+++ cms/__init__.py
-@@ -1,12 +1,16 @@
- # -*- coding: utf-8 -*-
- __version__ = '2.3.5'
- 
-+import django.core.exceptions
-+
- # patch settings 
- try:
-     from django.conf import settings
-     if 'cms' in settings.INSTALLED_APPS:
-         from conf import patch_settings
-         patch_settings()
-+except django.core.exceptions.ImproperlyConfigured:
-+    pass
- except ImportError: # pragma: no cover
-     """
-     This exception means that either the application is being built, or is