Commit 543fdfe147ced4ada32bbc82397634e9e98f8294 - glance

+10

-1

debian/changelog less more

	0	glance (2012.1~e2-4) unstable; urgency=low
	1
	2	* Fix new packages replaces
	3	* Fix init script stop action
	4	* Fix depends on httplib2
	5	* Do not fail if db_sync fails
	6
	7	-- Julien Danjou <acid@debian.org> Tue, 20 Dec 2011 10:26:52 +0100
	8
0	9	glance (2012.1~e2+git66-gea99d1c-1) experimental; urgency=low
1	10
2	11	* New snapshot release

7	16
8	17	[ Ghe Rivero ]
9	18	* Fix piuparts errors
10		* Split glance into api and registriy daemons
	19	* Split glance into api and registry daemons
11	20	* Fixed embeded javascript library in python-glance-doc
12	21
13	22	-- Ghe Rivero <ghe@debian.org> Mon, 19 Dec 2011 17:48:42 +0100

+10

-8

debian/control less more

16	16	python-migrate,
17	17	python-routes,
18	18	python-boto,
19		python-kombu
	19	python-kombu,
	20	python-httplib2 (>= 0.6.0)
20	21	Standards-Version: 3.9.2
21		X-Python-Version: >= 2.6
22	22	Homepage: http://launchpad.net/glance
23	23	Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/glance.git;a=summary
24	24	Vcs-Git: git://anonscm.debian.org/openstack/glance.git

37	37	python-migrate,
38	38	python-kombu,
39	39	python-xattr,
40		python-crypto
41		Provides: ${python:Provides}
	40	python-crypto,
	41	python-httplib2 (>= 0.6.0)
42	42	Description: OpenStack Image Registry and Delivery Service - Python client library
43	43	The Glance project provides an image registration, discovery and
44	44	delivery service. These services may be used as stand-along services, and

50	50	Package: glance-common
51	51	Architecture: all
52	52	Section: python
	53	Replaces: glance (<< 2012.1~e2-3)
53	54	Depends: ${python:Depends}, ${misc:Depends},
54	55	adduser,
55	56	python-eventlet,

57	58	python-migrate,
58	59	python-routes,
59	60	python-sqlalchemy-ext \| python-sqlalchemy (<< 0.6.3-2),
60		python-xattr
	61	python-xattr,
	62	python-paste
61	63	Description: OpenStack Image Registry and Delivery Service - Common
62	64	The Glance project provides an image registration, discovery and
63	65	delivery service. These services may be used as stand-along services, and

69	71	Package: glance-api
70	72	Architecture: all
71	73	Section: python
72		Replaces: glance (<< 2012.1~e1-2)
	74	Replaces: glance (<< 2012.1~e2-3)
73	75	Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
74	76	Description: OpenStack Image Registry and Delivery Service - API
75	77	The Glance project provides an image registration, discovery and

82	84	Package: glance-registry
83	85	Architecture: all
84	86	Section: python
85		Replaces: glance (<< 2012.1~e2-2)
	87	Replaces: glance (<< 2012.1~e2-3)
86	88	Depends: ${python:Depends}, ${misc:Depends}, glance-common (= ${source:Version})
87	89	Description: OpenStack Image Registry and Delivery Service - Registry
88	90	The Glance project provides an image registration, discovery and

115	117	they may also be used by Nova to deliver images from object stores, such as
116	118	OpenStack's Swift service, to Nova's compute nodes.
117	119	.
118		This package contains the documentation.⏎
	120	This package contains the documentation.

+1

-4

debian/glance-api.init less more

36	36
37	37	do_stop()
38	38	{
39		start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
	39	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
40	40	RETVAL="$?"
41		[ "$RETVAL" = 2 ] && return 2
42		start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --name $NAME
43		[ "$?" = 2 ] && return 2
44	41	rm -f $PIDFILE
45	42	return "$RETVAL"
46	43	}

+1

-4

debian/glance-registry.init less more

36	36
37	37	do_stop()
38	38	{
39		start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
	39	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
40	40	RETVAL="$?"
41		[ "$RETVAL" = 2 ] && return 2
42		start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --name $NAME
43		[ "$?" = 2 ] && return 2
44	41	rm -f $PIDFILE
45	42	return "$RETVAL"
46	43	}

+1

-1

debian/glance-registry.postinst less more

5	5	then
6	6	if ! grep sql_connection /etc/glance/glance-registry.conf \| grep -qv "sql_connection = sqlite:////var/lib/glance/glance.sqlite"
7	7	then
8		su -c 'glance-manage db_sync' glance
	8	su -c 'glance-manage db_sync' glance \|\| true
9	9	fi
10	10	fi
11	11