Merge lp:~zyga/checkbox/fix-1256963-packaging into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ng

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 5
Merged at revision: 5
Proposed branch: lp:~zyga/checkbox/fix-1256963-packaging
Merge into: lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ng
Diff against target: 28 lines (+4/-0)
2 files modified
debian/changelog (+2/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1256963-packaging
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+217009@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-16 12:24:36 +0000
3+++ debian/changelog 2014-04-24 09:16:19 +0000
4@@ -11,6 +11,8 @@
5 custom theme
6 * debian/rules: build i18n catalogs
7 * debian/*.install: install everything manually
8+ * debian/control: build depend on python3-plainbox-doc and python3-doc for
9+ intersphinx database links.
10
11 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Wed, 09 Apr 2014 18:34:16 +0200
12
13
14=== modified file 'debian/control'
15--- debian/control 2014-04-16 12:24:36 +0000
16+++ debian/control 2014-04-24 09:16:19 +0000
17@@ -11,9 +11,11 @@
18 python3-checkbox-support (>= 0.2),
19 python3-dbus,
20 python3-distutils-extra,
21+ python3-doc,
22 python3-docutils,
23 python3-gi,
24 python3-plainbox (>= 0.5.3),
25+ python3-plainbox-doc,
26 python3-requests (>= 1.0),
27 python3-setuptools,
28 python3-sphinx,

Subscribers

People subscribed via source and target branches