Merge lp:~zulcss/python-neutronclient/rename into lp:~ubuntu-server-dev/python-neutronclient/havana

[Chuck Short]

[lp:~zulcss/python-neutronclient/rename]

36. By Chuck Short on 2013-07-09

d/control: Update VCS fields for new branch locations.

37. By Chuck Short on 2013-07-09

debian/control: Add transitional package.

[James Page (james-page)]

Hey Chuck

Firstly, can you have a tidy of the following lintian warnings/errors:

E: python-quantumclient: copyright-contains-dh_make-todo-boilerplate
N:
N: The string "Please also look if..." appears in the copyright file, which
N: indicates that you either didn't check the whole source to find
N: additional copyright/license, or that you didn't remove that paragraph
N: after having done so.
N:
N: Refer to Debian Policy Manual section 12.5 (Copyright information) for
N: details.
N:
N: Severity: serious, Certainty: possible
N:
N: Check: copyright-file, Type: binary
N:
W: python-quantumclient: description-starts-with-leading-spaces
N:
N: The package "Description:" starts with leading spaces. Usually, leading
N: spaces are used to switch "verbatim display" on (i.e., lines are not
N: wrapped) so this might be a bug in the package.
N:
N: Severity: normal, Certainty: possible
N:
N: Check: description, Type: binary, udeb
N:
W: python-neutronclient: debian-changelog-line-too-long line 5
N:
N: The given line of the latest changelog entry is over 80 columns. Such
N: changelog entries may look poor in terminal windows and mail messages
N: and be annoying to read. Please wrap changelog entries at 80 columns or
N: less where possible.
N:
N: Severity: normal, Certainty: certain
N:
N: Check: changelog-file, Type: binary
N:
E: python-neutronclient: copyright-contains-dh_make-todo-boilerplate

review: Needs Fixing

[lp:~zulcss/python-neutronclient/rename]

38. By Chuck Short on 2013-07-09

  + Updated debian/control to rename python-quantumclient to
    python-neutronclient.
* debian/copyright: Cleaned up, fix lintian warnings.

39. By Chuck Short on 2013-07-09

Fixed conflicts

40. By Chuck Short on 2013-07-09

....with feeling

41. By Chuck Short on 2013-07-09

breaks/replaces

42. By Chuck Short on 2013-07-09

Fix typo

43. By Chuck Short on 2013-07-09

debian/control: Dropped quantum-client.

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-09 13:06:40 +0000
+++ debian/changelog	2013-07-09 14:55:28 +0000
@@ -1,9 +1,16 @@
-python-quantumclient (1:2.2.1.29.gde7fd2b-0ubuntu1) UNRELEASED; urgency=low
+python-neutronclient (1:2.2.4.2.g037497d-0ubuntu1) UNRELEASED; urgency=low
 
   [ Chuck Short ]
+  * Renamed to python-neutronclient.
+    + Updated debian/control to rename python-quantumclient to 
+      python-neutronclient.
+    + Updated debian/copyright.
+    + debian/control: Conflict and Replace python-quantumclient.
   * debian/rules, debian/control: Run testsuite with testrepository.
   * debian/control: Add python-pbr and python-d2to1.
   * debian/docs: Renamed README to README.rst.
+  * debian/copyright: Cleaned up, fix lintian warnings.
+  * debian/control: Dropped quantum-client.
 
   [ Adam Gandelman ]
   * debian/control: Bump python-cliff min. requirement to 1.3.2 as per

=== modified file 'debian/control'
--- debian/control	2013-07-09 13:06:40 +0000
+++ debian/control	2013-07-09 14:55:28 +0000
@@ -1,4 +1,4 @@
-Source: python-quantumclient
+Source: python-neutronclient
 Section: python
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -20,16 +20,17 @@
  testrepository,
  cliff-tablib,
  python-iso8601
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 Homepage: http://launchpad.net/python-quantumclient
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-neutronclient/havana/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-neutronclient/havana
 XS-Testsuite: autopkgtest
 
-Package: python-quantumclient
+Package: python-neutronclient
 Architecture: all
-Replaces: quantum-client
+Breaks: python-quantumclient ( << 1:2.2.4.2.g037497d-0ubuntu1~ )
+Replaces: python-quantumclient ( << 1:2.2.4.2.g037497d-0ubuntu1~ )
 Depends: python-cliff (>= 1.3.2),
  python-httplib2,
  python-prettytable,
@@ -38,14 +39,14 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: client - Quantum is a virtual network service for Openstack
- Quantum is a virtual network service for Openstack, and a part of
+Description: client - Neutron is a virtual network service for Openstack
+ Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Quantum provides an API to
+ request and configure virtual servers, Neutron provides an API to
  dynamically request and configure virtual networks. These networks
  connect "interfaces" from other OpenStack services (e.g., virtual NICs
- from Nova VMs). The Quantum API supports extensions to provide
+ from Nova VMs). The Neutron API supports extensions to provide
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the quantum client.
+ This package provides the neutron client.

=== modified file 'debian/copyright'
--- debian/copyright	2012-02-01 16:14:52 +0000
+++ debian/copyright	2013-07-09 14:55:28 +0000
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: python-quantumclient
-Source: http://github.com/openstack/python-quantumclient
+Upstream-Name: python-neutronclient
+Source: http://github.com/openstack/python-neutronclient
 
 Files: *
 Copyright: 2011 Citrix Systems
@@ -42,5 +42,3 @@
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

=== modified file 'debian/rules'
--- debian/rules	2013-04-08 15:48:19 +0000
+++ debian/rules	2013-07-09 14:55:28 +0000
@@ -14,3 +14,6 @@
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area
+
+override_dh_auto_test:
+	testr init && testr run

=== modified file 'debian/watch'
--- debian/watch	2012-09-18 23:59:18 +0000
+++ debian/watch	2013-07-09 14:55:28 +0000
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-quantumclient/+download https://launchpad.net/python-quantumclient/.*/.*/.*/python-quantumclient-(.*)\.tar\.gz
-http://tarballs.openstack.org/python-quantumclient/ python-quantumclient-(\d.*).tar.gz
-http://pypi.python.org/packages/source/p/python-quantumclient/python-quantumclient-(\d.*).tar.gz
+opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-neutronclient/+download https://launchpad.net/python-neutronclient/.*/.*/.*/python-neutronclient-(.*)\.tar\.gz
+http://tarballs.openstack.org/python-neutronclient/ python-neutronclient-(\d.*).tar.gz
+http://pypi.python.org/packages/source/p/python-neutronclient/python-neutronclient-(\d.*).tar.gz