Lintian Fixes - dials-data

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/dials-data lintian-fixes/main

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index c5c39da..8b9fbb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
+dials-data (2.0.0-4) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * debian/copyright: use spaces rather than tabs to start continuation lines.
+  * Update watch file format version to 4.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 14 Feb 2021 00:56:16 -0000
+
 dials-data (2.0.0-3) unstable; urgency=medium
 
   * Source only upload for migration to testing
-  
+
  -- Sebastien Delafond <seb@debian.org>  Mon, 07 Dec 2020 12:52:18 +0100
 
 dials-data (2.0.0-2) unstable; urgency=medium
@@ -13,6 +24,5 @@ dials-data (2.0.0-2) unstable; urgency=medium
 dials-data (2.0.0-1) unstable; urgency=medium
 
   * First release (Closes: #962458)
-  
- -- Sebastien Delafond <seb@debian.org>  Mon, 08 Jun 2020 14:50:14 +0200
 
+ -- Sebastien Delafond <seb@debian.org>  Mon, 08 Jun 2020 14:50:14 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 3774258..3cdc5d3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Sebastien Delafond <seb@debian.org>
-Build-Depends: debhelper (>= 12), dh-python, python3-setuptools, python3-all, python3-pytest-runner, python3-pytest, python3-yaml, python3-six, python3-mock
+Build-Depends: debhelper-compat (= 12), dh-python, python3-setuptools, python3-all, python3-pytest-runner, python3-pytest, python3-yaml, python3-six, python3-mock
 Standards-Version: 4.5.0
 Homepage: https://github.com/dials/data
 Vcs-Browser: https://salsa.debian.org/science-team/dials-data
diff --git a/debian/copyright b/debian/copyright
index 7f0602e..2c75c96 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -186,97 +186,97 @@ License: cc-by-4.0
   .
   Section 2 – Scope.
       a. License grant.
-	  1. Subject to the terms and conditions of this Public License,
-	  the Licensor hereby grants You a worldwide, royalty-free,
-	  non-sublicensable, non-exclusive, irrevocable license to
-	  exercise the Licensed Rights in the Licensed Material to:
-	      A. reproduce and Share the Licensed Material, in whole or
-	      in part; and
-	      B. produce, reproduce, and Share Adapted Material.
-	  2. Exceptions and Limitations. For the avoidance of doubt,
-	  where Exceptions and Limitations apply to Your use, this
-	  Public License does not apply, and You do not need to comply
-	  with its terms and conditions.
-	  3. Term. The term of this Public License is specified in
-	  Section 6(a).
-	  4. Media and formats; technical modifications allowed. The
-	  Licensor authorizes You to exercise the Licensed Rights in all
-	  media and formats whether now known or hereafter created, and
-	  to make technical modifications necessary to do so. The
-	  Licensor waives and/or agrees not to assert any right or
-	  authority to forbid You from making technical modifications
-	  necessary to exercise the Licensed Rights, including technical
-	  modifications necessary to circumvent Effective Technological
-	  Measures. For purposes of this Public License, simply making
-	  modifications authorized by this Section 2(a)(4) never
-	  produces Adapted Material.
-	  5. Downstream recipients.
-	      A. Offer from the Licensor – Licensed Material. Every
-	      recipient of the Licensed Material automatically receives
-	      an offer from the Licensor to exercise the Licensed Rights
-	      under the terms and conditions of this Public License.
-	      B. No downstream restrictions. You may not offer or impose
-	      any additional or different terms or conditions on, or
-	      apply any Effective Technological Measures to, the
-	      Licensed Material if doing so restricts exercise of the
-	      Licensed Rights by any recipient of the Licensed Material.
-	  6. No endorsement. Nothing in this Public License constitutes
-	  or may be construed as permission to assert or imply that You
-	  are, or that Your use of the Licensed Material is, connected
-	  with, or sponsored, endorsed, or granted official status by,
-	  the Licensor or others designated to receive attribution as
-	  provided in Section 3(a)(1)(A)(i).
+ 	  1. Subject to the terms and conditions of this Public License,
+ 	  the Licensor hereby grants You a worldwide, royalty-free,
+ 	  non-sublicensable, non-exclusive, irrevocable license to
+ 	  exercise the Licensed Rights in the Licensed Material to:
+ 	      A. reproduce and Share the Licensed Material, in whole or
+ 	      in part; and
+ 	      B. produce, reproduce, and Share Adapted Material.
+ 	  2. Exceptions and Limitations. For the avoidance of doubt,
+ 	  where Exceptions and Limitations apply to Your use, this
+ 	  Public License does not apply, and You do not need to comply
+ 	  with its terms and conditions.
+ 	  3. Term. The term of this Public License is specified in
+ 	  Section 6(a).
+ 	  4. Media and formats; technical modifications allowed. The
+ 	  Licensor authorizes You to exercise the Licensed Rights in all
+ 	  media and formats whether now known or hereafter created, and
+ 	  to make technical modifications necessary to do so. The
+ 	  Licensor waives and/or agrees not to assert any right or
+ 	  authority to forbid You from making technical modifications
+ 	  necessary to exercise the Licensed Rights, including technical
+ 	  modifications necessary to circumvent Effective Technological
+ 	  Measures. For purposes of this Public License, simply making
+ 	  modifications authorized by this Section 2(a)(4) never
+ 	  produces Adapted Material.
+ 	  5. Downstream recipients.
+ 	      A. Offer from the Licensor – Licensed Material. Every
+ 	      recipient of the Licensed Material automatically receives
+ 	      an offer from the Licensor to exercise the Licensed Rights
+ 	      under the terms and conditions of this Public License.
+ 	      B. No downstream restrictions. You may not offer or impose
+ 	      any additional or different terms or conditions on, or
+ 	      apply any Effective Technological Measures to, the
+ 	      Licensed Material if doing so restricts exercise of the
+ 	      Licensed Rights by any recipient of the Licensed Material.
+ 	  6. No endorsement. Nothing in this Public License constitutes
+ 	  or may be construed as permission to assert or imply that You
+ 	  are, or that Your use of the Licensed Material is, connected
+ 	  with, or sponsored, endorsed, or granted official status by,
+ 	  the Licensor or others designated to receive attribution as
+ 	  provided in Section 3(a)(1)(A)(i).
       b. Other rights.
-	  1. Moral rights, such as the right of integrity, are not
-	  licensed under this Public License, nor are publicity,
-	  privacy, and/or other similar personality rights; however, to
-	  the extent possible, the Licensor waives and/or agrees not to
-	  assert any such rights held by the Licensor to the limited
-	  extent necessary to allow You to exercise the Licensed Rights,
-	  but not otherwise.
-	  2. Patent and trademark rights are not licensed under this
-	  Public License.
-	  3. To the extent possible, the Licensor waives any right to
-	  collect royalties from You for the exercise of the Licensed
-	  Rights, whether directly or through a collecting society under
-	  any voluntary or waivable statutory or compulsory licensing
-	  scheme. In all other cases the Licensor expressly reserves any
-	  right to collect such royalties.
+ 	  1. Moral rights, such as the right of integrity, are not
+ 	  licensed under this Public License, nor are publicity,
+ 	  privacy, and/or other similar personality rights; however, to
+ 	  the extent possible, the Licensor waives and/or agrees not to
+ 	  assert any such rights held by the Licensor to the limited
+ 	  extent necessary to allow You to exercise the Licensed Rights,
+ 	  but not otherwise.
+ 	  2. Patent and trademark rights are not licensed under this
+ 	  Public License.
+ 	  3. To the extent possible, the Licensor waives any right to
+ 	  collect royalties from You for the exercise of the Licensed
+ 	  Rights, whether directly or through a collecting society under
+ 	  any voluntary or waivable statutory or compulsory licensing
+ 	  scheme. In all other cases the Licensor expressly reserves any
+ 	  right to collect such royalties.
   .
   Section 3 – License Conditions.
   Your exercise of the Licensed Rights is expressly made subject to the
   following conditions.
       a. Attribution.
-	  1. If You Share the Licensed Material (including in modified
-	  form), You must:
-	      A. retain the following if it is supplied by the Licensor
-	      with the Licensed Material:
-		  i. identification of the creator(s) of the Licensed
-		  Material and any others designated to receive
-		  attribution, in any reasonable manner requested by the
-		  Licensor (including by pseudonym if designated);
-		  ii. a copyright notice;
-		  iii. a notice that refers to this Public License;
-		  iv. a notice that refers to the disclaimer of warranties;
-		  v. a URI or hyperlink to the Licensed Material to the
-		  extent reasonably practicable;
-	      B. indicate if You modified the Licensed Material and
-	      retain an indication of any previous modifications; and
-	      C. indicate the Licensed Material is licensed under this
-	      Public License, and include the text of, or the URI or
-	      hyperlink to, this Public License.
-	  2. You may satisfy the conditions in Section 3(a)(1) in any
-	  reasonable manner based on the medium, means, and context in
-	  which You Share the Licensed Material. For example, it may be
-	  reasonable to satisfy the conditions by providing a URI or
-	  hyperlink to a resource that includes the required
-	  information.
-	  3. If requested by the Licensor, You must remove any of the
-	  information required by Section 3(a)(1)(A) to the extent
-	  reasonably practicable.
-	  4. If You Share Adapted Material You produce, the Adapter's
-	  License You apply must not prevent recipients of the Adapted
-	  Material from complying with this Public License.
+ 	  1. If You Share the Licensed Material (including in modified
+ 	  form), You must:
+ 	      A. retain the following if it is supplied by the Licensor
+ 	      with the Licensed Material:
+ 		  i. identification of the creator(s) of the Licensed
+ 		  Material and any others designated to receive
+ 		  attribution, in any reasonable manner requested by the
+ 		  Licensor (including by pseudonym if designated);
+ 		  ii. a copyright notice;
+ 		  iii. a notice that refers to this Public License;
+ 		  iv. a notice that refers to the disclaimer of warranties;
+ 		  v. a URI or hyperlink to the Licensed Material to the
+ 		  extent reasonably practicable;
+ 	      B. indicate if You modified the Licensed Material and
+ 	      retain an indication of any previous modifications; and
+ 	      C. indicate the Licensed Material is licensed under this
+ 	      Public License, and include the text of, or the URI or
+ 	      hyperlink to, this Public License.
+ 	  2. You may satisfy the conditions in Section 3(a)(1) in any
+ 	  reasonable manner based on the medium, means, and context in
+ 	  which You Share the Licensed Material. For example, it may be
+ 	  reasonable to satisfy the conditions by providing a URI or
+ 	  hyperlink to a resource that includes the required
+ 	  information.
+ 	  3. If requested by the Licensor, You must remove any of the
+ 	  information required by Section 3(a)(1)(A) to the extent
+ 	  reasonably practicable.
+ 	  4. If You Share Adapted Material You produce, the Adapter's
+ 	  License You apply must not prevent recipients of the Adapted
+ 	  Material from complying with this Public License.
   .
   Section 4 – Sui Generis Database Rights.
   Where the Licensed Rights include Sui Generis Database Rights that
@@ -328,10 +328,10 @@ License: cc-by-4.0
       terminate automatically.
       b. Where Your right to use the Licensed Material has terminated
       under Section 6(a), it reinstates:
-	  1. automatically as of the date the violation is cured,
-	  provided it is cured within 30 days of Your discovery of the
-	  violation; or
-	  2. upon express reinstatement by the Licensor.
+ 	  1. automatically as of the date the violation is cured,
+ 	  provided it is cured within 30 days of Your discovery of the
+ 	  violation; or
+ 	  2. upon express reinstatement by the Licensor.
       c. For the avoidance of doubt, this Section 6(b) does not affect
       any right the Licensor may have to seek remedies for Your
       violations of this Public License.
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..3840406
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/dials/data/issues
+Bug-Submit: https://github.com/dials/data/issues/new
+Repository: https://github.com/dials/data.git
+Repository-Browse: https://github.com/dials/data
diff --git a/debian/watch b/debian/watch
index 9267f87..532cfab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://github.com/dials/data/tags .*/v(\d[\d\.]*)\.tar\.gz debian uupdate

Debdiff

File lists identical (after any substitutions)

No differences were encountered in the control files

Run locally

Try this locally (using the lintian-brush package):

debcheckout dials-data
cd dials-data
lintian-brush

More details

Full run details