Merge ~paride/jenkins-launchpad-plugin:packaging into jenkins-launchpad-plugin:master

[Paride Legovini]

Update the packaging for the Py3 version

Changes:
 - Install the templates in /usr/share
 - Delete the scrips/ directory (not needed)
 - Rename the 'dput' tool to 'jlp-dput'
 - Update debian/*

[Joshua Powers (powersj)]

review: Approve

[Paride Legovini (paride)]

This will go in the same PPA where I'm putting the Tarmac test builds, as jlp has tarmac as a dependency:

  sudo add-apt-repository ppa:legovini/tarmac-test

The package is currently being built.

On the version number: I'm planning to apply the same format we decide for Tarmac (YYYYMMDD.n or a similar date based version string).

NOTE that I renamed the 'dput' tool to 'jlp-dput'. Was there a reason to chose the same name as the "real" dput tool? Thoughts?

[Paride Legovini (paride)]

I'd like to have a final "approve" given that I explicitly pointed out the dput rename after the approval commentl

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..4ba9e3e
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+*.debhelper.log
diff --git a/debian/changelog b/debian/changelog
index 3896a16..6182378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
+jenkins-launchpad-plugin (19.1-1) UNRELEASED; urgency=medium
+
+  * Switch to Python 3.
+  * Refactoring of the packaging.
+  * Rename 'dput' to 'jlp-dput' to avoid the file name clash.
+
+ -- Paride Legovini <[e-mail]>  Mon, 16 Dec 2019 15:59:31 +0100
+
 jenkins-launchpad-plugin (0.1.1) trusty; urgency=medium
 
-  * Add support for patching URLs when reading jenkins data behind a proxy. 
+  * Add support for patching URLs when reading jenkins data behind a proxy.
 
  -- Francis Ginther <[e-mail]>  Mon, 14 Dec 2015 10:08:24 -0600
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3badde7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+*.egg-info/
+docs/_static/
+dist/
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index ea975c9..ebea72a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,35 +2,56 @@ Source: jenkins-launchpad-plugin
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Martin Mrazik <[e-mail]>
-Build-Depends: debhelper (>= 9),
-               tarmac,
-               python-launchpadlib,
-               python-bzrlib,
-               python-mock,
-               python-testtools,
-               python-jenkins,
-               python-lockfile,
-               python-testscenarios,
-               python-setuptools,
-               python-junitxml,
-               python-coverage,
-               python-autopilot,
-               python-yaml,
-               python-sphinx,
-Standards-Version: 3.9.4
+XSBC-Original-Maintainer: Paride Legovini <[e-mail]>
+Build-Depends: debhelper-compat (= 12),
+               dh-python,
+               python3-all,
+               python3-autopilot,
+               python3-breezy,
+               python3-git,
+               python3-jinja2,
+               python3-launchpadlib,
+               python3-testtools,
+               python3-jenkins,
+               python3-lockfile,
+               python3-testscenarios,
+               python3-setuptools,
+               python3-tarmac,
+               python3-yaml,
+               python3-sphinx,
+Standards-Version: 4.4.1
 Homepage: https://launchpad.net/jenkins-launchpad-plugin
+Rules-Requires-Root: no
 
 Package: jenkins-launchpad-plugin
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
-         ${python:Depends},
-         python-minimal,
-         tarmac,
-         python-jenkins,
-         python-launchpadlib,
-         python-lockfile,
-         python-bzrlib,
-         python-yaml,
-Description: Scripts for integrating launchpad merge proposals workflow with jenkins
+         ${python3:Depends},
+         python3-git,
+         python3-breezy,
+         python3-jenkins,
+         python3-launchpadlib,
+         python3-lockfile,
+         python3-tarmac,
+         python3-yaml,
+Suggests: jenkins-launchpad-plugin-doc,
+          tarmac,
+Description: Scripts for integrating Launchpad merge proposals workflow Jenkins
+ jenkins-launchpad-plugin is a set of scripts for polling Launchpad (looking
+ for new merge proposals) and for updating launchpad merge proposals with
+ different messages and votes in a CI workflow based on Jenkins.
 
+Package: jenkins-launchpad-plugin-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+Built-Using: ${sphinxdoc:Built-Using}
+Description: Scripts for integrating Launchpad merge proposals with Jenkins (documentation)
+ jenkins-launchpad-plugin is a set of scripts for polling Launchpad (looking
+ for new merge proposals) and for updating launchpad merge proposals with
+ different messages and votes in a CI workflow based on Jenkins.
+ .
+ This package contains the HTML documentation.
diff --git a/debian/copyright b/debian/copyright
index 3bc456a..a949755 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jenkins-launchpad-plugin
 Source: https://launchpad.net/jenkins-launchpad-plugin
 
 Files: *
-Copyright: 2013 Canonical
+Copyright: 2013-2019 Canonical Ltd.
 License: GPL-3.0
 
 License: GPL-3.0
@@ -21,4 +21,3 @@ License: GPL-3.0
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..1aff5b7
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+upstream-tree=SLOPPY
diff --git a/debian/jenkins-launchpad-plugin-doc.doc-base b/debian/jenkins-launchpad-plugin-doc.doc-base
new file mode 100644
index 0000000..5f4101b
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin-doc.doc-base
@@ -0,0 +1,7 @@
+Document: jenkins-launchpad-plugin-doc
+Title: Jenkins Launchpad Plugin documentation
+Section: Programming/Project Management
+
+Format: HTML
+Index: /usr/share/doc/jenkins-launchpad-plugin/html/index.html
+Files: /usr/share/doc/jenkins-launchpad-plugin/html/*
diff --git a/debian/jenkins-launchpad-plugin-doc.docs b/debian/jenkins-launchpad-plugin-doc.docs
new file mode 100644
index 0000000..6d28621
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin-doc.docs
@@ -0,0 +1 @@
+build/html
diff --git a/debian/jenkins-launchpad-plugin.docs b/debian/jenkins-launchpad-plugin.docs
index 39b99d0..e845566 100644
--- a/debian/jenkins-launchpad-plugin.docs
+++ b/debian/jenkins-launchpad-plugin.docs
@@ -1,4 +1 @@
-docs/_build/html
 README
-HACKING
-jlp.config
diff --git a/debian/jenkins-launchpad-plugin.examples b/debian/jenkins-launchpad-plugin.examples
new file mode 100644
index 0000000..db740e4
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin.examples
@@ -0,0 +1 @@
+jlp.config
diff --git a/debian/jenkins-launchpad-plugin.install b/debian/jenkins-launchpad-plugin.install
new file mode 100644
index 0000000..73752c9
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin.install
@@ -0,0 +1 @@
+usr
diff --git a/debian/rules b/debian/rules
index 0b8a99b..2aabdd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
+
 %:
-	dh $@ --with python2
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
-	sphinx-build -b html -W docs/ docs/_build/html
 	dh_auto_build
-
-override_dh_auto_test:
-	python -m coverage run -p /usr/bin/autopilot run -o test_results.xml -f xml tests
-	python -m coverage combine
-	python -m coverage xml --omit '/usr*,tests*'
-
-
-override_dh_install:
-	dh_install --fail-missing
+	mkdir docs/_static
+	sphinx-build -W -b html docs/ build/html
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..2c3bf10
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# The pakage format switched from native to quilt.
+jenkins-launchpad-plugin source: odd-historical-debian-changelog-version 0.1*
diff --git a/jlp/__init__.py b/jlp/__init__.py
index 9802aea..7dd8434 100644
--- a/jlp/__init__.py
+++ b/jlp/__init__.py
@@ -8,7 +8,7 @@ jlp
 """
 
 __name__ = 'jlp'
-__version__ = '3.1'
+__version__ = '19.1'
 __author__ = 'Martin Mrazik'
 
 import jinja2
@@ -87,8 +87,10 @@ def set_log_level(logger, stdout_handler):
 
 
 def get_jinja_environment(extra_dir=None):
-    default_templates = '/'.join(__file__.split('/')[0:-2]) + '/templates'
-    templates = [default_templates]
+    default_templates = '/usr/share/jenkins-launchpad-plugin/templates'
+    dist_templates = '/'.join(__file__.split('/')[0:-2]) + '/templates'
+
+    templates = [dist_templates, default_templates]
     if extra_dir:
         # we load the arg templates first
         # then add in any missing templates from the defaults
diff --git a/scripts/autoland b/scripts/autoland
deleted file mode 100755
index 6279088..0000000
--- a/scripts/autoland
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-import sys
-# this is to keep backwards compatibility with deployments directly from
-# bzr branch
-sys.path.append('.')  # add local directory
-from jlp.commands.autoland import autoland
-
-if __name__ == "__main__":
-    sys.exit(autoland())
diff --git a/scripts/dput b/scripts/dput
deleted file mode 100755
index 7bef560..0000000
--- a/scripts/dput
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-import sys
-# this is to keep backwards compatibility with deployments directly from
-# bzr branch
-sys.path.append('.')  # add local directory
-from jlp.commands.dput import dput
-
-if __name__ == "__main__":
-    sys.exit(dput())
diff --git a/scripts/getMergeProposals b/scripts/getMergeProposals
deleted file mode 100755
index c2b072b..0000000
--- a/scripts/getMergeProposals
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-import sys
-# this is to keep backwards compatibility with deployments directly from
-# bzr branch
-sys.path.append('.')  # add local directory
-from jlp.commands.getMergeProposals import getMergeProposals
-
-if __name__ == "__main__":
-    sys.exit(getMergeProposals())
diff --git a/scripts/launchpadTrigger b/scripts/launchpadTrigger
deleted file mode 100755
index 28aa2e3..0000000
--- a/scripts/launchpadTrigger
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-import sys
-# this is to keep backwards compatibility with deployments directly from
-# bzr branch
-sys.path.append('.')  # add local directory
-from jlp.commands.launchpadTrigger import launchpadTrigger
-
-if __name__ == "__main__":
-    sys.exit(launchpadTrigger())
diff --git a/scripts/voteOnMergeProposal b/scripts/voteOnMergeProposal
deleted file mode 100755
index 61f099c..0000000
--- a/scripts/voteOnMergeProposal
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-import sys
-# this is to keep backwards compatibility with deployments directly from
-# bzr branch
-sys.path.append('.')  # add local directory
-from jlp.commands.voteOnMergeProposal import voteOnMergeProposal
-
-if __name__ == "__main__":
-    sys.exit(voteOnMergeProposal())
diff --git a/setup.py b/setup.py
index 346810d..33b744c 100644
--- a/setup.py
+++ b/setup.py
@@ -8,12 +8,13 @@ setup(
     url='https://launchpad.net/jenkins-launchpad-plugin',
     packages=find_packages(),
     include_package_data=True,
-    data_files=[('templates', glob.glob('templates/*.j2'))],
+    data_files=[('share/jenkins-launchpad-plugin/templates',
+                glob.glob('templates/*.j2'))],
     test_suite='tests',
     entry_points="""\
           [console_scripts]
           autoland = jlp.commands.autoland:autoland
-          dput = jlp.commands.dput:dput
+          jlp-dput = jlp.commands.dput:dput
           getMergeProposals = jlp.commands.getMergeProposals:getMergeProposals
           launchpadTrigger = jlp.commands.launchpadTrigger:launchpadTrigger
           voteOnMergeProposal = \