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

Proposed by Ken VanDine
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
Ubuntu Touch System Settings 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.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

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

Moved some build depends to runtime depends

1716. By Ken VanDine

merged prereq branch

1715. By Ken VanDine

dropped unused files in debian dir

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2016-09-16 14:17:21 +0000
+++ debian/control 2016-09-16 14:17:21 +0000
@@ -27,7 +27,6 @@
27 libupower-glib-dev,27 libupower-glib-dev,
28 pkg-config,28 pkg-config,
29 qml-module-qtcontacts,29 qml-module-qtcontacts,
30 qml-module-qtquick-layouts,
31 qml-module-qtsysteminfo (>= 5.0~),30 qml-module-qtsysteminfo (>= 5.0~),
32 qml-module-ubuntu-connectivity (>= 0.5.5),31 qml-module-ubuntu-connectivity (>= 0.5.5),
33 qt5-default,32 qt5-default,
@@ -35,9 +34,6 @@
35 qtbase5-private-dev,34 qtbase5-private-dev,
36 qtdeclarative5-dev,35 qtdeclarative5-dev,
37 qtdeclarative5-dev-tools,36 qtdeclarative5-dev-tools,
38 qtdeclarative5-ubuntu-history0.1,
39 qtdeclarative5-ubuntu-keyboard-extensions0.1 [armhf arm64 amd64 i386],
40 qtdeclarative5-ubuntu-download-manager0.1 (>= 1.3~),
41 libapt-pkg-dev,37 libapt-pkg-dev,
42 libgnome-desktop-3-dev,38 libgnome-desktop-3-dev,
43 libgsettings-qt-dev,39 libgsettings-qt-dev,
@@ -91,6 +87,7 @@
91 qmenumodel-qml,87 qmenumodel-qml,
92 qml-module-biometryd,88 qml-module-biometryd,
93 qml-module-qt-labs-folderlistmodel,89 qml-module-qt-labs-folderlistmodel,
90 qml-module-qtquick-layouts,
94 qml-module-ubuntu-connectivity (>= 0.7.1),91 qml-module-ubuntu-connectivity (>= 0.7.1),
95 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,92 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
96 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),93 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
@@ -99,6 +96,9 @@
99 qtdeclarative5-ubuntu-content1,96 qtdeclarative5-ubuntu-content1,
100 qtdeclarative5-ubuntu-settings-components (>= 0.8),97 qtdeclarative5-ubuntu-settings-components (>= 0.8),
101 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),98 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
99 qtdeclarative5-ubuntu-history0.1,
100 qtdeclarative5-ubuntu-keyboard-extensions0.1 [armhf arm64 amd64 i386],
101 qtdeclarative5-ubuntu-download-manager0.1 (>= 1.3~),
102 suru-icon-theme (>= 14.04+15.04.20150813~),102 suru-icon-theme (>= 14.04+15.04.20150813~),
103 whoopsie-preferences (>= 0.9),103 whoopsie-preferences (>= 0.9),
104 libsystemsettings1 (= ${binary:Version}),104 libsystemsettings1 (= ${binary:Version}),
105105
=== removed file 'debian/ubuntu-system-settings-wizard.install'
--- debian/ubuntu-system-settings-wizard.install 2014-06-15 19:12:41 +0000
+++ debian/ubuntu-system-settings-wizard.install 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1usr/bin/system-settings-wizard
2usr/share/ubuntu/settings/wizard
3usr/share/upstart/sessions/ubuntu-system-settings-wizard*.conf
4var/lib/polkit-1/localauthority/10-vendor.d/50-com.ubuntu.system-settings.wizard.pkla
50
=== removed file 'debian/ubuntu-system-settings-wizard.lintian-overrides'
--- debian/ubuntu-system-settings-wizard.lintian-overrides 2014-09-24 11:06:06 +0000
+++ debian/ubuntu-system-settings-wizard.lintian-overrides 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1ubuntu-system-settings-wizard: binary-without-manpage usr/bin/system-settings-wizard

Subscribers

People subscribed via source and target branches