Merge lp:~zulcss/glance/refreshed into lp:~ubuntu-server-dev/glance/havana

[Chuck Short]

- Refreshed patches
- Added oslo.sphinx dependency.

[Andres Rodriguez (andreserl)]

Lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-24 07:26:33 +0000
+++ debian/changelog	2013-08-02 13:43:24 +0000
@@ -1,3 +1,11 @@
+glance (1:2013.2.a46.g4b12897-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/control: Add python-oslo.sphinx as a build 
+    dependency.
+
+ -- Chuck Short <[e-mail]>  Fri, 02 Aug 2013 13:00:22 +0000
+
 glance (1:2013.2~b2-0ubuntu2) saucy; urgency=low
 
   * d/p/bump-sqlalchemy-versions.patch: Include 0.8.x of SQLAlchemy as

=== modified file 'debian/control'
--- debian/control	2013-07-19 15:04:28 +0000
+++ debian/control	2013-08-02 13:43:24 +0000
@@ -23,6 +23,7 @@
  python-nose,
  python-openssl,
  python-oslo.config,
+ python-oslo.sphinx,
  python-passlib,
  python-paste,
  python-pastedeploy,

=== modified file 'debian/patches/bump-sqlalchemy-versions.patch'
--- debian/patches/bump-sqlalchemy-versions.patch	2013-07-24 07:26:33 +0000
+++ debian/patches/bump-sqlalchemy-versions.patch	2013-08-02 13:43:24 +0000
@@ -3,10 +3,10 @@
  upstream catchup.
 Author: James Page <[e-mail]>
 Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tools/pip-requires
-+++ b/tools/pip-requires
+
+diff -Naurp glance-2013.2.a46.g4b12897.orig/requirements.txt glance-2013.2.a46.g4b12897/requirements.txt
+--- glance-2013.2.a46.g4b12897.orig/requirements.txt	2013-08-02 03:21:26.000000000 +0000
++++ glance-2013.2.a46.g4b12897/requirements.txt	2013-08-02 13:02:16.080622955 +0000
 @@ -4,7 +4,7 @@
  greenlet>=0.3.1
  

=== modified file 'debian/patches/disable-network-for-docs.patch'
--- debian/patches/disable-network-for-docs.patch	2012-08-29 10:24:17 +0000
+++ debian/patches/disable-network-for-docs.patch	2013-08-02 13:43:24 +0000
@@ -1,15 +1,14 @@
 Description: Dont allow network access for building docs.
 Author: Chuck Short <[e-mail]>
 Forwarded: no
-Index: glance-2012.2~rc1~20120829.55.4c038b0/doc/source/conf.py
-===================================================================
---- glance-2012.2~rc1~20120829.55.4c038b0.orig/doc/source/conf.py	2012-08-29 12:20:42.600288455 +0200
-+++ glance-2012.2~rc1~20120829.55.4c038b0/doc/source/conf.py	2012-08-29 12:21:15.092289227 +0200
-@@ -44,7 +44,6 @@
+diff -Naurp glance-2013.2.a46.g4b12897.orig/doc/source/conf.py glance-2013.2.a46.g4b12897/doc/source/conf.py
+--- glance-2013.2.a46.g4b12897.orig/doc/source/conf.py	2013-08-02 03:21:25.000000000 +0000
++++ glance-2013.2.a46.g4b12897/doc/source/conf.py	2013-08-02 13:06:04.812622955 +0000
+@@ -44,7 +44,6 @@ sys.path = [
  # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = ['sphinx.ext.coverage',
                'sphinx.ext.ifconfig',
 -              'sphinx.ext.intersphinx',
                'sphinx.ext.pngmath',
-               'sphinx.ext.graphviz']
- 
+               'sphinx.ext.graphviz',
+               'oslo.sphinx',

=== modified file 'debian/rules'
--- debian/rules	2013-05-28 17:02:51 +0000
+++ debian/rules	2013-08-02 13:43:24 +0000
@@ -18,7 +18,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-#	nosetests -d glance/tests/unit || true
+	nosetests -d glance/tests/unit || true
 endif
 
 override_dh_auto_build: