Merge lp:~rjwills/ensoft-sextant/packaging into lp:ensoft-sextant

[Robert]

Add support for debian packaging.

These changes add support for debian packaging.

[Patrick Stevens (patrickas)]

One question

[Phil Connell (pconnell)]

One comment inline that may or may not need addressing.

review: Needs Fixing

[Patrick Stevens (patrickas)]

Reply

[lp:~rjwills/ensoft-sextant/packaging]

17. By Robert Wills <email address hidden> on 2014-09-03

Markups from review.

18. By Robert Wills <email address hidden> on 2014-09-05

Merge with trunk.

19. By Robert Wills <email address hidden> on 2014-09-05

Fix packaging so that pip works inside a virtualenv.

Unmerged revisions

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-09-03 09:47:19 +0000
@@ -0,0 +1,5 @@
+sextant (1.1) precise; urgency=low
+
+  * Initial release for Ubuntu.
+
+ -- Robert Wills <[e-mail]>  Mon, 01 Sep 2014 12:04:23 +0100
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-09-03 09:47:19 +0000
@@ -0,0 +1,1 @@
+7
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-09-03 09:47:19 +0000
@@ -0,0 +1,13 @@
+Source: sextant
+Maintainer: Robert Wills <[e-mail]>
+Section: misc
+Priority: optional
+Build-Depends: debhelper,python,python-setuptools
+Standards-Version: 3.9.3
+
+Package: sextant
+Architecture: all
+Depends: python,python-support,python-twisted,graphviz,${misc:Depends}
+Description: Call graph generator and analysis tool, supporting C and Python.
+ Sextant analyzes C and Python programs and is able to produce a call graph.
+ It also provides command-line querying tools.
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-09-03 09:47:19 +0000
@@ -0,0 +1,2 @@
+Copyright 2014, Ensoft Ltd.
+All rights reserved.
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-09-03 09:47:19 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
+%:
+	dh ${WITH_PYTHON2} $@
 
=== modified file 'etc/sextant.conf'
--- etc/sextant.conf	2014-08-29 13:10:17 +0000
+++ etc/sextant.conf	2014-09-03 09:47:19 +0000
@@ -1,15 +1,15 @@
 [Neo4j]
 # URL of the Neo4J server
-remote_neo4j = 
+#remote_neo4j = http://localhost:7474
 # Port on which to serve Sextant Web
 #port = 2905
 # Number of calls incoming before we consider a function to be 'common'.
 # Defaults to 10.
 #common_function_calls = 10
 # Whether to connect using SSH to the remote server. Warning: if remote_neo4j
-# is some kind of localhost, we won't be able to SSH. Default is True (that is,
-# automatically SSH).
-#use_ssh_tunnel = True
+# is some kind of localhost, we won't be able to SSH. Default is False (that is,
+# don't SSH but connect directly).
+#use_ssh_tunnel = False
 # Which username to use on the remote SSH server. Default, or empty, is your
 # currently-logged-in username.
 #ssh_username =
 
=== modified file 'setup.py'
--- setup.py	2014-09-02 13:29:08 +0000
+++ setup.py	2014-09-03 09:47:19 +0000
@@ -11,18 +11,14 @@
 
 setup(
     name='Sextant',
-    version='1.0.1',
+    version='1.1',
     description= 'Navigating the C',
     url='http://open.ensoft.co.uk/Sextant',
     license='Simplified BSD License',
     packages=['sextant', 'sextant.web', 'resources', 'etc'],
     package_dir={'sextant': 'src/sextant', 'resources': 'resources', 'etc': 'etc'},
     scripts=['bin/sextant'],
-    # neo4jrestclient has no python-neo4jrestclient package on Ubuntu 12,
-    # so we remove its dependency here. You *must* install neo4jrestclient
-    # somehow before using Sextant; we recommend pip.
-    install_requires=['twisted'],
-    #install_requires=['neo4jrestclient', 'twisted'],
+    install_requires=['neo4jrestclient', 'twisted'],
     package_data={
         'resources': ['sextant/web/*'],
         'etc': ['*.conf', 'init/*'],
 
=== modified file 'src/sextant/environment.py'
--- src/sextant/environment.py	2014-09-01 10:23:22 +0000
+++ src/sextant/environment.py	2014-09-03 09:47:19 +0000
@@ -108,7 +108,7 @@
     conf = ConfigParser.ConfigParser({'remote_neo4j': 'http://localhost:7474',
                                       'port': '2905',
                                       'common_function_calls': '10',
-                                      'use_ssh_tunnel': 'True',
+                                      'use_ssh_tunnel': 'False',
                                       'ssh_username': ''})
     # It turns out that getint, getboolean etc want the defaults to be strings.
     # When getboolean is called and the default is not a string, and the