summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitattributes2
-rw-r--r--Makefile9
-rw-r--r--debian/README.source9
-rw-r--r--debian/changelog38
-rw-r--r--debian/clean1
-rw-r--r--debian/compat1
-rw-r--r--debian/control52
-rw-r--r--debian/copyright30
-rw-r--r--debian/docs3
-rw-r--r--debian/leap-client.install3
-rw-r--r--debian/leap-client.xpm281
-rw-r--r--debian/manpages1
-rw-r--r--debian/menu7
-rwxr-xr-xdebian/rules61
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/include-binaries1
16 files changed, 496 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
index eb8672e0..2408b4c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,8 +12,6 @@ docs/covhtml export-ignore
include/ export-ignore
lib/ export-ignore
local/ export-ignore
-man/ export-ignore
share/ export-ignore
src/leap.egg-info/ export-ignore
src/leap_client.egg-info export-ignore
-src/leap/_version.py export-subst
diff --git a/Makefile b/Makefile
index 4f4d77c4..69cf29ed 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,7 @@
# TODO move to setup scripts
# and implement it in python
# http://die-offenbachs.homelinux.org:48888/hg/eric5/file/5072605ad4dd/compileUiFiles.py
-###### EDIT ######################
-
+###### EDIT ######################
#Directory with ui and resource files
RESOURCE_DIR = data/resources
UI_DIR = src/leap/bitmask/gui/ui
@@ -57,6 +56,12 @@ $(COMPILED_DIR)/ui_%.py : $(UI_DIR)/%.ui
$(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc
$(PYRCC) $< -o $@
+deb:
+ #XXX finish this!
+ #should tag upstream/VERSION in upstream branch...
+ #@git tag -a upstream/$(DEBVER) -m "..."
+ @git-buildpackage --git-ignore-new --git-builder="debuild -us -uc -i'.*|bin|share|lib|local|include|\.git'" --git-upstream-branch=upstream --git-upstream-tree=branch --git-debian-branch=debian
+
manpages:
rst2man docs/man/bitmask.1.rst docs/man/bitmask.1
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..c72287f6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,38 @@
+bitmask (0.3.1pre) unstable; urgency=low
+
+ * Merge develop for new release
+
+ -- Micah Anderson <micah@debian.org> Thu, 22 Aug 2013 17:22:26 -0400
+
+bitmask (0.3.0) unstable; urgency=low
+
+ * Upgrade to 0.3.0
+ * Add python-pyside dependencies
+ * Remove versioned dependency on python-requests
+ * Rename manpage for bitmask rename
+ * Remove no longer existing NEWS file installation
+ * Disable running of tests on package build
+ * Add man pages back in
+ * Rename to bitmask
+
+ -- Micah Anderson <micah@debian.org> Thu, 15 Aug 2013 20:22:18 -0400
+
+leap-client (0.2.0) unstable; urgency=low
+ [ Kali ]
+ * add python-jsonschema dependency >= 0.8
+ * generate manpage from .rst file
+ * fixes to sphinxdoc install
+ * merged release/v0.2.0 branch
+ * updated dependency list
+
+ [ Micah Anderson ]
+ * updated build-dependencies to have necessary packages to pass tests
+ * 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: #111111111111)
+
+ -- Ben Carrillo <ben@futeisha.org> Fri, 01 Feb 2013 02:40:00 -0900
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 00000000..322f3a67
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+docs/man/leap-client.1
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..b42f684e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,52 @@
+Source: bitmask
+Section: misc
+Priority: extra
+Maintainer: Ben Carrillo <ben@futeisha.org>
+Standards-Version: 3.9.4
+Homepage: https://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-setuptools,
+ pep8,
+ python-sphinx (>= 1.0.7+dfsg), docutils-common, python-nose, python-mock,
+ python-requests, python-srp, python-crypto, python-keyring, python-xdg,
+ python-jsonschema (>= 0.7.0), python-psutil, python-openssl,
+ python-dateutil, python-argparse, python-netifaces, pyside-tools,
+ xvfb, xauth
+X-Python-Version: >= 2.6
+
+Package: bitmask
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends},
+ python-openssl,
+ python-crypto,
+ python-keyring (>= 0.9.2),
+ python-srp,
+ python-dateutil,
+ python-argparse,
+ python-psutil,
+ python-netifaces,
+ python-requests,
+ python-xdg,
+ python-jsonschema (>= 0.7.0),
+ python-setuptools,
+ python-nose,
+ python-mock,
+ pep8,
+ openvpn,
+ policykit-1-gnome,
+ python-pyside,
+ python-pyside.qtcore,
+ python-pyside.qtgui
+Suggests: resolvconf
+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..bfa51229
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+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+ OpenSSL
+ 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'.
+ .
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations including
+ the two.
+ .
+ You must obey the GNU General Public License in all respects for all
+ of the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the
+ file(s), but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version. If you delete
+ this exception statement from all source files in the program, then
+ also delete it here.
+
+# REVIEW-ME This needs a licensecheck -r run !!! -- kali
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/leap-client.install b/debian/leap-client.install
new file mode 100644
index 00000000..2a470423
--- /dev/null
+++ b/debian/leap-client.install
@@ -0,0 +1,3 @@
+pkg/linux/polkit/net.openvpn.gui.leap.policy usr/share/polkit-1/actions/
+pkg/linux/resolv-update etc/leap/
+debian/leap-client.xpm usr/share/pixmaps
diff --git a/debian/leap-client.xpm b/debian/leap-client.xpm
new file mode 100644
index 00000000..4aca802e
--- /dev/null
+++ b/debian/leap-client.xpm
@@ -0,0 +1,281 @@
+/* XPM */
+static char * leap_client_xpm[] = {
+"32 26 252 2",
+" c None",
+". c #370F14",
+"+ c #942F2F",
+"@ c #E1415B",
+"# c #C616A8",
+"$ c #540A45",
+"% c #DC831E",
+"& c #FF4E54",
+"* c #FF554B",
+"= c #EB1BC5",
+"- c #F81ECD",
+"; c #30082A",
+"> c #202E3A",
+", c #C19C00",
+"' c #F5961F",
+") c #FF5051",
+"! c #F02AA7",
+"~ c #EB1DC2",
+"{ c #646BC6",
+"] c #3A1445",
+"^ c #2D7CE5",
+"/ c #458AD0",
+"( c #002745",
+"_ c #2C9BCB",
+": c #03353B",
+"< c #B28F00",
+"[ c #EEC100",
+"} c #F69122",
+"| c #F6348B",
+"1 c #B051D4",
+"2 c #207AFF",
+"3 c #5A1B1E",
+"4 c #9D436B",
+"5 c #7E68AC",
+"6 c #3F3161",
+"7 c #03111D",
+"8 c #3589F9",
+"9 c #88D6E2",
+"0 c #6CD6CF",
+"a c #10D363",
+"b c #0F960F",
+"c c #1C5810",
+"d c #426C38",
+"e c #747295",
+"f c #888572",
+"g c #F1C100",
+"h c #EFC500",
+"i c #F18943",
+"j c #1977CB",
+"k c #2F1613",
+"l c #A76A00",
+"m c #FFB400",
+"n c #C84D06",
+"o c #3A4051",
+"p c #384200",
+"q c #AEE200",
+"r c #CCFF00",
+"s c #BEEB16",
+"t c #3081A5",
+"u c #0F5EAB",
+"v c #427898",
+"w c #FFFF1C",
+"x c #B6E300",
+"y c #5C6D5D",
+"z c #B71C00",
+"A c #B53C00",
+"B c #812D00",
+"C c #000306",
+"D c #829F43",
+"E c #337FBD",
+"F c #0094CD",
+"G c #0048BA",
+"H c #0137C8",
+"I c #718270",
+"J c #461087",
+"K c #3E0634",
+"L c #050100",
+"M c #59B3CB",
+"N c #2F9CC7",
+"O c #2670B4",
+"P c #512180",
+"Q c #592078",
+"R c #582379",
+"S c #2A0453",
+"T c #000000",
+"U c #3EBFD6",
+"V c #0083AA",
+"W c #334E95",
+"X c #62317C",
+"Y c #572E80",
+"Z c #171EA2",
+"` c #000007",
+" . c #003017",
+".. c #004792",
+"+. c #0078AA",
+"@. c #0030A6",
+"#. c #0013A3",
+"$. c #0014A3",
+"%. c #00149C",
+"&. c #006117",
+"*. c #00576C",
+"=. c #002987",
+"-. c #250F6E",
+";. c #25087D",
+">. c #0214A0",
+",. c #000C61",
+"'. c #008700",
+"). c #189E0D",
+"!. c #5B6857",
+"~. c #012780",
+"{. c #0C207B",
+"]. c #400066",
+"^. c #10001B",
+"/. c #0B2105",
+"(. c #9EBF2C",
+"_. c #B3CB34",
+":. c #EBE20D",
+"<. c #FEEA00",
+"[. c #FDD702",
+"}. c #CBA614",
+"|. c #68BA5F",
+"1. c #67B359",
+"2. c #65AF56",
+"3. c #4E9D6B",
+"4. c #33B9BF",
+"5. c #9ECBFF",
+"6. c #4A93D2",
+"7. c #0E420C",
+"8. c #7CC41F",
+"9. c #E2A40E",
+"0. c #FE9B09",
+"a. c #FF9907",
+"b. c #D9B026",
+"c. c #9BC54F",
+"d. c #75CC66",
+"e. c #76CC65",
+"f. c #4EBEA7",
+"g. c #27C5C3",
+"h. c #2ECDE3",
+"i. c #62C9F1",
+"j. c #A3D575",
+"k. c #011328",
+"l. c #EFD300",
+"m. c #BA7303",
+"n. c #FF9A08",
+"o. c #C6BA34",
+"p. c #BEC03B",
+"q. c #83C95D",
+"r. c #66C77F",
+"s. c #48BDB2",
+"t. c #2CB190",
+"u. c #00C6C2",
+"v. c #34CEE4",
+"w. c #00C3BE",
+"x. c #AF5505",
+"y. c #FAB123",
+"z. c #8A6515",
+"A. c #0E2125",
+"B. c #303626",
+"C. c #FACD0A",
+"D. c #D2A100",
+"E. c #976500",
+"F. c #A1780C",
+"G. c #B8BE3C",
+"H. c #4DC3A7",
+"I. c #47B5AD",
+"J. c #30A88B",
+"K. c #009C48",
+"L. c #12732D",
+"M. c #245221",
+"N. c #1D8E92",
+"O. c #66632D",
+"P. c #A2451B",
+"Q. c #E87F0E",
+"R. c #B98043",
+"S. c #000008",
+"T. c #269FB6",
+"U. c #012025",
+"V. c #2D3121",
+"W. c #8C9B68",
+"X. c #C9B32C",
+"Y. c #A58300",
+"Z. c #2F6601",
+"`. c #0C4603",
+" + c #1E313B",
+".+ c #0E161A",
+"++ c #011B0F",
+"@+ c #011509",
+"#+ c #3D1D0F",
+"$+ c #893B18",
+"%+ c #D85A00",
+"&+ c #C2764E",
+"*+ c #5C3098",
+"=+ c #1359D5",
+"-+ c #4A7490",
+";+ c #191831",
+">+ c #393B7A",
+",+ c #A2BA71",
+"'+ c #AEE983",
+")+ c #286106",
+"!+ c #335200",
+"~+ c #121A00",
+"{+ c #1A0B04",
+"]+ c #5F2B60",
+"^+ c #3F469C",
+"/+ c #0070CE",
+"(+ c #0765A6",
+"_+ c #3FB2FF",
+":+ c #3C97F4",
+"<+ c #BB696F",
+"[+ c #683623",
+"}+ c #338500",
+"|+ c #36C10F",
+"1+ c #009A24",
+"2+ c #265D07",
+"3+ c #1E3000",
+"4+ c #3A1F42",
+"5+ c #003060",
+"6+ c #292742",
+"7+ c #665472",
+"8+ c #9A1B00",
+"9+ c #D32E09",
+"0+ c #8A290F",
+"a+ c #00370F",
+"b+ c #0FA11F",
+"c+ c #00C736",
+"d+ c #00B51C",
+"e+ c #2A5900",
+"f+ c #401700",
+"g+ c #811900",
+"h+ c #BC0D00",
+"i+ c #C0520C",
+"j+ c #00E43E",
+"k+ c #00DB3D",
+"l+ c #00B015",
+"m+ c #009E00",
+"n+ c #142600",
+"o+ c #220C00",
+"p+ c #782000",
+"q+ c #A60600",
+"r+ c #4E9928",
+"s+ c #00A50D",
+"t+ c #008200",
+"u+ c #005A00",
+"v+ c #521800",
+"w+ c #EA1D00",
+"x+ c #016200",
+"y+ c #006200",
+"z+ c #812200",
+"A+ c #AA2700",
+"B+ c #002200",
+"C+ c #170000",
+" ",
+" . + @ # $ ",
+" % & * = - ; > ",
+" , ' ) ! ~ { ] ^ / ",
+" ( _ : < [ } | 1 2 3 4 5 6 ",
+" 7 8 9 0 a b c d e f g h i j k l m n o ",
+" p q r s t u v w x y z A B C ",
+" D E F G H I J K L ",
+" M N O P Q R S ",
+" T U V W X Y Z ` ",
+" ...+.@.#.$.%. ",
+" &.*.=.-.;.>.,. ",
+" '.).!.~.{.].^. ",
+" /.(._.:.<.[.}.|.1.2.3.4.5.6. ",
+" 7.8.9.0.a.b.c.d.e.f.g.h.i.j.k. ",
+" l.m.n.o.p.q.r.s.t.u.v.w.x.y.z. A. ",
+" B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S. T.U.",
+" V.W.X.Y.Z.`. +.+++@+ #+$+%+&+*+=+-+ ",
+" ;+>+ ,+'+)+!+~+ {+]+^+/+ ",
+" (+_+:+<+[+ }+|+1+2+3+ 4+5+ ",
+" 6+7+8+9+0+ a+b+c+d+e+ ",
+" f+g+h+i+j+k+l+m+n+ ",
+" o+p+q+r+s+t+u+ ",
+" v+w+x+y+ ",
+" z+A+B+ ",
+" C+ "};
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 00000000..4cf72795
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+docs/man/bitmask.1
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 00000000..1ea0047a
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,7 @@
+?package(leap-client):needs="X11"\
+ hints="LEAP,Routing,Network Routing,Anonymous,openvpn"\
+ section="Applications/System/Security"\
+ title="LEAP-Client Internet Encryption Toolkit"\
+ command="/usr/bin/leap-client"\
+ icon="/usr/share/pixmaps/leap-client.xpm"
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..d364f764
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,61 @@
+#!/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
+DEB_BUILD_OPTIONS=nocheck
+
+PYTHON2=$(shell pyversions -vr)
+
+%:
+ dh $@ --with python2 --buildsystem=python_distutils
+#dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
+
+override_dh_prep:
+ rst2man docs/man/bitmask.1.rst docs/man/bitmask.1
+ dh_prep
+ make -f ./Makefile
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+
+# run tests!
+#
+
+test-python%:
+ xvfb-run ./run_tests.sh -x -N
+
+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
+
+# build and install sphinx docs
+#
+override_dh_installdocs:
+ python setup.py build_sphinx
+#COMMENTING OUT TO WORKAROUND THIS ERROR:
+#dh_sphinxdoc: error: unknown JavaScript code: debian/bitmask/usr/share/doc/bitmask/html/_static/jquery.js
+#dh_installdocs build/sphinx/html
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+ rm -rf docs/_build
+ rm -rf *.egg-info
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 21:44:45 +0000