Merge branch 'devel'

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Upcoming Wekan release
+# v0.85 2018-04-18 Wekan release
 
 This release fixes the following bugs:
 
@@ -6,7 +6,9 @@ This release fixes the following bugs:
 - [Fix Wekan logo positioning](https://github.com/wekan/wekan/issues/1378);
 - [Fix checklists items migration error "title is required"](https://github.com/wekan/wekan/issues/1576);
 - [Removed paxctl alpine fix #1303 , because it did not work anymore, so Docker container
-   did not build correctly](https://github.com/wekan/wekan/commit/ce659632174ba25ca9b5e85b053fde02fd9c3928).
+   did not build correctly](https://github.com/wekan/wekan/commit/ce659632174ba25ca9b5e85b053fde02fd9c3928);
+- [Use curl to download 100% CPU fibers fixed node in snap, and remove paxctl from
+   snap package](https://github.com/wekan/wekan/commit/179ff7a12457be1592f04e1bdc15a5bb4fe9d398).
 
 Thanks to GitHub users andresmanelli, iwkse and xet7 for their contributions.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 69,
+    appVersion = 70,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.84.0~2018-04-16"),
+    appMarketingVersion = (defaultText = "0.85.0~2018-04-18"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

snapcraft.yaml

@@ -95,7 +95,6 @@ parts:
             - capnproto
             - npm
             - curl
-            - paxctl
             - execstack
         prepare: |
             echo "Cleaning environment first"
@@ -111,7 +110,7 @@ parts:
             # Description at https://releases.wekan.team/node.txt
             # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
             echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d  node" >> node-SHASUMS256.txt.asc
-            wget https://releases.wekan.team/node
+            curl https://releases.wekan.team/node -o node
             # Verify Fibers patched node authenticity
             echo "Fibers 100% CPU issue patched node authenticity:"
             grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
@@ -119,6 +118,7 @@ parts:
             chmod +x node
             mv node `which node`
             # DOES NOT WORK: paxctl fix.
+            # Removed from build-packages: - paxctl
             #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
             #paxctl -mC `which node`
             echo "Installing meteor"