EnDroid

Merge lp:~isoschiz/endroid/webv2 into lp:endroid

  1. webv2
  2. Merge into trunk
Proposed by Martin Morrison
Status: Merged
Approved by: ChrisD
Approved revision: 74
Merged at revision: 72
Proposed branch: lp:~isoschiz/endroid/webv2
Merge into: lp:endroid
Diff against target: 63 lines (+7/-9)
6 files modified
debian/compat (+1/-1)
debian/conffiles (+1/-1)
debian/control (+1/-1)
debian/endroid.install (+2/-2)
debian/rules (+1/-3)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~isoschiz/endroid/webv2
Reviewer Review Type Date Requested Status
ChrisD Approve
Review via email: mp+214406@code.launchpad.net

Commit message

Build fixes.

Description of the change

Minor build updates to fix bugs from the last commit.

To post a comment you must log in.
lp:~isoschiz/endroid/webv2 updated
74. By Martin Morrison <email address hidden>

Merge in changes from trunk

Revision history for this message
ChrisD (gingerchris) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/compat'
2--- debian/compat 2012-08-13 22:27:22 +0000
3+++ debian/compat 2014-04-05 23:26:04 +0000
4@@ -1,1 +1,1 @@
5-7
6+9
7
8=== modified file 'debian/conffiles'
9--- debian/conffiles 2013-08-13 11:46:00 +0000
10+++ debian/conffiles 2014-04-05 23:26:04 +0000
11@@ -1,1 +1,1 @@
12-var/lib/endroid/db/endroid.db
13+/var/lib/endroid/db/endroid.db
14
15=== modified file 'debian/control'
16--- debian/control 2014-04-05 17:00:38 +0000
17+++ debian/control 2014-04-05 23:26:04 +0000
18@@ -2,7 +2,7 @@
19 Maintainer: Martin Morrison <martin.morrison@ensoft.co.uk>
20 Section: misc
21 Priority: optional
22-Build-Depends: debhelper (>= 7), python
23+Build-Depends: debhelper (>= 9),python,python-setuptools
24 Standards-Version: 3.9.3
25
26 Package: endroid
27
28=== modified file 'debian/endroid.install'
29--- debian/endroid.install 2014-04-05 11:42:51 +0000
30+++ debian/endroid.install 2014-04-05 23:26:04 +0000
31@@ -7,5 +7,5 @@
32 lib/wokkel-0.7.1-py2.7.egg usr/lib/endroid/dependencies
33 var/endroid.db var/lib/endroid/db
34 doc/EnDroid.png usr/share/endroid/media/
35-resources/httpinterface/index.html usr/share/endroid/templates/httpinterface/index.html
36-resources/httpinterface/notfound.html usr/share/endroid/templates/httpinterface/notfound.html
37+resources/httpinterface/index.html usr/share/endroid/templates/httpinterface/
38+resources/httpinterface/notfound.html usr/share/endroid/templates/httpinterface/
39
40=== modified file 'debian/rules'
41--- debian/rules 2012-09-02 21:06:53 +0000
42+++ debian/rules 2014-04-05 23:26:04 +0000
43@@ -1,6 +1,4 @@
44 #!/usr/bin/make -f
45
46-WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
47-
48 %:
49- dh ${WITH_PYTHON2} $@
50+ dh $@ --with python2
51
52=== modified file 'setup.py'
53--- setup.py 2013-08-14 11:28:46 +0000
54+++ setup.py 2014-04-05 23:26:04 +0000
55@@ -6,7 +6,7 @@
56 from distutils.core import setup
57
58 setup(name='endroid',
59- version="1.2",
60+ version="1.3",
61 description='EnDroid: a modular XMPP bot',
62 url='http://open.ensoft.co.uk/EnDroid',
63 packages=['endroid', 'endroid.plugins', 'endroid.plugins.compute'],

Subscribers

People subscribed via source and target branches