Merge lp:~blake-rouse/maas/packaging-remove-pyscss into lp:~maas-maintainers/maas/packaging

[Blake Rouse]

Remove the need for python-pyscss as a build dependency.

[Andres Rodriguez (andreserl)]

lgtm!

Also, please test this from packaging before landing (and upgrades).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-26 21:26:48 +0000
+++ debian/changelog	2015-03-02 20:19:01 +0000
@@ -2,7 +2,9 @@
 
   * New upstream release, 1.8.0~alpha3 bzr3568
     - Adds support for Microsoft OCP Chassis.
-  * debian/control: Add python-bson as a depends.
+  * debian/control:
+    - Add python-bson as a depends.
+    - Remove python-pyscss as a build dependency.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 24 Feb 2015 15:47:07 -0500
 
@@ -160,7 +162,7 @@
       client MAAS API users.  (LP: #1383609)
     - Allow users to disable DHCP NIC scanning during commissioning otherwise
       this can lead machines not being able to commission (LP: #1383384)
-    - Ensure that MAAS can correctly download, and install HWE Kernels, and 
+    - Ensure that MAAS can correctly download, and install HWE Kernels, and
       not crash in the process. (LP: #1357532, LP: #1382281)
     - Add a lock to ensure we don't give the same 2 systems to two different
       users when acquiring a machine. (LP: #1382575)
@@ -240,7 +242,7 @@
 
   [Diogo Matsubara]
   * debian/control:
-    - maas-cluster-controller depends on syslinux-dev | 
+    - maas-cluster-controller depends on syslinux-dev |
       syslinux-common (LP: #1328659)
     - python-maas-provisioningserver depends on
       python-paramiko (LP: #1334401)
@@ -280,7 +282,7 @@
     debian/maas-region-controller-min.postinst
     debian/maas-region-controller.postinst
     - Install /var/log/maas/maas.log as a syslog file.
-    - Ensure logging is set up for upgrades 
+    - Ensure logging is set up for upgrades
 
   [ Graham Binns ]
   * debian/maas-region-controller.postinst:
@@ -377,7 +379,7 @@
   [ Jason Hobbs ]
   * debian/extras/99-maas: Allow access to keyserver.ubuntu.com via
     squid-deb-proxy.
- 
+
   [Jeroen Vermeulen]
   * debian/maas-cluster-controller.postinst:
     - Make the tgt config link point to the new boot-resources dir.
@@ -1011,7 +1013,7 @@
   * New upstream release (LP: #1044367)
 
   [ Julian Edwards ]
-  * Fix 02-pserv-config.patch to handle new default tftp directory 
+  * Fix 02-pserv-config.patch to handle new default tftp directory
 
   [ Andres Rodriguez ]
   * debian/maas.postinst:
@@ -1142,7 +1144,7 @@
   * debian/maas.postinst:
     - Set cobbler password in between quotes (LP: #984427)
     - Do not change permissions to maas.log (LP: #980915)
-  * no longer use maas-cloudimg2ephemeral, but rather use premade images 
+  * no longer use maas-cloudimg2ephemeral, but rather use premade images
     at http://maas.ubuntu.com
 
  -- Andres Rodriguez <[e-mail]>  Tue, 17 Apr 2012 23:44:46 -0700
@@ -1242,7 +1244,7 @@
 maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low
 
   [ Dave Walker (Daviey) ]
-  * debian/control: Add openssh-server as a Recommends, and wrap-and-sort. 
+  * debian/control: Add openssh-server as a Recommends, and wrap-and-sort.
 
   [ Andres Rodriguez ]
   * debian/maas.postinst:
@@ -1282,7 +1284,7 @@
 
   [ Dave Walker ]
   * debian/maas.postinst: Do not import ISO's at install time.
-  * debian/control: 
+  * debian/control:
     - Drop run-one, it's not a requirement and currently in universe.
     - Drop python-setproctitle, no longer required.
 
@@ -1303,7 +1305,7 @@
     - 02-pserv-config.patch: Update, and set 'maas' as username.
     - 03-longpoll-config.patch: Update.
   * debian/maas.install: Install preseeds and snippets.
-  * debian/maas.postinst: 
+  * debian/maas.postinst:
     - Set password for 'maas' cobbler username (in pserv and cobbler).
     - Set DEFAULT_MAAS_URL to IP of interface with default gateway.
 
@@ -1378,7 +1380,7 @@
   [ Dave Walker ]
   * debian/control:
     - Changed depends from psycopg2 to python-psycopg2 and dropped versioning.
-      - LP: #937982 
+      - LP: #937982
 
   [ Andres Rodriguez ]
   * debian/maas.install: Install maas-import-isos and related files.
@@ -1395,7 +1397,7 @@
 maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
 
   * New upstream snapshot, post 0.1 release.
-  * debian/control: 
+  * debian/control:
     - Drop depends on rabbitmq-server, no longer required.
   * debian/watch: Introduced watch file.
 

=== modified file 'debian/control'
--- debian/control	2015-02-26 21:26:48 +0000
+++ debian/control	2015-03-02 20:19:01 +0000
@@ -7,8 +7,7 @@
                po-debconf,
                python (>= 2.7),
                python-distribute,
-               python-django,
-               python-pyscss
+               python-django
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/maas

=== modified file 'debian/rules'
--- debian/rules	2015-01-30 13:54:45 +0000
+++ debian/rules	2015-03-02 20:19:01 +0000
@@ -22,11 +22,6 @@
 	HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON)	\
 		$(CURDIR)/src/maasserver/utils/jsenums.py	\
 		$(py_enums) > $(BUILDHOME)/enums.js
-	HOME=$(BUILDHOME) pyscss	\
-		$(CURDIR)/src/maasserver/static/scss/maas-styles.scss	\
-		--no-compress \
-		-o $(CURDIR)/src/maasserver/static/css/maas-styles.css	\
-		--load-path=$(CURDIR)/src/maasserver/static/scss
 
 override_dh_auto_install:
 	dh_auto_install