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

Proposed by Raphaël Badin on 2015-07-01
Status: Merged
Approved by: Mike Pontillo on 2015-07-04
Approved revision: 409
Merged at revision: 409
Proposed branch: lp:~rvb/maas/packaging-1.8-1413388
Merge into: lp:~maas-maintainers/maas/packaging-1.8
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+2/-0)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~rvb/maas/packaging-1.8-1413388
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve on 2015-07-04
Ricardo Bánffy (community) 2015-07-01 Approve on 2015-07-02
Review via email: mp+263476@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Ricardo Bánffy (rbanffy) wrote :
review: Approve
Mike Pontillo (mpontillo) wrote :

@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) wrote :

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) wrote :

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) wrote :

> 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) wrote :

> > 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) wrote :

> 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) wrote :
review: Approve

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 2015-06-26 13:15:52 +0000
3+++ debian/changelog 2015-07-01 08:08:17 +0000
4@@ -4,6 +4,8 @@
5
6 [ Raphaël Badin ]
7 * Enable proxy_wstunnel module.
8+ * Drop dependency on python-iscpy: the code has been integrated into
9+ MAAS. (LP: #1413388).
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 09 Jun 2015 20:57:42 -0400
12
13
14=== modified file 'debian/control'
15--- debian/control 2015-06-05 18:05:28 +0000
16+++ debian/control 2015-07-01 08:08:17 +0000
17@@ -209,7 +209,6 @@
18 Architecture: all
19 Depends: bind9,
20 maas-region-controller-min (= ${binary:Version}),
21- python-iscpy,
22 ${misc:Depends}
23 Conflicts: dnsmasq
24 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)

Subscribers

People subscribed via source and target branches