17 files changed, 82 insertions, 99 deletions
diff --git a/debian/bitmask-cli.install b/debian/bitmask-cli.install
deleted file mode 100644
index 1c497c6..0000000
--- a/debian/bitmask-cli.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/bin/bitmask_cli
-/usr/lib/python2.7/dist-packages/leap/bitmask/cli/
-
diff --git a/debian/bitmask-core.install b/debian/bitmask-core.install
index d399ca1..075b49c 100644
--- a/debian/bitmask-core.install
+++ b/debian/bitmask-core.install
@@ -1,2 +1,11 @@
 /usr/bin/bitmaskd
+/usr/bin/bitmaskctl
 /usr/lib/python2.7/dist-packages/leap/bitmask/core/
+/usr/lib/python2.7/dist-packages/leap/bitmask/cli/
+/usr/lib/python2.7/dist-packages/leap/bitmask/bonafide/
+/usr/lib/python2.7/dist-packages/leap/bitmask/__init__.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/_version.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/util.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/hooks.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/config.py
+/usr/lib/python2.7/dist-packages/leap.bitmask-*.egg-info
diff --git a/debian/bitmask-mail.install b/debian/bitmask-mail.install
new file mode 100644
index 0000000..3bcd93f
--- /dev/null
+++ b/debian/bitmask-mail.install
@@ -0,0 +1,2 @@
+/usr/lib/python2.7/dist-packages/leap/bitmask/mail/
+/usr/lib/python2.7/dist-packages/leap/bitmask/keymanager/
diff --git a/debian/bitmask-mua.install b/debian/bitmask-mua.install
new file mode 100644
index 0000000..6dc1029
--- /dev/null
+++ b/debian/bitmask-mua.install
@@ -0,0 +1 @@
+src/leap/bitmask/mua /usr/lib/python2.7/dist-packages/leap/bitmask/mua
diff --git a/debian/bitmask-qt.install b/debian/bitmask-qt.install
new file mode 100644
index 0000000..06e8c37
--- /dev/null
+++ b/debian/bitmask-qt.install
@@ -0,0 +1,5 @@
+/usr/bin/bitmask
+src/leap/bitmask/gui /usr/lib/python2.7/dist-packages/leap/bitmask/gui
+debian/bitmask-qt.xpm usr/share/pixmaps
+debian/bitmask-qt.desktop usr/share/applications
+debian/icons/hicolor usr/share/icons
diff --git a/debian/bitmask.xpm b/debian/bitmask-qt.xpm
index aa160d4..aa160d4 100644
--- a/debian/bitmask.xpm
+++ b/debian/bitmask-qt.xpm
diff --git a/debian/bitmask-vpn.install b/debian/bitmask-vpn.install
new file mode 100644
index 0000000..aa4db8e
--- /dev/null
+++ b/debian/bitmask-vpn.install
@@ -0,0 +1,3 @@
+src/leap/bitmask/vpn /usr/lib/python2.7/dist-packages/leap/bitmask/vpn
+src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy usr/share/polkit-1/actions/
+src/leap/bitmask/vpn/helpers/linux/bitmask-root usr/sbin/
diff --git a/debian/bitmask.desktop b/debian/bitmask.desktop
deleted file mode 100644
index 2fb9f10..0000000
--- a/debian/bitmask.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Bitmask
-Comment=Secure Communication
-Comment[es]=Secure Communication
-Comment[de]=Secure Communication
-Exec=bitmask %U
-Terminal=false
-Icon=bitmask
-Categories=Network;Application;
-StartupNotify=true
-X-AppInstall-Package=bitmask
-Keywords=email;messaging;encryption;vpn;leap
diff --git a/debian/bitmask.install b/debian/bitmask.install
deleted file mode 100644
index ee3d2fc..0000000
--- a/debian/bitmask.install
+++ /dev/null
@@ -1,14 +0,0 @@
-/usr/bin/bitmask
-/usr/lib/python2.7/dist-packages/leap.bitmask-*.egg-info
-src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy usr/share/polkit-1/actions/
-src/leap/bitmask/vpn/helpers/linux/bitmask-root usr/sbin/
-debian/bitmask.xpm usr/share/pixmaps
-debian/bitmask.desktop usr/share/applications
-debian/icons/hicolor usr/share/icons
-src/leap/bitmask usr/lib/python2.7/dist-packages/leap/
-
-# pixelated hacks!!!
-# src/pixelated usr/lib/python2.7/dist-packages/
-# src/pixelated_www usr/lib/python2.7/dist-packages/
-
-
diff --git a/debian/bitmask.pyremove b/debian/bitmask.pyremove
index 9d6e34d..e69de29 100644
--- a/debian/bitmask.pyremove
+++ b/debian/bitmask.pyremove
@@ -1,3 +0,0 @@
-usr/etc/leap
-usr/bin/bitmaskd
-usr/bin/bitmask_cli
diff --git a/debian/changelog b/debian/changelog
index 0a59995..eb80212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ bitmask (0.10.0) unstable; urgency=medium
   * Update to 0.10.0 release.
   * Ported new UI with VPN and Email support.
 
- -- Ben Carrillo <ben@futeisha.org>  Thu, 19 Jul 2017 00:00:00 +0100
+ -- Ben Carrillo <ben@futeisha.org>  Wed, 19 Jul 2017 00:00:00 +0100
 
 bitmask (0.9.2.1) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f6763ca..e892851 100644
--- a/debian/control
+++ b/debian/control
@@ -2,43 +2,29 @@ Source: bitmask
 Section: misc
 Priority: extra
 Maintainer: Ben Carrillo <ben@futeisha.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Uploaders: Micah Anderson <micah@debian.org>
 Homepage: https://leap.se
-Build-Depends: debhelper (>= 8.0.0), dh-python, python, python-setuptools,
-               pep8, python-sphinx, docutils-common, pyqt5-dev-tools,
-               docutils-common, python-keyring, python-dateutil, python-argparse
+Build-Depends: debhelper (>= 9.0.0), dh-python, python, python-setuptools,
+               pep8, python-sphinx, docutils-common, 
 X-Python-Version: >= 2.7 
 
-Package: bitmask
+Package: bitmask-core
 Architecture: all
+Provides: leap.bitmask.core, leap.bitmask.cli
 Depends:
   ${misc:Depends}, ${python:Depends},
   python-openssl,
+  python-setuptools,
   python-cryptography,
   python-srp,
-  python-dateutil,
-  python-daemon,
-  python-argparse,
-  python-logbook (>= 0.7.0-1),
-  python-psutil,
-  python-requests (>= 1.2.3-1),
   python-jsonschema (>= 0.7.0),
-  python-setuptools,
   python-zope.proxy,
-  openvpn,
-  python-pyqt5,
-  python-pyqt5.qtwebkit,
   python-twisted-core (>= 14.0.2),
   python-leap-common,
-  soledad-client,
-  python-whoosh,
 # This is a workaround to broken python-srp in wily.
 # We should remove libssl-dev when #7566 is solved
-  libssl-dev
-Recommends: xul-ext-bitmask
-Suggests: policykit-1-gnome
-Enhances: openvpn, gnupg
+#  libssl-dev
 Description: Provides the desktop client for LEAP 
  The LEAP project aims to secure everyday communication.
  .
@@ -55,29 +41,55 @@ Description: Provides the desktop client for LEAP
  with the server; all message relay among service providers is required to be
  encrypted when possible; and public keys are automatically discovered and
  validated.
+ .
+ This package provides the core daemon.
 
-Package: bitmask-core
+Package: bitmask-qt
 Architecture: all
-Depends: python-twisted-core,
-  python-zope.interface,
-  leap-bonafide
-Suggests: bitmask-cli
-Provides: leap.bitmask.core, ${python:Provides}
-# Replaces: ...
-# Breaks: ...
+Build-Depends: pyqt5-dev-tools, 
+Depends: python-pyqt5,
+  	 python-pyqt5.qtwebkit,
+# XXX this depends also on leap-bitmask-js
+Provides: leap.bitmask.gui
 Description: Desktop client to access LEAP Services.
- The LEAP project aims to secure everyday communication.
+ The LEAP project aims to secure everyday communications.
+ .
+ This package provides the qt5 gui.
+
+Package: bitmask-vpn
+Architecture: all
+Build-Depends: 
+Depends: bitmask-core, openvpn
+Suggests: policykit-1-gnome
+Enhances: openvpn
+Provides: leap.bitmask.vpn
+Description: Desktop client to access LEAP Services.
+ The LEAP project aims to secure everyday communications.
  .
  This package provides the core daemon.
 
+Package: bitmask-mail
+Architecture: all
+Build-Depends: 
+Depends: bitmask-core, gnupg1,
+         soledad-client,
+Recommends: xul-ext-bitmask
+Suggests: bitmask-mua
+Enhances: gnupg1
+Provides: leap.bitmask.mail
+Description: Desktop client to access LEAP Services.
+ The LEAP project aims to secure everyday communications.
+ .
+ This package provides the Bitmask Mail components.
 
-Package: bitmask-cli
+Package: bitmask-mua
 Architecture: all
-Depends: bitmask-core
-Provides: leap.bitmask.cli, ${python:Provides}
-# Replaces: ...
-# Breaks: ...
+Build-Depends: pyqt5-dev-tools, 
+Depends: bitmask-mail,
+         python-whoosh, python-requests, python-chardet
+# XXX this depends on leap-pixelated, leap-pixelated-www
+Provides: leap.bitmask.mua
 Description: Desktop client to access LEAP Services.
  The LEAP project aims to secure everyday communication.
  .
- This package provides the command line client.
+ This package provides the Pixelated MUA.
diff --git a/debian/menu b/debian/menu
index b80028e..c138664 100644
--- a/debian/menu
+++ b/debian/menu
@@ -3,5 +3,5 @@
          section="Applications/System/Security"\
          title="Bitmask, the Internet Encryption Toolkit"\
          command="/usr/bin/bitmask"\
-         icon="/usr/share/pixmaps/bitmask.xpm"
+         icon="/usr/share/pixmaps/bitmask-qt.xpm"
 
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index 2d51cd5..ac307c5 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -1,7 +1,3 @@
-leap.soledad.client soledad-client ; PEP386
+leap.soledad soledad-client; PEP386
 leap.common python-leap-common ; PEP386
-leap.mail leap-mail ; PEP386
-leap.keymanager leap-keymanager
-leap.bitmask bitmask
-leap.bitmask-core bitmask-core
-leap.bonafide leap-bonafide
+python-leap.bitmask bitmask
diff --git a/debian/rules b/debian/rules
index 8fcf0bf..e1e632d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,18 @@ package=bitmask
 
 PYTHON2=$(shell pyversions -vr)
 
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.0.1:9
+
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
-#dh $@ --with python2,sphinxdoc --buildsystem=python_distutils
+	dh $@ --with python2 --namespace=leap --buildsystem=python_distutils
+
 
 override_dh_prep:
 	rst2man docs/man/bitmask.1.rst docs/man/bitmask.1
 	rst2man docs/man/bitmask-root.1.rst docs/man/bitmask-root.1
 
 	dh_prep
-	mv src/leap.bitmask.egg-info src/leap.bitmask.egg-info.orig
-	mv src/leap/bitmask/core src/bitmask-core.orig
-	mv src/leap/bitmask/cli src/bitmask-cli.orig
-
 	# this will re-generate the resource files and locales.
 	make -f ./Makefile qt-resources
 
@@ -42,15 +41,6 @@ endif
 
 #dh_auto_build should be enough to build the python2 version
 
-build-python%:
-	python$* setup.py build
-
-override_dh_install:
-	dh_install
-	rm -rf src/leap.bitmask.egg-info
-	mv src/leap.bitmask.egg-info.orig src/leap.bitmask.egg-info
-	mv src/bitmask-core.orig src/leap/bitmask/core/
-	mv src/bitmask-cli.orig src/leap/bitmask/cli/
 
 # build and install sphinx docs
 # 
@@ -58,12 +48,8 @@ override_dh_installdocs:
 #	python setup.py build_sphinx
 	dh_installdocs
 
-#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_installchangelogs:
-	 dh_installchangelogs CHANGELOG.rst
+	 dh_installchangelogs docs/changelog.rst
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..82cd981
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,3 @@
+tar-ignore = ".git/*"
+tar-ignore = "ui/*"
+tar-ignore = "venv/*"