Merge lp:~mterry/dee-qt/pre-depends into lp:dee-qt

Proposed by Michael Terry
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 85
Merged at revision: 85
Proposed branch: lp:~mterry/dee-qt/pre-depends
Merge into: lp:dee-qt
Diff against target: 29 lines (+3/-2)
1 file modified
debian/control (+3/-2)
To merge this branch: bzr merge lp:~mterry/dee-qt/pre-depends
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201261@code.launchpad.net

Commit message

Add some missing ${misc:Pre-Depends} lines and drop ${shlibs:Depends} from the dev package.

Description of the change

Add some missing ${misc:Pre-Depends} lines and drop ${shlibs:Depends} from the dev package.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-06-04 15:14:35 +0000
+++ debian/control 2014-01-10 22:17:43 +0000
@@ -33,6 +33,7 @@
3333
34Package: libqtdee334Package: libqtdee3
35Architecture: any35Architecture: any
36Pre-Depends: ${misc:Pre-Depends}
36Depends: ${shlibs:Depends},37Depends: ${shlibs:Depends},
37 ${misc:Depends},38 ${misc:Depends},
38 libdee-qt4-3 (= ${binary:Version}),39 libdee-qt4-3 (= ${binary:Version}),
@@ -68,6 +69,7 @@
6869
69Package: qtdeclarative5-dee-plugin70Package: qtdeclarative5-dee-plugin
70Architecture: any71Architecture: any
72Pre-Depends: ${misc:Pre-Depends}
71Depends: ${shlibs:Depends},73Depends: ${shlibs:Depends},
72 ${misc:Depends},74 ${misc:Depends},
73 libdee-qt5-3 (= ${binary:Version}),75 libdee-qt5-3 (= ${binary:Version}),
@@ -79,8 +81,7 @@
79Package: libdee-qt5-dev81Package: libdee-qt5-dev
80Section: libdevel82Section: libdevel
81Architecture: any83Architecture: any
82Depends: ${shlibs:Depends},84Depends: ${misc:Depends},
83 ${misc:Depends},
84 libdee-qt5-3 (= ${binary:Version}),85 libdee-qt5-3 (= ${binary:Version}),
85 libdee-dev (>= 1.0.0),86 libdee-dev (>= 1.0.0),
86Multi-Arch: same87Multi-Arch: same

Subscribers

People subscribed via source and target branches

to all changes: