From 9ca89fb5bfe755a50c0c06c2c0008b0f77f71289 Mon Sep 17 00:00:00 2001 From: gustavo panizzo Date: Mon, 6 Jan 2014 15:02:07 -0300 Subject: [PATCH] disable intersphinx and use python-keyring >=2.0 --- debian/patches/001-disable-intersphinx.patch | 25 +++++++++++++++++++ .../002-python-keyring-requirements.patch | 25 +++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 52 insertions(+) create mode 100644 debian/patches/001-disable-intersphinx.patch create mode 100644 debian/patches/002-python-keyring-requirements.patch create mode 100644 debian/patches/series diff --git a/debian/patches/001-disable-intersphinx.patch b/debian/patches/001-disable-intersphinx.patch new file mode 100644 index 00000000..876e7a24 --- /dev/null +++ b/debian/patches/001-disable-intersphinx.patch @@ -0,0 +1,25 @@ +Description: this patch disables intersphinx. + Intersphinx downloads stuff from internet, that is not allowed on buildds. + . + python-openstackclient (0.3.0-1) unstable; urgency=low + . + * Initial release. (Closes: #733557) +Author: gustavo panizzo +Bug-Debian: http://bugs.debian.org/733557 + +--- +Origin: vendor +Forwarded: not-needed +Reviewed-By: gustavo panizzo +Last-Update: <2014-01-06> + +--- python-openstackclient-0.3.0.orig/doc/source/conf.py ++++ python-openstackclient-0.3.0/doc/source/conf.py +@@ -31,7 +31,6 @@ sys.path.insert(0, os.path.abspath(os.pa + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. + extensions = ['sphinx.ext.autodoc', + 'sphinx.ext.doctest', +- 'sphinx.ext.intersphinx', + 'sphinx.ext.todo'] + + # Add any paths that contain templates here, relative to this directory. diff --git a/debian/patches/002-python-keyring-requirements.patch b/debian/patches/002-python-keyring-requirements.patch new file mode 100644 index 00000000..8aa2df61 --- /dev/null +++ b/debian/patches/002-python-keyring-requirements.patch @@ -0,0 +1,25 @@ +Description: Allow python-keyring newer than 2.0 + We have newer version than 2.0 on Debian. That's the reason for this change. + . + python-openstackclient (0.3.0-1) unstable; urgency=low + . + * Initial release. (Closes: #733557) +Author: gustavo panizzo +Bug-Debian: http://bugs.debian.org/733557 + +--- +Origin: vendor +Forwarded: not-needed +Reviewed-By: gustavo panizzo +Last-Update: <2014-01-06> + +--- python-openstackclient-0.3.0.orig/requirements.txt ++++ python-openstackclient-0.3.0/requirements.txt +@@ -1,6 +1,6 @@ + pbr>=0.5.21,<1.0 + cliff>=1.4.3 +-keyring>=1.6.1,<2.0 ++keyring>=1.6.1 + pycrypto>=2.6 + python-glanceclient>=0.9.0 + python-keystoneclient>=0.4.1 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..fcd7aa01 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +001-disable-intersphinx.patch +002-python-keyring-requirements.patch