Merge lp:~rvb/maas/packaging-1.8-1413388 into lp:~maas-maintainers/maas/packaging-1.8

[Raphaël Badin]

Drop dependency on python-iscpy: the code has been integrated into MAAS.

Note: this needs https://code.launchpad.net/~mpontillo/maas/remove-iscpy-1.7/+merge/263450 to be forward ported to 1.8 before this can land.

[Ricardo Bánffy (rbanffy)]

Shouldn't https://code.launchpad.net/~mpontillo/maas/remove-iscpy-1.7/+merge/263450 be marked as a requirement for this?

review: Approve

[Mike Pontillo (mpontillo)]

@rbanffy, I don't think Launchpad understands dependencies between packaging and a "normal" MAAS branch. I seem to remember trying it once, and it really messed up the diff. ;-)

[Mike Pontillo (mpontillo)]

Raphaël, I noticed this on the 1.8 branch:

$ cat Makefile | grep 'PACKAGING :='
PACKAGING := $(CURDIR)/../packaging.trunk

Does that mean that trunk and 1.8 still share a packaging branch?

Should this be updated to packaging-1.8 in the 1.8 branch?

review: Needs Information

[Mike Pontillo (mpontillo)]

For what it's worth, I see this on 1.7 (and it matches the other branch you proposed):

$ cat Makefile | grep 'PACKAGING :='
PACKAGING := $(CURDIR)/../packaging.utopic

[Raphaël Badin (rvb)]

> Raphaël, I noticed this on the 1.8 branch:
>
> $ cat Makefile | grep 'PACKAGING :='
> PACKAGING := $(CURDIR)/../packaging.trunk
>
> Does that mean that trunk and 1.8 still share a packaging branch?
>
> Should this be updated to packaging-1.8 in the 1.8 branch?

You're right. Whoever cut the packaging-1.8 branch forgot to do that; note that this only affects the (debug only) `make package` target, published packages are built using the proper packaging branch. I'll fix it but in a different branch, this has nothing to do with this branch.

[Raphaël Badin (rvb)]

> > Raphaël, I noticed this on the 1.8 branch:
> >
> > $ cat Makefile | grep 'PACKAGING :='
> > PACKAGING := $(CURDIR)/../packaging.trunk
> >
> > Does that mean that trunk and 1.8 still share a packaging branch?
> >
> > Should this be updated to packaging-1.8 in the 1.8 branch?
>
> You're right. Whoever cut the packaging-1.8 branch forgot to do that; note
> that this only affects the (debug only) `make package` target, published
> packages are built using the proper packaging branch. I'll fix it but in a
> different branch, this has nothing to do with this branch.

Done in https://code.launchpad.net/~rvb/maas/fix-link-packaging-1.8/+merge/263753

[Raphaël Badin (rvb)]

> Shouldn't https://code.launchpad.net/~mpontillo/maas/remove-
> iscpy-1.7/+merge/263450 be marked as a requirement for this?

AFAIK you can't set a pre req using a MP that targets another branch.

[Mike Pontillo (mpontillo)]

Will land this after https://code.launchpad.net/~mpontillo/maas/remove-iscpy-1.8/+merge/263552 lands.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-26 13:15:52 +0000
+++ debian/changelog	2015-07-01 08:08:17 +0000
@@ -4,6 +4,8 @@
 
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
+  * Drop dependency on python-iscpy: the code has been integrated into
+    MAAS. (LP: #1413388).
 
  -- Andres Rodriguez <[e-mail]>  Tue, 09 Jun 2015 20:57:42 -0400
 

=== modified file 'debian/control'
--- debian/control	2015-06-05 18:05:28 +0000
+++ debian/control	2015-07-01 08:08:17 +0000
@@ -209,7 +209,6 @@
 Architecture: all
 Depends: bind9,
  maas-region-controller-min (= ${binary:Version}),
- python-iscpy,
  ${misc:Depends}
 Conflicts: dnsmasq
 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)