Merge lp:~dholbach/help-app/pelican-backport into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[Nicholas Skaggs (nskaggs)]

Just a question; but otherwise +1.

review: Approve

=== modified file 'HACKING'
--- HACKING	2015-03-05 15:24:44 +0000
+++ HACKING	2015-03-09 12:01:58 +0000
@@ -65,6 +65,14 @@
 Prerequisites
 -------------
 
+Note: if you are still on trusty (14.04), please add the following PPA:
+
+  sudo add-apt-repository ppa:ubuntu-touch-coreapps-drivers/collection
+  sudo apt update
+
+This is necessary because we need at least pelican 3.5.0. From thereon
+the following steps should be smooth sailing.
+
 Before you get started, run:
 
   sudo apt install python-pelican po4a make bzr \
 
=== modified file 'debian/control'
--- debian/control	2015-03-05 15:24:44 +0000
+++ debian/control	2015-03-09 12:01:58 +0000
@@ -5,7 +5,7 @@
 Build-Depends: bzr,
                debhelper (>= 9),
                po4a,
-               python-pelican,
+               python-pelican (>= 3.5.0~),
                python3-polib,
 #               ubuntu-html5-ui-toolkit
 Standards-Version: 3.9.6