Merge lp:~andreserl/maas/packaging_updates into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2012-03-07
Status: Merged
Approved by: Julian Edwards on 2012-03-07
Approved revision: no longer in the source branch.
Merged at revision: 19
Proposed branch: lp:~andreserl/maas/packaging_updates
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 176 lines (+81/-13)
8 files modified
debian/changelog (+9/-2)
debian/control (+23/-8)
debian/maas.dirs (+1/-0)
debian/maas.install (+22/-3)
debian/maas.links (+1/-0)
debian/maas.postinst (+12/-0)
debian/python-django-maas.install (+3/-0)
debian/rules (+10/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_updates
Reviewer Review Type Date Requested Status
Julian Edwards (community) 2012-03-07 Approve on 2012-03-07
Review via email: mp+96418@code.launchpad.net

Commit message

Split into different binary packages (maas,python-django-maas), and handle maas apache config.
Release 0.1+bzr232+dfsg-0ubuntu1
Open 0.1+bzr233+dfsg-0ubuntu1

To post a comment you must log in.
Raphaël Badin (rvb) wrote :

84 +++ debian/maas.dirs 2012-03-07 17:58:26 +0000
85 @@ -0,0 +1,1 @@
86 +var/lib/maas/static/

I know close to nothing about packaging so please bear but maybe we should have var/lib/maas/media/ in here too…?

Andres Rodriguez (andreserl) wrote :

Yes. However, at the moment is not being created as I will handle that once I completely integrate the collect stuff, as I already uploaded maas to the archives.

review: Approve
lp:~andreserl/maas/packaging_updates updated on 2012-03-07
19. By Andres Rodriguez on 2012-03-07

[r=julian-edwards][bug=][author=andreserl] Split into different binary packages (maas,python-django-maas), and handle maas apache config.
Release 0.1+bzr232+dfsg-0ubuntu1
Open 0.1+bzr233+dfsg-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-01 23:31:20 +0000
3+++ debian/changelog 2012-03-07 17:58:26 +0000
4@@ -1,6 +1,11 @@
5-maas (0.1+bzr204+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (0.1+bzr233+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * UNRELEASED
9+
10+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:51:12 -0500
11+
12+maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low
13+
14 * New upstream snapshot.
15
16 [ Dave Walker ]
17@@ -15,8 +20,10 @@
18 - debian/control: Depend on squid3.
19 - debian/maas.{postinst,postrm}: Handle installation/removal of custom
20 squid config file.
21+ * Split into different binary packages (maas,python-django-maas).
22+ - debian/maas.postinst: Handle the apache2 configuration.
23
24- -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 01 Mar 2012 18:23:56 -0500
25+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500
26
27 maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
28
29
30=== modified file 'debian/control'
31--- debian/control 2012-03-01 23:31:20 +0000
32+++ debian/control 2012-03-07 17:58:26 +0000
33@@ -2,24 +2,39 @@
34 Section: net
35 Priority: optional
36 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
37-Build-Depends: debhelper (>= 8), python-all (>= 2.7), python-distribute
38+Build-Depends: debhelper (>= 8), python-dev (>= 2.7), python-distribute
39 Standards-Version: 3.9.2
40 X-Python-Version: >= 2.7
41 Homepage: https://launchpad.net/maas
42
43 Package: maas
44 Architecture: all
45-Depends: postgresql-9.1,
46- python-psycopg2,
47+Depends: ${misc:Depends},
48+ ${python:Depends},
49+ apache2,
50+ postgresql-9.1,
51 python-django,
52+ python-django-maas (>= ${binary:Version}),
53 python-django-piston,
54 python-django-south,
55+ squid3
56+Description: The next step in the development of orchestra.
57+ It provides an easy to use UI to provision your Ubuntu servers.
58+
59+Package: python-django-maas
60+Architecture: all
61+Depends: ${misc:Depends},
62+ ${python:Depends},
63+ python-oops,
64+ python-oops-amqp,
65+ python-oops-datedir-repo,
66+ python-oops-twisted,
67+ python-oops-wsgi,
68+ python-psycopg2,
69 python-setproctitle,
70 python-sphinx,
71 python-twisted,
72- python-zope.interface,
73- squid3,
74- ${misc:Depends},
75- ${python:Depends}
76-Description: The next step in the development of orchestra.
77+ python-txamqp,
78+ python-zope.interface
79+Description: The next step in the development of Orchestra.
80 It provides an easy to use UI to provision your Ubuntu servers.
81
82=== added file 'debian/maas.dirs'
83--- debian/maas.dirs 1970-01-01 00:00:00 +0000
84+++ debian/maas.dirs 2012-03-07 17:58:26 +0000
85@@ -0,0 +1,1 @@
86+var/lib/maas/static/
87
88=== modified file 'debian/maas.install'
89--- debian/maas.install 2012-03-01 23:31:20 +0000
90+++ debian/maas.install 2012-03-07 17:58:26 +0000
91@@ -1,5 +1,24 @@
92+# Install project
93+debian/tmp/usr/lib/python*/dist-packages/maas/__init__.py usr/share/maas/maas
94+debian/tmp/usr/lib/python*/dist-packages/maas/demo.py usr/share/maas/maas
95+debian/tmp/usr/lib/python*/dist-packages/maas/development.py usr/share/maas/maas
96+debian/tmp/usr/lib/python*/dist-packages/maas/production.py usr/share/maas/maas
97+debian/tmp/usr/lib/python*/dist-packages/maas/settings.py usr/share/maas/maas
98+debian/tmp/usr/lib/python*/dist-packages/maas/urls.py usr/share/maas/maas
99+
100+# Install Apache Config
101+contrib/maas-http.conf etc/maas
102+
103+# Install MaaS local settings
104+debian/tmp/usr/share/maas/maas_local_settings.py
105+
106+# Install WSGI
107+contrib/wsgi.py usr/share/maas
108+
109+# Install all other stuff
110+debian/extras/squid.conf usr/share/maas/conf
111+etc/cron.d/maas-import-isos
112 etc/maas/import_isos
113-etc/cron.d/maas-import-isos
114+man/maas-import-isos.8 usr/share/man/man8
115 scripts/maas-import-isos usr/sbin
116-man/maas-import-isos.8 usr/share/man/man8
117-debian/extras/squid.conf usr/share/maas/conf
118+
119
120=== added file 'debian/maas.links'
121--- debian/maas.links 1970-01-01 00:00:00 +0000
122+++ debian/maas.links 2012-03-07 17:58:26 +0000
123@@ -0,0 +1,1 @@
124+usr/share/maas/maas_local_settings.py etc/maas/maas_local_settings.py
125
126=== modified file 'debian/maas.postinst'
127--- debian/maas.postinst 2012-03-01 23:31:20 +0000
128+++ debian/maas.postinst 2012-03-07 17:58:26 +0000
129@@ -2,6 +2,18 @@
130
131 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
132
133+ # handle apache
134+ if [ -e /etc/maas/maas-http.conf -a \
135+ ! -e /etc/apache2/conf.d/maas-http.conf ]; then
136+ ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
137+ fi
138+
139+ # enable apache modules needed
140+ a2enmod expires
141+
142+ # restart apache
143+ invoke-rc.d apache2 restart
144+
145 # Handle squid integration
146 if [ -e /etc/squid3/squid.conf ] ; then
147 cp /etc/squid3/squid.conf /etc/squid3/squid.conf.orig
148
149=== added file 'debian/python-django-maas.install'
150--- debian/python-django-maas.install 1970-01-01 00:00:00 +0000
151+++ debian/python-django-maas.install 2012-03-07 17:58:26 +0000
152@@ -0,0 +1,3 @@
153+debian/tmp/usr/lib/python*/dist-packages/maasserver
154+debian/tmp/usr/lib/python*/dist-packages/metadataserver
155+debian/tmp/usr/lib/python*/dist-packages/provisioningserver
156
157=== modified file 'debian/rules'
158--- debian/rules 2012-02-16 21:30:01 +0000
159+++ debian/rules 2012-03-07 17:58:26 +0000
160@@ -3,6 +3,16 @@
161 %:
162 dh $@ --with python2 --buildsystem=python_distutils
163
164+override_dh_auto_install:
165+ dh_auto_install
166+
167+ # Copy the local config file
168+ install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas
169+ cp $(CURDIR)/contrib/maas_local_settings_sample.py \
170+ $(CURDIR)/debian/tmp/usr/share/maas/maas_local_settings.py
171+
172+ dh_install --list-missing
173+
174 DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
175 REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
176 | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')

Subscribers

People subscribed via source and target branches

to all changes: