[Python-modules-commits] [python-django] 02/03: Run wrap-and-sort -s

Fri May 13 08:12:26 UTC 2016

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/master
in repository python-django.

commit 8f56cbb904a642a5e80a70b6357af3178964cdf9
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Fri May 13 10:10:28 2016 +0200

    Run wrap-and-sort -s
---
 debian/control            | 89 ++++++++++++++++++++++++++++++++++++-----------
 debian/copyright          |  8 ++---
 debian/python-django.docs |  2 +-
 3 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 0c23808..6d97339 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,41 @@ Source: python-django
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Luke Faraone <lfaraone at debian.org>,
+Uploaders:
+ Luke Faraone <lfaraone at debian.org>,
  Raphaël Hertzog <hertzog at debian.org>,
  Brian May <bam at debian.org>,
  Chris Lamb <lamby at debian.org>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.3), locales (>= 0),
-# Needed to enable supplementary tests in test suite
- python-bcrypt, python3-bcrypt,
- python-docutils, python3-docutils,
- python-jinja2, python3-jinja2,
- python-mock, python3-mock,
- python-numpy, python3-numpy,
- python-pil, python3-pil,
- python-yaml, python3-yaml,
- python-tz, python3-tz,
- python-setuptools, python3-setuptools,
- python-tblib, python3-tblib,
-# python-memcache, python3-memcache, memcached, # we can't rely on running daemon
- python-sqlparse, python3-sqlparse,
-# python-selenium in theory too... but it's not properly packaged
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ locales (>= 0),
+ python-all (>= 2.6.6-3~),
+ python-bcrypt,
+ python-docutils,
+ python-jinja2,
+ python-mock,
+ python-numpy,
+ python-pil,
+ python-setuptools,
+ python-sphinx (>= 1.3),
+ python-sqlparse,
+ python-tblib,
+ python-tz,
+ python-yaml,
+ python3-all,
+ python3-bcrypt,
+ python3-docutils,
+ python3-jinja2,
+ python3-mock,
+ python3-numpy,
+ python3-pil,
+ python3-setuptools,
+ python3-sqlparse,
+ python3-tblib,
+ python3-tz,
+ python3-yaml
 Build-Depends-Indep: libjs-jquery
 Homepage: http://www.djangoproject.com/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-django.git
@@ -31,9 +46,26 @@ X-Python-Version: >= 2.7
 Package: python-django
 Architecture: all
 Pre-Depends: dpkg (>= 1.17.14)
-Depends: ${misc:Depends}, ${python:Depends}, python-django-common (= ${binary:Version})
+Depends:
+ python-django-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Recommends: libjs-jquery, python-sqlparse, python-tz
-Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-memcache, python-pil, python-bcrypt, python-yaml, geoip-database-extra | geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
+Suggests:
+ bpython,
+ geoip-database-extra | geoip-database-contrib,
+ gettext,
+ ipython,
+ libgdal1,
+ python-bcrypt,
+ python-django-doc,
+ python-flup,
+ python-memcache,
+ python-mysqldb,
+ python-pil,
+ python-psycopg2,
+ python-sqlite,
+ python-yaml
 Description: High-level Python web development framework (Python 2 version)
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.
@@ -60,10 +92,27 @@ Description: High-level Python web development framework (Python 2 version)
 
 Package: python3-django
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python-django-common (= ${binary:Version})
+Depends:
+ python-django-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends}
 Pre-Depends: dpkg (>= 1.17.14)
 Recommends: libjs-jquery, python3-sqlparse, python3-tz
-Suggests: python3-psycopg2, python3-mysqldb, python3-flup, python3-sqlite, python3-memcache, python3-pil, python3-bcrypt, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
+Suggests:
+ bpython3,
+ geoip-database-contrib,
+ gettext,
+ ipython3,
+ libgdal1,
+ python-django-doc,
+ python3-bcrypt,
+ python3-flup,
+ python3-memcache,
+ python3-mysqldb,
+ python3-pil,
+ python3-psycopg2,
+ python3-sqlite,
+ python3-yaml
 Description: High-level Python web development framework (Python 3 version)
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.
diff --git a/debian/copyright b/debian/copyright
index 7877051..9cd23ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -171,7 +171,7 @@ License: BSD-2-Clause
     1. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
  .
-    2. Redistributions in binary form must reproduce the above copyright 
+    2. 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.
  .
@@ -185,15 +185,15 @@ License: BSD-2-Clause
  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.
- 
+
 License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
-    1. Redistributions of source code must retain the above copyright notice, 
+    1. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
  .
-    2. Redistributions in binary form must reproduce the above copyright 
+    2. 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.
  .
diff --git a/debian/python-django.docs b/debian/python-django.docs
index c19ffba..24948f1 100644
--- a/debian/python-django.docs
+++ b/debian/python-django.docs
@@ -1,2 +1,2 @@
-README.rst
 AUTHORS
+README.rst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git

