Merge pull request #7 from xtaran/master

Fix the most blatant issues of the generated .deb

README.md

@@ -13,10 +13,16 @@ Required Software
 
  - You need PyXAPI, available here:
    http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/
- - You also need autossh, available in various package management systems
  - Python 2.x, both locally and the remote system
 
 
+Additional Suggested Software
+-----------------------------
+
+ - You may want to need autossh, available in various package management
+   systems
+
+
 sshuttle: where transparent proxy meets VPN meets ssh
 =====================================================
 

packaging/control

@@ -1,14 +1,16 @@
 Package: sshuttle
-Version: 0.2
+Version: 0+git
-Architecture: i386
+Architecture: all
 Maintainer: Jim Wyllie <jwyllie83@gmail.com>
-Depends: autossh, upstart, python (>=2.6)
+Depends: iptables, python (>= 2.6)
-Section: utils
+Suggests: autossh
+Section: net
 Priority: optional
-Homepage: http://github.com/jwyllie83/sshuttle.udp
+Homepage: http://github.com/sshuttle/sshuttle
-Description: "Full-featured" VPN over an SSH tunnel, allowing full remote
+Description: "Full-featured" VPN over an SSH tunnel
- access somewhere where all you have is an SSH connection.  It works well if
+ It allows full remote access somewhere where all you have is an SSH
- you generally find yourself in the following situation:
+ connection.  It works well if you generally find yourself in the
+ following situation:
  .
  - Your client machine (or router) is Linux, FreeBSD, or MacOS.
  - You have access to a remote network via ssh.
@@ -22,5 +24,5 @@ Description: "Full-featured" VPN over an SSH tunnel, allowing full remote
     it's disabled by default on openssh servers; plus it does
     TCP-over-TCP, which has suboptimal performance
  .
- It also has hooks for more complicated setups (VPN-in-a-SSH-VPN, etc) to allow
+ It also has hooks for more complicated setups (VPN-in-a-SSH-VPN, etc.) to allow
  you to set it up as you like.

packaging/make_deb

@@ -24,6 +24,11 @@ cp ../src/sshuttle ${B}/usr/bin
 cp -r sshuttle.conf ${B}/etc/init
 cp prefixes.conf ${B}/etc/sshuttle
 cp tunnel.conf ${B}/etc/sshuttle
+# Remove MacOS X stuff from .deb
+rm -r ${B}/usr/share/sshuttle/ui-macos
+
+# Fix path to main.py
+sed -e 's:^DIR=.*$:DIR=/usr/share/sshuttle/:' -i ${B}/usr/bin/sshuttle
 
 # Copy the control file over, as well
 cp control ${B}/DEBIAN