[PKG-Openstack-devel] Bug#880609: python-oslo.config: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.config
Version: 1:4.11.0-4
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/control: Retain Breaks/Replaces.
    - debian/watch: Use tarballs.openstack.org.


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.config-4.11.0/debian/control python-oslo.config-4.11.0/debian/control
--- python-oslo.config-4.11.0/debian/control	2017-11-01 17:27:17.000000000 -0400
+++ python-oslo.config-4.11.0/debian/control	2017-11-02 10:27:45.000000000 -0400
@@ -71,6 +71,8 @@
  python-yaml,
  ${misc:Depends},
  ${python:Depends},
+Breaks: python-oslo.config (>= 1:3.22.0),
+Replaces: python-oslo.config (>= 1:3.22.0),
 Description: Common code for Openstack Projects (configuration API) - Python 2.x
  The OpenStack Oslo project provides Python libraries containing
  infrastructure code shared by OpenStack projects.
@@ -109,6 +111,8 @@
  python3-yaml,
  ${misc:Depends},
  ${python3:Depends},
+Breaks: python3-oslo.config (>= 1:3.22.0),
+Replaces: python3-oslo.config (>= 1:3.22.0),
 Description: Common code for Openstack Projects (configuration API) - Python 3.x
  The OpenStack Oslo project provides Python libraries containing
  infrastructure code shared by OpenStack projects.
diff -Nru python-oslo.config-4.11.0/debian/gbp.conf python-oslo.config-4.11.0/debian/gbp.conf
--- python-oslo.config-4.11.0/debian/gbp.conf	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.config-4.11.0/debian/gbp.conf	2017-11-02 10:27:45.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.config-4.11.0/debian/watch python-oslo.config-4.11.0/debian/watch
--- python-oslo.config-4.11.0/debian/watch	2017-11-01 17:27:17.000000000 -0400
+++ python-oslo.config-4.11.0/debian/watch	2017-11-02 10:27:45.000000000 -0400
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.config/tags .*/(\d[\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://tarballs.openstack.org/oslo.config/ oslo.config-(\d.*)\.tar\.gz