[Python-modules-commits] r19591 - in packages/python-django-feincms/trunk/debian (3 files)

[janos-guest at users.alioth.debian.org]

    Date: Sunday, December 11, 2011 @ 14:39:36
  Author: janos-guest
Revision: 19591

Add DM-Upload-Allowed control field, fix dep5 syntax, update build-depends.

Modified:
  packages/python-django-feincms/trunk/debian/changelog
  packages/python-django-feincms/trunk/debian/control
  packages/python-django-feincms/trunk/debian/copyright

Modified: packages/python-django-feincms/trunk/debian/changelog
===================================================================
--- packages/python-django-feincms/trunk/debian/changelog	2011-12-11 14:20:39 UTC (rev 19590)
+++ packages/python-django-feincms/trunk/debian/changelog	2011-12-11 14:39:36 UTC (rev 19591)
@@ -1,3 +1,11 @@
+python-django-feincms (1.4.2-2) unstable; urgency=low
+
+  * Add DM-Upload-Allowed control field.
+  * Fix dep5 syntax.
+  * Add python-all to build-depends.
+
+ -- Janos Guljas <janos at resenje.org>  Sun, 11 Dec 2011 15:33:41 +0100
+
 python-django-feincms (1.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/python-django-feincms/trunk/debian/control
===================================================================
--- packages/python-django-feincms/trunk/debian/control	2011-12-11 14:20:39 UTC (rev 19590)
+++ packages/python-django-feincms/trunk/debian/control	2011-12-11 14:39:36 UTC (rev 19591)
@@ -2,8 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Janos Guljas <janos at resenje.org>
+DM-Upload-Allowed: yes
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-setuptools, python-django,
+Build-Depends: debhelper (>= 7.0.50~), python-all, python-setuptools, python-django,
  python-sphinx, python-imaging, python-feedparser, python-django-mptt,
  python-django-tagging, python-lxml, python-tidylib
 Standards-Version: 3.9.2

Modified: packages/python-django-feincms/trunk/debian/copyright
===================================================================
--- packages/python-django-feincms/trunk/debian/copyright	2011-12-11 14:20:39 UTC (rev 19590)
+++ packages/python-django-feincms/trunk/debian/copyright	2011-12-11 14:39:36 UTC (rev 19591)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: FeinCMS
 Upstream-Contact: Matthias Kestenholz <mk at spinlock.ch>
 Source: http://github.com/matthiask/feincms
@@ -17,12 +17,12 @@
 
 Files: feincms/templates/admin/content/table/init.html
 Copyright: 2008 Greg Weber greg at gregweber.info
-License: MIT, GPL-2+
+License: MIT or GPL-2+
 
 Files: feincms/static/feincms/jquery-1.5.1.js
  feincms/static/feincms/jquery-1.5.1.min.js
 Copyright: 2011, John Resig
-License: MIT, GPL-2+
+License: MIT or GPL-2+
 
 Files: feincms/static/feincms/jquery-ui-1.8.13.custom.js
  feincms/static/feincms/jquery-ui-1.8.13.custom.min.js
@@ -50,11 +50,11 @@
   Maggie Costello Wachs
   Richard D. Worth (rdworth.org)
   Jörn Zaefferer (bassistance.de)
-License: MIT, GPL-2+
+License: MIT or GPL-2+
 
 Files: feincms/static/feincms/jquery.cookie.js
 Copyright: 2006 Klaus Hartl (stilbuero.de)
-License: MIT, GPL-2+
+License: MIT or GPL-2+
 
 Files: feincms/static/feincms/jquery.alerts.js
 Copyright: 2008 Cory S.N. LaViska
@@ -148,10 +148,10 @@
  copies of the Software, and to permit persons to whom the
  Software is furnished to do so, subject to the following
  conditions:
-  
+ .
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
-  
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND