[pkg] new debianization split

with this organization, there's no need to install too many dependencies
if user only needs either vpn or mail.

1 files changed, 48 insertions, 36 deletions

diff --git a/debian/control b/debian/control
index f6763ca4..e8928516 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.