Merge lp:~matsubara/maas/syslinux-dev-dep-utopic into lp:~maas-maintainers/maas/packaging

[Diogo Matsubara]

Update maas-cluster-controller to use strictly earlier option for Trusty's syslinux-common dependency

Change how syslinux-dev and syslinux-common dependencies for maas-cluster-controller are handled. Previously setting only syslinux-dev | syslinux-common, made the package install only syslinux-common on Utopic. Setting the strictly earlier option, as suggested by Colin seems to do the trick and the package installs correctly both on Utopic and Trusty.

I ran the integration tests with this packaging branch:

- http://d-jenkins.ubuntu-ci:8080/view/MAAS/job/utopic-adt-maas-manual/43/consoleFull shows both syslinux-common and syslinux-dev installed.
- http://d-jenkins.ubuntu-ci:8080/view/MAAS/job/trusty-adt-maas-manual/194/consoleFull shows only syslinux-common installed.

[Blake Rouse (blake-rouse)]

lgtm!

review: Approve

[Diogo Matsubara (matsubara)]

Thanks Blake!

=== modified file 'debian/control'
--- debian/control	2014-06-20 16:52:55 +0000
+++ debian/control	2014-06-20 17:08:01 +0000
@@ -164,8 +164,8 @@
          python-twisted,
          python-zope.interface,
          rsyslog,
+         syslinux-dev | syslinux-common (<< 3:6.00~pre4+dfsg-5),
          syslinux-common,
-         syslinux-dev | syslinux-common,
          tgt,
          ubuntu-cloudimage-keyring,
          uuid-runtime,