EnGage

Merge lp:~slimey/engage/stockwell into lp:engage

  1. stockwell
  2. Merge into victoria
Proposed by Simon C
Status: Merged
Approved by: Simon C
Approved revision: 5
Merged at revision: 5
Proposed branch: lp:~slimey/engage/stockwell
Merge into: lp:engage
Diff against target: 66 lines (+13/-29)
3 files modified
bin/engage (+6/-28)
debian/changelog (+6/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~slimey/engage/stockwell
Reviewer Review Type Date Requested Status
Simon C Approve
Review via email: mp+126308@code.launchpad.net

Commit message

Packaging improvement

Description of the change

Packaging improvement

To post a comment you must log in.
Revision history for this message
Martin Morrison (isoschiz) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

Revision history for this message
Simon C (slimey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/engage'
2--- bin/engage 2012-09-25 12:44:16 +0000
3+++ bin/engage 2012-09-25 17:49:44 +0000
4@@ -1,28 +1,6 @@
5-#!/usr/bin/python
6-#
7-# This is just a crazy equivalent of
8-#
9-# /usr/bin/twistd --uid nobody --gid nogroup --logfile /var/log/engage.log --nodaemon engage
10-#
11-# but allowing Twisted to be embedded, for those ubutnu machines with
12-# a stock (pre-12.0) version.
13-#
14-# Happy day when we can ditch this.
15-#
16-import os, platform, sys
17-try:
18- import _preamble
19-except ImportError:
20- sys.exc_clear()
21-
22-lib_dir = '/usr/lib/engage/lib-depends'
23-sys.path.insert(0, lib_dir)
24-sys.path.insert(0, os.path.join(lib_dir, 'twisted-engage.egg'))
25-
26-argv_head = sys.argv[0]
27-argv_tail = sys.argv[1:]
28-sys.argv = [argv_head, '--uid', 'nobody', '--gid', 'nogroup', '--logfile',
29- '/var/log/engage.log', '--nodaemon'] + argv_tail + ['engage']
30-
31-from twisted.scripts.twistd import run
32-run()
33+#!/bin/sh
34+LIBDIR=/usr/lib/engage/lib-depends
35+PYTHONPATH=$LIBDIR/twisted-engage.egg:$LIBDIR
36+export PYTHONPATH
37+ARGS="--uid nobody --gid nogroup --logfile /var/log/engage.log --nodaemon"
38+twistd $ARGS "$@" engage
39
40=== modified file 'debian/changelog'
41--- debian/changelog 2012-09-25 12:44:16 +0000
42+++ debian/changelog 2012-09-25 17:49:44 +0000
43@@ -1,3 +1,9 @@
44+engage (0.6.2) precise; urgency=low
45+
46+ * Packaging improvement
47+
48+ -- Simon C <simonc@ensoft.co.uk> Tue, 25 Sep 2012 18:46:58 +0100
49+
50 engage (0.6.1) precise; urgency=low
51
52 * Embedded twisted 12 for easy of installing on stock ubuntu
53
54=== added file 'lib-depends/twisted-engage.egg'
55=== modified file 'setup.py'
56--- setup.py 2012-09-25 12:44:16 +0000
57+++ setup.py 2012-09-25 17:49:44 +0000
58@@ -7,7 +7,7 @@
59 from distutils.core import setup
60
61 setup(name='engage',
62- version="0.6.1",
63+ version="0.6.2",
64 description='EnGage: system/network statistics monitoring and Apple TV control',
65 url='http://open.ensoft.co.uk/EnGage',
66 packages=['engage', 'engage.collector', 'engage.media', 'engage.monitor',

Subscribers

People subscribed via source and target branches

to all changes: