Merge lp:~townsend/libertine/fix-lib-deps into lp:libertine

Proposed by Christopher Townsend on 2017-03-31
Status: Merged
Approved by: Larry Price on 2017-04-03
Approved revision: 455
Merged at revision: 454
Proposed branch: lp:~townsend/libertine/fix-lib-deps
Merge into: lp:libertine
Diff against target: 33 lines (+2/-7)
1 file modified
debian/control (+2/-7)
To merge this branch: bzr merge lp:~townsend/libertine/fix-lib-deps
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve on 2017-04-03
Larry Price 2017-03-31 Approve on 2017-03-31
Review via email: mp+321608@code.launchpad.net

Commit message

Remove hard-coded dependency on libraries.

To post a comment you must log in.
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:454
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/495/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/896
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/740
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/740
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/740
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/740
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/906
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/897
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/897
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/897
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/897
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/897/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/495/rebuild

review: Approve (continuous-integration)
Libertine CI Bot (libertine-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:455
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/498/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/899
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/741
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/741
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/741
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/741
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/910
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/899
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/899
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/899
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/899
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/899/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/498/rebuild

review: Approve (continuous-integration)
Larry Price (larryprice) wrote :

lgtm

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-03-22 19:28:12 +0000
3+++ debian/control 2017-03-31 19:02:44 +0000
4@@ -62,7 +62,6 @@
5 Depends: libertine-qt-common,
6 libertine-tools,
7 python3-libertine-lxd,
8- libsystemsettings1,
9 ${misc:Depends},
10 ${shlibs:Depends}
11 Enhances: ubuntu-system-settings
12@@ -75,7 +74,7 @@
13 Architecture: any
14 Depends: qml-module-qtquick2,
15 qml-module-qtquick-dialogs,
16- qtdeclarative5-ubuntu-ui-toolkit-plugin,
17+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
18 ${misc:Depends},
19 ${shlibs:Depends}
20 Description: common files for qt-based libertine applications
21@@ -101,11 +100,7 @@
22
23 Package: libertine-xmir-tools
24 Architecture: amd64 armhf arm64 i386
25-Depends: libcontent-hub0,
26- libqt5core5a,
27- libqt5gui5,
28- libqt5widgets5,
29- python3-libertine,
30+Depends: python3-libertine,
31 xmir [amd64 armhf arm64 i386],
32 ${misc:Depends},
33 ${python3:Depends},

Subscribers

People subscribed via source and target branches