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

Subscribers

People subscribed via source and target branches