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

[Adam Stokes]

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

[Adam Stokes (adam-stokes)]

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

[Bryce Harrington (bryce)]

Changes look fine.

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

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-15 15:40:00 +0000
+++ debian/changelog	2012-04-11 14:34:33 +0000
@@ -1,3 +1,9 @@
+arsenal (0.1.3~precise) precise; urgency=low
+
+  * Fix debian packaging issues 
+
+ -- Adam Stokes <[e-mail]>  Wed, 11 Apr 2012 10:08:22 -0400
+
 arsenal (0.1.3~lucid) lucid; urgency=low
 
   * Check launchpadlib version before appending beta to API url
 
=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2011-09-12 12:48:57 +0000
+++ debian/rules	2012-04-11 14:34:33 +0000
@@ -5,7 +5,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/langpack.mk
+include /usr/share/cdbs/1/class/langcore.mk
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-scripts usr/share/arsenal --install-purelib=/usr/lib/python$(cdbs_python_current_version)/dist-packages/
 
=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2012-03-27 00:54:25 +0000
+++ setup.py	2012-04-11 14:34:33 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 from distutils.core import setup
+from arsenal import info
 import glob, os, re
 
 # look/set what version we have
@@ -33,9 +34,7 @@
         ('/var/lib/arsenal/templates',       glob.glob('web/templates/*.*')),
         ('/var/lib/arsenal/templates/frame', glob.glob('web/templates/frame/*.*')),
         ],
-    scripts=[
-        glob.glob('scripts/*'),
-        ],
+    scripts=glob.glob('scripts/*'),
     )
 
 # Uninstallation: