← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.precise

 

Julian Edwards has proposed merging lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.precise.

Requested reviews:
  Julian Edwards (julian-edwards)

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/122178

Update packaging to use latest trunk
-- 
https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/122178
Your team MAAS Maintainers is subscribed to branch lp:~maas-maintainers/maas/packaging.precise.
=== modified file 'debian/changelog'
--- debian/changelog	2012-08-29 03:14:49 +0000
+++ debian/changelog	2012-08-31 01:19:26 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr937+dfsg-0ubuntu1~precise1) precise; urgency=low
+maas (0.1+bzr950+dfsg-0ubuntu1~precise1) precise; urgency=low
 
   * New upstream release for Precise
 

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2012-08-23 21:32:31 +0000
+++ debian/patches/02-pserv-config.patch	2012-08-31 01:19:26 +0000
@@ -27,7 +27,7 @@
  
 @@ -33,10 +33,8 @@
  tftp:
-   # root: /var/lib/tftpboot
+   # root: /var/lib/maas/tftp
    # port: 69
 -  port: 5244
    ## The URL to be contacted to generate PXE configurations.


Follow ups