[Python-modules-commits] [python-django] 04/04: Fix multiple details detected by lintian
Raphaël Hertzog
hertzog at moszumanska.debian.org
Wed Apr 6 16:48:36 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 f986eb8c9d839cc2383474637ae609250f20c4c9
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Wed Apr 6 18:34:34 2016 +0200
Fix multiple details detected by lintian
* Update Standards-Version to 3.9.8.
* Add some lintian overrides.
* Tweak Vcs-Browser to use https.
* Drop obsolete parts of the copyright file.
---
debian/changelog | 4 ++
debian/control | 4 +-
debian/copyright | 54 ---------------------------
debian/python-django-common.lintian-overrides | 4 ++
4 files changed, 10 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6600dfc..16b9117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ python-django (1.9.5-1) unstable; urgency=medium
https://docs.djangoproject.com/en/1.9/releases/1.9.5/
* Fix the DEP-8 test suite (django-admin --with python3 failing
because ./manage.py does not have a good shebang).
+ * Update Standards-Version to 3.9.8.
+ * Add some lintian overrides.
+ * Tweak Vcs-Browser to use https.
+ * Drop obsolete parts of the copyright file.
-- Raphaël Hertzog <hertzog at debian.org> Wed, 06 Apr 2016 18:05:42 +0200
diff --git a/debian/control b/debian/control
index 0c09c4f..4b463a5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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.6
+Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0),
# Needed to enable supplementary tests in test suite
python-bcrypt, python3-bcrypt,
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-al
Build-Depends-Indep: libjs-jquery
Homepage: http://www.djangoproject.com/
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-django.git
-Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/python-django.git
+Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-django.git
X-Python-Version: >= 2.7
Package: python-django
diff --git a/debian/copyright b/debian/copyright
index 0ed05be..7877051 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,10 +43,6 @@ Files: django/utils/baseconv.py
Copyright: 2010 Guilherme Gondim, 2009 Simon Willison, 2002 Drew Perttula
License: PSF-baseconv
-Files: django/utils/dictconfig.py
-Copyright: 2009-2010 Vinay Sajip
-License: Expat
-
Files: django/utils/ipv6.py
Copyright: 2007 Google Inc.
License: Apache-2.0
@@ -117,56 +113,6 @@ License: Expat
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-License: PSF
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
- .
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
- All Rights Reserved" are retained in Python alone or in any derivative
- version prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
License: PSF-baseconv
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
--------------------------------------------
diff --git a/debian/python-django-common.lintian-overrides b/debian/python-django-common.lintian-overrides
index ca3b9a4..5d8ce45 100644
--- a/debian/python-django-common.lintian-overrides
+++ b/debian/python-django-common.lintian-overrides
@@ -3,3 +3,7 @@
python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/distapp/fixtures/initial_data.json.gz
python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/geoapp/fixtures/initial_data.json.gz
python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
+python-django-common: package-contains-timestamped-gzip usr/share/python-django-common/django/contrib/auth/common-passwords.txt.gz
+
+# This is not a true python script, it's a template only
+python-django-common: python-script-but-no-python-dep usr/share/python-django-common/django/conf/project_template/manage.py-tpl
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git
More information about the Python-modules-commits
mailing list