Merge lp:~ken-vandine/ubuntu-system-settings/packaging_cleanup into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2016-09-16
Status: Needs review
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/packaging_cleanup
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~ken-vandine/ubuntu-system-settings/build_deps
Diff against target: 54 lines (+4/-9)
3 files modified
debian/control (+4/-4)
debian/ubuntu-system-settings-wizard.install (+0/-4)
debian/ubuntu-system-settings-wizard.lintian-overrides (+0/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/packaging_cleanup
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-09-16
Ubuntu Touch System Settings 2016-09-16 Pending
Review via email: mp+305961@code.launchpad.net

Commit message

* Moved some build depends to runtime depends
* dropped unused files in debian dir

Description of the change

* Moved some build depends to runtime depends
* dropped unused files in debian dir

To post a comment you must log in.

FAILED: Continuous integration, rev:1717
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/154/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1533/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1533
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1381/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1381/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1381/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1381/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1381/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1381/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1381/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1381/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1381
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1381/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/154/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1717. By Ken VanDine on 2016-09-16

Moved some build depends to runtime depends

1716. By Ken VanDine on 2016-09-16

merged prereq branch

1715. By Ken VanDine on 2016-09-16

dropped unused files in debian dir

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 2016-09-16 14:17:21 +0000
3+++ debian/control 2016-09-16 14:17:21 +0000
4@@ -27,7 +27,6 @@
5 libupower-glib-dev,
6 pkg-config,
7 qml-module-qtcontacts,
8- qml-module-qtquick-layouts,
9 qml-module-qtsysteminfo (>= 5.0~),
10 qml-module-ubuntu-connectivity (>= 0.5.5),
11 qt5-default,
12@@ -35,9 +34,6 @@
13 qtbase5-private-dev,
14 qtdeclarative5-dev,
15 qtdeclarative5-dev-tools,
16- qtdeclarative5-ubuntu-history0.1,
17- qtdeclarative5-ubuntu-keyboard-extensions0.1 [armhf arm64 amd64 i386],
18- qtdeclarative5-ubuntu-download-manager0.1 (>= 1.3~),
19 libapt-pkg-dev,
20 libgnome-desktop-3-dev,
21 libgsettings-qt-dev,
22@@ -91,6 +87,7 @@
23 qmenumodel-qml,
24 qml-module-biometryd,
25 qml-module-qt-labs-folderlistmodel,
26+ qml-module-qtquick-layouts,
27 qml-module-ubuntu-connectivity (>= 0.7.1),
28 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
29 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
30@@ -99,6 +96,9 @@
31 qtdeclarative5-ubuntu-content1,
32 qtdeclarative5-ubuntu-settings-components (>= 0.8),
33 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
34+ qtdeclarative5-ubuntu-history0.1,
35+ qtdeclarative5-ubuntu-keyboard-extensions0.1 [armhf arm64 amd64 i386],
36+ qtdeclarative5-ubuntu-download-manager0.1 (>= 1.3~),
37 suru-icon-theme (>= 14.04+15.04.20150813~),
38 whoopsie-preferences (>= 0.9),
39 libsystemsettings1 (= ${binary:Version}),
40
41=== removed file 'debian/ubuntu-system-settings-wizard.install'
42--- debian/ubuntu-system-settings-wizard.install 2014-06-15 19:12:41 +0000
43+++ debian/ubuntu-system-settings-wizard.install 1970-01-01 00:00:00 +0000
44@@ -1,4 +0,0 @@
45-usr/bin/system-settings-wizard
46-usr/share/ubuntu/settings/wizard
47-usr/share/upstart/sessions/ubuntu-system-settings-wizard*.conf
48-var/lib/polkit-1/localauthority/10-vendor.d/50-com.ubuntu.system-settings.wizard.pkla
49
50=== removed file 'debian/ubuntu-system-settings-wizard.lintian-overrides'
51--- debian/ubuntu-system-settings-wizard.lintian-overrides 2014-09-24 11:06:06 +0000
52+++ debian/ubuntu-system-settings-wizard.lintian-overrides 1970-01-01 00:00:00 +0000
53@@ -1,1 +0,0 @@
54-ubuntu-system-settings-wizard: binary-without-manpage usr/bin/system-settings-wizard

Subscribers

People subscribed via source and target branches