19 files changed, 500 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 00000000..045d9700
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+python-leap-client for Debian
+-----------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- unknown <kali@croatan>  Sat, 21 Jul 2012 00:11:05 -0700
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000..da12f753
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+leap-client for Debian
+-----------------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000..cb4de3d5
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,14 @@
+leap-client (0.2.0~rc+d53729f) unstable; urgency=low
+  [ Kali ]
+  * fixes to sphinxdoc install
+  * merged release/v0.2.0 branch
+  * updated dependency list
+  [ Micah Anderson ]
+  * removed unused comments from control file
+  * move build-depends to source package section of control file
+  * switch source/format to 3.0 (native)
+  * fix build-dependency on python-mock
+  [ Kali ]
+  * Initial release (Closes: #XXX)
+
+ -- kali <kali@leap.se>  Sat, 21 Jul 2012 00:11:05 -0700
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..45a4fb75
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000..c94189ca
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,47 @@
+Source: leap-client
+Section: misc
+Priority: extra
+Maintainer: Micah Anderson <micah@debian.org>
+Standards-Version: 3.9.3
+Homepage: http://leap.se
+#Vcs-Git: git://git.debian.org/python-applications-team/leap-client.git
+#Vcs-Browser: http://git.debian.org/?p=python-applications-team/leap-client.git;a=summary
+Build-Depends: debhelper (>= 8.0.0), python-support, python (>=2.6), python-sphinx (>= 1.0.7+dfsg)
+X-Python-Version: >= 2.6
+
+Package: leap-client
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends},
+  python-qt4,
+  python-openssl,
+  python-crypto,
+  python-keyring,
+  python-srp,
+  python-dateutil,
+  python-argparse,
+  python-psutil,
+  python-netifaces,
+  python-requests,
+  python-xdg,
+  python-jsonschema,
+  python-sh,
+  python-setuptools,
+  python-nose,
+  python-mock,
+  pep8,
+  openvpn
+#pyqt4-dev-tools, ???
+#python-sphinx, only build-depend, right?
+Suggests: resolvconf 
+#, python-geoip ???
+Conflicts: autoresolv
+Enhances: openvpn
+Description: Provides the desktop client for the LEAP Encryption Access Project Platform.
+ LEAP (LEAP Encryption Access Project) develops
+ a plan to secure everyday communication, breaking down
+ into discrete services.
+ .
+ The client for the current phase gives support to the EIP Service.
+ EIP (the Encrypted Internet Proxy) provides circumvention, location
+ anonymization, and traffic encryption in a hassle-free,
+ automatically self-configuring fashion, and has an enhanced level of security.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000..fff117e1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,17 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: leap-client
+Upstream-Contact: info@leap.se
+Source: <http://github.com/leapcode/leap_client/>
+
+Files: *
+Copyright: 2012,2013 The LEAP Encryption Access Project 
+License: GPL-3+
+ This package is released under the GNU GPL, version 3 or a later revision.
+ For further details see the COPYING file.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+# REVIEW-ME This needs a licensecheck -r run !!! -- kali
+# Do we need to add the GPL OpenSSL exception??
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..fc8df7fd
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+# XXX fix path...
+#NEWS.rst
+#README.rst
diff --git a/debian/init.d.ex b/debian/init.d.ex
new file mode 100644
index 00000000..3eec795a
--- /dev/null
+++ b/debian/init.d.ex
@@ -0,0 +1,154 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          python-leap-client
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the software>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+# Author: unknown <cal@croatan>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=python-leap-client             # Introduce a short description here
+NAME=python-leap-client             # Introduce the short server's name here
+DAEMON=/usr/sbin/python-leap-client # Introduce the server's location here
+DAEMON_ARGS=""             # Arguments to run the daemon with
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+    do_start
+    case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+  ;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/debian/leap-client.doc-base.EX b/debian/leap-client.doc-base.EX
new file mode 100644
index 00000000..e70c2917
--- /dev/null
+++ b/debian/leap-client.doc-base.EX
@@ -0,0 +1,20 @@
+Document: python-leap-client
+Title: Debian python-leap-client Manual
+Author: <insert document author here>
+Abstract: This manual describes what python-leap-client is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/python-leap-client/python-leap-client.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/python-leap-client/python-leap-client.ps.gz
+
+Format: text
+Files: /usr/share/doc/python-leap-client/python-leap-client.text.gz
+
+Format: HTML
+Index: /usr/share/doc/python-leap-client/html/index.html
+Files: /usr/share/doc/python-leap-client/html/*.html
diff --git a/debian/leap-client.install b/debian/leap-client.install
new file mode 100644
index 00000000..c468a909
--- /dev/null
+++ b/debian/leap-client.install
@@ -0,0 +1 @@
+pkg/linux/polkit/net.openvpn.gui.leap.policy usr/share/polkit-1/actions/
diff --git a/debian/menu.ex b/debian/menu.ex
new file mode 100644
index 00000000..0ac5a68c
--- /dev/null
+++ b/debian/menu.ex
@@ -0,0 +1,2 @@
+?package(python-leap-client):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="python-leap-client" command="/usr/bin/python-leap-client"
diff --git a/debian/postinst.ex b/debian/postinst.ex
new file mode 100644
index 00000000..888928ca
--- /dev/null
+++ b/debian/postinst.ex
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for python-leap-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm.ex b/debian/postrm.ex
new file mode 100644
index 00000000..5048c8e2
--- /dev/null
+++ b/debian/postrm.ex
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for python-leap-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/preinst.ex b/debian/preinst.ex
new file mode 100644
index 00000000..8aeafcfe
--- /dev/null
+++ b/debian/preinst.ex
@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for python-leap-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm.ex b/debian/prerm.ex
new file mode 100644
index 00000000..19cc6ca1
--- /dev/null
+++ b/debian/prerm.ex
@@ -0,0 +1,38 @@
+#!/bin/sh
+# prerm script for python-leap-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..198e923f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,65 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Uncomment this to turn on verbose mode.
+#DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+
+%:
+	dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+
+# run tests!
+#
+
+# have to fix running tests inside venv.
+# XXX breaking git-buildpackage process
+# if we choose to run inside venv
+test-python%:
+	./run_tests.sh
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
+override_dh_preps:
+	# XXX trying to generate the manpage from rst,
+	# but not the right override... :(
+	rst2html docs/man/leap-client.1.rst docs/man/leap-client.1
+	dh_preps
+
+#dh_auto_build should be enough to build the python2 version
+
+build-python%:
+	python$* setup.py build
+
+#override_dh_auto_build: $(PYTHON3:%=build-python%)
+#        dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+#override_dh_auto_install: $(PYTHON3:%=install-python%)
+#        dh_auto_install
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k CHANGES.txt
+
+# build and install sphinx docs
+# 
+override_dh_installdocs:
+	python setup.py build_sphinx
+	dh_installdocs build/sphinx/html
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf docs/_build 
+	rm -rf *.egg-info
+	#rm docs/man/leap.1
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..89ae9db8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 00000000..9868b8e2
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+dist/leap_client-0.1dev-py2.7.egg
diff --git a/debian/watch.ex b/debian/watch.ex
new file mode 100644
index 00000000..77f571a6
--- /dev/null
+++ b/debian/watch.ex
@@ -0,0 +1,10 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# XXX Leaving this here until we have leap.se downloads page -- kali
+https://github.com/leapcode/leap_client/tags.*/v(\d[\d\.]+)\.tar\.gz