Ubuntu Help App

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

  1. pelican-backport
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-03-09
Status: Merged
Merged at revision: 80
Proposed branch: lp:~dholbach/help-app/pelican-backport
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 31 lines (+9/-1)
2 files modified
HACKING (+8/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~dholbach/help-app/pelican-backport
Reviewer Review Type Date Requested Status
Nicholas Skaggs 2015-03-09 Approve on 2015-03-09
Review via email: mp+252272@code.launchpad.net
To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

Just a question; but otherwise +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2015-03-05 15:24:44 +0000
3+++ HACKING 2015-03-09 12:01:58 +0000
4@@ -65,6 +65,14 @@
5 Prerequisites
6 -------------
7
8+Note: if you are still on trusty (14.04), please add the following PPA:
9+
10+ sudo add-apt-repository ppa:ubuntu-touch-coreapps-drivers/collection
11+ sudo apt update
12+
13+This is necessary because we need at least pelican 3.5.0. From thereon
14+the following steps should be smooth sailing.
15+
16 Before you get started, run:
17
18 sudo apt install python-pelican po4a make bzr \
19
20=== modified file 'debian/control'
21--- debian/control 2015-03-05 15:24:44 +0000
22+++ debian/control 2015-03-09 12:01:58 +0000
23@@ -5,7 +5,7 @@
24 Build-Depends: bzr,
25 debhelper (>= 9),
26 po4a,
27- python-pelican,
28+ python-pelican (>= 3.5.0~),
29 python3-polib,
30 # ubuntu-html5-ui-toolkit
31 Standards-Version: 3.9.6

Subscribers

People subscribed via source and target branches