From 08e84001a81843bb0d57443b280def0616eda2a2 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalpati <njoseph@thoughtworks.com>
Date: Wed, 16 Aug 2017 13:45:33 +0530
Subject: [PATCH] Diaspora: Disable for release 0.15.2

diaspora* is no longer installable from Debian
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872305

Signed-off-by: Joseph Nuthalpati <njoseph@thoughtworks.com>

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 data/etc/plinth/modules-enabled/diaspora | 2 --
 setup.py                                 | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 data/etc/plinth/modules-enabled/diaspora

diff --git a/data/etc/plinth/modules-enabled/diaspora b/data/etc/plinth/modules-enabled/diaspora
deleted file mode 100644
index 1ae682dfd..000000000
--- a/data/etc/plinth/modules-enabled/diaspora
+++ /dev/null
@@ -1,2 +0,0 @@
-plinth.modules.diaspora
-
diff --git a/setup.py b/setup.py
index 98829355f..fc06637ba 100755
--- a/setup.py
+++ b/setup.py
@@ -52,9 +52,10 @@ ENABLED_APPS_PATH = "/etc/plinth/modules-enabled/"
 
 DISABLED_APPS_TO_REMOVE = [
     'apps',
+    'diaspora',
+    'owncloud',
     'system',
     'xmpp',
-    'owncloud'
 ]
 
 LOCALE_PATHS = [