Merge lp:~jaypipes/glance/ubuntu into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Jay Pipes]

Should be merged when https://review.openstack.org/1619 is merged into trunk.

This cleans up the dependencies in the client packaging and updated the glance-api.conf to point the application entrypoint to new module.

[lp:~jaypipes/glance/ubuntu]

73. By Jay Pipes on 2011-11-16

Update email in changelog

[Monty Taylor (mordred)]

Line 14 - stray * - just delete the line. Otherwise - kickass.

review: Needs Fixing

[lp:~jaypipes/glance/ubuntu]

74. By Jay Pipes on 2011-11-16

Remvoe extraneous * in changelog

[Monty Taylor (mordred)]

Great! Looks good to me.

review: Approve

[Jay Pipes (jaypipes)]

https://review.openstack.org/#change,1619

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-11 19:02:53 +0000
+++ debian/changelog	2011-11-16 06:13:25 +0000
@@ -1,3 +1,15 @@
+glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+
+  [ Jay Pipes ]
+  * Removes now-unnecessary dependencies from client package
+  * Rewrote the description for the Glance project to remove
+    ancient language about Teller and Parallax
+  * Added a patch to update the paste entrypoint for the v1app
+
+ -- Jay Pipes <[e-mail]>  Tue, 15 Nov 2011 16:58:48 -0500
+
 glance (2012.1~e1~20110919.1021-0ubuntu0) oneiric; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-11-11 19:02:53 +0000
+++ debian/control	2011-11-16 06:13:25 +0000
@@ -36,33 +36,28 @@
 Section: python
 Depends: ${python:Depends}, ${misc:Depends},
  python-webob,
- python-routes,
- python-eventlet,
- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
  python-pastedeploy,
- python-migrate,
  python-kombu,
  python-httplib2 (>= 0.6.0),
- python-crypto,
- python-xattr
+ python-crypto
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Description: OpenStack Image Registry and Delivery Service - Python library
- The Glance project provides an image registration and discovery service
- (Parallax) and an image delivery service (Teller). These services are used
- in conjunction by Nova to deliver images from object stores, such as
+Description: OpenStack Image Registry and Delivery Service - Python client library
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
- This package contains the Python libraries.
+ This package contains the Python client libraries.
 
 Package: glance
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser, python-argparse
+Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser
 Description: OpenStack Image Registry and Delivery Service - Daemons
- The Glance project provides an image registration and discovery service
- (Parallax) and an image delivery service (Teller). These services are used
- in conjunction by Nova to deliver images from object stores, such as
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
  This package contains the daemons.
@@ -72,9 +67,9 @@
 Section: doc
 Depends: libjs-jquery, ${misc:Depends}
 Description: OpenStack Image Registry and Delivery Service - Documentation
- The Glance project provides an image registration and discovery service
- (Parallax) and an image delivery service (Teller). These services are used
- in conjunction by Nova to deliver images from object stores, such as
+ The Glance project provides an image registration, discovery and 
+ delivery service. These services may be used as stand-along services, and
+ they may also be used by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
  This package contains the documentation.
 
=== added file 'debian/patches/paste_router.patch'
--- debian/patches/paste_router.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/paste_router.patch	2011-11-16 06:13:25 +0000
@@ -0,0 +1,11 @@
+--- a/etc/glance-api.conf
++++ b/etc/glance-api.conf
+@@ -155,7 +155,7 @@
+ paste.app_factory = glance.api.versions:app_factory
+ 
+ [app:apiv1app]
+-paste.app_factory = glance.api.v1:app_factory
++paste.app_factory = glance.api.v1.router:app_factory
+ 
+ [filter:versionnegotiation]
+ paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory