From 76dd998d18d54cc2e1fa3eb0be9ab1845dd220a0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 8 Dec 2015 15:23:01 +0100 Subject: [PATCH] Config files are now .json and not .yaml: fixing the patch. --- debian/changelog | 1 + debian/patches/also-package-json-files.patch | 15 +++++++++++++++ debian/patches/include-all-yaml-files.patch | 15 --------------- debian/patches/series | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 debian/patches/also-package-json-files.patch delete mode 100644 debian/patches/include-all-yaml-files.patch diff --git a/debian/changelog b/debian/changelog index 6861ecb..5ebf8c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-os-client-config (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. * Fixed (build-)depends for this release. * Added support for DEB_BUILD_OPTIONS=nodocs. + * Config files are now .json and not .yaml: fixing the patch. -- Thomas Goirand Fri, 27 Nov 2015 12:15:09 +0100 diff --git a/debian/patches/also-package-json-files.patch b/debian/patches/also-package-json-files.patch new file mode 100644 index 0000000..33428db --- /dev/null +++ b/debian/patches/also-package-json-files.patch @@ -0,0 +1,15 @@ +Description: Also package .json files +Author: Thomas Goirand +Forwarded: no +Last-Update: 2015-12-08 + +--- python-os-client-config-1.12.0.orig/MANIFEST.in ++++ python-os-client-config-1.12.0/MANIFEST.in +@@ -3,4 +3,5 @@ include ChangeLog + exclude .gitignore + exclude .gitreview + +-global-exclude *.pyc +\ No newline at end of file ++global-exclude *.pyc ++recursive-include os_client_config *.json diff --git a/debian/patches/include-all-yaml-files.patch b/debian/patches/include-all-yaml-files.patch deleted file mode 100644 index e5b5e9b..0000000 --- a/debian/patches/include-all-yaml-files.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Also package all yaml files -Author: Thomas Goirand -Forwarded: https://review.openstack.org/222074 -Last-Update: 2015-09-10 - ---- python-os-client-config-1.6.0.orig/MANIFEST.in -+++ python-os-client-config-1.6.0/MANIFEST.in -@@ -3,4 +3,5 @@ include ChangeLog - exclude .gitignore - exclude .gitreview - --global-exclude *.pyc -\ No newline at end of file -+global-exclude *.pyc -+recursive-include os_client_config *.yaml diff --git a/debian/patches/series b/debian/patches/series index b4a67a3..1116099 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -include-all-yaml-files.patch +also-package-json-files.patch