Merge branch 'upgrade-electron' of https://forge.cadoles.com/Cadoles/pitaya-launcher into upgrade-electron

2017-04-21 14:46:45 +02:00 · 2017-04-21 14:46:45 +02:00 · 9bf744d46f
parent 32c474969d 54d2a1f640
commit 9bf744d46f
4 changed files with 7 additions and 6 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,3 @@
+/dist
+/node_modules
+/build
--- a/.tamarinrc
+++ b/.tamarinrc
@ -0,0 +1,3 @@
+project_version=0.0.2
+project_name=pitaya
+no_version_suffix=no
--- a/2
+++ b/2
@ -11,7 +11,7 @@ all: build
 build:
 	apt-get update
 	apt-get install --yes --no-install-recommends curl ca-certificates
-	curl --silent --location https://deb.nodesource.com/setup_0.12 | bash -
+	curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
 	apt-get install --yes nodejs
 	npm install --ignore-scripts
 	ARCH=$(ELECTRON_ARCH) npm run build
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +0,0 @@
-pitaya (0.0.1) unstable; urgency=low
-
-  * Dev release
-
- -- William Petit <wpetit@cadoles.com>  Fri, 16 Oct 2015 15:57:03 +0200