Merge lp:~matsubara/maas/packaging-fix-patches into lp:~maas-maintainers/maas/packaging

[Diogo Matsubara]

Fix patches in patches directory to apply cleanly.

This patch fixes two patches in the patches/ dir: 02-pserv-config.patch and 03-txlongpoll-config.patch so they'll apply cleanly.

This is to fix the dailybuilds maas recipe https://code.launchpad.net/~maas-maintainers/+archive/dailybuilds/+recipebuild/220586

[Gavin Panella (allenap)]

I think I broke that. Sorry.

review: Approve

[Diogo Matsubara (matsubara)]

Thanks for the review! It's merged and I requested a new build. Let's
see how it goes.

On Mon, Apr 23, 2012 at 4:08 PM, Gavin Panella
<email address hidden> wrote:
> Review: Approve
>
> I think I broke that. Sorry.
> --
> https://code.launchpad.net/~matsubara/maas/packaging-fix-patches/+merge/103149
> You are the owner of lp:~matsubara/maas/packaging-fix-patches.

--
Diogo M. Matsubara

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2012-04-12 00:21:00 +0000
+++ debian/patches/02-pserv-config.patch	2012-04-23 18:29:19 +0000
@@ -26,7 +26,7 @@
  ## running server.
  #
  # logfile: "pserv.log"
--logfile: "logs/pserv.log"
+-logfile: "/dev/null"
 +logfile: "/var/log/maas/pserv.log"
  
  ## OOPS configuration (optional).

=== modified file 'debian/patches/03-txlongpoll-config.patch'
--- debian/patches/03-txlongpoll-config.patch	2012-04-10 19:26:20 +0000
+++ debian/patches/03-txlongpoll-config.patch	2012-04-23 18:29:19 +0000
@@ -35,5 +35,5 @@
  ## running server.
  #
  # logfile: "txlongpoll.log"
--logfile: "logs/txlongpoll.log"
+-logfile: "/dev/null"
 +logfile: "/var/log/maas/txlongpoll.log"