Merge lp:~mardy/online-accounts-api/packaging-1608814 into lp:online-accounts-api

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~mardy/online-accounts-api/packaging-1608814
Merge into: lp:online-accounts-api
Diff against target: 38 lines (+11/-1)
3 files modified
debian/changelog (+9/-0)
debian/control (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~mardy/online-accounts-api/packaging-1608814
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+303123@code.launchpad.net

Description of the change

Packaging changes:

- Update debian/control for qdoc dependency
- Don't use dh_python

To post a comment you must log in.
28. By Alberto Mardegan

Build-Depend on upstart to avoid s390x builds on yakkety.

29. By Alberto Mardegan

Remove upstart dep

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 2016-07-22 05:09:24 +0000
3+++ debian/changelog 2016-10-03 07:47:07 +0000
4@@ -1,3 +1,12 @@
5+online-accounts-api (0.1+16.10.20160722.4-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/control:
8+ - Depend on qttools5-dev-tools for qdoc (LP: #1608814)
9+ * debian/rules:
10+ - No need to invoke dh_python
11+
12+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 17 Aug 2016 14:44:49 +0300
13+
14 online-accounts-api (0.1+16.10.20160722.4-0ubuntu1) yakkety; urgency=medium
15
16 [ Alberto Mardegan ]
17
18=== modified file 'debian/control'
19--- debian/control 2015-09-02 11:34:16 +0000
20+++ debian/control 2016-10-03 07:47:07 +0000
21@@ -15,6 +15,7 @@
22 qt5-default,
23 qtbase5-dev (>= 5.4),
24 qtdeclarative5-dev,
25+ qttools5-dev-tools,
26 signon-plugins-dev,
27 xvfb,
28 Standards-Version: 3.9.4
29
30=== modified file 'debian/rules'
31--- debian/rules 2015-08-28 14:25:23 +0000
32+++ debian/rules 2016-10-03 07:47:07 +0000
33@@ -10,4 +10,4 @@
34 dh_install --fail-missing
35
36 %:
37- dh $@ --with python3
38+ dh $@

Subscribers

People subscribed via source and target branches