diff options
-rw-r--r-- | debian/README.Debian | 6 | ||||
-rw-r--r-- | debian/README.source | 9 | ||||
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 18 | ||||
-rw-r--r-- | debian/copyright | 38 | ||||
-rw-r--r-- | debian/docs | 2 | ||||
-rw-r--r-- | debian/init.d.ex | 154 | ||||
-rw-r--r-- | debian/menu.ex | 2 | ||||
-rw-r--r-- | debian/postinst.ex | 39 | ||||
-rw-r--r-- | debian/postrm.ex | 37 | ||||
-rw-r--r-- | debian/preinst.ex | 35 | ||||
-rw-r--r-- | debian/prerm.ex | 38 | ||||
-rw-r--r-- | debian/python-leap-client.cron.d.ex | 4 | ||||
-rw-r--r-- | debian/python-leap-client.default.ex | 10 | ||||
-rw-r--r-- | debian/python-leap-client.doc-base.EX | 20 | ||||
-rw-r--r-- | debian/python-leap-client.install | 2 | ||||
-rwxr-xr-x | debian/rules | 57 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/include-binaries | 1 | ||||
-rw-r--r-- | debian/watch.ex | 23 | ||||
-rw-r--r-- | src/leap/gui/mainwindow_rc.py | 2 |
22 files changed, 503 insertions, 1 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..eae9eabd --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +python-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..d0397d38 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-leap-client (0.1.0+01234-1) unstable; urgency=low + + * 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..ce5ba56c --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: python-leap-client +Section: unknown +Priority: extra +Maintainer: kali <kali@leap.se> +Standards-Version: 3.9.3 +Homepage: http://leap.se +#Vcs-Git: git://git.debian.org/collab-maint/python-leap-client.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/python-leap-client.git;a=summary +X-Python-Version: >= 2.6 + +Package: python-leap-client +Architecture: all +#XXX ??? +#Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: openvpn, python-qt4 +Build-Depends: debhelper (>= 8.0.0), pyqt4-dev-tools, python-nose, python-moc, python-sphinx, pep8 +Description: the encrypted interned toolkit + <insert long description, indented with spaces> diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..a5907f48 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: python-leap-client +Source: <url://example.com> + +Files: * +Copyright: <years> <put author's name and email here> + <years> <likewise for another author> +License: <special license> + <Put the license of the package here indented by 1 space> + <This follows the format of Description: lines in control file> + . + <Including paragraphs> + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2012 unknown <cal@croatan> +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..e953f2c6 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +CHANGES.txt +README.txt 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/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/python-leap-client.cron.d.ex b/debian/python-leap-client.cron.d.ex new file mode 100644 index 00000000..693a391e --- /dev/null +++ b/debian/python-leap-client.cron.d.ex @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the python-leap-client package +# +0 4 * * * root [ -x /usr/bin/python-leap-client_maintenance ] && /usr/bin/python-leap-client_maintenance diff --git a/debian/python-leap-client.default.ex b/debian/python-leap-client.default.ex new file mode 100644 index 00000000..131c9f87 --- /dev/null +++ b/debian/python-leap-client.default.ex @@ -0,0 +1,10 @@ +# Defaults for python-leap-client initscript +# sourced by /etc/init.d/python-leap-client +# installed at /etc/default/python-leap-client by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" diff --git a/debian/python-leap-client.doc-base.EX b/debian/python-leap-client.doc-base.EX new file mode 100644 index 00000000..e70c2917 --- /dev/null +++ b/debian/python-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/python-leap-client.install b/debian/python-leap-client.install new file mode 100644 index 00000000..82bef82b --- /dev/null +++ b/debian/python-leap-client.install @@ -0,0 +1,2 @@ +#usr/share/polkit-1/actions/net.openvpn.gui.leap +#polkit/net.openvpn.gui.leap.policy usr/share/polkit-1/actions/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..cceb49ab --- /dev/null +++ b/debian/rules @@ -0,0 +1,57 @@ +#!/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 --buildsystem=python_distutils #,sphinxdoc + +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 + +#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 *.egg-info diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) 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..791fbd7d --- /dev/null +++ b/debian/watch.ex @@ -0,0 +1,23 @@ +# 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 + +# Uncomment to examine a Webpage +# <Webpage URL> <string match> +#http://www.example.com/downloads.php python-leap-client-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/python-leap-client-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/python-leap-client-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for devscripts >= 2.9 +# http://sf.net/python-leap-client/python-leap-client-(.*)\.tar\.gz + +# Uncomment to find new files on GooglePages +# http://example.googlepages.com/foo.html python-leap-client-(.*)\.tar\.gz diff --git a/src/leap/gui/mainwindow_rc.py b/src/leap/gui/mainwindow_rc.py index 59cd6948..7330b67a 100644 --- a/src/leap/gui/mainwindow_rc.py +++ b/src/leap/gui/mainwindow_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Thu Aug 9 23:13:20 2012 +# Created: Thu Aug 9 23:06:52 2012 # by: The Resource Compiler for PyQt (Qt v4.8.2) # # WARNING! All changes made in this file will be lost! |