[Python-modules-commits] r16613 - in packages/django-permissions/trunk/debian (5 files)

Mon Apr 18 13:08:28 UTC 2011

Date: Monday, April 18, 2011 @ 13:08:20
  Author: fladi-guest
Revision: 16613

New upstream release.

 * Use Django-1.3 DATABASES format for unittest project.
 * Run `wrap-and-sort`.
 * Remove superflous PYTHONPATH in d/rules.

Modified:
  packages/django-permissions/trunk/debian/changelog
  packages/django-permissions/trunk/debian/control
  packages/django-permissions/trunk/debian/copyright
  packages/django-permissions/trunk/debian/rules
  packages/django-permissions/trunk/debian/settings.py

Modified: packages/django-permissions/trunk/debian/changelog
===================================================================

--- packages/django-permissions/trunk/debian/changelog	2011-04-18 12:24:00 UTC (rev 16612)
+++ packages/django-permissions/trunk/debian/changelog	2011-04-18 13:08:20 UTC (rev 16613)
@@ -1,5 +1,5 @@
-django-permissions (1.0-1) unstable; urgency=low
+django-permissions (1.0.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #582140)
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 08 Feb 2011 13:17:22 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 18 Apr 2011 15:05:48 +0200

Modified: packages/django-permissions/trunk/debian/control
===================================================================
--- packages/django-permissions/trunk/debian/control	2011-04-18 12:24:00 UTC (rev 16612)
+++ packages/django-permissions/trunk/debian/control	2011-04-18 13:08:20 UTC (rev 16613)
@@ -3,9 +3,12 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support, 
- python-setuptools, python-django
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.5),
+               python-django (>= 1.3),
+               python-setuptools,
+               python-support
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Homepage: http://pypi.python.org/pypi/django-permissions/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-permissions/trunk/
@@ -13,8 +16,8 @@
 
 Package: python-django-permissions
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-django
+Depends: python-django, ${misc:Depends}, ${python:Depends}
 Description: generic per-object permissions for Django
- A generic framework for per-object permissions for Django. 
- Permissions are granted to roles (and only to roles) in order to allow 
+ A generic framework for per-object permissions for Django.
+ Permissions are granted to roles (and only to roles) in order to allow
  object-access to users or groups which the required roles.

Modified: packages/django-permissions/trunk/debian/copyright
===================================================================
--- packages/django-permissions/trunk/debian/copyright	2011-04-18 12:24:00 UTC (rev 16612)
+++ packages/django-permissions/trunk/debian/copyright	2011-04-18 13:08:20 UTC (rev 16613)
@@ -12,27 +12,27 @@
 License: BSD
 
 License: BSD
- Redistribution and use in source and binary forms, with or without 
+ Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
-  * Redistributions of source code must retain the above copyright notice, 
+  * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
  .
-  * Redistributions in binary form must reproduce the above copyright 
-    notice, this list of conditions and the following disclaimer in the 
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
  .
-  * Neither the name of the author nor the names of other contributors may 
-    be used to endorse or promote products derived from this software 
+  * Neither the name of the author nor the names of other contributors may
+    be used to endorse or promote products derived from this software
     without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: packages/django-permissions/trunk/debian/rules
===================================================================
--- packages/django-permissions/trunk/debian/rules	2011-04-18 12:24:00 UTC (rev 16612)
+++ packages/django-permissions/trunk/debian/rules	2011-04-18 13:08:20 UTC (rev 16613)
@@ -11,7 +11,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
 	cp debian/settings.py testproject/settings.py
-	PYTHONPATH=".:src" django-admin syncdb --settings=testproject.settings --noinput
+	PYTHONPATH="." django-admin syncdb --settings=testproject.settings --noinput
 	set -e; \
 	for python in $(shell pyversions -r); do \
 	    PYTHONPATH="." $$python testproject/manage.py test --settings=testproject.settings permissions ; \

Modified: packages/django-permissions/trunk/debian/settings.py
===================================================================
--- packages/django-permissions/trunk/debian/settings.py	2011-04-18 12:24:00 UTC (rev 16612)
+++ packages/django-permissions/trunk/debian/settings.py	2011-04-18 13:08:20 UTC (rev 16613)
@@ -1,5 +1,9 @@
-DATABASE_ENGINE = "sqlite3"
-DATABASE_NAME = "testproject/test.db3"
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'testproject/test.db3'
+    }
+}
 INSTALLED_APPS = ["permissions",
                   "django.contrib.auth",
                   "django.contrib.contenttypes",


