launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/pkg-move-pserv-yaml into lp:~maas-maintainers/maas/packaging.

Commit message:
Packaging branch: move pserv.yaml from etc/ to etc/maas/ in the source tree (still install it into /etc/maas/ as before).

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/pkg-move-pserv-yaml/+merge/166867

What you see here is a packaging change to accompany this code change: https://code.launchpad.net/~jtv/maas/move-pserv-yaml/+merge/166865

The pserv.yaml file *in the code* moves from etc/ to etc/maas/.  It will still be installed in /etc/maas/ as before, but its location in the source tree now matches its install location more sensibly.

Combining the upstream branch with this packaging branch produces a package that installs and starts up happily, with the patch applied to /etc/maas/pserv.yaml as one would expect.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/pkg-move-pserv-yaml/+merge/166867
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/pkg-move-pserv-yaml into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2012-08-31 01:44:13 +0000
+++ debian/patches/02-pserv-config.patch	2013-05-31 18:02:36 +0000
@@ -3,10 +3,10 @@
  include port, logfile, oops directory, cobbler url and username
 Author: Andres Rodriguez <andreserl@xxxxxxxxxx>
 
-Index: maas-0.1+bzr917+dfsg.orig/etc/pserv.yaml
+Index: maas-0.1+bzr917+dfsg.orig/etc/maas/pserv.yaml
 ===================================================================
---- maas-0.1+bzr917+dfsg.orig.orig/etc/pserv.yaml	2012-08-23 16:22:46.483599114 -0400
-+++ maas-0.1+bzr917+dfsg.orig/etc/pserv.yaml	2012-08-23 16:22:56.579599373 -0400
+--- maas-0.1+bzr917+dfsg.orig.orig/etc/maas/pserv.yaml	2012-08-23 16:22:46.483599114 -0400
++++ maas-0.1+bzr917+dfsg.orig/etc/maas/pserv.yaml	2012-08-23 16:22:56.579599373 -0400
 @@ -6,7 +6,7 @@
  ## running server.
  #