diff -Nru quantum-2012.1~rc1/debian/changelog quantum-2012.1~rc1/debian/changelog --- quantum-2012.1~rc1/debian/changelog 2012-03-27 09:25:18.000000000 +0000 +++ quantum-2012.1~rc1/debian/changelog 2012-03-30 18:14:49.000000000 +0000 @@ -1,6 +1,16 @@ +quantum (2012.1~rc1-0ubuntu4) precise; urgency=low + + * Make quantum installable again (LP: #965551): + - debian/control: quantum-server depends on quantum-common. + - debian/control: Add python-quantumclient dependency. + - debian/upstart: Rename and update upstart job. + - Fix typos in debian/quantum-common.postinst. + + -- Chuck Short Fri, 30 Mar 2012 14:14:42 -0400 + quantum (2012.1~rc1-0ubuntu3) precise; urgency=low - * debian/control: Fix spelling typos. (LP: #960713) + * debian/control: Fix spelling typos. (LP: #960713) -- Paolo Rotolo Fri, 23 Mar 2012 21:35:54 +0100 diff -Nru quantum-2012.1~rc1/debian/control quantum-2012.1~rc1/debian/control --- quantum-2012.1~rc1/debian/control 2012-03-27 09:25:18.000000000 +0000 +++ quantum-2012.1~rc1/debian/control 2012-03-30 18:14:49.000000000 +0000 @@ -25,7 +25,8 @@ Package: quantum-server Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, adduser, + quantum-common Description: server - Quantum is a virtual network service for Openstack Quantum is a virtual network service for Openstack, and a part of Netstack. Just like OpenStack Nova provides an API to dynamically @@ -99,7 +100,7 @@ advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the nicira plugin. + This package provides the nicira plugin Package: quantum-plugin-ryu Architecture: all @@ -129,7 +130,8 @@ python-simplejson, python-sqlalchemy, python-lxml, - python-webob + python-webob, + python-quantumclient Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Quantum is a virutal network service for Openstack. (python library) @@ -142,5 +144,5 @@ advanced network capabilities (e.g., QoS, ACLs, network monitoring, etc.) . - This package provides the python library. + This package provvides the(python library. diff -Nru quantum-2012.1~rc1/debian/patches/fix-namespace.patch quantum-2012.1~rc1/debian/patches/fix-namespace.patch --- quantum-2012.1~rc1/debian/patches/fix-namespace.patch 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/patches/fix-namespace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -diff -Naurp quantum-2012.1.orig/setup.py quantum-2012.1/setup.py ---- quantum-2012.1.orig/setup.py 2012-03-19 05:25:42.000000000 -0400 -+++ quantum-2012.1/setup.py 2012-03-22 11:19:29.304475628 -0400 -@@ -105,4 +105,5 @@ setup( - 'quantum-server = quantum.server:main', - ] - }, -+ namespace_packages=['quantum',], - ) diff -Nru quantum-2012.1~rc1/debian/patches/series quantum-2012.1~rc1/debian/patches/series --- quantum-2012.1~rc1/debian/patches/series 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fix-namespace.patch diff -Nru quantum-2012.1~rc1/debian/quantum-common.install quantum-2012.1~rc1/debian/quantum-common.install --- quantum-2012.1~rc1/debian/quantum-common.install 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-common.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -etc/plugins.ini etc/quantum -etc/quantum.conf etc/quantum diff -Nru quantum-2012.1~rc1/debian/quantum-common.postinst quantum-2012.1~rc1/debian/quantum-common.postinst --- quantum-2012.1~rc1/debian/quantum-common.postinst 2012-03-20 17:58:28.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-common.postinst 2012-03-30 18:14:49.000000000 +0000 @@ -8,12 +8,12 @@ then addgroup --system quantum >/dev/null fi - if ! getent passwd glance > /dev/null 2>&1 + if ! getent passwd quantum > /dev/null 2>&1 then - adduser --system --home /var/lib/quantume --ingroup glance --no-create-home --shell /bin/false quantum + adduser --system --home /var/lib/quantum --ingroup quantum --no-create-home --shell /bin/false quantum fi chown -R quantum:quantum /var/lib/quantum/ /var/log/quantum/ /etc/quantum/ - chmod 0700 /etc/glance/ /var/log/glance/ + chmod 0700 /etc/quantum/ /var/log/quantum/ fi #DEBHELPER# diff -Nru quantum-2012.1~rc1/debian/quantum-plugin-nicira.install quantum-2012.1~rc1/debian/quantum-plugin-nicira.install --- quantum-2012.1~rc1/debian/quantum-plugin-nicira.install 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-plugin-nicira.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -etc/quantum/plugins/nicira/* etc/quantum/plugins/nicira diff -Nru quantum-2012.1~rc1/debian/quantum-plugin-ryu.install quantum-2012.1~rc1/debian/quantum-plugin-ryu.install --- quantum-2012.1~rc1/debian/quantum-plugin-ryu.install 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-plugin-ryu.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -etc/quantum/plugins/ryu/* etc/quantum/plugins/ryu diff -Nru quantum-2012.1~rc1/debian/quantum-server.install quantum-2012.1~rc1/debian/quantum-server.install --- quantum-2012.1~rc1/debian/quantum-server.install 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-server.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin/quantum-server usr/bin diff -Nru quantum-2012.1~rc1/debian/quantum-server.usptart quantum-2012.1~rc1/debian/quantum-server.usptart --- quantum-2012.1~rc1/debian/quantum-server.usptart 1970-01-01 00:00:00.000000000 +0000 +++ quantum-2012.1~rc1/debian/quantum-server.usptart 2012-03-30 18:14:49.000000000 +0000 @@ -0,0 +1,14 @@ +description "Quantum server" +author "Chuck Short " + +start on (local-filesystems and net-device-up IFACE!=lo) +stop on runlevel [016] + +respawn + +pre-start script + mkdir -p /var/run/quantum + chown quantum:root /var/run/quantum +end script + +exec start-stop-daemon --start --quiet --chuid quantum --exec /usr/bin/quantum-server diff -Nru quantum-2012.1~rc1/debian/upstart quantum-2012.1~rc1/debian/upstart --- quantum-2012.1~rc1/debian/upstart 2012-03-22 16:45:07.000000000 +0000 +++ quantum-2012.1~rc1/debian/upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -description "Quantum server" -author "Chuck Short " - -start on (local-filesystems and net-device-up IFACE!=lo) -stop on runlevel [016] - -respawn - -pre-start script - mkdir -p /var/run/quantum - chown quantum:root /var/run/quantum -end script - -exec start-stop-daemon --start --quiet --chuid quantum --exec quantum-server