MAAS

Merge lp:~julian-edwards/maas/1.6-makefile into lp:maas/1.6

  1. 1.6-makefile
  2. Merge into 1.6
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 2548
Proposed branch: lp:~julian-edwards/maas/1.6-makefile
Merge into: lp:maas/1.6
Diff against target: 14 lines (+2/-2)
1 file modified
Makefile (+2/-2)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.6-makefile
Reviewer Review Type Date Requested Status
Julian Edwards (community) trivial Approve
Review via email: mp+231488@code.launchpad.net

Commit message

Update the Makefile so package building works in 1.6.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve (trivial)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-06-10 14:45:14 +0000
3+++ Makefile 2014-08-20 02:47:29 +0000
4@@ -344,8 +344,8 @@
5 # has a bug and always considers apt-source tarballs before the specified
6 # branch. So instead, export to a local tarball which is always found.
7 # Make sure debhelper and dh-apport packages are installed before using this.
8-PACKAGING := $(CURDIR)/../packaging.trunk
9-PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging
10+PACKAGING := $(CURDIR)/../packaging.trusty
11+PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging.trusty
12
13 package_branch:
14 @echo Downloading/refreshing packaging branch...

Subscribers

People subscribed via source and target branches

to all changes: