Merge lp:~townsend/libertine/xmir-helpers-package into lp:libertine

Proposed by Christopher Townsend
Status: Merged
Approved by: Larry Price
Approved revision: 322
Merged at revision: 321
Proposed branch: lp:~townsend/libertine/xmir-helpers-package
Merge into: lp:libertine
Diff against target: 77 lines (+26/-5)
4 files modified
debian/changelog (+6/-0)
debian/control (+17/-2)
debian/libertine-tools.install (+0/-3)
debian/libertine-xmir-tools.install (+3/-0)
To merge this branch: bzr merge lp:~townsend/libertine/xmir-helpers-package
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Larry Price Approve
Review via email: mp+309399@code.launchpad.net

Commit message

Split out Xmir helper apps into their own package.
Bump changelog version to 1.4.3 for the Breaks/Replaces.

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

PASSED: Continuous integration, rev:321
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/189/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/431
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/341
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/341
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/341
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/341
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/341
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/341
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/330/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/433
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/414
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/414
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/414
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/413/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/413/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/413/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/413/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/413/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/413
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/413/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
322. By Christopher Townsend

Fix typo.

Revision history for this message
Larry Price (larryprice) wrote :

lgtm - everything seems to be working functionally after a removal of 1.4.2 -> installation of 1.4.3.

review: Approve
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:322
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/190/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/432
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/342
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/342
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/342
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/342
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/342
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/342
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/331/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/434
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/415
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/415
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/415
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/414/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/414/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/414/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/414/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/414/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/414
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/414/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-10-05 15:53:14 +0000
+++ debian/changelog 2016-10-27 15:45:28 +0000
@@ -1,3 +1,9 @@
1libertine (1.4.3-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Bump version to 1.4.3.
4
5 -- Chris Townsend <christopher.townsend@canonical.com> Wed, 26 Oct 2016 15:59:38 -0400
6
1libertine (1.4.2+16.10.20161005-0ubuntu1) yakkety; urgency=medium7libertine (1.4.2+16.10.20161005-0ubuntu1) yakkety; urgency=medium
28
3 [ Chris Townsend ]9 [ Chris Townsend ]
410
=== modified file 'debian/control'
--- debian/control 2016-10-13 18:28:34 +0000
+++ debian/control 2016-10-27 15:45:28 +0000
@@ -39,8 +39,6 @@
39Depends: libertine-qt-common,39Depends: libertine-qt-common,
40 libertine-tools,40 libertine-tools,
41 python3-libertine-lxc,41 python3-libertine-lxc,
42 qml-module-qtquick2,
43 qtdeclarative5-ubuntu-ui-toolkit-plugin,
44 ${misc:Depends},42 ${misc:Depends},
45 ${shlibs:Depends}43 ${shlibs:Depends}
46Description: sandbox for running deb-packaged X11 apps on Ubuntu Personal44Description: sandbox for running deb-packaged X11 apps on Ubuntu Personal
@@ -87,6 +85,7 @@
87Package: libertine-tools85Package: libertine-tools
88Architecture: any86Architecture: any
89Depends: libglib2.0-bin,87Depends: libglib2.0-bin,
88 libertine-xmir-tools (>= 1.4.3),
90 lsb-release,89 lsb-release,
91 python3-apt,90 python3-apt,
92 python3-dbus,91 python3-dbus,
@@ -101,6 +100,22 @@
101 Command-line tools that can be used for creating, manipulating, and using100 Command-line tools that can be used for creating, manipulating, and using
102 the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.101 the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.
103102
103Package: libertine-xmir-tools
104Architecture: any
105Depends: libcontent-hub0,
106 libqt5core5a,
107 libqt5gui5,
108 libqt5widgets5,
109 xmir,
110 ${misc:Depends},
111 ${python3:Depends},
112 ${shlibs:Depends}
113Breaks: libertine-tools (<< 1.4.3)
114Replaces: libertine-tools (<< 1.4.3)
115Description: helper apps for using and interacting with Xmir
116 Helper applications for using and interacting with Xmir such as launching
117 Xmir and allowing copy and paste.
118
104Package: liblibertine1119Package: liblibertine1
105Architecture: any120Architecture: any
106Multi-Arch: same121Multi-Arch: same
107122
=== modified file 'debian/libertine-tools.install'
--- debian/libertine-tools.install 2016-10-07 21:09:41 +0000
+++ debian/libertine-tools.install 2016-10-27 15:45:28 +0000
@@ -1,7 +1,4 @@
1usr/bin/libertine-container-manager1usr/bin/libertine-container-manager
2usr/bin/libertine-launch2usr/bin/libertine-launch
3usr/bin/libertine-xmir
4usr/bin/pasted
5usr/share/bash-completion/completions/libertine-container-manager3usr/share/bash-completion/completions/libertine-container-manager
6usr/share/man4usr/share/man
7usr/share/upstart/sessions/libertine-xmir.conf
85
=== added file 'debian/libertine-xmir-tools.install'
--- debian/libertine-xmir-tools.install 1970-01-01 00:00:00 +0000
+++ debian/libertine-xmir-tools.install 2016-10-27 15:45:28 +0000
@@ -0,0 +1,3 @@
1usr/bin/libertine-xmir
2usr/bin/pasted
3usr/share/upstart/sessions/libertine-xmir.conf

Subscribers

People subscribed via source and target branches