From 331db1e03574b678b1b7e8883d16ab1614983ef9 Mon Sep 17 00:00:00 2001
From: William Petit <william.petit@ptitcloud.fr>
Date: Thu, 22 Oct 2015 13:49:38 +0200
Subject: [PATCH] Packaging Debian fonctionnel

---
 Makefile                      | 23 +++++++++++++++++------
 debian/control                | 10 ++--------
 debian/pitaya_amd64.install   |  1 -
 debian/pitaya_ia32.install    |  1 -
 debian/rules                  | 11 ++++++++++-
 package.json                  |  4 ++--
 scripts/install-build-deps.sh |  5 -----
 7 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 debian/pitaya_amd64.install
 delete mode 100644 debian/pitaya_ia32.install
 delete mode 100755 scripts/install-build-deps.sh

diff --git a/Makefile b/Makefile
index d75374d..e15f1a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,22 @@
+DESTDIR=./
+INSTALL_LOCATION=$(DESTDIR)/opt/pitaya
+ELECTRON_ARCH=x64
 
+ifeq ($(DEB_TARGET_ARCH), i386)
+	ELECTRON_ARCH=ia32
+endif
 
-build: clean
-	npm run build
+all: build
 
-clean: install-deps
+build:
+	apt-get install --yes --no-install-recommends curl ca-certificates
+	curl --silent --location https://deb.nodesource.com/setup_0.12 | bash -
+	apt-get install --yes nodejs
+	npm install --ignore-scripts
 	npm run clean
+	npm run compile
+	npm run package -- --arch=$(ELECTRON_ARCH)
 
-install-deps:
-	./scripts/install-build-deps.sh
-	npm install
+install:
+	mkdir -p $(INSTALL_LOCATION)
+	cp -r build/pitaya-linux-$(ELECTRON_ARCH)/* $(INSTALL_LOCATION)/
diff --git a/debian/control b/debian/control
index ea1b7d4..b53efd9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,6 @@ Homepage:
 Vcs-Git: https://forge.cadoles.com/wpetit/pitaya.git
 Vcs-Browser: https://forge.cadoles.com/wpetit/pitaya
 
-Package: pitaya_amd64
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Lanceur d'application pour GNU/Linux
-
-Package: pitaya_ia32
-Architecture: ia32
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Package: pitaya
+Architecture: any
 Description: Lanceur d'application pour GNU/Linux
diff --git a/debian/pitaya_amd64.install b/debian/pitaya_amd64.install
deleted file mode 100644
index b920387..0000000
--- a/debian/pitaya_amd64.install
+++ /dev/null
@@ -1 +0,0 @@
-build/pitaya-linux-x64/* opt/pitaya
diff --git a/debian/pitaya_ia32.install b/debian/pitaya_ia32.install
deleted file mode 100644
index 346f6d1..0000000
--- a/debian/pitaya_ia32.install
+++ /dev/null
@@ -1 +0,0 @@
-build/pitaya-linux-ia32/* opt/pitaya
diff --git a/debian/rules b/debian/rules
index 218df65..4ec8f96 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,16 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
 	dh $@
+
+override_dh_makeshlibs:
+	# Disabled
+
+override_dh_shlibdeps:
+	# Disabled
+
+override_dh_strip:
+	# Disabled
diff --git a/package.json b/package.json
index b0cd4fd..b0cb5f2 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
   "scripts": {
     "test": "./node_modules/.bin/nodeunit test",
     "start": "./node_modules/.bin/electron .",
-    "compile": "./node_modules/.bin/jsx -x js src dist",
+    "compile": "./node_modules/.bin/jsx -x js --no-cache-dir src dist",
     "clean": "rm -rf dist/* build/*",
-    "package": "./node_modules/.bin/electron-packager ./ pitaya --prune --ignore=res/ --ignore=scripts/ --ignore=debian/ --ignore=test/ --platform=linux --arch=ia32,x64 --version=0.33.6 --out=build --overwrite --app-version 0.0.0",
+    "package": "./node_modules/.bin/electron-packager ./ pitaya --out=./build --app-version 0.0.0 --version=0.33.6 --prune --ignore='/res(/|$)' --ignore='/debian(/|$)' --ignore='/scripts(/|$)' --ignore='/build(/|$)' --ignore='/test(/|$)' --ignore='/electron-packager(/|$)' --ignore='/electron-tmp-.+(/|$)' --platform=linux --overwrite",
     "build": "npm run clean && npm run compile && npm run package"
   },
   "dependencies": {
diff --git a/scripts/install-build-deps.sh b/scripts/install-build-deps.sh
deleted file mode 100755
index 31859da..0000000
--- a/scripts/install-build-deps.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-apt-get install --yes --no-install-recommends curl ca-certificates || exit 1
-curl --silent --location https://deb.nodesource.com/setup_4.x | bash - || exit 1
-apt-get install --yes nodejs || exit 1