From 4048e7773842a97a782a2905fa7d7be8ca44b4c6 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 28 Sep 2013 18:04:53 -0400
Subject: [PATCH 1/2] Fixes for plinth.config when run from source folder.

---
 Makefile             | 1 +
 plinth.sample.config | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index d02c4a34f..b4c313b02 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ clean:
 	@find . -name "*.bak" -exec rm {} \;
 	@$(MAKE) -s -C doc clean
 	@$(MAKE) -s -C templates clean
+	rm -f plinth.config
 	rm -f predepend
 
 hosting:
diff --git a/plinth.sample.config b/plinth.sample.config
index ece4d06d7..1134b2e81 100644
--- a/plinth.sample.config
+++ b/plinth.sample.config
@@ -4,6 +4,7 @@ box_name = FreedomBox
 
 [Path]
 file_root = %(root)s
+python_root = %(root)s
 data_dir = %(file_root)s/data
 store_file = %(data_dir)s/store.sqlite3
 user_db = %(data_dir)s/users

From cda21f395fb1ef510bb81c7c9839a7a40c04d879 Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Sat, 28 Sep 2013 18:06:03 -0400
Subject: [PATCH 2/2] Fix to avoid python error about non-ASCII character.

---
 modules/installed/apps/apps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py
index ef2e1b7d3..d6ba9d662 100644
--- a/modules/installed/apps/apps.py
+++ b/modules/installed/apps/apps.py
@@ -77,7 +77,7 @@ some other websites business model.</p>
         form.submit(_("Update setup"))
         main += form.render()
         sidebar_right="""
-<strong>Owncloud</strong><p>gives you universal access to your files through a web interface or WebDAV. It also provides a platform to easily view & sync your contacts, calendars and bookmarks across all your devices and enables basic editing right on the web. Installation has minimal server requirements, doesn’t need special permissions and is quick. ownCloud is extendable via a simple but powerful API for applications and plugins.
+<strong>Owncloud</strong><p>gives you universal access to your files through a web interface or WebDAV. It also provides a platform to easily view & sync your contacts, calendars and bookmarks across all your devices and enables basic editing right on the web. Installation has minimal server requirements, doesn't need special permissions and is quick. ownCloud is extendable via a simple but powerful API for applications and plugins.
 </p>
 """
         return self.fill_template(title="Owncloud", main=main, sidebar_right=sidebar_right)