Changes 2.2:

* django-mptt now a proper dependency
* Django 1.3 support
* View permissions
* django-sekizai instead of PluginMedia
* Toolbar must be enabled explicitly in templates
* Static files moved to /static/
* Dropped support for django-dbgettext

3 files changed, 419 insertions, 369 deletions

diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 9ea75c92067..d0613b1e599 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2011/04/06 21:42:41 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/01/08 07:56:58 adam Exp $
 
-DISTNAME=	django-cms-2.1.3
+DISTNAME=	django-cms-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/d/django-cms/
@@ -22,6 +22,8 @@ DEPENDS+=	${PYPKGPREFIX}-imaging-[0-9]*:../../graphics/py-imaging
 DEPENDS+=	${PYPKGPREFIX}-django-south-[0-9]*:../../www/py-django-south
 DEPENDS+=	${PYPKGPREFIX}-django-classy-tags-[0-9]*:../../www/py-django-classy-tags
 DEPENDS+=	${PYPKGPREFIX}-django-appmedia-[0-9]*:../../www/py-django-appmedia
+DEPENDS+=	${PYPKGPREFIX}-django-mptt-[0-9]*:../../www/py-django-mptt
+DEPENDS+=	${PYPKGPREFIX}-django-sekizai-[0-9]*:../../www/py-django-sekizai
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django-cms/PLIST b/www/py-django-cms/PLIST
index aba9987e76e..3e44762959b 100644
--- a/www/py-django-cms/PLIST
+++ b/www/py-django-cms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/02/24 08:26:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/01/08 07:56:58 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -44,6 +44,9 @@ ${PYSITELIB}/cms/admin/useradmin.pyo
 ${PYSITELIB}/cms/admin/views.py
 ${PYSITELIB}/cms/admin/views.pyc
 ${PYSITELIB}/cms/admin/views.pyo
+${PYSITELIB}/cms/api.py
+${PYSITELIB}/cms/api.pyc
+${PYSITELIB}/cms/api.pyo
 ${PYSITELIB}/cms/app_base.py
 ${PYSITELIB}/cms/app_base.pyc
 ${PYSITELIB}/cms/app_base.pyo
@@ -59,6 +62,9 @@ ${PYSITELIB}/cms/cache/__init__.pyo
 ${PYSITELIB}/cms/cache/permissions.py
 ${PYSITELIB}/cms/cache/permissions.pyc
 ${PYSITELIB}/cms/cache/permissions.pyo
+${PYSITELIB}/cms/cms_toolbar.py
+${PYSITELIB}/cms/cms_toolbar.pyc
+${PYSITELIB}/cms/cms_toolbar.pyo
 ${PYSITELIB}/cms/conf/__init__.py
 ${PYSITELIB}/cms/conf/__init__.pyc
 ${PYSITELIB}/cms/conf/__init__.pyo
@@ -71,9 +77,6 @@ ${PYSITELIB}/cms/conf/patch.pyo
 ${PYSITELIB}/cms/context_processors.py
 ${PYSITELIB}/cms/context_processors.pyc
 ${PYSITELIB}/cms/context_processors.pyo
-${PYSITELIB}/cms/dbgettext_registration.py
-${PYSITELIB}/cms/dbgettext_registration.pyc
-${PYSITELIB}/cms/dbgettext_registration.pyo
 ${PYSITELIB}/cms/exceptions.py
 ${PYSITELIB}/cms/exceptions.pyc
 ${PYSITELIB}/cms/exceptions.pyo
@@ -181,6 +184,10 @@ ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/km/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/km/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/km/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/km/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.mo
@@ -201,6 +208,10 @@ ${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ro/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/ro/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/ro/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/ro/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/ru/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/ru/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/ru/LC_MESSAGES/djangojs.mo
@@ -209,6 +220,10 @@ ${PYSITELIB}/cms/locale/sk/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/sk/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/sk/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/sk/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/djangojs.mo
@@ -231,255 +246,27 @@ ${PYSITELIB}/cms/management/__init__.pyo
 ${PYSITELIB}/cms/management/commands/__init__.py
 ${PYSITELIB}/cms/management/commands/__init__.pyc
 ${PYSITELIB}/cms/management/commands/__init__.pyo
+${PYSITELIB}/cms/management/commands/cms.py
+${PYSITELIB}/cms/management/commands/cms.pyc
+${PYSITELIB}/cms/management/commands/cms.pyo
 ${PYSITELIB}/cms/management/commands/publisher_publish.py
 ${PYSITELIB}/cms/management/commands/publisher_publish.pyc
 ${PYSITELIB}/cms/management/commands/publisher_publish.pyo
-${PYSITELIB}/cms/media/cms/css/change_form.css
-${PYSITELIB}/cms/media/cms/css/jquery.dialog.css
-${PYSITELIB}/cms/media/cms/css/jquery.tooltip.css
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_ffffff_256x240.png
-${PYSITELIB}/cms/media/cms/css/jquery/cupertino/jquery-ui.css
-${PYSITELIB}/cms/media/cms/css/pages.css
-${PYSITELIB}/cms/media/cms/css/plugin_editor.css
-${PYSITELIB}/cms/media/cms/css/plugin_forms.css
-${PYSITELIB}/cms/media/cms/css/rte.css
-${PYSITELIB}/cms/media/cms/css/tinymce_toolbar.css
-${PYSITELIB}/cms/media/cms/css/toolbar.css
-${PYSITELIB}/cms/media/cms/css/wymeditor.css
-${PYSITELIB}/cms/media/cms/images/bold.gif
-${PYSITELIB}/cms/media/cms/images/changelist-filter-button-bg.jpg
-${PYSITELIB}/cms/media/cms/images/close.gif
-${PYSITELIB}/cms/media/cms/images/cms_toolbar.gif
-${PYSITELIB}/cms/media/cms/images/cms_toolbar.png
-${PYSITELIB}/cms/media/cms/images/copy.gif
-${PYSITELIB}/cms/media/cms/images/cut.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/flv.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/gif.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/html.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/java.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/jpg.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/mp3.png
-${PYSITELIB}/cms/media/cms/images/file_icons/ods.png
-${PYSITELIB}/cms/media/cms/images/file_icons/odt.png
-${PYSITELIB}/cms/media/cms/images/file_icons/pdf.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/php.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/png.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/swf.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/tgz.png
-${PYSITELIB}/cms/media/cms/images/file_icons/ttf.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/txt.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/txt.png
-${PYSITELIB}/cms/media/cms/images/file_icons/wav.gif
-${PYSITELIB}/cms/media/cms/images/file_icons/zip.png
-${PYSITELIB}/cms/media/cms/images/icon_addlink.gif
-${PYSITELIB}/cms/media/cms/images/icon_deletelink.gif
-${PYSITELIB}/cms/media/cms/images/icon_extension.gif
-${PYSITELIB}/cms/media/cms/images/icon_pluginedit.gif
-${PYSITELIB}/cms/media/cms/images/icons.png
-${PYSITELIB}/cms/media/cms/images/image.png
-${PYSITELIB}/cms/media/cms/images/indicator.gif
-${PYSITELIB}/cms/media/cms/images/italic.gif
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-left-act.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-left-over.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-left.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle-act.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle-over.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-right-act.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-right-over.png
-${PYSITELIB}/cms/media/cms/images/jquery/accordion-right.png
-${PYSITELIB}/cms/media/cms/images/jquery/default-bg.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-e.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-n.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-ne.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-nw.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-s.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-se.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-sw.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-title.gif
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-titlebar-close-hover.png
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-titlebar-close.png
-${PYSITELIB}/cms/media/cms/images/jquery/dialog-w.gif
-${PYSITELIB}/cms/media/cms/images/jquery/nav-bg.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-e.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-n.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-ne.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-nw.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-s.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-se.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-sw.gif
-${PYSITELIB}/cms/media/cms/images/jquery/resizable-w.gif
-${PYSITELIB}/cms/media/cms/images/jquery/slider-bg-1.png
-${PYSITELIB}/cms/media/cms/images/jquery/slider-bg-2.png
-${PYSITELIB}/cms/media/cms/images/jquery/slider-handle.gif
-${PYSITELIB}/cms/media/cms/images/jquery/tabs.png
-${PYSITELIB}/cms/media/cms/images/link.png
-${PYSITELIB}/cms/media/cms/images/logo.jpg
-${PYSITELIB}/cms/media/cms/images/nav-bg.gif
-${PYSITELIB}/cms/media/cms/images/page_find.gif
-${PYSITELIB}/cms/media/cms/images/pluginlist-delete.png
-${PYSITELIB}/cms/media/cms/images/pluginlist-holder-bg.gif
-${PYSITELIB}/cms/media/cms/images/plugins/file.png
-${PYSITELIB}/cms/media/cms/images/plugins/image.png
-${PYSITELIB}/cms/media/cms/images/plugins/link.png
-${PYSITELIB}/cms/media/cms/images/plugins/snippet.png
-${PYSITELIB}/cms/media/cms/images/pony.jpg
-${PYSITELIB}/cms/media/cms/images/sitemap-exim.gif
-${PYSITELIB}/cms/media/cms/images/sitemap-exlm.gif
-${PYSITELIB}/cms/media/cms/images/sitemap-extm.gif
-${PYSITELIB}/cms/media/cms/images/sitemap-li-bg.jpg
-${PYSITELIB}/cms/media/cms/images/sitemap-li-collapse.gif
-${PYSITELIB}/cms/media/cms/images/sitemap-li-drag.gif
-${PYSITELIB}/cms/media/cms/images/unordered.gif
-${PYSITELIB}/cms/media/cms/js/change_form.js
-${PYSITELIB}/cms/media/cms/js/change_list.js
-${PYSITELIB}/cms/media/cms/js/csrf.js
-${PYSITELIB}/cms/media/cms/js/lib/effects.core.js
-${PYSITELIB}/cms/media/cms/js/lib/effects.highlight.js
-${PYSITELIB}/cms/media/cms/js/lib/functional.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.backgroundposition.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.bind.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.cookie.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.form.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.livequery.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.nyroModal-1.6.2.pack.js
-${PYSITELIB}/cms/media/cms/js/lib/jquery.query.js
-${PYSITELIB}/cms/media/cms/js/lib/ui.checkbox.js
-${PYSITELIB}/cms/media/cms/js/lib/ui.core.js
-${PYSITELIB}/cms/media/cms/js/lib/ui.dialog.js
-${PYSITELIB}/cms/media/cms/js/lib/ui.sortable.js
-${PYSITELIB}/cms/media/cms/js/placeholder_editor_registry.js
-${PYSITELIB}/cms/media/cms/js/plugin_editor.js
-${PYSITELIB}/cms/media/cms/js/tinymce.placeholdereditor.js
-${PYSITELIB}/cms/media/cms/js/toolbar.js
-${PYSITELIB}/cms/media/cms/js/tools.js
-${PYSITELIB}/cms/media/cms/js/wymeditor.placeholdereditor.js
-${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/icons.png
-${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/skin.css
-${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/skin.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/_all.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/css.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.cookie.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.hotkeys.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.listen.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.log.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.metadata.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.xslt.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/sarissa.js
-${PYSITELIB}/cms/media/cms/jstree/_lib/sarissa_ieemu_xpath.js
-${PYSITELIB}/cms/media/cms/jstree/flat.xsl
-${PYSITELIB}/cms/media/cms/jstree/nested.xsl
-${PYSITELIB}/cms/media/cms/jstree/themes/classic/folder.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/classic/folderopen.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/classic/minus.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/classic/plus.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/classic/style.css
-${PYSITELIB}/cms/media/cms/jstree/themes/default/context.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/create.png
-${PYSITELIB}/cms/media/cms/jstree/themes/default/dot.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/f.png
-${PYSITELIB}/cms/media/cms/jstree/themes/default/fminus.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/fminus_rtl.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/fplus.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/fplus_rtl.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/lastli.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/lastli_rtl.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/li.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/marker.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/marker_rtl.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/plus.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/remove.gif
-${PYSITELIB}/cms/media/cms/jstree/themes/default/remove.png
-${PYSITELIB}/cms/media/cms/jstree/themes/default/rename.png
-${PYSITELIB}/cms/media/cms/jstree/themes/default/style.css
-${PYSITELIB}/cms/media/cms/jstree/themes/default/throbber.gif
-${PYSITELIB}/cms/media/cms/jstree/tree_component.css
-${PYSITELIB}/cms/media/cms/jstree/tree_component.js
-${PYSITELIB}/cms/media/cms/plugins/twitter/js/jquery.tweet.js
-${PYSITELIB}/cms/media/cms/swf/expressInstall.swf
-${PYSITELIB}/cms/media/cms/swf/player.swf
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-blockquote.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h1.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h2.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h3.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h4.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h5.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h6.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-p.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-pre.png
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/wymiframe.css
-${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/wymiframe.html
-${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.js
-${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.min.js
-${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.pack.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/bg.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/ca.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/cs.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/de.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/en.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/es.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/fa.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/fi.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/fr.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/he.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/hr.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/hu.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/it.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/nb.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/nl.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/nn.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/pl.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/pt-br.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/pt.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/ru.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/sv.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/tr.js
-${PYSITELIB}/cms/media/cms/wymeditor/lang/zh_cn.js
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/embed/jquery.wymeditor.embed.js
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/fullscreen/icon_fullscreen.gif
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
-${PYSITELIB}/cms/media/cms/wymeditor/plugins/resizable/readme.txt
-${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/icons.png
-${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/skin.css
-${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/skin.js
-${PYSITELIB}/cms/media/cms/wymeditor/skins/default/icons.png
-${PYSITELIB}/cms/media/cms/wymeditor/skins/default/skin.css
-${PYSITELIB}/cms/media/cms/wymeditor/skins/default/skin.js
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.header.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.selector.silver.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.wymeditor.png
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/icons.silver.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/skin.css
-${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/skin.js
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/COPYING
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/README
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.header.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.selector.silver.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.wymeditor.png
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/icons.silver.gif
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/skin.css
-${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/skin.js
-${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/icons.png
-${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/skin.css
-${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/skin.js
-${PYSITELIB}/cms/media/cms/wymeditor/skins/wymeditor_icon.png
+${PYSITELIB}/cms/management/commands/subcommands/__init__.py
+${PYSITELIB}/cms/management/commands/subcommands/__init__.pyc
+${PYSITELIB}/cms/management/commands/subcommands/__init__.pyo
+${PYSITELIB}/cms/management/commands/subcommands/base.py
+${PYSITELIB}/cms/management/commands/subcommands/base.pyc
+${PYSITELIB}/cms/management/commands/subcommands/base.pyo
+${PYSITELIB}/cms/management/commands/subcommands/list.py
+${PYSITELIB}/cms/management/commands/subcommands/list.pyc
+${PYSITELIB}/cms/management/commands/subcommands/list.pyo
+${PYSITELIB}/cms/management/commands/subcommands/moderator.py
+${PYSITELIB}/cms/management/commands/subcommands/moderator.pyc
+${PYSITELIB}/cms/management/commands/subcommands/moderator.pyo
+${PYSITELIB}/cms/management/commands/subcommands/uninstall.py
+${PYSITELIB}/cms/management/commands/subcommands/uninstall.pyc
+${PYSITELIB}/cms/management/commands/subcommands/uninstall.pyo
 ${PYSITELIB}/cms/menu.py
 ${PYSITELIB}/cms/menu.pyc
 ${PYSITELIB}/cms/menu.pyo
@@ -489,9 +276,6 @@ ${PYSITELIB}/cms/menu_bases.pyo
 ${PYSITELIB}/cms/middleware/__init__.py
 ${PYSITELIB}/cms/middleware/__init__.pyc
 ${PYSITELIB}/cms/middleware/__init__.pyo
-${PYSITELIB}/cms/middleware/media.py
-${PYSITELIB}/cms/middleware/media.pyc
-${PYSITELIB}/cms/middleware/media.pyo
 ${PYSITELIB}/cms/middleware/multilingual.py
 ${PYSITELIB}/cms/middleware/multilingual.pyc
 ${PYSITELIB}/cms/middleware/multilingual.pyo
@@ -603,6 +387,12 @@ ${PYSITELIB}/cms/migrations/0032_auto__del_field_cmsplugin_publisher_public__del
 ${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.py
 ${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.pyc
 ${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.pyo
+${PYSITELIB}/cms/migrations/0034_auto__chg_field_title_language__chg_field_cmsplugin_language__add_fiel.py
+${PYSITELIB}/cms/migrations/0034_auto__chg_field_title_language__chg_field_cmsplugin_language__add_fiel.pyc
+${PYSITELIB}/cms/migrations/0034_auto__chg_field_title_language__chg_field_cmsplugin_language__add_fiel.pyo
+${PYSITELIB}/cms/migrations/0035_auto__add_field_globalpagepermission_can_view__add_field_pagepermissio.py
+${PYSITELIB}/cms/migrations/0035_auto__add_field_globalpagepermission_can_view__add_field_pagepermissio.pyc
+${PYSITELIB}/cms/migrations/0035_auto__add_field_globalpagepermission_can_view__add_field_pagepermissio.pyo
 ${PYSITELIB}/cms/migrations/__init__.py
 ${PYSITELIB}/cms/migrations/__init__.pyc
 ${PYSITELIB}/cms/migrations/__init__.pyo
@@ -645,6 +435,9 @@ ${PYSITELIB}/cms/plugin_base.pyo
 ${PYSITELIB}/cms/plugin_pool.py
 ${PYSITELIB}/cms/plugin_pool.pyc
 ${PYSITELIB}/cms/plugin_pool.pyo
+${PYSITELIB}/cms/plugin_processors.py
+${PYSITELIB}/cms/plugin_processors.pyc
+${PYSITELIB}/cms/plugin_processors.pyo
 ${PYSITELIB}/cms/plugin_rendering.py
 ${PYSITELIB}/cms/plugin_rendering.pyc
 ${PYSITELIB}/cms/plugin_rendering.pyo
@@ -657,9 +450,6 @@ ${PYSITELIB}/cms/plugins/file/__init__.pyo
 ${PYSITELIB}/cms/plugins/file/cms_plugins.py
 ${PYSITELIB}/cms/plugins/file/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/file/cms_plugins.pyo
-${PYSITELIB}/cms/plugins/file/dbgettext_registration.py
-${PYSITELIB}/cms/plugins/file/dbgettext_registration.pyc
-${PYSITELIB}/cms/plugins/file/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.pyo
@@ -752,9 +542,6 @@ ${PYSITELIB}/cms/plugins/googlemap/migrations/__init__.pyo
 ${PYSITELIB}/cms/plugins/googlemap/models.py
 ${PYSITELIB}/cms/plugins/googlemap/models.pyc
 ${PYSITELIB}/cms/plugins/googlemap/models.pyo
-${PYSITELIB}/cms/plugins/googlemap/settings.py
-${PYSITELIB}/cms/plugins/googlemap/settings.pyc
-${PYSITELIB}/cms/plugins/googlemap/settings.pyo
 ${PYSITELIB}/cms/plugins/googlemap/templates/cms/plugins/googlemap.html
 ${PYSITELIB}/cms/plugins/inherit/__init__.py
 ${PYSITELIB}/cms/plugins/inherit/__init__.pyc
@@ -784,9 +571,6 @@ ${PYSITELIB}/cms/plugins/link/__init__.pyo
 ${PYSITELIB}/cms/plugins/link/cms_plugins.py
 ${PYSITELIB}/cms/plugins/link/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/link/cms_plugins.pyo
-${PYSITELIB}/cms/plugins/link/dbgettext_registration.py
-${PYSITELIB}/cms/plugins/link/dbgettext_registration.pyc
-${PYSITELIB}/cms/plugins/link/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/link/forms.py
 ${PYSITELIB}/cms/plugins/link/forms.pyc
 ${PYSITELIB}/cms/plugins/link/forms.pyo
@@ -827,9 +611,6 @@ ${PYSITELIB}/cms/plugins/picture/__init__.pyo
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.py
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.pyo
-${PYSITELIB}/cms/plugins/picture/dbgettext_registration.py
-${PYSITELIB}/cms/plugins/picture/dbgettext_registration.pyc
-${PYSITELIB}/cms/plugins/picture/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.pyo
@@ -917,9 +698,6 @@ ${PYSITELIB}/cms/plugins/text/__init__.pyo
 ${PYSITELIB}/cms/plugins/text/cms_plugins.py
 ${PYSITELIB}/cms/plugins/text/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/text/cms_plugins.pyo
-${PYSITELIB}/cms/plugins/text/dbgettext_registration.py
-${PYSITELIB}/cms/plugins/text/dbgettext_registration.pyc
-${PYSITELIB}/cms/plugins/text/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/text/forms.py
 ${PYSITELIB}/cms/plugins/text/forms.pyc
 ${PYSITELIB}/cms/plugins/text/forms.pyo
@@ -938,6 +716,9 @@ ${PYSITELIB}/cms/plugins/text/migrations/0004_table_rename.pyo
 ${PYSITELIB}/cms/plugins/text/migrations/0005_publisher2.py
 ${PYSITELIB}/cms/plugins/text/migrations/0005_publisher2.pyc
 ${PYSITELIB}/cms/plugins/text/migrations/0005_publisher2.pyo
+${PYSITELIB}/cms/plugins/text/migrations/0006_2_1_4_upgrade.py
+${PYSITELIB}/cms/plugins/text/migrations/0006_2_1_4_upgrade.pyc
+${PYSITELIB}/cms/plugins/text/migrations/0006_2_1_4_upgrade.pyo
 ${PYSITELIB}/cms/plugins/text/migrations/__init__.py
 ${PYSITELIB}/cms/plugins/text/migrations/__init__.pyc
 ${PYSITELIB}/cms/plugins/text/migrations/__init__.pyo
@@ -1028,6 +809,24 @@ ${PYSITELIB}/cms/plugins/video/settings.py
 ${PYSITELIB}/cms/plugins/video/settings.pyc
 ${PYSITELIB}/cms/plugins/video/settings.pyo
 ${PYSITELIB}/cms/plugins/video/templates/cms/plugins/video.html
+${PYSITELIB}/cms/publisher/__init__.py
+${PYSITELIB}/cms/publisher/__init__.pyc
+${PYSITELIB}/cms/publisher/__init__.pyo
+${PYSITELIB}/cms/publisher/errors.py
+${PYSITELIB}/cms/publisher/errors.pyc
+${PYSITELIB}/cms/publisher/errors.pyo
+${PYSITELIB}/cms/publisher/manager.py
+${PYSITELIB}/cms/publisher/manager.pyc
+${PYSITELIB}/cms/publisher/manager.pyo
+${PYSITELIB}/cms/publisher/models.py
+${PYSITELIB}/cms/publisher/models.pyc
+${PYSITELIB}/cms/publisher/models.pyo
+${PYSITELIB}/cms/publisher/options.py
+${PYSITELIB}/cms/publisher/options.pyc
+${PYSITELIB}/cms/publisher/options.pyo
+${PYSITELIB}/cms/publisher/query.py
+${PYSITELIB}/cms/publisher/query.pyc
+${PYSITELIB}/cms/publisher/query.pyo
 ${PYSITELIB}/cms/signals.py
 ${PYSITELIB}/cms/signals.pyc
 ${PYSITELIB}/cms/signals.pyo
@@ -1037,6 +836,271 @@ ${PYSITELIB}/cms/sitemaps/__init__.pyo
 ${PYSITELIB}/cms/sitemaps/cms_sitemap.py
 ${PYSITELIB}/cms/sitemaps/cms_sitemap.pyc
 ${PYSITELIB}/cms/sitemaps/cms_sitemap.pyo
+${PYSITELIB}/cms/static/cms/css/change_form.css
+${PYSITELIB}/cms/static/cms/css/jquery.dialog.css
+${PYSITELIB}/cms/static/cms/css/jquery.tooltip.css
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/images/ui-icons_ffffff_256x240.png
+${PYSITELIB}/cms/static/cms/css/jquery/cupertino/jquery-ui.css
+${PYSITELIB}/cms/static/cms/css/pages.css
+${PYSITELIB}/cms/static/cms/css/plugin_editor.css
+${PYSITELIB}/cms/static/cms/css/plugin_forms.css
+${PYSITELIB}/cms/static/cms/css/plugins/cms.placeholders.css
+${PYSITELIB}/cms/static/cms/css/plugins/cms.toolbar.css
+${PYSITELIB}/cms/static/cms/css/rte.css
+${PYSITELIB}/cms/static/cms/css/tinymce_toolbar.css
+${PYSITELIB}/cms/static/cms/css/toolbar.css
+${PYSITELIB}/cms/static/cms/css/wymeditor.css
+${PYSITELIB}/cms/static/cms/images/bold.gif
+${PYSITELIB}/cms/static/cms/images/changelist-filter-button-bg.jpg
+${PYSITELIB}/cms/static/cms/images/close.gif
+${PYSITELIB}/cms/static/cms/images/cms_toolbar.gif
+${PYSITELIB}/cms/static/cms/images/cms_toolbar.png
+${PYSITELIB}/cms/static/cms/images/copy.gif
+${PYSITELIB}/cms/static/cms/images/cut.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/flv.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/gif.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/html.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/java.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/jpg.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/mp3.png
+${PYSITELIB}/cms/static/cms/images/file_icons/ods.png
+${PYSITELIB}/cms/static/cms/images/file_icons/odt.png
+${PYSITELIB}/cms/static/cms/images/file_icons/pdf.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/php.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/png.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/swf.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/tgz.png
+${PYSITELIB}/cms/static/cms/images/file_icons/ttf.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/txt.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/txt.png
+${PYSITELIB}/cms/static/cms/images/file_icons/wav.gif
+${PYSITELIB}/cms/static/cms/images/file_icons/zip.png
+${PYSITELIB}/cms/static/cms/images/icon_addlink.gif
+${PYSITELIB}/cms/static/cms/images/icon_deletelink.gif
+${PYSITELIB}/cms/static/cms/images/icon_extension.gif
+${PYSITELIB}/cms/static/cms/images/icon_pluginedit.gif
+${PYSITELIB}/cms/static/cms/images/icons.png
+${PYSITELIB}/cms/static/cms/images/image.png
+${PYSITELIB}/cms/static/cms/images/indicator.gif
+${PYSITELIB}/cms/static/cms/images/italic.gif
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-left-act.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-left-over.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-left.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-middle-act.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-middle-over.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-middle.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-right-act.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-right-over.png
+${PYSITELIB}/cms/static/cms/images/jquery/accordion-right.png
+${PYSITELIB}/cms/static/cms/images/jquery/default-bg.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-e.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-n.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-ne.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-nw.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-s.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-se.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-sw.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-title.gif
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-titlebar-close-hover.png
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-titlebar-close.png
+${PYSITELIB}/cms/static/cms/images/jquery/dialog-w.gif
+${PYSITELIB}/cms/static/cms/images/jquery/nav-bg.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-e.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-n.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-ne.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-nw.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-s.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-se.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-sw.gif
+${PYSITELIB}/cms/static/cms/images/jquery/resizable-w.gif
+${PYSITELIB}/cms/static/cms/images/jquery/slider-bg-1.png
+${PYSITELIB}/cms/static/cms/images/jquery/slider-bg-2.png
+${PYSITELIB}/cms/static/cms/images/jquery/slider-handle.gif
+${PYSITELIB}/cms/static/cms/images/jquery/tabs.png
+${PYSITELIB}/cms/static/cms/images/link.png
+${PYSITELIB}/cms/static/cms/images/logo.jpg
+${PYSITELIB}/cms/static/cms/images/nav-bg.gif
+${PYSITELIB}/cms/static/cms/images/page_find.gif
+${PYSITELIB}/cms/static/cms/images/pluginlist-delete.png
+${PYSITELIB}/cms/static/cms/images/pluginlist-holder-bg.gif
+${PYSITELIB}/cms/static/cms/images/plugins/file.png
+${PYSITELIB}/cms/static/cms/images/plugins/get_flash_player.gif
+${PYSITELIB}/cms/static/cms/images/plugins/image.png
+${PYSITELIB}/cms/static/cms/images/plugins/link.png
+${PYSITELIB}/cms/static/cms/images/plugins/snippet.png
+${PYSITELIB}/cms/static/cms/images/pony.jpg
+${PYSITELIB}/cms/static/cms/images/sitemap-exim.gif
+${PYSITELIB}/cms/static/cms/images/sitemap-exlm.gif
+${PYSITELIB}/cms/static/cms/images/sitemap-extm.gif
+${PYSITELIB}/cms/static/cms/images/sitemap-li-bg.jpg
+${PYSITELIB}/cms/static/cms/images/sitemap-li-collapse.gif
+${PYSITELIB}/cms/static/cms/images/sitemap-li-drag.gif
+${PYSITELIB}/cms/static/cms/images/toolbar/frame_shadow.gif
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_admin.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_child.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_delete.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_edit.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_history.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_lock.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_page.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_sibling.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_sitemap.png
+${PYSITELIB}/cms/static/cms/images/toolbar/icons/icon_template.png
+${PYSITELIB}/cms/static/cms/images/toolbar/loader.gif
+${PYSITELIB}/cms/static/cms/images/toolbar/sprite_toolbar-ie.png
+${PYSITELIB}/cms/static/cms/images/toolbar/sprite_toolbar.png
+${PYSITELIB}/cms/static/cms/images/toolbar/toolbar_bg.gif
+${PYSITELIB}/cms/static/cms/images/unordered.gif
+${PYSITELIB}/cms/static/cms/js/change_form.js
+${PYSITELIB}/cms/static/cms/js/change_list.js
+${PYSITELIB}/cms/static/cms/js/csrf.js
+${PYSITELIB}/cms/static/cms/js/libs/classy.min.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.bind.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.cookie.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.form.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.functional.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.livequery.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.query.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.tweet.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.checkbox.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.core.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.dialog.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.effects.core.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.effects.highlight.js
+${PYSITELIB}/cms/static/cms/js/libs/jquery.ui.sortable.js
+${PYSITELIB}/cms/static/cms/js/libs/swfobject.min.js
+${PYSITELIB}/cms/static/cms/js/placeholder_editor_registry.js
+${PYSITELIB}/cms/static/cms/js/plugin_editor.js
+${PYSITELIB}/cms/static/cms/js/plugins/admincompat.js
+${PYSITELIB}/cms/static/cms/js/plugins/cms.base.js
+${PYSITELIB}/cms/static/cms/js/plugins/cms.placeholders.js
+${PYSITELIB}/cms/static/cms/js/plugins/cms.toolbar.js
+${PYSITELIB}/cms/static/cms/js/tinymce.placeholdereditor.js
+${PYSITELIB}/cms/static/cms/js/wymeditor.placeholdereditor.js
+${PYSITELIB}/cms/static/cms/js/wymeditor/skins/django/icons.png
+${PYSITELIB}/cms/static/cms/js/wymeditor/skins/django/skin.css
+${PYSITELIB}/cms/static/cms/js/wymeditor/skins/django/skin.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/_all.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/css.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.cookie.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.hotkeys.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.listen.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.log.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.metadata.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/jquery.xslt.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/sarissa.js
+${PYSITELIB}/cms/static/cms/jstree/_lib/sarissa_ieemu_xpath.js
+${PYSITELIB}/cms/static/cms/jstree/flat.xsl
+${PYSITELIB}/cms/static/cms/jstree/nested.xsl
+${PYSITELIB}/cms/static/cms/jstree/themes/classic/folder.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/classic/folderopen.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/classic/minus.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/classic/plus.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/classic/style.css
+${PYSITELIB}/cms/static/cms/jstree/themes/default/context.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/create.png
+${PYSITELIB}/cms/static/cms/jstree/themes/default/dot.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/f.png
+${PYSITELIB}/cms/static/cms/jstree/themes/default/fminus.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/fminus_rtl.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/fplus.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/fplus_rtl.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/lastli.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/lastli_rtl.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/li.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/marker.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/marker_rtl.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/plus.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/remove.gif
+${PYSITELIB}/cms/static/cms/jstree/themes/default/remove.png
+${PYSITELIB}/cms/static/cms/jstree/themes/default/rename.png
+${PYSITELIB}/cms/static/cms/jstree/themes/default/style.css
+${PYSITELIB}/cms/static/cms/jstree/themes/default/throbber.gif
+${PYSITELIB}/cms/static/cms/jstree/tree_component.css
+${PYSITELIB}/cms/static/cms/jstree/tree_component.js
+${PYSITELIB}/cms/static/cms/swf/expressInstall.swf
+${PYSITELIB}/cms/static/cms/swf/player.swf
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-blockquote.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h1.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h2.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h3.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h4.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h5.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-h6.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-p.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/lbl-pre.png
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/wymiframe.css
+${PYSITELIB}/cms/static/cms/wymeditor/iframe/default/wymiframe.html
+${PYSITELIB}/cms/static/cms/wymeditor/jquery.wymeditor.js
+${PYSITELIB}/cms/static/cms/wymeditor/jquery.wymeditor.min.js
+${PYSITELIB}/cms/static/cms/wymeditor/jquery.wymeditor.pack.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/bg.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/ca.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/cs.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/de.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/en.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/es.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/fa.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/fi.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/fr.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/he.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/hr.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/hu.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/it.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/nb.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/nl.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/nn.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/pl.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/pt-br.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/pt.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/ru.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/sv.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/tr.js
+${PYSITELIB}/cms/static/cms/wymeditor/lang/zh_cn.js
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/embed/jquery.wymeditor.embed.js
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/fullscreen/icon_fullscreen.gif
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
+${PYSITELIB}/cms/static/cms/wymeditor/plugins/resizable/readme.txt
+${PYSITELIB}/cms/static/cms/wymeditor/skins/compact/icons.png
+${PYSITELIB}/cms/static/cms/wymeditor/skins/compact/skin.css
+${PYSITELIB}/cms/static/cms/wymeditor/skins/compact/skin.js
+${PYSITELIB}/cms/static/cms/wymeditor/skins/default/icons.png
+${PYSITELIB}/cms/static/cms/wymeditor/skins/default/skin.css
+${PYSITELIB}/cms/static/cms/wymeditor/skins/default/skin.js
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/images/bg.header.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/images/bg.selector.silver.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/images/bg.wymeditor.png
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/images/icons.silver.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/skin.css
+${PYSITELIB}/cms/static/cms/wymeditor/skins/minimal/skin.js
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/COPYING
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/README
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/images/bg.header.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/images/bg.selector.silver.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/images/bg.wymeditor.png
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/images/icons.silver.gif
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/skin.css
+${PYSITELIB}/cms/static/cms/wymeditor/skins/silver/skin.js
+${PYSITELIB}/cms/static/cms/wymeditor/skins/twopanels/icons.png
+${PYSITELIB}/cms/static/cms/wymeditor/skins/twopanels/skin.css
+${PYSITELIB}/cms/static/cms/wymeditor/skins/twopanels/skin.js
+${PYSITELIB}/cms/static/cms/wymeditor/skins/wymeditor_icon.png
 ${PYSITELIB}/cms/templates/admin/cms/mail/approvement_required.html
 ${PYSITELIB}/cms/templates/admin/cms/mail/approvement_required.txt
 ${PYSITELIB}/cms/templates/admin/cms/mail/base.html
@@ -1066,10 +1130,18 @@ ${PYSITELIB}/cms/templates/admin/cms/page/widgets/plugin_item.html
 ${PYSITELIB}/cms/templates/admin/page_submit_line.html
 ${PYSITELIB}/cms/templates/cms/content.html
 ${PYSITELIB}/cms/templates/cms/dummy.html
-${PYSITELIB}/cms/templates/cms/inc/csrf_js.html
 ${PYSITELIB}/cms/templates/cms/new.html
-${PYSITELIB}/cms/templates/cms/toolbar/add_plugins.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/_post_button_hidden.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/anchor.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/button.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/list.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/login.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/status.html
+${PYSITELIB}/cms/templates/cms/toolbar/items/switcher.html
+${PYSITELIB}/cms/templates/cms/toolbar/placeholder.html
+${PYSITELIB}/cms/templates/cms/toolbar/placeholder_wrapper.html
 ${PYSITELIB}/cms/templates/cms/toolbar/toolbar.html
+${PYSITELIB}/cms/templates/tests/rendering/base.html
 ${PYSITELIB}/cms/templatetags/__init__.py
 ${PYSITELIB}/cms/templatetags/__init__.pyc
 ${PYSITELIB}/cms/templatetags/__init__.pyo
@@ -1085,33 +1157,51 @@ ${PYSITELIB}/cms/templatetags/js.pyo
 ${PYSITELIB}/cms/templatetags/placeholder_tags.py
 ${PYSITELIB}/cms/templatetags/placeholder_tags.pyc
 ${PYSITELIB}/cms/templatetags/placeholder_tags.pyo
-${PYSITELIB}/cms/test/__init__.py
-${PYSITELIB}/cms/test/__init__.pyc
-${PYSITELIB}/cms/test/__init__.pyo
-${PYSITELIB}/cms/test/js_testcases.py
-${PYSITELIB}/cms/test/js_testcases.pyc
-${PYSITELIB}/cms/test/js_testcases.pyo
-${PYSITELIB}/cms/test/testcases.py
-${PYSITELIB}/cms/test/testcases.pyc
-${PYSITELIB}/cms/test/testcases.pyo
-${PYSITELIB}/cms/test/util/__init__.py
-${PYSITELIB}/cms/test/util/__init__.pyc
-${PYSITELIB}/cms/test/util/__init__.pyo
-${PYSITELIB}/cms/test/util/context_managers.py
-${PYSITELIB}/cms/test/util/context_managers.pyc
-${PYSITELIB}/cms/test/util/context_managers.pyo
-${PYSITELIB}/cms/test/util/menu_extender.py
-${PYSITELIB}/cms/test/util/menu_extender.pyc
-${PYSITELIB}/cms/test/util/menu_extender.pyo
-${PYSITELIB}/cms/test/util/mock.py
-${PYSITELIB}/cms/test/util/mock.pyc
-${PYSITELIB}/cms/test/util/mock.pyo
+${PYSITELIB}/cms/test_utils/__init__.py
+${PYSITELIB}/cms/test_utils/__init__.pyc
+${PYSITELIB}/cms/test_utils/__init__.pyo
+${PYSITELIB}/cms/test_utils/fixtures/__init__.py
+${PYSITELIB}/cms/test_utils/fixtures/__init__.pyc
+${PYSITELIB}/cms/test_utils/fixtures/__init__.pyo
+${PYSITELIB}/cms/test_utils/fixtures/fakemlng.py
+${PYSITELIB}/cms/test_utils/fixtures/fakemlng.pyc
+${PYSITELIB}/cms/test_utils/fixtures/fakemlng.pyo
+${PYSITELIB}/cms/test_utils/fixtures/menus.py
+${PYSITELIB}/cms/test_utils/fixtures/menus.pyc
+${PYSITELIB}/cms/test_utils/fixtures/menus.pyo
+${PYSITELIB}/cms/test_utils/fixtures/navextenders.py
+${PYSITELIB}/cms/test_utils/fixtures/navextenders.pyc
+${PYSITELIB}/cms/test_utils/fixtures/navextenders.pyo
+${PYSITELIB}/cms/test_utils/fixtures/templatetags.py
+${PYSITELIB}/cms/test_utils/fixtures/templatetags.pyc
+${PYSITELIB}/cms/test_utils/fixtures/templatetags.pyo
+${PYSITELIB}/cms/test_utils/testcases.py
+${PYSITELIB}/cms/test_utils/testcases.pyc
+${PYSITELIB}/cms/test_utils/testcases.pyo
+${PYSITELIB}/cms/test_utils/util/__init__.py
+${PYSITELIB}/cms/test_utils/util/__init__.pyc
+${PYSITELIB}/cms/test_utils/util/__init__.pyo
+${PYSITELIB}/cms/test_utils/util/context_managers.py
+${PYSITELIB}/cms/test_utils/util/context_managers.pyc
+${PYSITELIB}/cms/test_utils/util/context_managers.pyo
+${PYSITELIB}/cms/test_utils/util/menu_extender.py
+${PYSITELIB}/cms/test_utils/util/menu_extender.pyc
+${PYSITELIB}/cms/test_utils/util/menu_extender.pyo
+${PYSITELIB}/cms/test_utils/util/mock.py
+${PYSITELIB}/cms/test_utils/util/mock.pyc
+${PYSITELIB}/cms/test_utils/util/mock.pyo
+${PYSITELIB}/cms/test_utils/util/request_factory.py
+${PYSITELIB}/cms/test_utils/util/request_factory.pyc
+${PYSITELIB}/cms/test_utils/util/request_factory.pyo
 ${PYSITELIB}/cms/tests/__init__.py
 ${PYSITELIB}/cms/tests/__init__.pyc
 ${PYSITELIB}/cms/tests/__init__.pyo
 ${PYSITELIB}/cms/tests/admin.py
 ${PYSITELIB}/cms/tests/admin.pyc
 ${PYSITELIB}/cms/tests/admin.pyo
+${PYSITELIB}/cms/tests/api.py
+${PYSITELIB}/cms/tests/api.pyc
+${PYSITELIB}/cms/tests/api.pyo
 ${PYSITELIB}/cms/tests/apphooks.py
 ${PYSITELIB}/cms/tests/apphooks.pyc
 ${PYSITELIB}/cms/tests/apphooks.pyo
@@ -1121,15 +1211,18 @@ ${PYSITELIB}/cms/tests/docs.pyo
 ${PYSITELIB}/cms/tests/forms.py
 ${PYSITELIB}/cms/tests/forms.pyc
 ${PYSITELIB}/cms/tests/forms.pyo
-${PYSITELIB}/cms/tests/javascript.py
-${PYSITELIB}/cms/tests/javascript.pyc
-${PYSITELIB}/cms/tests/javascript.pyo
 ${PYSITELIB}/cms/tests/mail.py
 ${PYSITELIB}/cms/tests/mail.pyc
 ${PYSITELIB}/cms/tests/mail.pyo
+${PYSITELIB}/cms/tests/management.py
+${PYSITELIB}/cms/tests/management.pyc
+${PYSITELIB}/cms/tests/management.pyo
 ${PYSITELIB}/cms/tests/menu.py
 ${PYSITELIB}/cms/tests/menu.pyc
 ${PYSITELIB}/cms/tests/menu.pyo
+${PYSITELIB}/cms/tests/menu_utils.py
+${PYSITELIB}/cms/tests/menu_utils.pyc
+${PYSITELIB}/cms/tests/menu_utils.pyo
 ${PYSITELIB}/cms/tests/middleware.py
 ${PYSITELIB}/cms/tests/middleware.pyc
 ${PYSITELIB}/cms/tests/middleware.pyo
@@ -1154,6 +1247,9 @@ ${PYSITELIB}/cms/tests/placeholder.pyo
 ${PYSITELIB}/cms/tests/plugins.py
 ${PYSITELIB}/cms/tests/plugins.pyc
 ${PYSITELIB}/cms/tests/plugins.pyo
+${PYSITELIB}/cms/tests/po.py
+${PYSITELIB}/cms/tests/po.pyc
+${PYSITELIB}/cms/tests/po.pyo
 ${PYSITELIB}/cms/tests/publisher.py
 ${PYSITELIB}/cms/tests/publisher.pyc
 ${PYSITELIB}/cms/tests/publisher.pyo
@@ -1172,6 +1268,9 @@ ${PYSITELIB}/cms/tests/settings.pyo
 ${PYSITELIB}/cms/tests/site.py
 ${PYSITELIB}/cms/tests/site.pyc
 ${PYSITELIB}/cms/tests/site.pyo
+${PYSITELIB}/cms/tests/templatetags.py
+${PYSITELIB}/cms/tests/templatetags.pyc
+${PYSITELIB}/cms/tests/templatetags.pyo
 ${PYSITELIB}/cms/tests/toolbar.py
 ${PYSITELIB}/cms/tests/toolbar.pyc
 ${PYSITELIB}/cms/tests/toolbar.pyo
@@ -1181,6 +1280,18 @@ ${PYSITELIB}/cms/tests/urlutils.pyo
 ${PYSITELIB}/cms/tests/views.py
 ${PYSITELIB}/cms/tests/views.pyc
 ${PYSITELIB}/cms/tests/views.pyo
+${PYSITELIB}/cms/toolbar/__init__.py
+${PYSITELIB}/cms/toolbar/__init__.pyc
+${PYSITELIB}/cms/toolbar/__init__.pyo
+${PYSITELIB}/cms/toolbar/base.py
+${PYSITELIB}/cms/toolbar/base.pyc
+${PYSITELIB}/cms/toolbar/base.pyo
+${PYSITELIB}/cms/toolbar/constants.py
+${PYSITELIB}/cms/toolbar/constants.pyc
+${PYSITELIB}/cms/toolbar/constants.pyo
+${PYSITELIB}/cms/toolbar/items.py
+${PYSITELIB}/cms/toolbar/items.pyc
+${PYSITELIB}/cms/toolbar/items.pyo
 ${PYSITELIB}/cms/urls.py
 ${PYSITELIB}/cms/urls.pyc
 ${PYSITELIB}/cms/urls.pyo
@@ -1193,9 +1304,15 @@ ${PYSITELIB}/cms/utils/admin.pyo
 ${PYSITELIB}/cms/utils/copy_plugins.py
 ${PYSITELIB}/cms/utils/copy_plugins.pyc
 ${PYSITELIB}/cms/utils/copy_plugins.pyo
+${PYSITELIB}/cms/utils/django_load.py
+${PYSITELIB}/cms/utils/django_load.pyc
+${PYSITELIB}/cms/utils/django_load.pyo
 ${PYSITELIB}/cms/utils/helpers.py
 ${PYSITELIB}/cms/utils/helpers.pyc
 ${PYSITELIB}/cms/utils/helpers.pyo
+${PYSITELIB}/cms/utils/html.py
+${PYSITELIB}/cms/utils/html.pyc
+${PYSITELIB}/cms/utils/html.pyo
 ${PYSITELIB}/cms/utils/i18n.py
 ${PYSITELIB}/cms/utils/i18n.pyc
 ${PYSITELIB}/cms/utils/i18n.pyo
@@ -1268,72 +1385,3 @@ ${PYSITELIB}/menus/templatetags/menu_tags.pyo
 ${PYSITELIB}/menus/utils.py
 ${PYSITELIB}/menus/utils.pyc
 ${PYSITELIB}/menus/utils.pyo
-${PYSITELIB}/mptt/__init__.py
-${PYSITELIB}/mptt/__init__.pyc
-${PYSITELIB}/mptt/__init__.pyo
-${PYSITELIB}/mptt/exceptions.py
-${PYSITELIB}/mptt/exceptions.pyc
-${PYSITELIB}/mptt/exceptions.pyo
-${PYSITELIB}/mptt/forms.py
-${PYSITELIB}/mptt/forms.pyc
-${PYSITELIB}/mptt/forms.pyo
-${PYSITELIB}/mptt/managers--with rebuild.py
-${PYSITELIB}/mptt/managers--with rebuild.pyc
-${PYSITELIB}/mptt/managers--with rebuild.pyo
-${PYSITELIB}/mptt/managers.py
-${PYSITELIB}/mptt/managers.pyc
-${PYSITELIB}/mptt/managers.pyo
-${PYSITELIB}/mptt/models.py
-${PYSITELIB}/mptt/models.pyc
-${PYSITELIB}/mptt/models.pyo
-${PYSITELIB}/mptt/signals.py
-${PYSITELIB}/mptt/signals.pyc
-${PYSITELIB}/mptt/signals.pyo
-${PYSITELIB}/mptt/templatetags/__init__.py
-${PYSITELIB}/mptt/templatetags/__init__.pyc
-${PYSITELIB}/mptt/templatetags/__init__.pyo
-${PYSITELIB}/mptt/templatetags/mptt_tags.py
-${PYSITELIB}/mptt/templatetags/mptt_tags.pyc
-${PYSITELIB}/mptt/templatetags/mptt_tags.pyo
-${PYSITELIB}/mptt/tests/__init__.py
-${PYSITELIB}/mptt/tests/__init__.pyc
-${PYSITELIB}/mptt/tests/__init__.pyo
-${PYSITELIB}/mptt/tests/doctests.py
-${PYSITELIB}/mptt/tests/doctests.pyc
-${PYSITELIB}/mptt/tests/doctests.pyo
-${PYSITELIB}/mptt/tests/models.py
-${PYSITELIB}/mptt/tests/models.pyc
-${PYSITELIB}/mptt/tests/models.pyo
-${PYSITELIB}/mptt/tests/settings.py
-${PYSITELIB}/mptt/tests/settings.pyc
-${PYSITELIB}/mptt/tests/settings.pyo
-${PYSITELIB}/mptt/tests/testcases.py
-${PYSITELIB}/mptt/tests/testcases.pyc
-${PYSITELIB}/mptt/tests/testcases.pyo
-${PYSITELIB}/mptt/tests/tests.py
-${PYSITELIB}/mptt/tests/tests.pyc
-${PYSITELIB}/mptt/tests/tests.pyo
-${PYSITELIB}/mptt/utils.py
-${PYSITELIB}/mptt/utils.pyc
-${PYSITELIB}/mptt/utils.pyo
-${PYSITELIB}/publisher/__init__.py
-${PYSITELIB}/publisher/__init__.pyc
-${PYSITELIB}/publisher/__init__.pyo
-${PYSITELIB}/publisher/errors.py
-${PYSITELIB}/publisher/errors.pyc
-${PYSITELIB}/publisher/errors.pyo
-${PYSITELIB}/publisher/manager.py
-${PYSITELIB}/publisher/manager.pyc
-${PYSITELIB}/publisher/manager.pyo
-${PYSITELIB}/publisher/models.py
-${PYSITELIB}/publisher/models.pyc
-${PYSITELIB}/publisher/models.pyo
-${PYSITELIB}/publisher/mptt_support.py
-${PYSITELIB}/publisher/mptt_support.pyc
-${PYSITELIB}/publisher/mptt_support.pyo
-${PYSITELIB}/publisher/options.py
-${PYSITELIB}/publisher/options.pyc
-${PYSITELIB}/publisher/options.pyo
-${PYSITELIB}/publisher/query.py
-${PYSITELIB}/publisher/query.pyc
-${PYSITELIB}/publisher/query.pyo
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index fb6fc044892..e0a10db884c 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/02/24 08:26:47 adam Exp $
+$NetBSD: distinfo,v 1.5 2012/01/08 07:56:58 adam Exp $
 
-SHA1 (django-cms-2.1.3.tar.gz) = d52005c7d02d9eaeb6e7d81c594aaafec50c2641
-RMD160 (django-cms-2.1.3.tar.gz) = 7ee30e6c103e7c0dda8cd0fc050293906dced87b
-Size (django-cms-2.1.3.tar.gz) = 3063132 bytes
+SHA1 (django-cms-2.2.tar.gz) = 1e4267f21c138a6e770718b82f4e34a1b8133140
+RMD160 (django-cms-2.2.tar.gz) = 1df0a58cbc649db4131a0a79df9acfb5d866a027
+Size (django-cms-2.2.tar.gz) = 6993554 bytes