Merge lp:~yolanda.robla/glance/precise-essex-proposed into lp:ubuntu/precise-proposed/glance

[Yolanda Robla]

Resynchronize with stable/essex (74b067df)

[lp:~yolanda.robla/glance/precise-essex-proposed]

173. By Yolanda Robla on 2013-04-05

Resynchronize with stable/essex (74b067df)

174. By Yolanda Robla on 2013-04-10

Resynchronize with stable/essex (LP: #1089488):

175. By Yolanda Robla on 2013-04-11

  - [74b067d] v1 api returns location as header for cached images LP: 1135541
  - CVE-2013-1840
    LP: 1098962 (CVE-2013-0212)

Unmerged revisions

175. By Yolanda Robla on 2013-04-11

  - [74b067d] v1 api returns location as header for cached images LP: 1135541
  - CVE-2013-1840
    LP: 1098962 (CVE-2013-0212)

174. By Yolanda Robla on 2013-04-10

Resynchronize with stable/essex (LP: #1089488):

173. By Yolanda Robla on 2013-04-05

Resynchronize with stable/essex (74b067df)

172. By Yolanda Robla on 2013-04-02

Resynchronize with stable/essex (74b067df)

171. By Yolanda Robla on 2012-12-17

[ Yolanda Robla Mota ]
* Resynchronize with stable/essex (efd7e75b):
  - [efd7e75] Non-admin users can cause public glance images to be deleted
    from the backend storage repository (CVE-2012-4573)
  - [e6be061] Jenkins jobs fail because of incompatibility between sqlalchemy-
    migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
* Dropped patches, superseeded by snapshot:
  - debian/patches/CVE-2012-4573.patch: [efd7e75]
* SECURITY UPDATE: deletion of arbitrary public and shared images via
  authenticated user
  - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
    ensure image is owned by user before delayed_deletion
  - CVE-2012-4573

170. By Adam Gandelman on 2012-12-12

debian/rules: skipping pep8 tests to allow building

169. By Adam Gandelman on 2012-12-12

Revert changelog.

168. By Yolanda Robla on 2012-12-12

Resynchronize with stable/essex (efd7e75b) LP: #1089488:
modified changelog to add LP bug number

167. By Yolanda Robla on 2012-12-11

* Dropped patches, applied upstream:
  - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
    ensure image is owned by user before delayed_deletion
    from the backend storage repository
    migrate and the newest sqlalchemy-0.8.0b1
* debian/rules: skipping pep8 tests to allow building

166. By Yolanda Robla on 2012-12-11

* Resynchronize with stable/essex (efd7e75b):
  - [efd7e75] Non-admin users can cause public glance images to be deleted
    from the backend storage repository (LP: #1065187)
  - [e6be061] Jenkins jobs fail because of incompatibility between sqlalchemy-
    migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
* SECURITY UPDATE: deletion of arbitrary public and shared images via
  authenticated user
  - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
    ensure image is owned by user before delayed_deletion
  - CVE-2012-4573
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [0d4d1f7] Compile BigInteger to INTEGER for sqlite
* [f5ed968] Add MySQLPingListener() back
* [8e642d9] Run version_control after auto-creating the DB
* [6390447] rename the right index
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [1e708f4] Allow specifying the current version in 'glance-manage
  version_control'
* [d21cf6b] Reject excessively long image names.
* Automated Ubuntu testing build:
* [2f8bec1] Add support for auth version 2.
* Automated Ubuntu testing build:
* [d21cf6b] Reject excessively long image names.
* [9b68243] Allow yes-like values to be interpreted as bool
* [bb7c329] Support owner paramater to glance add
* Automated Ubuntu testing build:
* [127101a] Ensure functional db connection in configure_db()
* [9b68243] Allow yes-like values to be interpreted as bool
* [bb7c329] Support owner paramater to glance add
* [bf0fec0] Send output of stty test cmd to stderr.
* [98f5347] Fixed db conn recovery issue. Fixes bug 954971.
* [98f6f2e] Set content_type for messages in Qpid notifier.
* [244359e] Avoid leaking secrets into config logging.
* [75da821] Fixes lp959670
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [86dbfe1] Use unique per-test S3 bucket name.
* [bf0fec0] Send output of stty test cmd to stderr.
* [98f6f2e] Set content_type for messages in Qpid notifier.
* [244359e] Avoid leaking secrets into config logging.
* [75da821] Fixes lp959670
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [e677abf] Specify location when creating s3 bucket.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [f4a7035] Final versioning
* Automated Ubuntu testing build:
* [15d9c8f] Update 'bin/glance add' docstring *_format options
* [b0a608c] Ensure all unauthorized reponses return 403
* [a2dc56a] Avoid leaking s3 credentials into logs.
* [23c222a] Avoid glance-logcapture displaying empty logs.
* [17397a9] Add 'publicize_image' policy
* [c00ba7d] tox tests with run_tests.sh instead of nosetests
* [f6ba144] Don't use auth url to determine service protocol
* [f5603c8] Use tenant/user ids rather than names
* [b3be2e4] Update context middleware with supported headers
* [c5cb723] Fixes LP #957401 - Remove stray output on stderr
* [1f0c4ba] check connection in Listener. refer to Bug #943031
* [fdb56c8] Avoid tests leaking empty tmp dirs.
* [5bd453b] Remove keystone.middleware.glance_auth_token
* [094ba9d] Updating version of Keystone
* [2145c24] nose plugin to capture glance service logs
* [5638fab] Do not error when service does not have 'type'.
* [2e94076] Disambiguates HTTP 401 and HTTP 403 in Glance. Fixes bug
  956513.
* Automated Ubuntu testing build:
* [9681f40] Add policy checks for cache manage middleware
* [eff04c5] Add admin_role option
* Automated Ubuntu testing build:
* [29b035b] Add new UnexpectedStatus exception.
* [eff04c5] Add admin_role option
* Automated Ubuntu testing build:
* [9f2de6c] Remove references to admin_token
* [d759821] Remove dependency on apiv1app from cachemanage
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [d453def] Remove glance-cache-queue-image
* Automated Ubuntu testing build:
* [d759821] Remove dependency on apiv1app from cachemanage
* [e2e88d8] Return 403 when policy engine denies action
* [6619298] Ensure copy and original image IDs differ.
* Automated Ubuntu testing build:
* [0a19061] Add error checking to get_terminal_size.
* [6619298] Ensure copy and original image IDs differ.
* [182b71e] Include babel.cfg and glance.pot in tarballs
* [3a8103e] Updating authentication docs
* Automated Ubuntu testing build:
* [c593722] Well-formed exception types for 413 & 503.
* [3a8103e] Updating authentication docs
* Automated Ubuntu testing build:
* [182b71e] Include babel.cfg and glance.pot in tarballs
* Automated Ubuntu testing build:
* [3a8103e] Updating authentication docs
* [d9f4cbf] General docs cleanup
* [b6b28d1] Add note about cache config options
* [65b1b84] Change CLIAuth arg names
* [ce33576] Update cli docs
* [691deeb] Remove 'community' doc page
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [ee2d212] General cleanup
* [f1bc67c] Remove todolist from docs
* [b6b28d1] Add note about cache config options
* [ce33576] Update cli docs
* [691deeb] Remove 'community' doc page
* Automated Ubuntu testing build:
* [d9f4cbf] General docs cleanup
* [f1bc67c] Remove todolist from docs
* [55eb458] Add module name to ClientException
* [691deeb] Remove 'community' doc page
* [6e2f39d] Removing registry spec from docs
* Automated Ubuntu testing build:
* No change rebuild.
* Automated Ubuntu testing build:
* [51a06aa] Retry sendfile on EAGAIN or EBUSY
* [55eb458] Add module name to ClientException
* Automated Ubuntu testing build:
* [1615a1f] Fixes LP#934492 - Allow Null Name
* [95efaf0] Fix typo in tox.ini.
* [4d41027] Glance cache updates to support Keystone Essex.
* [b43b676] updates man page for glance-scrubber. this time with extra
  pep8 scrubbing powers. Fixes bug 908803
* [cb70ff9] Update tox.ini for jenkins.
* [80cd81f] Replaced use of webob.Request.str_param
* [2773170] Update paste file to use service tenant.
* [9e640d0] Update bin/glance to allow for specifying image id
* [630c9a5] Fix deprecated warnings.
* [bbf46b4] Remove trailing whitespaces in regular file
* [c6a626e] add git commit date / sha1 to sphinx html docs
* [4ef665a] Glance skip prompting if stdin isn't a tty
* [d8f0c38] Added first step of babel-based translations.
* Automated Ubuntu testing build:
* [7125728] Refresh SSL cfg after parsing service catalog entry
* [4d41027] Glance cache updates to support Keystone Essex.
* Automated Ubuntu testing build:
* [95efaf0] Fix typo in tox.ini.
* Automated Ubuntu testing build:
* [4d41027] Glance cache updates to support Keystone Essex.
* Automated Ubuntu testing build:
* [b43b676] updates man page for glance-scrubber. this time with extra
  pep8 scrubbing powers. Fixes bug 908803
* [80cd81f] Replaced use of webob.Request.str_param
* [2773170] Update paste file to use service tenant.
* [9e640d0] Update bin/glance to allow for specifying image id
* [630c9a5] Fix deprecated warnings.
* [4ef665a] Glance skip prompting if stdin isn't a tty
* Automated Ubuntu testing build:
* [cb70ff9] Update tox.ini for jenkins.
* [80cd81f] Replaced use of webob.Request.str_param
* [2773170] Update paste file to use service tenant.
* [9e640d0] Update bin/glance to allow for specifying image id
* [630c9a5] Fix deprecated warnings.
* [cb70ff9] Update tox.ini for jenkins. [9e640d0] Update bin/glance to
  allow for specifying image id [d8f0c38] Added first step of babel-
  based translations.
* No change rebuild.
* [bbf46b4] Remove trailing whitespaces in regular file [d8f0c38]
  Added first step of babel-based translations.
* [c6a626e] add git commit date / sha1 to sphinx html docs
* No change rebuild.
* [8d46288] Allow region selection when using V2 keystone [95dc869]
  Fix update of queued image with location set.
* [e653a00] Disallow file:// sources on location or copy-from.
  [95dc869] Fix update of queued image with location set.
* [63f3af7] Progress bar causes intermittent test failures [0613daa]
  Support copy-from for queued images. [2090314] Add checksum to an
  external image during add.
* No change rebuild.
* [7db2075] Complete fix for modification of unowned image [0613daa]
  Support copy-from for queued images.
* [d26f66b] Align to jenkins tox patterns.
* [9593687] Fix MANIFEST.in to include missing files
* [f6e9199] Fix exception name [8efa62d] Create sorting/pagination
  helper function [c83bce1] Support new image copied from external
  storage. [d5539b2] blueprint progressbar-upload-image
* No change rebuild.
* [c0bce06] Correct kernel/ramdisk example in docs [d5539b2] blueprint
  progressbar-upload-image
* [8efa62d] Create sorting/pagination helper function
* [f380c9e] Avoid TestClient error on missing '__mro__' attr
* [5f31371] disk/container_format required on image activate
* [62c913c] Require container & disk formats on image create
* No change rebuild.
* debian/control: Add python-iso8601 to python-glance.
* [f8f9f17] Support non-UTC timestamps in changes-since filter
* [45f9e05] Return 503 if insufficient permission on filestore
* [3b8ff18] Adds README.rst to the tarball.
* [1d2356c] Ensure StorageFull only raised on space starvation
  [b90575d] 003_add_disk_format.py: Avoid deadlock in upgrade
  [59ca8b0] Function uses 'msg' not 'message' [7990cb4] Fix paging
  ties [0f0fe2b] New -k/--insecure command line option
* [3af64e5] Require auth URL if keystone strategy is enabled.
  [59ca8b0] Function uses 'msg' not 'message'
* No change rebuild.
* [b90575d] 003_add_disk_format.py: Avoid deadlock in upgrade
  [0f0fe2b] New -k/--insecure command line option
* [7990cb4] Fix paging ties [0f0fe2b] New -k/--insecure command line
  option [f0832fd] Add a generic tox build environment.
* No change rebuild.
* [40b5ed7] Ensure sane chunk size when pysendfile unavailable.
  [f0832fd] Add a generic tox build environment.
* No change rebuild.
* [56efd27] Fix pep8 error [2fa1ed0] Implement blueprint add-qpid-
  support.
* [c77f4dd] Update Authors file [2fa1ed0] Implement blueprint add-
  qpid-support. [e7b32c1] Include glance/tests/etc [9c2c97f] Force
  auth_strategy=keystone if --auth_url or OS_AUTH_URL is set
* [481929b] Don't fail response if caching failed
* [e4db87c] Make Glance work with SQLAlchemy 0.7 [8043962] Respawn
  glance services on unexpected death.
* No change rebuild.
* [7696ae5] Use sendfile() for zero-copy of uploaded images. [eea25b4]
  Prep tox config for jenkins builds.
* [8df4d1d] Blueprint cli-auth: common cli args [eea25b4] Prep tox
  config for jenkins builds.
* [c6c458e] Get rid of DeprecationWarning during db migration
  [3092156] Add filter validation to glance API [fdb7b21] Fixes LP
  922723 [81ce7b4] Handle access restriction to public unowned image
  [76b894b] Don't force client to supply SSL cert/key
* No change rebuild.
* [132c54f] Add --capture-output option to glance-control. [fdb7b21]
  Fixes LP 922723 [81ce7b4] Handle access restriction to public
  unowned image
* [3092156] Add filter validation to glance API [fdb7b21] Fixes LP
  922723 [81ce7b4] Handle access restriction to public unowned image
* [7c2e325] Typofix is_publi -> is_public [c77776a] Fix Bug #919255
* [593e8c2] Add --await-child option to glance-control.
* [c77776a] Fix Bug #919255
* [16b682d] Cap boto version at 2.1.1
* [28f0dd4] Simplify pep8 output to one line per violation
* [28f2cae] Check service catalogue type rather than name
* No change rebuild.
* [2ce7838] Restore inadvertantly dropped lines. [c713c22] Few small
  cleanups to align with Nova
* No change rebuild.
* [08dbc2a] Include the LICENSE file in the tarball.
* No change rebuild.
* [aaa18a0] Change xattr usage to be more broadly compatible.
* [8ec2f81] Fix mixed usage of 's' and 'self'.
* No change rebuild.
* [180ae89] Adds documentation for policy files. [6cac288] More
  flexible specification of auth credentials. [601fb31] glance-api
  fails fast if default store unsupported [946278d] Bug #909574:
  Glance does not sanity-check given image size on upload [3b2ef8e]
  glance-control need not locate a server's config file (lp#919520)
* [7094e89] Client.add_image() accepts image data as iterable.
  Bug #909574: Glance does not sanity-check given image size on upload
  [3b2ef8e] glance-control need not locate a server's config file
  (lp#919520)
* No change rebuild.
* [601fb31] glance-api fails fast if default store unsupported
  [0db2cfa] Bug#911599 - Location field wiped on update
* [946278d] Bug #909574: Glance does not sanity-check given image size
  on upload [0db2cfa] Bug#911599 - Location field wiped on update
  [2e8e628] Set url's on AuthBadRequest exceptions. [eeb4d1e] Add
  policy checking for basic image operations [41b981c] Swallow
  exception on unsupported image deletion.
* [0db2cfa] Bug#911599 - Location field wiped on update [2e8e628] Set
  url's on AuthBadRequest exceptions. [eeb4d1e] Add policy checking
  for basic image operations [41b981c] Swallow exception on
  unsupported image deletion.
* [eb2ab3a] Return 400 if registry returns 400. [eeb4d1e] Add policy
  checking for basic image operations [41b981c] Swallow exception on
  unsupported image deletion.
* No change rebuild.
* No change rebuild.
* No change rebuild.
* [2e8e628] Set url's on AuthBadRequest exceptions.
* [b712949] Ensure we only send a single content-type header
* [e893b24] Multi-process Glance API server support. [097ced8] Make
  paste.ini file location configurable. [5835b30] Avoid the need for
  users to manually edit PasteDeploy config in order to switch
  pipelines. [14593a3] Split out paste deployment config from the core
  glance *.conf files into corresponding *-paste.ini files.
* No change rebuild.
* [3956c54] Set size metadata correctly for remote images. [b4624ec]
  Fixes LP Bug#913608 - tests should be isolated [6fd0054] Set correct
  Content-Length on cached remote images
* [5835b30] Avoid the need for users to manually edit PasteDeploy
  config in order to switch pipelines. [b4624ec] Fixes LP Bug#913608 -
  tests should be isolated [6fd0054] Set correct Content-Length on
  cached remote images
* [14593a3] Split out paste deployment config from the core glance
  *.conf files into corresponding *-paste.ini files.
* [b4624ec] Fixes LP Bug#913608 - tests should be isolated
* [6fd0054] Set correct Content-Length on cached remote images
* [195e667] Implement retries in notify_kombu [2be1efe] Remove
  assertDictEqual for python 2.6 compatibility.
* [b46401a] Return correct href if bind_host is 0.0.0.0. [2be1efe]
  Remove assertDictEqual for python 2.6 compatibility. [8780360] LP
  Bug#912800 - Delete image remain in cache [e2f9d15] Add
  notifications for sending an image
* No change rebuild.
* No change rebuild.
* [1590dad] Add optional revision field to version number [1cff825]
  Add Fedora clauses to the installing document. [422c1e4] Remove
  doc/Makefile. [d466cec] Fixes incorrect URI scheme for s3 backend
  [9633697] Add comments for swift options in glance-api.conf.
  [f8ae3c4] Split notification strategies out into modules.
* No change rebuild.
* No change rebuild.
* No change rebuild.
* No change rebuild.
* [4844917] Bug #909533: Swift uploads through Glance using
  ridiculously small chunks [1cff825] Add Fedora clauses to the
  installing document. [422c1e4] Remove doc/Makefile. [aba34d1] Fix
  help output for inverse of BoolOpt. [5e5d2eb] PEP8 glance cleanup
  [58532a4] Add more man pages. [668149d] Set execute permissions on
  glance-cache-queue-image.
* No change rebuild.
* No change rebuild.
* No change rebuild.
* debian/glance-registry.postinst: Ensure new database is version_controlled
  before first call of db_sync.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-04-02 08:55:26 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2013-04-02 08:55:26 +0000
@@ -0,0 +1,538 @@
+glance (2012.1.4+stable-20130402-74b067df-0ubuntu1) precise-proposed; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/glance-{registry, api}.logrotate: Fix incorrect logfile
+    locations. (LP: #1049314)
+
+  [ Yolanda Robla Mota ]
+  * debian/rules: skipping pep8 tests to allow building
+  * Resynchronize with stable/essex (74b067df):
+    - [74b067d] v1 api returns location as header for cached images (LP: #1135541)
+    - [37d4d96] glance image-download can display backend Swift password
+      (LP: #1098962)
+    - [efd7e75] Non-admin users can cause public glance images to be deleted
+      from the backend storage repository (CVE-2012-4573)
+    - [e6be061] Jenkins jobs fail because of incompatibility between sqlalchemy-
+      migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
+
+  * Dropped patches, superseeded by snapshot:
+    - debian/patches/CVE-2012-4573.patch: [efd7e75]
+
+ -- Yolanda Robla Mota <[e-mail]>  Mon, 17 Dec 2012 10:56:46 +0000
+
+glance (2012.1.3+stable~20120821-120fcf-0ubuntu1.2) precise-security; urgency=low
+
+  * SECURITY UPDATE: deletion of arbitrary public and shared images via
+    authenticated user
+    - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
+      ensure image is owned by user before delayed_deletion
+    - CVE-2012-4573
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 08 Nov 2012 07:19:39 -0600
+
+glance (2012.1.3+stable~20120821-120fcf-0ubuntu1) precise-proposed; urgency=low
+
+  * New upstream snapshot. (LP: #1041120)
+  * Resynchronzie with stable/essex:
+    - Glance add uploads a double image if using ssl and images is smaller
+      than 4k. (LP: #1007093)
+    - If response.environ is None, instance fails to spawn.
+      (LP: #1010560)
+    - exception.BadStoreURL exposes sensitive information to end users.
+      (LP: #1012268)
+    - glance-cache.conf needs metadata encryption key (LP: #1012752)
+    - image.upload notification doesn't report size (LP: #1018246)
+    - Admins should be able to share image regardless of ownership.
+      (LP: #1021054)
+    - Glance scrubber date formatting fails with postgres (LP: #1022369)
+    - Support zero-size image creation. (LP: #1025353)
+    - Image id not contained in swift chunk debug message. (LP: #1028433)
+    - qpid_heartbeat setting is ineffective. (LP: #1032314)
+    - Image properties that reference image ids are not updated to UUIDs.
+      (LP: #975651)
+    - Migration 012_id_to_uuid attempts to convert IDs twice for non-sqlite 
+      databases. (LP: #975655)
+    - multiprocess glance-api failed to exit when stopped by ctrl+c.
+      (LP: #978130)
+    - /usr/bin/glance's built-in pager breaks redirection.
+      (LP: #978610)
+    - Content-Length and Transfer-Encoding are mutually exclusive HTTP headers
+      (LP: #981332)
+    - glance add command - incorrect help text (LP: #997565)
+  * debian/patches/convert_properties_to_uuid.patch: Dropped no longer
+    needed.
+  * debian/patches/fix-pep8-ubuntu.patch: Dropped no longer needed.
+
+ -- Adam Gandelman <[e-mail]>  Fri, 24 Jun 2012 03:14:33 -0400
+
+glance (2012.1+stable~20120608-5462295-0ubuntu2.2) precise-proposed; urgency=low
+
+  * New usptream snapshot. (LP: #1010473)
+  * Resynchronize with stable/essex: 
+   - 5462295 Fix i18n in glance.notifier.notify_kombu. (LP: #983829)
+   - 7a9e3a7 Omit Content-Length on chunked transfer. (LP: #981332)
+   - 5838b63 Fix content type for qpid notifier. (LP: #980872)
+   - 98913da search for logger in PATH. Fixes (LP: #978907)
+   - f136e7e Ensure swift auth URL includes trailing slash. Fixes (LP: #979745)
+  * debian/rules: Add ability to build tarballs from a git snapshot.
+  * debian/patches/fix-pep8-ubuntu.patch: Fix pep8 errors.
+
+ -- Chuck Short <[e-mail]>  Tue, 05 Jun 2012 10:43:12 -0400
+
+glance (2012.1-0ubuntu2.1) precise; urgency=low
+
+  * debian/patches/disable-swift-tests.patch: Fix indentation, allowing tests
+    to pass when not run on buildds or other constrained environments,
+    refreshed.
+
+ -- Adam Gandelman <[e-mail]>  Tue, 29 May 2012 10:20:52 -0700
+
+glance (2012.1-0ubuntu2) precise; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/patches/disable_db_table_auto_create.patch: Disable auto-creation
+    of database schema at service start, inspect for consistenty and advise
+    running manual migrations instead.
+  * debian/patches/fix_migration_012_foreign_keys.patch: Fix a migration issue
+    around missing FKs. Cherry-picked from upstream.  Can be dropped with
+    first stable update.
+  * debian/patches/convert_properties_to_uuid.patch: Fixes migration 012 to
+    also convert kernel_id and ramdisk_ids to UUID. Cherry picked from upstream.
+    Can be dropped with first stable update (LP: #975651)
+  * debian/glance-common.postinst: Clean up, fix purging issue due to poor
+    us of conditionals
+  * debian/glance-registry.postinst:  Ensure new database is version_controlled
+    before first call of db_sync. 
+
+  [ Chuck Short ]
+  * debian/control: Fix upgrades from oneiric to precise. (LP: #974592)
+
+ -- Adam Gandelman <[e-mail]>  Thu, 12 Apr 2012 15:02:08 -0700
+
+glance (2012.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Thu, 05 Apr 2012 10:24:28 -0400
+
+glance (2012.1~rc3-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+  * debian/control: Add sqlite3 as a Build-Depends (for test suite)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 03 Apr 2012 16:06:52 -0700
+
+glance (2012.1~rc2-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/rules: Fail build if testsuite fails.
+  * debian/patches/disable-swift-tests.patch: Disable swift tests that
+    require a swift server setup.
+  * debian/patches/disable-network-for-docs.patch: Disable network for
+    building docs.
+
+ -- Chuck Short <[e-mail]>  Mon, 02 Apr 2012 10:52:36 -0400
+
+glance (2012.1~rc1-0ubuntu2) precise; urgency=low
+
+  * New upstream release. This is hopefully the last release before
+    final. 
+  * debian/patches/0001-Fix-depreceated-warnings.patch: Dropped.
+
+ -- Chuck Short <[e-mail]>  Wed, 21 Mar 2012 09:47:54 -0400
+
+glance (2012.1~rc1~20120316.1354-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+
+ -- Adam Gandelman <[e-mail]>  Fri, 16 Mar 2012 16:23:34 -0400
+
+glance (2012.1~rc1~20120309.1315-0ubuntu2) precise; urgency=low
+
+  * debian/glance-common.postinst
+    - Give adm group read permission to /var/log/glance (LP: #950935)
+
+ -- Paul Belanger <[e-mail]>  Fri, 09 Mar 2012 11:04:43 -0500
+
+glance (2012.1~rc1~20120309.1315-0ubuntu1) precise; urgency=low
+
+  * New upstream version.
+  * debian/control, debian/glance-client.install,
+    glance-common.install: Add glance-client package. (LP: #928378) 
+  * debian/watch: Fix watch file.
+  * Fix lintian warnings.
+
+ -- Chuck Short <[e-mail]>  Fri, 09 Mar 2012 11:33:12 -0500
+
+glance (2012.1~e4-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/control: Add python date-util. (LP: #943748)
+  * debian/control: Add ca-certificates. (LP: #932800)
+  * debian/control: Add python-iso8601 to fix testsuite failures.
+
+ -- Chuck Short <[e-mail]>  Tue, 06 Mar 2012 09:30:41 -0500
+
+glance (2012.1~e4~20120224.1290-0ubuntu1) precise; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control: Add new dependency to python-glance: python-iso8601.
+
+  [ Chuck Short ]
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Thu, 01 Mar 2012 09:04:54 -0500
+
+glance (2012.1~e4~20120217.1275-0ubuntu1) precise; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+
+  [ Dave Walker (Daviey ]
+  * debian/patches/fix-broken-unittests.patch: Back out patch as it seems 
+    to be present in upstream git, but missing in upstream tarballs. Which
+    is blocking CI testing.
+
+ -- Chuck Short <[e-mail]>  Fri, 17 Feb 2012 09:50:40 -0500
+
+glance (2012.1~e4~20120209.1254-0ubuntu1) precise; urgency=low
+
+  * New upstream version.
+  * debian/patches/fix-broken-unittests.patch: Fix broken unittests.
+
+ -- Chuck Short <[e-mail]>  Fri, 10 Feb 2012 10:04:58 -0500
+
+glance (2012.1~e3-0ubuntu1) precise; urgency=low
+
+  [Chuck Short]
+  * New upstream version.
+  * debian/control: Add python-crypto as a build dependency.
+
+  [Adam Gandleman]
+  * debian/glance-api.install: Add policy.json
+
+ -- Chuck Short <[e-mail]>  Thu, 26 Jan 2012 09:22:37 -0500
+
+glance (2012.1~e3~20120120.1206-0ubuntu1) precise; urgency=low
+
+  [Chuck Short]
+  * New upstream release.
+
+  [Adam Gandleman]
+  * debian/glance-api.install, glance-registry.install:  Install
+    new paste configs that have been split among servers.
+
+ -- Chuck Short <[e-mail]>  Fri, 20 Jan 2012 14:37:16 -0500
+
+glance (2012.1~e3~20120112.1060-0ubuntu1) precise; urgency=low
+  
+  [Chuck Short]
+  * New upstream release.
+  * Drop debian/pyversions.
+  * debian/glance-api.logrotate, debian/glance-registry.logroate:
+    Add logrotate files. (LP: #904216)
+  * Update vcs information.
+  * Fix up some lintian warnings.
+  
+  [Adam Gandleman]
+  * debian/control: Drop python-support from Build-Depends
+  * debian/python-glance.postinst: Removed. python-support is needed
+    for update-python-modules but not a dependency.  Let dh_python2
+    generate instead. (LP: #907543)
+
+ -- Chuck Short <[e-mail]>  Fri, 13 Jan 2012 10:50:40 +0100
+
+glance (2012.1~e2-0ubuntu4) precise; urgency=low
+
+  * python-glance.postinst: Remove, obsolete call to update-python-modules.
+
+ -- Matthias Klose <[e-mail]>  Mon, 02 Jan 2012 13:02:24 +0100
+
+glance (2012.1~e2-0ubuntu2) precise; urgency=low
+
+  * debian/glance-registry.postinst: Fix typo in postinst. 
+
+ -- Chuck Short <[e-mail]>  Fri, 16 Dec 2011 15:57:19 -0500
+
+glance (2012.1~e2-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * Merge upstream debian packaging changes. 
+  * debian/*.upstart: Move upstart jobs to the approiate packages.
+  * debian/glance-api.postinst, debian/glance-registry.postinst:
+    Move configuration into glance-common.postinst, because it was 
+    doing the same thing.
+  * debian/glance-common.prerm: Dropped, remove cruft.
+  * debian/glance-api.prerm: Fixed bashism.
+  * debian/glance-registry.prerm: Fixed bashism.
+  * debian/glance-common.postinst: Change shell back to /bin/false.
+  * debian/glance.dirs, debian/glance-common.dirs: Merged, removed
+    unecessary glance.dirs.
+  * debian/control: Re-add missing python-dependencies.
+  * debian/glance-registry.postinst: Create the database when installing
+    glance-registry.
+  * debian/glance-common.postin: Re-add approiate permissions.
+
+ -- Chuck Short <[e-mail]>  Fri, 16 Dec 2011 14:19:59 -0500
+
+glance (2012.1~e2~20111209.1132-0ubuntu2) precise; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/glance.postinst: Specify shell when migrating sqllite
+    database as glance user. (LP: #902429) 
+
+ -- Chuck Short <[e-mail]>  Mon, 12 Dec 2011 10:18:49 -0500
+
+glance (2012.1~e2~20111209.1132-0ubuntu1) precise; urgency=low
+
+  * debian/glance.postinst, debian/glance.glance-api.upstart,
+    glance.glance-registry.upstart: Switch shell to /bin/false.
+    (LP: #890362)
+
+ -- Chuck Short <[e-mail]>  Fri, 09 Dec 2011 15:34:33 -0500
+
+glance (2012.1~e2~20111201.1123-0ubuntu2) precise; urgency=low
+
+  * debian/control: Add dependencies previously removed from python-glance
+    to glance package where they are actually required. (LP: #899970).
+
+ -- Chuck Short <[e-mail]>  Thu, 08 Dec 2011 11:23:49 -0500
+
+glance (2012.1~e2~20111201.1123-0ubuntu1) precise; urgency=low
+
+  [Chuck Short]
+  * 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.
+
+ -- Chuck Short <[e-mail]>  Fri, 02 Dec 2011 12:53:54 -0500
+
+glance (2012.1~e2~20111125.1118-0ubuntu1) precise; urgency=low
+
+  * New upstream version.
+
+ -- Chuck Short <[e-mail]>  Fri, 25 Nov 2011 10:53:04 -0500
+
+glance (2012.1~e2~20111117.1112-0ubuntu1) precise; urgency=low
+
+  * New upstrem release. 
+
+ -- Chuck Short <[e-mail]>  Fri, 18 Nov 2011 09:07:13 -0500
+
+glance (2012.1~e1-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * Sync with upstream changes. 
+
+ -- Chuck Short <[e-mail]>  Fri, 11 Nov 2011 13:50:35 -0500
+
+glance (2012.1~e1~20111021.1056-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+  * Dropped patches:
+    - debian/patches/lp_845788_glance_client_zero_length.patch
+    - debian/patches/lp_850425_remote_swift_image_streaming.patch
+  * debian/control: 
+    - Add dependency on python-httplib2. (LP: #779311)
+    - Add dependency on python-paste. 
+  * debian/patches/sql_conn.patch: Updated for update config file.
+  * debian/glance.install: Update for new config files.
+
+ -- Chuck Short <[e-mail]>  Fri, 21 Oct 2011 14:11:04 -0400
+
+glance (2011.3-0ubuntu4) oneiric; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/glance.postinst: Restrict permissions of /etc/glance/ and
+    /var/log/glance/ (LP: #862844)
+
+ -- Chuck Short <[e-mail]>  Fri, 30 Sep 2011 16:00:33 -0400
+
+glance (2011.3-0ubuntu3) oneiric; urgency=low
+
+  [Scott Moser]
+  * fix bug with glance and swift driver that resulted in zero length
+    images.  (LP: #845788)
+
+  [Chuck Short]
+  * Make streaming images from swift actually usuable.
+    (LP: #850425)
+
+ -- Chuck Short <[e-mail]>  Tue, 27 Sep 2011 14:49:05 -0400
+
+glance (2011.3-0ubuntu2) oneiric; urgency=low
+
+  * debian/glance.{postinst,postrm}: Fix syntax error, /dev/null redirect
+    typos.  Only remove user/group in .postrm if they exist. (LP: #857021)
+
+ -- Adam Gandelman <[e-mail]>  Thu, 22 Sep 2011 21:03:26 -0700
+
+glance (2011.3-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release. 
+  * debian/glance.postinst: Add glance group and add glance user to it.
+    (LP: #851860)
+
+ -- Chuck Short <[e-mail]>  Thu, 22 Sep 2011 10:45:33 -0400
+
+glance (2011.3~rc~20110915.r1007-0ubuntu1) oneiric; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release. 
+  * debian/rules: Dont fail to build because of broken testsuite.
+
+  [ Monty Taylor ]
+  * Added branch condition to fix build on lucid.
+
+ -- Monty Taylor <[e-mail]>  Mon, 19 Sep 2011 13:03:41 -0400
+
+glance (2011.3~rc~20110908.r1005-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Fri, 09 Sep 2011 14:59:27 -0400
+
+glance (2011.3~rc~20110831.1002-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Fri, 02 Sep 2011 13:50:13 -0400
+
+glance (2011.3~d4-0ubuntu1) oneiric; urgency=low
+
+  [Chuck Short]
+  * New upstream release.
+
+  [ Monty Taylor ]
+  * New upstream release.
+  * Added python-kombu as Depends and Build-depends.
+
+  [ Scott Moser ]
+  * glance.postinst: use a trailing slash when using chown on directories
+  
+  [ Ben Howard ]
+  * Install /etc/glance-scrubber.conf by default (LP: #816972)
+  * Remove glance user and logs on purge (LP: #828721)
+  * Converted dh to use "--with python2".
+  * Incremented standards version to 3.9.2; no changes required
+
+ -- Chuck Short <[e-mail]>  Fri, 26 Aug 2011 10:13:39 -0400
+
+glance (2011.3~d4~20110811.980-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Fri, 12 Aug 2011 05:23:21 -0400
+
+glance (2011.3~d3~20110709.152-0ubuntu2) UNRELEASED; urgency=low
+
+  [ Adam Gandelman ]
+  * Add python-xattr to Depends of python-glance
+
+  [ Jay Pipes ]
+  * Add python-boto to Build-depends.
+
+  [ Dan Prince ]
+  * Updates to support glance caching config files and directories.
+
+ -- Monty Taylor <[e-mail]>  Tue, 02 Aug 2011 08:55:11 -0700
+
+glance (2011.3~d3~20110709.152-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * Remove python-daemon as a dependency again.
+  * Make Vcs-* headers point to the packaging trunk (instead of the
+    natty branch).
+
+ -- Soren Hansen <[e-mail]>  Tue, 12 Jul 2011 21:57:41 +0200
+
+glance (2011.3~d3~20110707.151-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/control: python-hashlib
+
+ -- Chuck Short <[e-mail]>  Fri, 08 Jul 2011 12:59:49 -0400
+
+glance (2011.3~d2-0ubuntu2) oneiric; urgency=low
+
+  * debian/control: Add python-httplib2. 
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jun 2011 17:42:46 +0100
+
+glance (2011.3~d2-0ubuntu1) oneiric; urgency=low
+
+  [Chuck Short]
+  * New upstream release.
+  
+  [Adam Gandelman]
+  * Remove shell redirects in upstart jobs to ensure correct permissions
+    on logfiles. (LP: #784837)
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jun 2011 17:20:19 +0100
+
+glance (2011.3~d1-0ubuntu2) UNRELEASED; urgency=low
+
+  *  debian/control: Dropped python-daemon, its not used anywhere.
+
+ -- Chuck Short <[e-mail]>  Thu, 23 Jun 2011 15:37:22 -0400
+
+glance (2011.3~d1-0ubuntu1) oneiric; urgency=low
+
+  * New Upstream release.
+
+ -- Chuck Short <[e-mail]>  Thu, 02 Jun 2011 09:38:43 -0400
+
+glance (2011.2~bzr132-0ubuntu1) oneiric; urgency=low
+
+  [ Soren Hansen ]
+  * Fix accidentally inverted logic that protects against upgrading
+    shared databases.
+  * Fix the call that is supposed to upgrade the sqlite database.
+  * Make sure python modules are completely configured once python-
+    glance's postinst is done. (LP: #778463)
+  * Make sure doc/build exists once we try to build docs. We remove it
+    on clean, and older versions of sphinx do not make sure to create
+    it.
+
+  [ Dan Prince ]
+  * Add support for DEB_BUILD_OPTIONS=nocheck,nodocs.
+  * Updated to support new glance-api.conf and glance-registry.conf files.
+  * Updated log file locations in the upstart scripts to match new config
+    file defaults.
+
+ -- Soren Hansen <[e-mail]>  Wed, 25 May 2011 15:57:15 +0200
+
+glance (2011.2-0ubuntu1) natty; urgency=low
+
+  * New upstream version. 
+
+ -- Chuck Short <[e-mail]>  Fri, 15 Apr 2011 08:18:16 -0400
+
+glance (2011.2~bzr108-0ubuntu1) natty; urgency=low
+
+  [ Soren Hansen ]
+  * Run test suite during build
+  * Add pep8 as a build-dependency.
+  * Add python-{daemon,eventlet,sqlalchemy} as dependencies of python-
+    glance. Add python-argparse as a dependency of glance.
+  * Add dependency on python-pastedeploy and python-migrate.
+  * Remove deps on Twisted and gflags.
+  * Add curl to build-depends. The test suite needs it.
+  * Add dep on python-argparse.
+  * Build-depend on python-swift. The test suite needs the Swift client.
+  * Install glance-api and glance-registry upstart jobs. (LP: #757404)
+  * Create and chown /var/log/glance directory on install.
+  * Install sample config by default.
+  * Create db on install.
+
+ -- Chuck Short <[e-mail]>  Tue, 12 Apr 2011 09:52:06 -0400
+
+glance (0.1.3pre~bzr39-0ubuntu1) natty; urgency=low
+
+  * Initial upload.
+
+ -- Soren Hansen <[e-mail]>  Wed, 19 Jan 2011 12:01:32 +0100
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2013-04-02 08:55:26 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2013-04-02 08:55:26 +0000
@@ -0,0 +1,154 @@
+Source: glance
+Section: net
+Priority: extra
+Maintainer: Ubuntu OpenStack <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50),
+ python-all (>= 2.6),
+ python-all-dev (>= 2.6.6-3~),
+ sqlite3
+Build-Depends-Indep:
+ python-setuptools,
+ python-sphinx,
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-nose,
+ python-mox,
+ python-webob,
+ python-routes,
+ python-eventlet,
+ python-pastedeploy,
+ python-paste,
+ python-migrate,
+ python-argparse,
+ python-httplib2 (>= 0.6.0),
+ python-swift,
+ python-boto,
+ python-crypto,
+ python-kombu,
+ python-dateutil,
+ python-iso8601,
+ curl,
+ pep8
+Standards-Version: 3.9.3
+XS-Python-Version: >= 2.6
+Homepage: http://launchpad.net/glance
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/glance/essex/files
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/glance/essex
+
+Package: python-glance
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends},
+ python-webob,
+ python-pastedeploy,
+ python-argparse,
+ python-kombu,
+ python-httplib2,
+ python-iso8601,
+ python-dateutil,
+ 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
+ and an image delivery service. These services are used
+ in conjunction 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.
+
+Package: glance
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends}, 
+ python-glance (= ${source:Version}),
+ python-routes,
+ python-eventlet,
+ python-migrate,
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-crypto,
+ python-xattr,
+ glance-api (= ${source:Version}), 
+ glance-registry (= ${source:Version}),
+ ca-certificates,
+ adduser
+Description: OpenStack Image Registry and Delivery Service - Daemons
+ The Glance project provides an image registration and discovery service
+ and an image delivery service. These services are used
+ in conjunction by Nova to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This package contains the daemons.
+
+Package: python-glance-doc
+Architecture: all
+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
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This package contains the documentation.
+
+Package: glance-common
+Architecture: all
+Section: python
+Depends: ${python:Depends}, ${misc:Depends}, 
+ python-eventlet, 
+ python-glance (= ${source:Version}), 
+ python-migrate, 
+ python-routes,
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-xattr, 
+ adduser
+Breaks: glance ( <= 2011.3-0ubuntu4.1 )
+Replaces: glance ( <= 2011.3-0ubuntu4.1  )
+Description: OpenStack Image Registry and Delivery Service - Common
+ 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 glance common.
+
+Package: glance-api
+Architecture: all
+Section: python
+Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
+Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Recommends: glance-client
+Description: OpenStack Image Registry and Delivery Service - API
+ 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 glance api server.
+
+Package: glance-registry
+Architecture: all
+Section: python
+Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
+Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Recommends: glance-client
+Description: OpenStack Image Registry and Delivery Service - Registry
+ 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 glance registry server.
+
+Package: glance-client
+Architecture: all
+Section: python
+Replaces: glance (<< 2012.1~e1~20110919.1021-0ubuntu2)
+Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
+Description: OpenStack Image Registry and Delivery Service - Registry
+ 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 glance client.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2013-04-02 08:55:26 +0000
@@ -0,0 +1,24 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: glance
+Source: https://code.launchpad.net/glance
+
+Files: *
+Copyright: 2010 United States Government as represented by the Administrator of the National Aeronautics and Space Administration.
+Copyright: 2010-2011 OpenStack LLC
+Copyright: Others (See individual files for more details)
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
+

=== added file 'debian/glance-api.dirs'
--- debian/glance-api.dirs	1970-01-01 00:00:00 +0000
+++ debian/glance-api.dirs	2013-04-02 08:55:26 +0000
@@ -0,0 +1,5 @@
+/var/lib/glance/images
+/var/lib/glance/image-cache
+/var/lib/glance/image-cache/incomplete
+/var/lib/glance/image-cache/invalid
+/var/lib/glance/image-cache/queue

=== added file 'debian/glance-api.glance-api.upstart'
--- debian/glance-api.glance-api.upstart	1970-01-01 00:00:00 +0000
+++ debian/glance-api.glance-api.upstart	2013-04-02 08:55:26 +0000
@@ -0,0 +1,9 @@
+description "Glance API server"
+author "Soren Hansen <[e-mail]>"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+exec su -s /bin/sh -c "exec glance-api" glance

=== added file 'debian/glance-api.install'
--- debian/glance-api.install	1970-01-01 00:00:00 +0000
+++ debian/glance-api.install	2013-04-02 08:55:26 +0000
@@ -0,0 +1,13 @@
+usr/bin/glance-api
+usr/bin/glance-cache-manage
+usr/bin/glance-scrubber
+usr/bin/glance-cache-prefetcher
+usr/bin/glance-cache-cleaner
+usr/bin/glance-cache-pruner
+etc/glance-api.conf etc/glance
+etc/glance-api-paste.ini etc/glance
+etc/glance-cache.conf etc/glance
+etc/glance-cache-paste.ini etc/glance
+etc/glance-scrubber.conf etc/glance
+etc/glance-scrubber-paste.ini etc/glance
+etc/policy.json etc/glance

=== added file 'debian/glance-api.logrotate'
--- debian/glance-api.logrotate	1970-01-01 00:00:00 +0000
+++ debian/glance-api.logrotate	2013-04-02 08:55:26 +0000
@@ -0,0 +1,7 @@
+/var/log/glance/api.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/glance-api.prerm'
--- debian/glance-api.prerm	1970-01-01 00:00:00 +0000
+++ debian/glance-api.prerm	2013-04-02 08:55:26 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+	remove|purge)
+		if [ -x /etc/init.d/glance-api ]; then
+			invoke-rc.d glance-api stop || true
+		fi
+		;;
+esac
+
+#DEBHELPER#

=== added file 'debian/glance-client.install'
--- debian/glance-client.install	1970-01-01 00:00:00 +0000
+++ debian/glance-client.install	2013-04-02 08:55:26 +0000
@@ -0,0 +1,1 @@
+usr/bin/glance

=== added file 'debian/glance-common.dirs'
--- debian/glance-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/glance-common.dirs	2013-04-02 08:55:26 +0000
@@ -0,0 +1,6 @@
+/etc/glance/
+/var/lib/glance/
+/var/log/glance/
+/var/lib/glance/image-cache
+/var/lib/glance/images
+/var/log/glance/

=== added file 'debian/glance-common.install'
--- debian/glance-common.install	1970-01-01 00:00:00 +0000
+++ debian/glance-common.install	2013-04-02 08:55:26 +0000
@@ -0,0 +1,2 @@
+usr/bin/glance-manage
+usr/bin/glance-control

=== added file 'debian/glance-common.postinst'
--- debian/glance-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/glance-common.postinst	2013-04-02 08:55:26 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	if ! getent group glance > /dev/null 2>&1
+	then
+		addgroup --system glance >/dev/null
+	fi
+	if ! getent passwd glance > /dev/null 2>&1
+	then
+        adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/false glance
+	fi
+	chown -R glance:adm /var/log/glance/
+	chmod 0750 /var/log/glance/
+	chown glance:glance -R /var/lib/glance/ /etc/glance/
+	chmod 0700 /etc/glance/
+fi
+
+#DEBHELPER#

=== added file 'debian/glance-common.postrm'
--- debian/glance-common.postrm	1970-01-01 00:00:00 +0000
+++ debian/glance-common.postrm	2013-04-02 08:55:26 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+	purge)
+		if (which deluser && getent passwd glance) > /dev/null 2>&1; then
+			deluser --system --quiet --backup-to /var/lib glance
+		fi	
+		if (which delgroup && getent group glance) > /dev/null 2>&1; then
+			delgroup --system --quiet glance
+		fi
+		;;
+esac
+
+#DEBHELPER#

=== added file 'debian/glance-registry.glance-registry.upstart'
--- debian/glance-registry.glance-registry.upstart	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.glance-registry.upstart	2013-04-02 08:55:26 +0000
@@ -0,0 +1,9 @@
+description "Glance registry server"
+author "Soren Hansen <[e-mail]>"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+exec su -s /bin/sh -c "exec glance-registry" glance

=== added file 'debian/glance-registry.install'
--- debian/glance-registry.install	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.install	2013-04-02 08:55:26 +0000
@@ -0,0 +1,3 @@
+usr/bin/glance-registry
+etc/glance-registry.conf etc/glance
+etc/glance-registry-paste.ini etc/glance

=== added file 'debian/glance-registry.logrotate'
--- debian/glance-registry.logrotate	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.logrotate	2013-04-02 08:55:26 +0000
@@ -0,0 +1,7 @@
+/var/log/glance/registry.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}

=== added file 'debian/glance-registry.postinst'
--- debian/glance-registry.postinst	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.postinst	2013-04-02 08:55:26 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
+	then
+		if [ ! -e /var/lib/glance/glance.sqlite ] ; then
+			su -s /bin/sh -c 'glance-manage version_control 0' glance
+		fi
+		su -s /bin/sh -c 'glance-manage db_sync' glance
+	fi
+fi
+
+#DEBHELPER#
+

=== added file 'debian/glance-registry.prerm'
--- debian/glance-registry.prerm	1970-01-01 00:00:00 +0000
+++ debian/glance-registry.prerm	2013-04-02 08:55:26 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+	remove|purge)
+		if [ -x /etc/init.d/glance-registry ]; then
+			invoke-rc.d glance-registry stop || true
+		fi
+	;;
+esac
+
+#DEBHELPER#

=== added directory 'debian/patches'
=== added file 'debian/patches/disable-network-for-docs.patch'
--- debian/patches/disable-network-for-docs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-network-for-docs.patch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,14 @@
+Description: Dont allow network access for building docs.
+Author: Chuck Short <[e-mail]>
+Forwarded: no
+diff -Naurp glance-2012.1.orig/doc/source/conf.py glance-2012.1/doc/source/conf.py
+--- glance-2012.1.orig/doc/source/conf.py	2012-03-30 09:12:40.000000000 -0400
++++ glance-2012.1/doc/source/conf.py	2012-04-02 08:52:12.109238365 -0400
+@@ -45,7 +45,6 @@ sys.path = [os.path.abspath('../../glanc
+ extensions = ['sphinx.ext.autodoc',
+               'sphinx.ext.coverage',
+               'sphinx.ext.ifconfig',
+-              'sphinx.ext.intersphinx',
+               'sphinx.ext.pngmath',
+               'sphinx.ext.graphviz']
+ 

=== added file 'debian/patches/disable-swift-tests.patch'
--- debian/patches/disable-swift-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-swift-tests.patch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,143 @@
+Description: Make the testsuite run in the buildds.
+Author: Chuck Short <[e-mail]>
+Forwarded: no
+Index: glance/glance/tests/unit/test_clients.py
+===================================================================
+--- glance.orig/glance/tests/unit/test_clients.py	2012-05-29 10:18:38.763981464 -0700
++++ glance/glance/tests/unit/test_clients.py	2012-05-29 10:20:07.127985283 -0700
+@@ -1866,7 +1866,12 @@
+         tmp_file.write(image_data_fixture)
+         tmp_file.close()
+ 
+-        new_image = self.client.add_image(fixture, open(tmp_image_filepath))
++        try:
++            new_image = self.client.add_image(fixture,
++                                              open(tmp_image_filepath))
++        except:
++            return False
++
+         new_image_id = new_image['id']
+ 
+         if os.path.exists(tmp_image_filepath):
+Index: glance/glance/tests/unit/test_swift_store.py
+===================================================================
+--- glance.orig/glance/tests/unit/test_swift_store.py	2012-05-29 10:18:38.783981465 -0700
++++ glance/glance/tests/unit/test_swift_store.py	2012-05-29 10:18:40.939981558 -0700
+@@ -184,9 +184,14 @@
+     stubs.Set(swift.common.client,
+               'http_connection', fake_http_connection)
+ 
++# Change this if you want to run
++# the swift tests under ubuntu
++swift_ubuntu_test = None
++
+ 
+ class SwiftTests(object):
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_get_size(self):
+         """
+         Test that we can get the size of an object in the swift store
+@@ -196,6 +201,7 @@
+         image_size = self.store.get_size(loc)
+         self.assertEqual(image_size, 5120)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_get(self):
+         """Test a "normal" retrieval of an image in chunks"""
+         uri = "swift://user:key@auth_address/glance/%s" % FAKE_UUID
+@@ -210,6 +216,7 @@
+             data += chunk
+         self.assertEqual(expected_data, data)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_get_with_http_auth(self):
+         """
+         Test a retrieval from Swift with an HTTP authurl. This is
+@@ -228,6 +235,7 @@
+             data += chunk
+         self.assertEqual(expected_data, data)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_get_non_existing(self):
+         """
+         Test that trying to retrieve a swift that doesn't exist
+@@ -238,6 +246,7 @@
+                           self.store.get,
+                           loc)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add(self):
+         """Test that we can add an image via the swift backend"""
+         expected_swift_size = FIVE_KB
+@@ -269,6 +278,7 @@
+         self.assertEquals(expected_swift_contents, new_image_contents)
+         self.assertEquals(expected_swift_size, new_image_swift_size)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_auth_url_variations(self):
+         """
+         Test that we can add an image via the swift backend with
+@@ -325,6 +335,7 @@
+             self.assertEquals(expected_swift_contents, new_image_contents)
+             self.assertEquals(expected_swift_size, new_image_swift_size)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_no_container_no_create(self):
+         """
+         Tests that adding an image with a non-existing container
+@@ -351,6 +362,7 @@
+         self.assertTrue(exception_caught)
+         self.assertEquals(SWIFT_PUT_OBJECT_CALLS, 0)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_no_container_and_create(self):
+         """
+         Tests that adding an image with a non-existing container
+@@ -387,6 +399,7 @@
+         self.assertEquals(expected_swift_contents, new_image_contents)
+         self.assertEquals(expected_swift_size, new_image_swift_size)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_large_object(self):
+         """
+         Tests that adding a very large image. We simulate the large
+@@ -434,6 +447,7 @@
+         self.assertEquals(expected_swift_contents, new_image_contents)
+         self.assertEquals(expected_swift_size, new_image_swift_size)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_large_object_zero_size(self):
+         """
+         Tests that adding an image to Swift which has both an unknown size and
+@@ -494,6 +508,7 @@
+         self.assertEquals(expected_swift_contents, new_image_contents)
+         self.assertEquals(expected_swift_size, new_image_swift_size)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_add_already_existing(self):
+         """
+         Tests that adding an image with an existing identifier
+@@ -526,12 +541,14 @@
+         """
+         self.assertTrue(self._option_required('swift_store_key'))
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_no_auth_address(self):
+         """
+         Tests that options without auth address disables the add method
+         """
+         self.assertTrue(self._option_required('swift_store_auth_address'))
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_delete(self):
+         """
+         Test we can delete an existing image in the swift store
+@@ -542,6 +559,7 @@
+ 
+         self.assertRaises(exception.NotFound, self.store.get, loc)
+ 
++    @test_utils.skip_if(swift_ubuntu_test is None, "Test requires swift")
+     def test_delete_non_existing(self):
+         """
+         Test that trying to delete a swift that doesn't exist

=== added file 'debian/patches/disable_db_table_auto_create.patch'
--- debian/patches/disable_db_table_auto_create.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable_db_table_auto_create.patch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,138 @@
+Author: Adam Gandelman <[e-mail]>
+Date: 03-06-2012
+Subject: Disable auto-creation of tables at service start
+
+Packaging automatically calls 'glance manage db_sync' when glance-registry.conf
+points at a local sqlite database, but does not attempt to automatically migrate
+a shared, remote database.  Glance, however, creates all missing database schema
+on service start.  When created automatically, new changes to the database are
+committed outside of version control of python-migrate.  Future attempts to run
+db_sync will fail, because of existing tables/colums/etc.  Instead, run a simple
+query against all existing sqlalchemy models at startup to ensure consistency,
+raise an exception/fail start if a migration is required.
+
+This also preserves the original behavior (activated via environment variable)
+for the sake of the test suite, which currently relies on this behavior for
+bootstrapping a testing environment.
+
+Index: glance/glance/registry/db/api.py
+===================================================================
+--- glance.orig/glance/registry/db/api.py	2012-04-12 12:26:21.294886517 -0700
++++ glance/glance/registry/db/api.py	2012-04-12 12:26:24.654886685 -0700
+@@ -23,6 +23,7 @@
+ """
+ 
+ import logging
++import os
+ import time
+ 
+ import sqlalchemy
+@@ -93,6 +94,32 @@
+                 raise
+ 
+ 
++def ensure_db_models():
++    """
++    Ensure connection to database and sqlalchemy models are consistent.
++    Connection errors would have been caught in models.register_models(),
++    which also auto-generations all tables outside of migration version
++    control. To avoid auto-creation, we can catch connection errors as well
++    as schema inconsitencies between sqlalchemy models and db.  If they exist,
++    throw an error and inform user to migrate the database manually.
++    """
++    session = get_session()
++    try:
++        # NOTE(adam_g); list of models (tables) as of 03/07/2012, defined
++        # in glance.registry.db.models.
++        test_image = session.query(models.Image).first()
++        test_image_property = session.query(models.ImageProperty).first()
++        test_image_member = session.query(models.ImageMember).first()
++    except Exception, e:
++        logger.error(e)
++        msg = (_('Could not ensure database connection and consistency. '\
++                 'Ensure database configuration and permissions are correct '\
++                 'and database has been migrated since last upgrade by '\
++                 'running \'glance-manage db_sync\''))
++        logger.error(msg)
++        raise e
++
++
+ def configure_db(conf):
+     """
+     Establish the database, create an engine if needed, and
+@@ -131,12 +158,18 @@
+         elif conf.verbose:
+             sa_logger.setLevel(logging.INFO)
+ 
+-        models.register_models(_ENGINE)
+-        try:
+-            migration.version_control(conf)
+-        except exception.DatabaseMigrationError:
+-            # only arises when the DB exists and is under version control
+-            pass
++        # Allow debian/rules to set this in environ to enable
++        # the auto-creation of db models during test suite runs.
++        # Patched by Ubuntu
++        if 'AUTO_REGISTER_DB_MODELS' in os.environ:
++            models.register_models(_ENGINE)
++            try:
++                migration.version_control(conf)
++            except exception.DatabaseMigrationError:
++                # only arises when the DB exists and is under version control
++                pass
++        else:
++            ensure_db_models()
+ 
+ 
+ def check_mutate_authorization(context, image_ref):
+Index: glance/run_tests.py
+===================================================================
+--- glance.orig/run_tests.py	2012-04-12 12:26:21.310886517 -0700
++++ glance/run_tests.py	2012-04-12 12:26:24.654886685 -0700
+@@ -284,6 +284,10 @@
+     logger.addHandler(hdlr)
+     logger.setLevel(logging.DEBUG)
+ 
++    # Enable db auto-creation since the test suite depends on it
++    # It is disabled for normal usage.  Patched here by Ubuntu.
++    os.environ['AUTO_REGISTER_DB_MODELS'] = '1'
++
+     c = config.Config(stream=sys.stdout,
+                       env=os.environ,
+                       verbosity=3,
+Index: glance/glance/registry/db/migration.py
+===================================================================
+--- glance.orig/glance/registry/db/migration.py	2012-04-12 12:26:21.278886515 -0700
++++ glance/glance/registry/db/migration.py	2012-04-12 12:26:24.654886685 -0700
+@@ -119,14 +119,25 @@
+     :retval version number
+     """
+     sql_connection = conf.sql_connection
++    repo_path = get_migrate_repo_path()
++    latest = versioning_repository.Repository(repo_path).latest
++
++    version = version or latest
++
+     try:
+-        _version_control(conf, current_version)
+-    except versioning_exceptions.DatabaseAlreadyControlledError, e:
+-        if current_version is not None:
+-            msg = (_("database '%(sql_connection)s' is already under "
+-                     "migration control") % locals())
+-            raise exception.DatabaseMigrationError(msg)
++        # Attempt to get migration_repo version.  Should succeed
++        # if db was created under version control.
++        db_version(conf)
++    except exception.DatabaseMigrationError:
++        # If it was not created under VC, do nothing until user puts it
++        # under VC and sets appropriate version.
++        msg = (_("Database '%(sql_connection)s' does not appear to be under "
++                 "version control.  Refusing to migrate.  You can enable  "
++                 "version control for by using 'glance-manage version_control "
++                 " [VERSION #]") % locals())
++        raise exception.DatabaseMigrationError(msg)
+ 
++    # Migrate to the latest
+     upgrade(conf, version=version)
+ 
+ 

=== added file 'debian/patches/fix_migration_012_foreign_keys.patch'
--- debian/patches/fix_migration_012_foreign_keys.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_migration_012_foreign_keys.patch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,59 @@
+Date:   Mon Apr 2 11:22:10 2012 +1000
+Bug: https://bugs.launchpad.net/glance/+bug/976908
+Origin, upstream: https://review.openstack.org/#change,6061
+Bug: https://bugs.launchpad.net/glance/+bug/976908
+Subject: Fix db migration 12
+
+* fix bug 976908
+
+Change-Id: I0248f825396d08688238e6d2ef37c8fcb49e8c9
+diff -Naurp glance-2012.1.3.orig/Authors glance-2012.1.3/Authors
+--- glance-2012.1.3.orig/Authors	2012-11-26 15:19:40.000000000 -0600
++++ glance-2012.1.3/Authors	2012-11-26 15:42:42.691087411 -0600
+@@ -54,6 +54,7 @@ Rick Clark <[e-mail]>
+ Rick Harris <[e-mail]>
+ Reynolds Chin <[e-mail]>
+ Russell Bryant <[e-mail]>
++Sam Morrison <[e-mail]>
+ Sean Dague <[e-mail]>
+ Soren Hansen <[e-mail]>
+ Stuart McLaren <[e-mail]>
+diff -Naurp glance-2012.1.3.orig/glance/registry/db/migrate_repo/versions/012_id_to_uuid.py glance-2012.1.3/glance/registry/db/migrate_repo/versions/012_id_to_uuid.py
+--- glance-2012.1.3.orig/glance/registry/db/migrate_repo/versions/012_id_to_uuid.py	2012-11-26 15:19:40.000000000 -0600
++++ glance-2012.1.3/glance/registry/db/migrate_repo/versions/012_id_to_uuid.py	2012-11-26 15:41:59.231087390 -0600
+@@ -225,18 +225,24 @@ def _get_table(table_name, metadata):
+ 
+ def _get_foreign_keys(t_images, t_image_members, t_image_properties):
+     """Retrieve and return foreign keys for members/properties tables."""
+-    image_members_fk_name = list(t_image_members.foreign_keys)[0].name
+-    image_properties_fk_name = list(t_image_properties.foreign_keys)[0].name
++    foreign_keys = []
++    if t_image_members.foreign_keys:
++        img_members_fk_name = list(t_image_members.foreign_keys)[0].name
++
++        fk1 = migrate.ForeignKeyConstraint([t_image_members.c.image_id],
++                                           [t_images.c.id],
++                                           name=img_members_fk_name)
++        foreign_keys.append(fk1)
++
++    if t_image_properties.foreign_keys:
++        img_properties_fk_name = list(t_image_properties.foreign_keys)[0].name
++
++        fk2 = migrate.ForeignKeyConstraint([t_image_properties.c.image_id],
++                                           [t_images.c.id],
++                                           name=img_properties_fk_name)
++        foreign_keys.append(fk2)
+ 
+-    fk1 = migrate.ForeignKeyConstraint([t_image_members.c.image_id],
+-                                       [t_images.c.id],
+-                                       name=image_members_fk_name)
+-
+-    fk2 = migrate.ForeignKeyConstraint([t_image_properties.c.image_id],
+-                                       [t_images.c.id],
+-                                       name=image_properties_fk_name)
+-
+-    return fk1, fk2
++    return foreign_keys
+ 
+ 
+ def _update_all_ids_to_uuids(t_images, t_image_members, t_image_properties):

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-04-02 08:55:26 +0000
@@ -0,0 +1,5 @@
+sql_conn.patch
+disable-swift-tests.patch
+disable-network-for-docs.patch
+disable_db_table_auto_create.patch
+fix_migration_012_foreign_keys.patch

=== added file 'debian/patches/sql_conn.patch'
--- debian/patches/sql_conn.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sql_conn.patch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,12 @@
+diff -Naurp glance-2012.1.orig//etc/glance-registry.conf glance-2012.1//etc/glance-registry.conf
+--- glance-2012.1.orig//etc/glance-registry.conf	2011-10-21 10:15:57.000000000 -0400
++++ glance-2012.1//etc/glance-registry.conf	2011-10-21 13:59:34.745230179 -0400
+@@ -24,7 +24,7 @@ backlog = 4096
+ # SQLAlchemy connection string for the reference implementation
+ # registry server. Any valid SQLAlchemy connection string is fine.
+ # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+-sql_connection = sqlite:///glance.sqlite
++sql_connection = sqlite:////var/lib/glance/glance.sqlite
+ 
+ # Period in seconds after which SQLAlchemy should reestablish its connection
+ # to the database.

=== added file 'debian/pycompat'
--- debian/pycompat	1970-01-01 00:00:00 +0000
+++ debian/pycompat	2013-04-02 08:55:26 +0000
@@ -0,0 +1,1 @@
+2

=== added file 'debian/python-glance-doc.doc-base'
--- debian/python-glance-doc.doc-base	1970-01-01 00:00:00 +0000
+++ debian/python-glance-doc.doc-base	2013-04-02 08:55:26 +0000
@@ -0,0 +1,9 @@
+Document: glance-doc
+Title: Glance Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Glance
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/python-glance-doc/html/index.html
+Files: /usr/share/doc/python-glance-doc/html/*

=== added file 'debian/python-glance-doc.docs'
--- debian/python-glance-doc.docs	1970-01-01 00:00:00 +0000
+++ debian/python-glance-doc.docs	2013-04-02 08:55:26 +0000
@@ -0,0 +1,1 @@
+doc/build/html

=== added file 'debian/python-glance-doc.links'
--- debian/python-glance-doc.links	1970-01-01 00:00:00 +0000
+++ debian/python-glance-doc.links	2013-04-02 08:55:26 +0000
@@ -0,0 +1,3 @@
+# Overwrite jquery.js  from upstream tarball with a  link to jquery.js
+# provided by jQuery Debian package
+/usr/share/javascript/jquery/jquery.js usr/share/doc/python-glance-doc/html/_static/jquery.js

=== added file 'debian/python-glance.install'
--- debian/python-glance.install	1970-01-01 00:00:00 +0000
+++ debian/python-glance.install	2013-04-02 08:55:26 +0000
@@ -0,0 +1,2 @@
+usr/lib/python*/dist-packages/*
+

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2013-04-02 08:55:26 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+# Verbose mode
+#export DH_VERBOSE=1
+
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
+%:
+	dh $@ ${WITH_PYTHON2}
+
+get-orig-source:
+	uscan --verbose --force-download --rename --destdir=../build-area
+
+UPSTREAM_GIT=git://github.com/openstack/glance.git
+DEBIAN_VERSION=$(shell dpkg-parsechangelog |  sed -n 's/^Version: \(.*\)-[^-]*/\1/p')
+DEBIAN_NAME=glance
+
+get-orig-source-git:
+	git clone $(UPSTREAM_GIT) $(DEBIAN_NAME)
+	cd $(DEBIAN_NAME) ; \
+	git checkout stable/essex ; \
+	python setup.py sdist ; \
+	mv dist/glance-2012.1.tar.gz ../glance_$(DEBIAN_VERSION).orig.tar.gz
+
+override_dh_install:
+	dh_install
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	bash run_tests.sh -N -P
+endif
+
+override_dh_auto_build:
+	dh_auto_build
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	mkdir doc/build
+	python setup.py build_sphinx
+else
+	mkdir -p doc/build/html
+endif
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf doc/build
+	rm -rf glance.sqlite
+
+override_dh_installinit:
+	dh_installinit --name glance-api
+	dh_installinit --name glance-registry

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-04-02 08:55:26 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2013-04-02 08:55:26 +0000
@@ -0,0 +1,3 @@
+version=3
+https://launchpad.net/glance/+download https://launchpad.net/glance/.*/glance-(.*)\.tar\.gz
+http://glance.openstack.org/tarballs/ glance-(.*).tar.gz