[PKG-Openstack-devel] Bug#880605: python-oslo.context: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.context
Version: 2.17.0-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

    - d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
    - d/watch: Use tarballs.openstack.org.
    - d/control: Retain Breaks/Replaces.
    - d/p/remove-privacy-breach-in-README.rst.patch: Fix description field.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru python-oslo.context-2.17.0/debian/control python-oslo.context-2.17.0/debian/control
--- python-oslo.context-2.17.0/debian/control	2017-10-29 12:49:17.000000000 -0400
+++ python-oslo.context-2.17.0/debian/control	2017-11-02 10:41:21.000000000 -0400
@@ -42,6 +42,8 @@
  python-positional,
  ${misc:Depends},
  ${python:Depends},
+Replaces: python-oslo-context (<< 0.3.0-1~),
+Breaks: python-oslo-context (<< 0.3.0-1~),
 Description: WSGI context helpers for OpenStack - Python 2.x
  The Oslo context library has helpers to maintain useful information
  about a request context. The request context is usually populated
@@ -70,6 +72,8 @@
  python3-positional,
  ${misc:Depends},
  ${python3:Depends},
+Replaces: python3-oslo-context (<< 0.3.0-1~),
+Breaks: python3-oslo-context (<< 0.3.0-1~),
 Description: WSGI context helpers for OpenStack - Python 3.x
  The Oslo context library has helpers to maintain useful information
  about a request context. The request context is usually populated
diff -Nru python-oslo.context-2.17.0/debian/gbp.conf python-oslo.context-2.17.0/debian/gbp.conf
--- python-oslo.context-2.17.0/debian/gbp.conf	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.context-2.17.0/debian/gbp.conf	2017-11-02 10:41:21.000000000 -0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch
--- python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch	2017-10-29 12:49:17.000000000 -0400
+++ python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch	2017-11-02 10:41:21.000000000 -0400
@@ -1,4 +1,4 @@
-escription: Remove privacy breach in docs
+Description: Remove privacy breach in docs
 Author: Thomas Goirand <zigo at debian.org>
 Forwarded: not-needed
 Last-Update: 2017-08-04
diff -Nru python-oslo.context-2.17.0/debian/watch python-oslo.context-2.17.0/debian/watch
--- python-oslo.context-2.17.0/debian/watch	2017-10-29 12:49:17.000000000 -0400
+++ python-oslo.context-2.17.0/debian/watch	2017-11-02 10:41:21.000000000 -0400
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.context/tags .*/(\d[\d\.]+)\.tar\.gz
+    http://tarballs.openstack.org/oslo.context/ oslo.context-(\d.*)\.tar\.gz