[Python-modules-commits] [python-django] 06/09: Cleanup debian/copyright for dropped/renamed files.

[Raphaël Hertzog]

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 fd57a587ed0092c15e47b8e49e335d44cf31df85
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Nov 25 15:10:49 2015 +0100

    Cleanup debian/copyright for dropped/renamed files.
---
 debian/changelog |  1 +
 debian/copyright | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 003ccd8..4e7d6b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-django (1.8.7-2) UNRELEASED; urgency=medium
     have a __traceback__ attribute. Closes: #802677
   * Extend lintian overrides to cover more false positives of
     source-is-missing.
+  * Cleanup debian/copyright for dropped/renamed files.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Wed, 25 Nov 2015 12:32:25 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9ae5f56..0ed05be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,7 +29,7 @@ Files: django/contrib/admin/static/admin/js/inlines.*
 Copyright: 2009 Stanislaus Madueke
 License: BSD-2-Clause
 
-Files: django/contrib/gis/geos/* and django/contrib/gis/gdal/*
+Files: django/contrib/gis/geos/* django/contrib/gis/gdal/*
 Copyright: 2007 Justin Bronn
 Comment: "NAME" is GEOSGeometry and OGRGeometry
 License: BSD-3-Clause
@@ -39,10 +39,6 @@ Copyright: 2001-2003 Patrick K. O'Brien and Contributors
 Comment: "NAME" is Patrick K. O'Brien
 License: BSD-3-Clause
 
-Files: django/utils/simplejson/*
-Copyright: 2006 Bob Ippolito
-License: Expat
-
 Files: django/utils/baseconv.py
 Copyright: 2010 Guilherme Gondim, 2009 Simon Willison, 2002 Drew Perttula
 License: PSF-baseconv
@@ -63,10 +59,6 @@ Files: django/utils/six.py
 Copyright: 2010-2015 Benjamin Peterson
 License: Expat
 
-Files: django/utils/functional.py django/utils/_decimal.py
-Copyright: 2001-2007 Python Software Foundation
-License: PSF
-
 Files: django/utils/autoreload.py
 Copyright: 2004 CherryPy Team <team at cherrypy.org>, 2008 Ian Bicking
 Comment: "NAME" is the CherryPy Team. Also, quoting the source code:
@@ -78,7 +70,7 @@ Copyright: 2007 Robert Coup <robert.coup at onetrackmind.co.nz>
 Comment: "NAME" is Distance
 License: BSD-3-Clause
 
-Files: docs/_static/reset-fonts-grids.css
+Files: docs/_theme/djangodocs/static/reset-fonts-grids.css
 Copyright: 2008 Yahoo! Inc. All rights reserved.
 Comment: "NAME" is Yahoo! Inc.
  Software License Agreement (BSD License), downloaded from

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