From ffb51e40ae1ee1b0c0eeba4a9fe72ce3fec1f85a Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 28 Aug 2017 11:28:21 -0400
Subject: [pkg] bitmask-js package

---
 debian/bitmask-js.install |  1 +
 debian/control            | 17 ++++++++++++-----
 debian/pydist-overrides   |  1 +
 debian/rules              |  5 ++++-
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 debian/bitmask-js.install

(limited to 'debian')

diff --git a/debian/bitmask-js.install b/debian/bitmask-js.install
new file mode 100644
index 00000000..b55ae2a0
--- /dev/null
+++ b/debian/bitmask-js.install
@@ -0,0 +1 @@
+ui/pydist/leap/bitmask_js/ /usr/lib/python2.7/dist-packages/leap
diff --git a/debian/control b/debian/control
index 2d5f7a1a..137c3b63 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: LEAP automated build <sysdev@leap.se>
 Homepage: https://bitmask.net
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9.0.0), dh-python, python, python-setuptools, pep8,
-               pyqt5-dev-tools, python-docutils
+               pyqt5-dev-tools, python-docutils, docutils-common,
+               nodejs
 # XXX we're not installing sphinx docs now. in zesty we'll need universe,
 # sphinx has been moved there.
 # python-sphinx
@@ -25,9 +26,6 @@ Depends:
   python-zope.proxy,
   python-twisted-core (>= 14.0.2),
   python-leap-common,
-# This is a workaround to broken python-srp in wily.
-# We should remove libssl-dev when #7566 is solved
-#  libssl-dev
 Description: Provides the desktop client for LEAP
  The LEAP project aims to secure everyday communication.
  .
@@ -47,12 +45,21 @@ Description: Provides the desktop client for LEAP
  .
  This package provides the core daemon.
 
+Package: bitmask-js
+Architecture: all
+# Provides: leap.bitmask_js 
+# this "provides" seems it's not parsed correctly
+Description: Desktop client to access LEAP Services.
+ The LEAP project aims to secure everyday communications.
+ .
+ This package provides the bitmask_js javascript library.
+
 Package: bitmask-qt
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
          python-pyqt5,
          python-pyqt5.qtwebkit,
-# XXX this depends also on leap-bitmask-js
+         bitmask-js
 Provides: leap.bitmask.gui
 Description: Desktop client to access LEAP Services.
  The LEAP project aims to secure everyday communications.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index ac307c51..f362a232 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -1,3 +1,4 @@
 leap.soledad soledad-client; PEP386
 leap.common python-leap-common ; PEP386
 python-leap.bitmask bitmask
+leap.bitmask_js bitmask-js
diff --git a/debian/rules b/debian/rules
index e1e632d5..31b32567 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ package=bitmask
 PYTHON2=$(shell pyversions -vr)
 
 # Prevent setuptools/distribute from accessing the internet.
+# but careful! node needs to unset this to get random crap from the intertubes.
 export http_proxy = http://127.0.0.1:9
 
 %:
@@ -28,10 +29,12 @@ override_dh_prep:
 	# this will re-generate the resource files and locales.
 	make -f ./Makefile qt-resources
 
+	# build the ui package
+	cd ui && make clean && make pydist-build
+
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 
 # run tests!
-#
 
 #test-python%:
 #	xvfb-run ./run_tests.sh -x -N
-- 
cgit v1.2.3