Merge lp:~jaypipes/glance/ubuntu into lp:glance/diablo

Proposed by Jay Pipes
Status: Superseded
Proposed branch: lp:~jaypipes/glance/ubuntu
Merge into: lp:glance/diablo
Diff against target: 587 lines (+459/-0)
25 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+189/-0)
debian/compat (+1/-0)
debian/control (+76/-0)
debian/copyright (+24/-0)
debian/glance.dirs (+3/-0)
debian/glance.glance-api.upstart (+9/-0)
debian/glance.glance-registry.upstart (+9/-0)
debian/glance.install (+2/-0)
debian/glance.postinst (+18/-0)
debian/glance.postrm (+18/-0)
debian/glance.prerm (+11/-0)
debian/patches/paste_router.patch (+11/-0)
debian/patches/series (+1/-0)
debian/patches/sql_conn.patch (+13/-0)
debian/pycompat (+1/-0)
debian/python-glance-doc.doc-base (+9/-0)
debian/python-glance-doc.docs (+1/-0)
debian/python-glance-doc.links (+3/-0)
debian/python-glance.install (+2/-0)
debian/python-glance.postinst (+12/-0)
debian/pyversions (+1/-0)
debian/rules (+38/-0)
debian/source/format (+1/-0)
debian/watch (+4/-0)
To merge this branch: bzr merge lp:~jaypipes/glance/ubuntu
Reviewer Review Type Date Requested Status
OpenStack Infra Pending
Review via email: mp+82317@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~jaypipes/glance/ubuntu updated
73. By Jay Pipes

Update email in changelog

74. By Jay Pipes

Remvoe extraneous * in changelog

Unmerged revisions

74. By Jay Pipes

Remvoe extraneous * in changelog

73. By Jay Pipes

Update email in changelog

72. By Jay Pipes

* 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

71. By Chuck Short

Dropped python-git, not needed

70. By Chuck Short

* Remove useless python-argparse dependency
* Version python-httplib2 dependency (LP: #884805)
* Add python-crypto dependency (LP: #887225)

69. By Chuck Short

Install files in /etc/*.

68. By Monty Taylor

* New upstream release.
* debian/rules: Dont fail to build because of broken testsuite.
* Added branch condition to fix build on lucid.
* New upstream version.

67. By Monty Taylor

* New upstream release.
* Added python-git to build-depends for the Authors test.

66. By Monty Taylor

Automated PPA build. Packaging revision: 65.

65. By Monty Taylor

* Automated PPA build. Packaging revision: 64.
* Automated PPA build. Packaging revision: 64.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2011-11-15 21:08:36 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+merge = True
8
9=== added directory 'debian'
10=== added file 'debian/changelog'
11--- debian/changelog 1970-01-01 00:00:00 +0000
12+++ debian/changelog 2011-11-15 21:08:36 +0000
13@@ -0,0 +1,189 @@
14+glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
15+
16+ * New upstream release
17+
18+ [ Jay Pipes ]
19+ * Removes now-unnecessary dependencies from client package
20+ * Rewrote the description for the Glance project to remove
21+ ancient language about Teller and Parallax
22+ * Added a patch to update the paste entrypoint for the v1app
23+
24+ -- Jay Pipes <jpipes@uberbox> Tue, 15 Nov 2011 12:35:49 -0500
25+
26+glance (2012.1~e1~20110919.1021-0ubuntu0) oneiric; urgency=low
27+
28+ * New upstream release.
29+
30+ [ Dan Prince ]
31+ * Install files in /etc/*.
32+
33+ [ Jay Pipes ]
34+ * Remove useless python-argparse dependency
35+ * Version python-httplib2 dependency (LP: #884805)
36+ * Add python-crypto dependency (LP: #887225)
37+
38+ -- Monty Taylor <mordred@inaugust.com> Mon, 19 Sep 2011 12:40:45 -0400
39+
40+glance (2011.3~rc~20110915.r1007-0ubuntu1) oneiric; urgency=low
41+
42+ [ Chuck Short ]
43+ * New upstream release.
44+ * debian/rules: Dont fail to build because of broken testsuite.
45+
46+ [ Monty Taylor ]
47+ * Added branch condition to fix build on lucid.
48+
49+ -- Monty Taylor <mordred@inaugust.com> Mon, 19 Sep 2011 13:03:41 -0400
50+
51+glance (2011.3~rc~20110908.r1005-0ubuntu1) oneiric; urgency=low
52+
53+ * New upstream release.
54+
55+ [ Dan Prince ]
56+ * Remove glance-scrubber.conf sqlconn patch.
57+
58+ -- Chuck Short <zulcss@ubuntu.com> Fri, 09 Sep 2011 14:59:27 -0400
59+
60+glance (2011.3~rc~20110831.1002-0ubuntu1) oneiric; urgency=low
61+
62+ * New upstream release.
63+
64+ -- Chuck Short <zulcss@ubuntu.com> Fri, 02 Sep 2011 13:50:13 -0400
65+
66+glance (2011.3~d4-0ubuntu1) oneiric; urgency=low
67+
68+ [Chuck Short]
69+ * New upstream release.
70+
71+ [ Monty Taylor ]
72+ * New upstream release.
73+ * Added python-kombu as Depends and Build-depends.
74+
75+ [ Scott Moser ]
76+ * glance.postinst: use a trailing slash when using chown on directories
77+
78+ [ Ben Howard ]
79+ * Install /etc/glance-scrubber.conf by default (LP: #816972)
80+ * Remove glance user and logs on purge (LP: #828721)
81+ * Converted dh to use "--with python2".
82+ * Incremented standards version to 3.9.2; no changes required
83+
84+ [ Dan Prince ]
85+ * debian/control: Add python-httplib2 as python-glance Depends.
86+
87+ -- Chuck Short <zulcss@ubuntu.com> Fri, 26 Aug 2011 10:13:39 -0400
88+
89+glance (2011.3~d4~20110811.980-0ubuntu1) oneiric; urgency=low
90+
91+ * New upstream release.
92+
93+ -- Chuck Short <zulcss@ubuntu.com> Fri, 12 Aug 2011 05:23:21 -0400
94+
95+glance (2011.3~d3~20110709.152-0ubuntu2) UNRELEASED; urgency=low
96+
97+ [ Adam Gandelman ]
98+ * Add python-xattr to Depends of python-glance
99+
100+ [ Jay Pipes ]
101+ * Add python-boto to Build-depends.
102+
103+ [ Dan Prince ]
104+ * Updates to support glance caching config files and directories.
105+
106+ -- Monty Taylor <mordred@inaugust.com> Tue, 02 Aug 2011 08:55:11 -0700
107+
108+glance (2011.3~d3~20110709.152-0ubuntu1) UNRELEASED; urgency=low
109+
110+ * New upstream snapshot.
111+ * Remove python-daemon as a dependency again.
112+ * Make Vcs-* headers point to the packaging trunk (instead of the
113+ natty branch).
114+
115+ -- Soren Hansen <soren@ubuntu.com> Tue, 12 Jul 2011 21:57:41 +0200
116+
117+glance (2011.3~d3~20110707.151-0ubuntu1) oneiric; urgency=low
118+
119+ * New upstream release.
120+ * debian/control: python-hashlib
121+
122+ -- Chuck Short <zulcss@ubuntu.com> Fri, 08 Jul 2011 12:59:49 -0400
123+
124+glance (2011.3~d2-0ubuntu2) oneiric; urgency=low
125+
126+ * debian/control: Add python-httplib2.
127+
128+ -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jun 2011 17:42:46 +0100
129+
130+glance (2011.3~d2-0ubuntu1) oneiric; urgency=low
131+
132+ [Chuck Short]
133+ * New upstream release.
134+
135+ [Adam Gandelman]
136+ * Remove shell redirects in upstart jobs to ensure correct permissions
137+ on logfiles. (LP: #784837)
138+
139+ -- Chuck Short <zulcss@ubuntu.com> Thu, 30 Jun 2011 17:20:19 +0100
140+
141+glance (2011.3~d1-0ubuntu2) UNRELEASED; urgency=low
142+
143+ * debian/control: Dropped python-daemon, its not used anywhere.
144+
145+ -- Chuck Short <zulcss@ubuntu.com> Thu, 23 Jun 2011 15:37:22 -0400
146+
147+glance (2011.3~d1-0ubuntu1) oneiric; urgency=low
148+
149+ * New Upstream release.
150+
151+ -- Chuck Short <zulcss@ubuntu.com> Thu, 02 Jun 2011 09:38:43 -0400
152+
153+glance (2011.2-0ubuntu1) natty; urgency=low
154+
155+ * New upstream version.
156+
157+ -- Chuck Short <zulcss@ubuntu.com> Fri, 15 Apr 2011 08:18:16 -0400
158+
159+glance (2011.2~bzr132-0ubuntu1) oneiric; urgency=low
160+
161+ [ Soren Hansen ]
162+ * Fix accidentally inverted logic that protects against upgrading
163+ shared databases.
164+ * Fix the call that is supposed to upgrade the sqlite database.
165+ * Make sure python modules are completely configured once python-
166+ glance's postinst is done. (LP: #778463)
167+ * Make sure doc/build exists once we try to build docs. We remove it
168+ on clean, and older versions of sphinx do not make sure to create
169+ it.
170+
171+ [ Dan Prince ]
172+ * Add support for DEB_BUILD_OPTIONS=nocheck,nodocs.
173+ * Updated to support new glance-api.conf and glance-registry.conf files.
174+ * Updated log file locations in the upstart scripts to match new config
175+ file defaults.
176+
177+ -- Soren Hansen <soren@ubuntu.com> Wed, 25 May 2011 15:57:15 +0200
178+
179+glance (2011.2~bzr108-0ubuntu1) natty; urgency=low
180+
181+ [ Soren Hansen ]
182+ * Run test suite during build
183+ * Add pep8 as a build-dependency.
184+ * Add python-{daemon,eventlet,sqlalchemy} as dependencies of python-
185+ glance. Add python-argparse as a dependency of glance.
186+ * Add dependency on python-pastedeploy and python-migrate.
187+ * Remove deps on Twisted and gflags.
188+ * Add curl to build-depends. The test suite needs it.
189+ * Add dep on python-argparse.
190+ * Build-depend on python-swift. The test suite needs the Swift client.
191+ * Install glance-api and glance-registry upstart jobs. (LP: #757404)
192+ * Create and chown /var/log/glance directory on install.
193+ * Install sample config by default.
194+ * Create db on install.
195+
196+ -- Chuck Short <zulcss@ubuntu.com> Tue, 12 Apr 2011 09:52:06 -0400
197+
198+glance (0.1.3pre~bzr39-0ubuntu1) natty; urgency=low
199+
200+ * Initial upload.
201+
202+ -- Soren Hansen <soren@ubuntu.com> Wed, 19 Jan 2011 12:01:32 +0100
203
204=== added file 'debian/compat'
205--- debian/compat 1970-01-01 00:00:00 +0000
206+++ debian/compat 2011-11-15 21:08:36 +0000
207@@ -0,0 +1,1 @@
208+7
209
210=== added file 'debian/control'
211--- debian/control 1970-01-01 00:00:00 +0000
212+++ debian/control 2011-11-15 21:08:36 +0000
213@@ -0,0 +1,76 @@
214+Source: glance
215+Section: net
216+Priority: extra
217+Maintainer: Soren Hansen <soren@ubuntu.com>
218+Build-Depends: debhelper (>= 7.0.50),
219+ python-all (>= 2.6),
220+ python-all-dev (>= 2.6.6-3~) | python-support,
221+Build-Depends-Indep:
222+ python-setuptools,
223+ python-sphinx,
224+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
225+ python-nose,
226+ python-mox,
227+ python-webob,
228+ python-routes,
229+ python-eventlet,
230+ python-pastedeploy,
231+ python-migrate,
232+ python-httplib2 (>= 0.6.0),
233+ python-swift,
234+ python-boto,
235+ python-kombu,
236+ python-crypto,
237+ curl,
238+ pep8
239+Standards-Version: 3.9.2
240+XS-Python-Version: >= 2.6
241+Homepage: http://launchpad.net/glance
242+Vcs-Browser: http://bazaar.launchpad.net/~openstack-ubuntu-packagers/glance/ubuntu/files/
243+Vcs-Bzr: http://bazaar.launchpad.net/~openstack-ubuntu-packagers/glance/ubuntu/
244+XS-Debian-Vcs-Browser: http://bazaar.launchpad.net/~glance-core/debian/sid/glance/debian/files
245+XS-Debian-Vcs-Bzr: http://bazaar.launchpad.net/~glance-core/debian/sid/glance/debian
246+
247+Package: python-glance
248+Architecture: all
249+Section: python
250+Depends: ${python:Depends}, ${misc:Depends},
251+ python-webob,
252+ python-pastedeploy,
253+ python-kombu,
254+ python-httplib2 (>= 0.6.0),
255+ python-crypto
256+Provides: ${python:Provides}
257+XB-Python-Version: ${python:Versions}
258+Description: OpenStack Image Registry and Delivery Service - Python client library
259+ The Glance project provides an image registration, discovery and
260+ delivery service. These services may be used as stand-along services, and
261+ they may also be used by Nova to deliver images from object stores, such as
262+ OpenStack's Swift service, to Nova's compute nodes.
263+ .
264+ This package contains the Python client libraries.
265+
266+Package: glance
267+Architecture: all
268+Section: python
269+Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser
270+Description: OpenStack Image Registry and Delivery Service - Daemons
271+ The Glance project provides an image registration, discovery and
272+ delivery service. These services may be used as stand-along services, and
273+ they may also be used by Nova to deliver images from object stores, such as
274+ OpenStack's Swift service, to Nova's compute nodes.
275+ .
276+ This package contains the daemons.
277+
278+Package: python-glance-doc
279+Architecture: all
280+Section: doc
281+Depends: libjs-jquery, ${misc:Depends}
282+Description: OpenStack Image Registry and Delivery Service - Documentation
283+ The Glance project provides an image registration, discovery and
284+ delivery service. These services may be used as stand-along services, and
285+ they may also be used by Nova to deliver images from object stores, such as
286+ OpenStack's Swift service, to Nova's compute nodes.
287+ .
288+ This package contains the documentation.
289+
290
291=== added file 'debian/copyright'
292--- debian/copyright 1970-01-01 00:00:00 +0000
293+++ debian/copyright 2011-11-15 21:08:36 +0000
294@@ -0,0 +1,24 @@
295+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
296+Name: glance
297+Source: https://code.launchpad.net/glance
298+
299+Files: *
300+Copyright: 2010 United States Government as represented by the Administrator of the National Aeronautics and Space Administration.
301+Copyright: 2010-2011 OpenStack LLC
302+Copyright: Others (See individual files for more details)
303+License: Apache-2
304+ Licensed under the Apache License, Version 2.0 (the "License");
305+ you may not use this file except in compliance with the License.
306+ You may obtain a copy of the License at
307+ .
308+ http://www.apache.org/licenses/LICENSE-2.0
309+ .
310+ Unless required by applicable law or agreed to in writing, software
311+ distributed under the License is distributed on an "AS IS" BASIS,
312+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
313+ See the License for the specific language governing permissions and
314+ limitations under the License.
315+ .
316+ On Debian-based systems the full text of the Apache version 2.0 license
317+ can be found in `/usr/share/common-licenses/Apache-2.0'.
318+
319
320=== added file 'debian/glance.dirs'
321--- debian/glance.dirs 1970-01-01 00:00:00 +0000
322+++ debian/glance.dirs 2011-11-15 21:08:36 +0000
323@@ -0,0 +1,3 @@
324+/var/lib/glance/image-cache
325+/var/lib/glance/images
326+/var/log/glance/
327
328=== added file 'debian/glance.glance-api.upstart'
329--- debian/glance.glance-api.upstart 1970-01-01 00:00:00 +0000
330+++ debian/glance.glance-api.upstart 2011-11-15 21:08:36 +0000
331@@ -0,0 +1,9 @@
332+description "Glance API server"
333+author "Soren Hansen <soren@linux2go.dk>"
334+
335+start on (local-filesystems and net-device-up IFACE!=lo)
336+stop on runlevel [016]
337+
338+respawn
339+
340+exec su -c "glance-api" glance
341
342=== added file 'debian/glance.glance-registry.upstart'
343--- debian/glance.glance-registry.upstart 1970-01-01 00:00:00 +0000
344+++ debian/glance.glance-registry.upstart 2011-11-15 21:08:36 +0000
345@@ -0,0 +1,9 @@
346+description "Glance registry server"
347+author "Soren Hansen <soren@linux2go.dk>"
348+
349+start on (local-filesystems and net-device-up IFACE!=lo)
350+stop on runlevel [016]
351+
352+respawn
353+
354+exec su -c "glance-registry" glance
355
356=== added file 'debian/glance.install'
357--- debian/glance.install 1970-01-01 00:00:00 +0000
358+++ debian/glance.install 2011-11-15 21:08:36 +0000
359@@ -0,0 +1,2 @@
360+usr/bin/*
361+etc/* etc/glance
362
363=== added file 'debian/glance.postinst'
364--- debian/glance.postinst 1970-01-01 00:00:00 +0000
365+++ debian/glance.postinst 2011-11-15 21:08:36 +0000
366@@ -0,0 +1,18 @@
367+#!/bin/sh
368+
369+set -e
370+
371+if [ "$1" = "configure" ]
372+then
373+ if ! getent passwd glance > /dev/null 2>&1
374+ then
375+ adduser --system --home /var/lib/glance --no-create-home --shell /bin/bash glance
376+ fi
377+ chown glance -R /var/lib/glance/ /var/log/glance/
378+ if ! grep sql_connection /etc/glance/glance-registry.conf | grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
379+ then
380+ su -c 'glance-manage db_sync' glance
381+ fi
382+fi
383+
384+#DEBHELPER#
385
386=== added file 'debian/glance.postrm'
387--- debian/glance.postrm 1970-01-01 00:00:00 +0000
388+++ debian/glance.postrm 2011-11-15 21:08:36 +0000
389@@ -0,0 +1,18 @@
390+#!/bin/sh
391+
392+set -e
393+
394+case $1 in
395+ purge)
396+ echo "Purging glance. Backup of /var/lib/glance can be found at /var/lib/glance.tar.bz2"
397+
398+ if which deluser > /dev/null 2>&1; then
399+ deluser --system --quiet --backup-to /var/lib glance
400+ fi
401+
402+ [ -e /var/lib/glance ] && rm -rf /var/lib/glance
403+ [ -e /var/log/glance ] && rm -rf /var/log/glance
404+ ;;
405+esac
406+
407+#DEBHELPER#
408
409=== added file 'debian/glance.prerm'
410--- debian/glance.prerm 1970-01-01 00:00:00 +0000
411+++ debian/glance.prerm 2011-11-15 21:08:36 +0000
412@@ -0,0 +1,11 @@
413+#!/bin/sh
414+
415+set -e
416+
417+case $1 in
418+ remove|purge)
419+ invoke-rc.d glance-api stop
420+ invoke-rc.d glance-registry stop
421+esac
422+
423+#DEBHELPER#
424
425=== added directory 'debian/patches'
426=== added file 'debian/patches/paste_router.patch'
427--- debian/patches/paste_router.patch 1970-01-01 00:00:00 +0000
428+++ debian/patches/paste_router.patch 2011-11-15 21:08:36 +0000
429@@ -0,0 +1,11 @@
430+--- a/etc/glance-api.conf
431++++ b/etc/glance-api.conf
432+@@ -155,7 +155,7 @@
433+ paste.app_factory = glance.api.versions:app_factory
434+
435+ [app:apiv1app]
436+-paste.app_factory = glance.api.v1:app_factory
437++paste.app_factory = glance.api.v1.router:app_factory
438+
439+ [filter:versionnegotiation]
440+ paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory
441
442=== added file 'debian/patches/series'
443--- debian/patches/series 1970-01-01 00:00:00 +0000
444+++ debian/patches/series 2011-11-15 21:08:36 +0000
445@@ -0,0 +1,1 @@
446+sql_conn.patch
447
448=== added file 'debian/patches/sql_conn.patch'
449--- debian/patches/sql_conn.patch 1970-01-01 00:00:00 +0000
450+++ debian/patches/sql_conn.patch 2011-11-15 21:08:36 +0000
451@@ -0,0 +1,13 @@
452+Index: glance-2011.2~bzr108/etc/glance.conf.sample
453+===================================================================
454+--- glance-2011.2~bzr131.orig/etc/glance-registry.conf
455++++ glance-2011.2~bzr131/etc/glance-registry.conf
456+@@ -18,7 +18,7 @@
457+ # SQLAlchemy connection string for the reference implementation
458+ # registry server. Any valid SQLAlchemy connection string is fine.
459+ # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
460+-sql_connection = sqlite:///glance.sqlite
461++sql_connection = sqlite:////var/lib/glance/glance.sqlite
462+
463+ # Period in seconds after which SQLAlchemy should reestablish its connection
464+ # to the database.
465
466=== added file 'debian/pycompat'
467--- debian/pycompat 1970-01-01 00:00:00 +0000
468+++ debian/pycompat 2011-11-15 21:08:36 +0000
469@@ -0,0 +1,1 @@
470+2
471
472=== added file 'debian/python-glance-doc.doc-base'
473--- debian/python-glance-doc.doc-base 1970-01-01 00:00:00 +0000
474+++ debian/python-glance-doc.doc-base 2011-11-15 21:08:36 +0000
475@@ -0,0 +1,9 @@
476+Document: glance-doc
477+Title: Glance Documentation
478+Author: OpenStack
479+Abstract: Sphinx documentation for Glance
480+Section: Network/File Transfer
481+
482+Format: HTML
483+Index: /usr/share/doc/python-glance-doc/html/index.html
484+Files: /usr/share/doc/python-glance-doc/html/*
485
486=== added file 'debian/python-glance-doc.docs'
487--- debian/python-glance-doc.docs 1970-01-01 00:00:00 +0000
488+++ debian/python-glance-doc.docs 2011-11-15 21:08:36 +0000
489@@ -0,0 +1,1 @@
490+doc/build/html
491
492=== added file 'debian/python-glance-doc.links'
493--- debian/python-glance-doc.links 1970-01-01 00:00:00 +0000
494+++ debian/python-glance-doc.links 2011-11-15 21:08:36 +0000
495@@ -0,0 +1,3 @@
496+# Overwrite jquery.js from upstream tarball with a link to jquery.js
497+# provided by jQuery Debian package
498+/usr/share/javascript/jquery/jquery.js usr/share/doc/python-glance-doc/html/_static/jquery.js
499
500=== added file 'debian/python-glance.install'
501--- debian/python-glance.install 1970-01-01 00:00:00 +0000
502+++ debian/python-glance.install 2011-11-15 21:08:36 +0000
503@@ -0,0 +1,2 @@
504+usr/lib/python*/dist-packages/*
505+
506
507=== added file 'debian/python-glance.postinst'
508--- debian/python-glance.postinst 1970-01-01 00:00:00 +0000
509+++ debian/python-glance.postinst 2011-11-15 21:08:36 +0000
510@@ -0,0 +1,12 @@
511+#!/bin/sh
512+
513+set -e
514+
515+#DEBHELPER#
516+
517+if [ "$1" = "configure" ]
518+then
519+ update-python-modules --post-install
520+fi
521+
522+exit 0
523
524=== added file 'debian/pyversions'
525--- debian/pyversions 1970-01-01 00:00:00 +0000
526+++ debian/pyversions 2011-11-15 21:08:36 +0000
527@@ -0,0 +1,1 @@
528+2.6-
529
530=== added file 'debian/rules'
531--- debian/rules 1970-01-01 00:00:00 +0000
532+++ debian/rules 2011-11-15 21:08:36 +0000
533@@ -0,0 +1,38 @@
534+#!/usr/bin/make -f
535+
536+# Verbose mode
537+#export DH_VERBOSE=1
538+
539+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
540+
541+%:
542+ dh $@ ${WITH_PYTHON2}
543+
544+get-orig-source:
545+ uscan --verbose --force-download --rename --destdir=../build-area
546+
547+override_dh_install:
548+ dh_install
549+
550+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
551+override_dh_auto_test:
552+ bash run_tests.sh -N || true
553+endif
554+
555+override_dh_auto_build:
556+ dh_auto_build
557+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
558+ mkdir doc/build
559+ python setup.py build_sphinx
560+else
561+ mkdir -p doc/build/html
562+endif
563+
564+override_dh_auto_clean:
565+ dh_auto_clean
566+ rm -rf doc/build
567+ rm -rf glance.sqlite
568+
569+override_dh_installinit:
570+ dh_installinit --name glance-api
571+ dh_installinit --name glance-registry
572
573=== added directory 'debian/source'
574=== added file 'debian/source/format'
575--- debian/source/format 1970-01-01 00:00:00 +0000
576+++ debian/source/format 2011-11-15 21:08:36 +0000
577@@ -0,0 +1,1 @@
578+3.0 (quilt)
579
580=== added file 'debian/watch'
581--- debian/watch 1970-01-01 00:00:00 +0000
582+++ debian/watch 2011-11-15 21:08:36 +0000
583@@ -0,0 +1,4 @@
584+version=3
585+http://launchpad.net/glance/+download http://launchpad.net/glance/.*/glance-(.*)\.tar\.gz
586+http://glance.openstack.org/tarballs/ glance-(.*).tar.gz
587+

Subscribers

People subscribed via source and target branches

to all changes: