Merge ~lucaskanashiro/ubuntu/+source/python-seamicroclient:merge into ubuntu/+source/python-seamicroclient:debian/sid

[Lucas Kanashiro]

It FTBFS in focal at the moment and it was fixed in Debian. The delta was kept:

    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
      [Updated version and DEP3 header]

Here is my PPA with the proposed package built:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-python-seamicroclient-fix-ftbfs/+packages

P.S.: for more info about the FTBFS issue check the previous MP here:

https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/python-seamicroclient/+git/python-seamicroclient/+merge/381474

[Christian Ehrhardt  (paelzer)]

Re-review - yes as merge it LGTM.
+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Actually the changelog is too wide, but I can fix this up on upload

[Christian Ehrhardt  (paelzer)]

And you copy&pasted it from bryce :-)

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/python-seamicroclient
 * [new tag] upload/0.4.0+2016.05.20.git.40ee44c664-3ubuntu1 -> upload/0.4.0+2016.05.20.git.40ee44c664-3ubuntu1

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-3ubuntu1.dsc: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664.orig.tar.xz: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-3ubuntu1.debian.tar.xz: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-3ubuntu1_source.buildinfo: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-3ubuntu1_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

It already migrated to focal.

diff --git a/debian/changelog b/debian/changelog
index b786443..a2487cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
+python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-3ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
+    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
+      [Updated version and DEP3 header]
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 01 Apr 2020 11:39:54 -0300
+
 python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-3) unstable; urgency=medium
 
   * Fixup calling unit tests, which fixes FTBFS (Closes: #950044).
 
  -- Thomas Goirand <[e-mail]>  Fri, 31 Jan 2020 16:34:57 +0100
 
+python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-2ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
+    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
+      [Updated version and DEP3 header]
+
+ -- Bryce Harrington <[e-mail]>  Tue, 06 Aug 2019 16:49:39 -0700
+
 python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -43,6 +61,22 @@ python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-1) experimental; urgency=
 
  -- Thomas Goirand <[e-mail]>  Tue, 26 Mar 2019 11:05:49 +0100
 
+python-seamicroclient (0.4.0-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add python3 support:
+      + debian/rules: Build/test with python3
+      + debian/patches/python3-support.patch.
+      + debian/control: Add build-deps/package for python3.
+    - Drop Build-Depends on python-hacking since we don't use pep8 testing.
+  * debian/patches:
+    - fix-tests.patch: Drop. No longer needed.
+    - skip-tests.patch: Drop. No longer needed.
+    - add-pkg-info.patch: Add PKG-INFO in top level dir so it doesn't FTBFS.
+    - debian/control: Depends on python3-mock and python3-requests.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 03 Feb 2016 12:49:38 +0100
+
 python-seamicroclient (0.4.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -51,6 +85,42 @@ python-seamicroclient (0.4.0-1) experimental; urgency=medium
 
  -- Thomas Goirand <[e-mail]>  Tue, 08 Sep 2015 00:08:05 +0200
 
+python-seamicroclient (0.2.1-0ubuntu2) xenial; urgency=medium
+
+  * Add python3 support.
+  * debian/patches/python3-support.patch
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Nov 2015 09:15:22 -0500
+
+python-seamicroclient (0.2.1-0ubuntu1) trusty-proposed; urgency=medium
+
+  * New upstream bugfix release.
+    - This release only fixes connection issues when trying to power on/off
+      multiple nodes at the same time. (LP: #1311140)
+  * debian/patches/fix-tests.patch: Fix tests.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 22 Apr 2014 12:18:19 -0400
+
+python-seamicroclient (0.2.0-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1305220)
+    - Remove use of auth_token for REST API. Fixes concurrent access by
+      using user/password each time instead of auth_token (LP: #1302828)
+  * debian/watch: Updated to include correct URL link.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Apr 2014 13:37:27 -0400
+
+python-seamicroclient (0.1.0-2ubuntu1) trusty; urgency=medium
+
+  * debian/control:
+    - Drop Build-Depends on python-hacking since we don't use pep8 testing.
+    - Add Build-Depends on python-requests.
+  * debian/rules: Run tests with testr instead.
+  * debian/patches/skip-tests.patch: Skip various tests as they require to
+    have actual hardware to test against.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 28 Mar 2014 12:17:18 -0400
+
 python-seamicroclient (0.1.0-2) unstable; urgency=medium
 
   * Added missing build-depends: openstack-pkg-tools (Closes: #741539).
diff --git a/debian/control b/debian/control
index 3ca59fa..18729ec 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-seamicroclient
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenStack <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
 Build-Depends:
@@ -16,7 +17,6 @@ Build-Depends-Indep:
  python3-babel,
  python3-coverage,
  python3-fixtures,
- python3-hacking,
  python3-iso8601,
  python3-keyring,
  python3-mock,
diff --git a/debian/patches/add-pkg-info.patch b/debian/patches/add-pkg-info.patch
new file mode 100644
index 0000000..b8b97cf
--- /dev/null
+++ b/debian/patches/add-pkg-info.patch
@@ -0,0 +1,31 @@
+Description: Adds PKG-INFO for the package
+ Without this, the egg is incorrectly set to version 0.0.1.dev10.
+ For version <= 0.4.0, also fixed FTBS with python setup.py build.
+Author: Andres Rodriguez <[e-mail]>
+Origin: vendor
+Reviewed-By: Bryce Harrington <[e-mail]>
+Last-Updated: 2019-08-05
+
+--- /dev/null
++++ python-seamicroclient-0.4.0/PKG-INFO
+@@ -0,0 +1,20 @@
++Metadata-Version: 1.1
++Name: python-seamicroclient
++Version: 0.4.0+2016.05.20.git.40ee44c664
++Summary: Client library for Seamicro chassis API
++Home-page: https://github.com/seamicro/python-seamicroclient
++Author: AMD
++Author-email: [e-mail]
++License: Apache License, Version 2.0
++Description: Python client for consuming SeaMicro REST API v2.0
++        
++        
++Platform: UNKNOWN
++Classifier: Development Status :: 4 - Beta
++Classifier: Environment :: Console
++Classifier: Environment :: Web Environment
++Classifier: Intended Audience :: Developers
++Classifier: Intended Audience :: Information Technology
++Classifier: License :: OSI Approved :: Apache Software License
++Classifier: Operating System :: OS Independent
++Classifier: Programming Language :: Python
diff --git a/debian/patches/series b/debian/patches/series
index 2438367..ca7c4bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-requirements.txt.patch
 removed-failing-tests.patch
+add-pkg-info.patch