From 4efc9777007be383bdee5653839b69f0155114b4 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 17 Jan 2016 06:39:54 +0000 Subject: [PATCH] Added patch to stop using reno. --- debian/changelog | 2 ++ debian/copyright | 12 ++++++------ debian/patches/remove-the-use-of-reno.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 debian/patches/remove-the-use-of-reno.patch diff --git a/debian/changelog b/debian/changelog index 4290f2b..7c5cc64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-os-client-config (1.14.0-1) experimental; urgency=medium * New upstream release. * Fixed (build-)depends for this release. + * Added patch to stop using reno. + * Fixed debian/copyright ordering. -- Thomas Goirand Sat, 16 Jan 2016 06:14:32 +0000 diff --git a/debian/copyright b/debian/copyright index 5315757..ffce332 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: os-client-config Source: git://github.com/stackforge/os-client-config.git -Files: debian/* -Copyright: (c) 2014-2015, Thomas Goirand - (c) 2015, gustavo panizzo +Files: * +Copyright: (c) 2014-2016, OpenStack Foundation + (c) 2014 Hewlett-Packard Development Company, L.P. License: Apache-2 -Files: * -Copyright: (c) 2014-2015, OpenStack Foundation - (c) 2014 Hewlett-Packard Development Company, L.P. +Files: debian/* +Copyright: (c) 2014-2016, Thomas Goirand + (c) 2015, gustavo panizzo License: Apache-2 License: Apache-2 diff --git a/debian/patches/remove-the-use-of-reno.patch b/debian/patches/remove-the-use-of-reno.patch new file mode 100644 index 0000000..0bdd6ee --- /dev/null +++ b/debian/patches/remove-the-use-of-reno.patch @@ -0,0 +1,17 @@ +Description: Do not use reno +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-01-17 + +--- python-os-client-config-1.14.0.orig/doc/source/conf.py ++++ python-os-client-config-1.14.0/doc/source/conf.py +@@ -23,8 +23,7 @@ sys.path.insert(0, os.path.abspath('../. + extensions = [ + 'sphinx.ext.autodoc', + #'sphinx.ext.intersphinx', +- 'oslosphinx', +- 'reno.sphinxext' ++ 'oslosphinx' + ] + + # autodoc generation is a bit aggressive and a nuisance when doing heavy diff --git a/debian/patches/series b/debian/patches/series index 1116099..5289515 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ also-package-json-files.patch +remove-the-use-of-reno.patch