Makefile

@@ -1,11 +1,8 @@
 #! /usr/bin/make -f
 #
-# Copyright © 2015–2016 Ben Finney <ben+python@benfinney.id.au>
-#
-# This is free software: you may copy, modify, and/or distribute this work
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 3 of that license or any later version.
-# No warranty expressed or implied. See the file ‘LICENSE.GPL-3’ for details.
+# This is free software, and you are welcome to redistribute it under
+# certain conditions; see the end of this file for copyright
+# information, grant of license, and disclaimer of warranty.
 
 # Makefile for ‘dput’ code base.
 
@@ -84,6 +81,14 @@ test-coverage-report:
 	$(PYTHON_COVERAGE) report ${coverage_opts} ${package_modules}
 
 
+# Copyright © 2015–2016 Ben Finney <bignose@debian.org>
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 3 of that license or any later version.
+# No warranty expressed or implied. See the file ‘LICENSE.GPL-3’ for details.
+
+
 # Local variables:
 # coding: utf-8
 # mode: make

debian/bash-completion

@@ -0,0 +1,5 @@
+# debian/bash-completion
+# Bash command completion scripts to install for the ‘dput’ package.
+# Manual page: ‘dh_bash-completion(1)’.
+
+dput/bash-completion    dput

debian/changelog

@@ -1,3 +1,13 @@
+dput (0.11.0~4) experimental; urgency=medium
+
+  * Correct my email address for Debian work.
+  * Correct copyright information for Distutils configuration script.
+  * Correct copyright information for Debian packaging files.
+  * Correctly record license grant and license conditions.
+  * Explicitly handle Bash command completion script.
+
+ --
+
 dput (0.11.0~3) experimental; urgency=medium
 
   * Add autopkgtest smoke tests to verify the commands will run.

debian/control

@@ -13,6 +13,7 @@ Build-Depends-Indep:
     python-setuptools,
     python (>= 2.7),
     debconf-utils (>= 1.1.1),
+    bash-completion,
     dh-python,
     debhelper (>= 9~)
 Standards-Version: 3.9.8

debian/copyright

@@ -7,6 +7,7 @@ Copyright:
     Copyright © 2006–2009 Thomas Viehmann <tv@beamnet.de>
     Copyright © 2000–2005 Christian Kurz <shorty@debian.org>
 License: GPL-2+
+License-Grant:
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -36,15 +37,35 @@ License: GPL-3+
 
 Files: setup.py
 Copyright:
-    Copyright © 2015–2016 Ben Finney <bignose@debian.org>
+    Copyright © 2008–2016 Ben Finney <ben+python@benfinney.id.au>
 License: GPL-3+
+License-Grant:
+    This is free software: you may copy, modify, and/or distribute this work
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; version 3 of that license or any later version.
 
+Files: debian/*
+Copyright:
+    Copyright © 2015–2016 Ben Finney <bignose@debian.org>
 License: GPL-3+
+License-Grant:
     This is free software: you may copy, modify, and/or distribute this work
     under the terms of the GNU General Public License as published by the
     Free Software Foundation; version 3 of that license or any later version.
-    .
-    No warranty expressed or implied. See the file ‘LICENSE.GPL-3’ for details.
-    .
+
+
+License: GPL-2+
+    On Debian systems, the complete text of the GNU General Public License
+    version 2 can be found in the file ‘/usr/share/common-licenses/GPL-2’.
+
+License: GPL-3+
     On Debian systems, the complete text of the GNU General Public License
     version 3 can be found in the file ‘/usr/share/common-licenses/GPL-3’.
+
+
+# Local variables:
+# coding: utf-8
+# mode: debian-copyright
+# fill-column: 78
+# End:
+# vim: fileencoding=utf-8 textwidth=78 :

debian/dput.docs

@@ -1,7 +1,8 @@
-# dput.docs
+# debian/dput.docs
 # Documentation files to install for the ‘dput’ package.
+# Manual page: ‘dh_installdocs(1)’.
 
 README
-FAQ
 TODO
-THANKS
+doc/FAQ
+doc/THANKS

debian/dput.manpages

@@ -1,6 +1,7 @@
-# dput.manpages
+# debian/dput.manpages
 # Man page files to install for the ‘dput’ package.
+# Manual page: ‘dh_installman(1)’.
 
-dput.1
-dput.cf.5
-dcut.1
+doc/man/dcut.1
+doc/man/dput.1
+doc/man/dput.cf.5

debian/rules

@@ -3,12 +3,9 @@
 # debian/rules
 # Part of Debian ‘dput’ package.
 #
-# Copyright © 2015–2016 Ben Finney <bignose@debian.org>
-#
-# This is free software: you may copy, modify, and/or distribute this work
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of that license or any later version.
-# No warranty expressed or implied. See the file ‘LICENSE.GPL-2’ for details.
+# This is free software, and you are welcome to redistribute it under
+# certain conditions; see the end of this file for copyright
+# information, grant of license, and disclaimer of warranty.
 
 PACKAGE_NAME = dput
 
@@ -22,7 +19,7 @@ export PYBUILD_INSTALL_ARGS ?= \
 
 
 %:
-	dh $@ --with=python2 --buildsystem=pybuild
+	dh $@ --with=bash-completion,python2 --buildsystem=pybuild
 
 
 override_dh_clean:
@@ -33,6 +30,14 @@ override_dh_installman:
 	dh_installman --language=C
 
 
+# Copyright © 2015–2016 Ben Finney <bignose@debian.org>
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of that license or any later version.
+# No warranty expressed or implied. See the file ‘LICENSE.GPL-2’ for details.
+
+
 # Local variables:
 # coding: utf-8
 # mode: make