arsenal

Merge lp:~adam-stokes/arsenal/arsenal into lp:arsenal/trunk

  1. arsenal
  2. Merge into 0.x
Proposed by Adam Stokes
Status: Merged
Merged at revision: 979
Proposed branch: lp:~adam-stokes/arsenal/arsenal
Merge into: lp:arsenal/trunk
Diff against target: 49 lines (+9/-4)
3 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
setup.py (+2/-3)
To merge this branch: bzr merge lp:~adam-stokes/arsenal/arsenal
Reviewer Review Type Date Requested Status
Bryce Harrington code Approve
Review via email: mp+101568@code.launchpad.net

This proposal supersedes a proposal from 2012-04-11.

Description of the change

Fix path location to language helper class in cdbs
Fix scripts loading in python distutils setup.py

To post a comment you must log in.
Revision history for this message
Adam Stokes (adam-stokes) wrote : Posted in a previous version of this proposal

The changelog has a weird packaging entry wrt ~lucid|precise is it possible to agree on a certain naming scheme?

Revision history for this message
Bryce Harrington (bryce) wrote :

Changes look fine.

We don't actually ship arsenal in ubuntu (yet), but these look like sane updates to the packaging.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-15 15:40:00 +0000
3+++ debian/changelog 2012-04-11 14:34:33 +0000
4@@ -1,3 +1,9 @@
5+arsenal (0.1.3~precise) precise; urgency=low
6+
7+ * Fix debian packaging issues
8+
9+ -- Adam Stokes <adam.stokes@canonical.com> Wed, 11 Apr 2012 10:08:22 -0400
10+
11 arsenal (0.1.3~lucid) lucid; urgency=low
12
13 * Check launchpadlib version before appending beta to API url
14
15=== modified file 'debian/rules' (properties changed: -x to +x)
16--- debian/rules 2011-09-12 12:48:57 +0000
17+++ debian/rules 2012-04-11 14:34:33 +0000
18@@ -5,7 +5,7 @@
19
20 include /usr/share/cdbs/1/rules/debhelper.mk
21 include /usr/share/cdbs/1/class/python-distutils.mk
22-include /usr/share/cdbs/1/rules/langpack.mk
23+include /usr/share/cdbs/1/class/langcore.mk
24
25 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
26 DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-scripts usr/share/arsenal --install-purelib=/usr/lib/python$(cdbs_python_current_version)/dist-packages/
27
28=== modified file 'setup.py' (properties changed: -x to +x)
29--- setup.py 2012-03-27 00:54:25 +0000
30+++ setup.py 2012-04-11 14:34:33 +0000
31@@ -1,6 +1,7 @@
32 #!/usr/bin/python
33
34 from distutils.core import setup
35+from arsenal import info
36 import glob, os, re
37
38 # look/set what version we have
39@@ -33,9 +34,7 @@
40 ('/var/lib/arsenal/templates', glob.glob('web/templates/*.*')),
41 ('/var/lib/arsenal/templates/frame', glob.glob('web/templates/frame/*.*')),
42 ],
43- scripts=[
44- glob.glob('scripts/*'),
45- ],
46+ scripts=glob.glob('scripts/*'),
47 )
48
49 # Uninstallation:

Subscribers

People subscribed via source and target branches

to status/vote changes: