From 21cf71538877216266520ef1515af3324108f78e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Mon, 13 Nov 2017 22:52:22 +0100
Subject: [PATCH] upgrade to 1.6.0

---
 check_process | 4 ++++
 conf/app.src  | 6 +++---
 manifest.json | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/check_process b/check_process
index 355618a..88677ed 100644
--- a/check_process
+++ b/check_process
@@ -11,6 +11,10 @@
 		setup_private=1
 		setup_public=0
 		upgrade=1
+		; test upgrade from latest published version
+		upgrade=1	from_commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428
+		; test upgrade from latest git commit before Jibec's rewriting
+		upgrade=1	from_commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
diff --git a/conf/app.src b/conf/app.src
index a9713ff..9aebc99 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/1.5.2.zip
-SOURCE_SUM=2ce201626b720589d1916972cac0cfdec27db42992924b7fb7fef5ae92a148d8
+SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/1.6.0.tar.gz
+SOURCE_SUM=5dc5144845e13c30783c706f7768eccc22f9558521475a7124b343df7db92953
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
+SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 592e2b6..20e190d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "Firefox Sync Server",
     "id": "ffsync",
-    "version": "1.5.2",
+    "version": "1.6.0",
     "url": "https://github.com/mozilla-services/syncserver",
     "packaging_format": 1,
     "description": {