[Python-modules-commits] [python-django] 07/07: Handle lintian's findings

[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 ab85ce5ad08851f9df7e7904a291651dd04cbd0a
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Nov 23 11:05:03 2016 +0100

    Handle lintian's findings
    
    * Update copyright file (and drop new extra LICENSE.txt).
    * Adjust lintian overrides.
---
 debian/changelog                              | 2 ++
 debian/copyright                              | 4 ++++
 debian/python-django-common.lintian-overrides | 7 -------
 debian/rules                                  | 8 ++++----
 debian/source/lintian-overrides               | 2 ++
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f00655..e8dd9ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-django (1:1.10.3-2) unstable; urgency=medium
 
   * Add patch to fix tests running in parallel. Closes: #844139
+  * Update copyright file (and drop new extra LICENSE.txt).
+  * Adjust lintian overrides.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Wed, 23 Nov 2016 10:45:50 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 9cd23ed..01d88f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,10 @@ Copyright:
  2013-2015 Luke Faraone <lfaraone at debian.org>,
  2014 Brian May <bam at debian.org>
 
+Files: django/contrib/admin/static/admin/fonts/*
+Copyright: Copyright 2011 Google Inc.
+License: Apache-2.0
+
 Files: django/contrib/admin/static/admin/js/jquery.*
 Copyright: 2005, 2014 jQuery Foundation, Inc. and other contributors
 License: Expat
diff --git a/debian/python-django-common.lintian-overrides b/debian/python-django-common.lintian-overrides
index 5d8ce45..6409332 100644
--- a/debian/python-django-common.lintian-overrides
+++ b/debian/python-django-common.lintian-overrides
@@ -1,9 +1,2 @@
-# Those gzip files are not created during build, the embedded timestamps
-# won't change across multiple rebuilds.
-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
diff --git a/debian/rules b/debian/rules
index a4f6fee..1545b1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,10 +35,10 @@ override_dh_auto_install:
 	dh_auto_install
 
 	# Drop extra license files
-	find $(PREFIX) -name LICENSE -o -name license.txt -o -name license.python.txt | \
-	    xargs --no-run-if-empty rm
-	find $(PREFIX3) -name LICENSE -o -name license.txt -o -name license.python.txt | \
-	    xargs --no-run-if-empty rm
+	find $(PREFIX) -name LICENSE -o -name license.txt -o -name license.python.txt \
+	    -o -name LICENSE.txt | xargs --no-run-if-empty rm
+	find $(PREFIX3) -name LICENSE -o -name license.txt -o -name license.python.txt \
+	    -o -name LICENSE.txt | xargs --no-run-if-empty rm
 
 	# Drop django-admin{,.py} which is in python-django-common and
 	# clean up empty parent directories
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..f40b87f
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# False positive: one very long line of data, but the file is its own source
+source-is-missing js_tests/qunit/blanket.js *

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