MAAS

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

  1. packaging_updates
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Julian Edwards
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) Approve
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.
Revision history for this message
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…?

Revision history for this message
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.

Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-01 23:31:20 +0000
+++ debian/changelog 2012-03-07 17:58:26 +0000
@@ -1,6 +1,11 @@
1maas (0.1+bzr204+dfsg-0ubuntu1) UNRELEASED; urgency=low1maas (0.1+bzr233+dfsg-0ubuntu1) UNRELEASED; urgency=low
22
3 * UNRELEASED3 * UNRELEASED
4
5 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:51:12 -0500
6
7maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low
8
4 * New upstream snapshot.9 * New upstream snapshot.
510
6 [ Dave Walker ]11 [ Dave Walker ]
@@ -15,8 +20,10 @@
15 - debian/control: Depend on squid3.20 - debian/control: Depend on squid3.
16 - debian/maas.{postinst,postrm}: Handle installation/removal of custom21 - debian/maas.{postinst,postrm}: Handle installation/removal of custom
17 squid config file.22 squid config file.
23 * Split into different binary packages (maas,python-django-maas).
24 - debian/maas.postinst: Handle the apache2 configuration.
1825
19 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 01 Mar 2012 18:23:56 -050026 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500
2027
21maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low28maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
2229
2330
=== modified file 'debian/control'
--- debian/control 2012-03-01 23:31:20 +0000
+++ debian/control 2012-03-07 17:58:26 +0000
@@ -2,24 +2,39 @@
2Section: net2Section: net
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 8), python-all (>= 2.7), python-distribute5Build-Depends: debhelper (>= 8), python-dev (>= 2.7), python-distribute
6Standards-Version: 3.9.26Standards-Version: 3.9.2
7X-Python-Version: >= 2.77X-Python-Version: >= 2.7
8Homepage: https://launchpad.net/maas8Homepage: https://launchpad.net/maas
99
10Package: maas10Package: maas
11Architecture: all11Architecture: all
12Depends: postgresql-9.1,12Depends: ${misc:Depends},
13 python-psycopg2,13 ${python:Depends},
14 apache2,
15 postgresql-9.1,
14 python-django,16 python-django,
17 python-django-maas (>= ${binary:Version}),
15 python-django-piston,18 python-django-piston,
16 python-django-south,19 python-django-south,
20 squid3
21Description: The next step in the development of orchestra.
22 It provides an easy to use UI to provision your Ubuntu servers.
23
24Package: python-django-maas
25Architecture: all
26Depends: ${misc:Depends},
27 ${python:Depends},
28 python-oops,
29 python-oops-amqp,
30 python-oops-datedir-repo,
31 python-oops-twisted,
32 python-oops-wsgi,
33 python-psycopg2,
17 python-setproctitle,34 python-setproctitle,
18 python-sphinx,35 python-sphinx,
19 python-twisted,36 python-twisted,
20 python-zope.interface,37 python-txamqp,
21 squid3,38 python-zope.interface
22 ${misc:Depends},39Description: The next step in the development of Orchestra.
23 ${python:Depends}
24Description: The next step in the development of orchestra.
25 It provides an easy to use UI to provision your Ubuntu servers.40 It provides an easy to use UI to provision your Ubuntu servers.
2641
=== added file 'debian/maas.dirs'
--- debian/maas.dirs 1970-01-01 00:00:00 +0000
+++ debian/maas.dirs 2012-03-07 17:58:26 +0000
@@ -0,0 +1,1 @@
1var/lib/maas/static/
02
=== modified file 'debian/maas.install'
--- debian/maas.install 2012-03-01 23:31:20 +0000
+++ debian/maas.install 2012-03-07 17:58:26 +0000
@@ -1,5 +1,24 @@
1# Install project
2debian/tmp/usr/lib/python*/dist-packages/maas/__init__.py usr/share/maas/maas
3debian/tmp/usr/lib/python*/dist-packages/maas/demo.py usr/share/maas/maas
4debian/tmp/usr/lib/python*/dist-packages/maas/development.py usr/share/maas/maas
5debian/tmp/usr/lib/python*/dist-packages/maas/production.py usr/share/maas/maas
6debian/tmp/usr/lib/python*/dist-packages/maas/settings.py usr/share/maas/maas
7debian/tmp/usr/lib/python*/dist-packages/maas/urls.py usr/share/maas/maas
8
9# Install Apache Config
10contrib/maas-http.conf etc/maas
11
12# Install MaaS local settings
13debian/tmp/usr/share/maas/maas_local_settings.py
14
15# Install WSGI
16contrib/wsgi.py usr/share/maas
17
18# Install all other stuff
19debian/extras/squid.conf usr/share/maas/conf
20etc/cron.d/maas-import-isos
1etc/maas/import_isos21etc/maas/import_isos
2etc/cron.d/maas-import-isos22man/maas-import-isos.8 usr/share/man/man8
3scripts/maas-import-isos usr/sbin23scripts/maas-import-isos usr/sbin
4man/maas-import-isos.8 usr/share/man/man824
5debian/extras/squid.conf usr/share/maas/conf
625
=== added file 'debian/maas.links'
--- debian/maas.links 1970-01-01 00:00:00 +0000
+++ debian/maas.links 2012-03-07 17:58:26 +0000
@@ -0,0 +1,1 @@
1usr/share/maas/maas_local_settings.py etc/maas/maas_local_settings.py
02
=== modified file 'debian/maas.postinst'
--- debian/maas.postinst 2012-03-01 23:31:20 +0000
+++ debian/maas.postinst 2012-03-07 17:58:26 +0000
@@ -2,6 +2,18 @@
22
3if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then3if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
44
5 # handle apache
6 if [ -e /etc/maas/maas-http.conf -a \
7 ! -e /etc/apache2/conf.d/maas-http.conf ]; then
8 ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
9 fi
10
11 # enable apache modules needed
12 a2enmod expires
13
14 # restart apache
15 invoke-rc.d apache2 restart
16
5 # Handle squid integration17 # Handle squid integration
6 if [ -e /etc/squid3/squid.conf ] ; then18 if [ -e /etc/squid3/squid.conf ] ; then
7 cp /etc/squid3/squid.conf /etc/squid3/squid.conf.orig19 cp /etc/squid3/squid.conf /etc/squid3/squid.conf.orig
820
=== added file 'debian/python-django-maas.install'
--- debian/python-django-maas.install 1970-01-01 00:00:00 +0000
+++ debian/python-django-maas.install 2012-03-07 17:58:26 +0000
@@ -0,0 +1,3 @@
1debian/tmp/usr/lib/python*/dist-packages/maasserver
2debian/tmp/usr/lib/python*/dist-packages/metadataserver
3debian/tmp/usr/lib/python*/dist-packages/provisioningserver
04
=== modified file 'debian/rules'
--- debian/rules 2012-02-16 21:30:01 +0000
+++ debian/rules 2012-03-07 17:58:26 +0000
@@ -3,6 +3,16 @@
3%:3%:
4 dh $@ --with python2 --buildsystem=python_distutils4 dh $@ --with python2 --buildsystem=python_distutils
55
6override_dh_auto_install:
7 dh_auto_install
8
9 # Copy the local config file
10 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas
11 cp $(CURDIR)/contrib/maas_local_settings_sample.py \
12 $(CURDIR)/debian/tmp/usr/share/maas/maas_local_settings.py
13
14 dh_install --list-missing
15
6DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))16DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
7REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \17REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
8 | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')18 | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')

Subscribers

People subscribed via source and target branches

to all changes: