Merge lp:~patrick-hetu/charms/oneiric/znc/trunk into lp:charms/oneiric/znc

Proposed by Patrick Hetu on 2012-08-05
Status: Merged
Approved by: Mark Mims on 2012-08-09
Approved revision: 26
Merge reported by: Mark Mims
Merged at revision: not available
Proposed branch: lp:~patrick-hetu/charms/oneiric/znc/trunk
Merge into: lp:charms/oneiric/znc
Diff against target: 22 lines (+2/-1)
2 files modified
hooks/install (+1/-1)
metadata.yaml (+1/-0)
To merge this branch: bzr merge lp:~patrick-hetu/charms/oneiric/znc/trunk
Reviewer Review Type Date Requested Status
Mark Mims (community) 2012-08-05 Approve on 2012-08-09
Benjamin Kerensa (community) Approve on 2012-08-08
Review via email: mp+118269@code.launchpad.net

Description of the change

add myself as maintainer and merge changes from lp:~charmers/charms/precise/znc/precise

To post a comment you must log in.
Benjamin Kerensa (bkerensa) wrote :

Thanks for the changes Patrick looks good.

review: Approve
Mark Mims (mark-mims) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2012-04-05 02:15:29 +0000
3+++ hooks/install 2012-08-05 17:52:18 +0000
4@@ -3,7 +3,7 @@
5 set -eu # -x for verbose logging to juju debug-log
6
7
8-DEBIAN_FRONTEND=noninteractive apt-get -y install -qq znc znc-extra adduser
9+apt-get -y install -qq znc znc-extra adduser pwgen
10
11 if ! getent passwd znc >/dev/null; then
12 adduser --gecos "" --disabled-password --home /var/lib/znc/ znc
13
14=== modified file 'metadata.yaml'
15--- metadata.yaml 2012-03-14 17:10:40 +0000
16+++ metadata.yaml 2012-08-05 17:52:18 +0000
17@@ -1,4 +1,5 @@
18 name: znc
19 summary: advanced modular IRC bouncer
20+maintainer: Patrick Hetu <patrick.hetu@gmail.com>
21 description: |
22 advanced modular IRC bouncer

Subscribers

People subscribed via source and target branches

to all changes: