Merge lp:~cjwatson/click/rename-python-packages into lp:click

[Colin Watson]

Rename python3-click back to its original name of python3-click-package to get it out of the way of PyPI's "click" package, conflicting with python3-click and python3-click-cli; this is unfortunate and non-compliant with the Python policy, but from that point of view the package that owns the name in the upstream packaging system ought to win.

Rename python3-click back to its original name of python3-click-package to get it out of the way of PyPI's "click" package, conflicting with python3-click and python3-click-cli; this is unfortunate and non-compliant with the Python policy, but from that point of view the package that owns the name in the upstream packaging system ought to win.

See:
  https://lists.ubuntu.com/archives/ubuntu-devel/2015-June/038803.html
  https://lists.ubuntu.com/archives/ubuntu-devel/2015-December/039048.html

[Michael Vogt (mvo)]

Looks good, +1

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-07-09 12:56:21 +0000
+++ .bzrignore	2015-12-15 12:06:40 +0000
@@ -55,7 +55,7 @@
 debian/libclick-0.4-0
 debian/libclick-0.4-dev
 debian/packagekit-plugin-click
-debian/python3-click
+debian/python3-click-package
 debian/tmp
 init/systemd/click-system-hooks.service
 init/systemd/click-user-hooks.service
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-11 01:31:29 +0000
+++ debian/changelog	2015-12-15 12:06:40 +0000
@@ -1,3 +1,14 @@
+click (0.4.42) UNRELEASED; urgency=medium
+
+  * Rename python3-click back to its original name of python3-click-package
+    to get it out of the way of PyPI's "click" package, conflicting with
+    python3-click and python3-click-cli; this is unfortunate and
+    non-compliant with the Python policy, but from that point of view the
+    package that owns the name in the upstream packaging system ought to
+    win.
+
+ -- Colin Watson <[e-mail]>  Tue, 15 Dec 2015 11:47:36 +0000
+
 click (0.4.41+16.04.20151211-0ubuntu1) xenial; urgency=medium
 
   [ Colin Watson ]
 
=== modified file 'debian/control'
--- debian/control	2015-12-03 22:54:43 +0000
+++ debian/control	2015-12-15 12:06:40 +0000
@@ -13,7 +13,7 @@
 Package: click
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click (= ${binary:Version}), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click-package (= ${binary:Version}), adduser
 Recommends: click-apparmor
 Suggests: click-reviewers-tools (>= 0.9), ubuntu-app-launch-tools | upstart-app-launch-tools
 Conflicts: click-package
@@ -28,7 +28,7 @@
 Package: click-dev
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${perl:Depends}, python3-click (= ${binary:Version})
+Depends: ${misc:Depends}, ${perl:Depends}, python3-click-package (= ${binary:Version})
 Recommends: debootstrap, schroot, dpkg-dev
 Description: build Click packages
  Click is a simplified packaging format that installs in a separate part of
@@ -36,13 +36,12 @@
  .
  click-dev provides support for building these packages.
 
-Package: python3-click
+Package: python3-click-package
 Section: python
 Architecture: any
 Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi
-Conflicts: python3-click-package
-Replaces: python3-click-package
-Provides: python3-click-package
+Conflicts: python3-click, python3-click-cli
+Replaces: python3-click (<< 0.4.42)
 Description: Click packages (Python 3 interface)
  Click is a simplified packaging format that installs in a separate part of
  the file system, suitable for third-party applications.
 
=== renamed file 'debian/python3-click.install' => 'debian/python3-click-package.install'