Indicator Location

Merge lp:~sil2100/indicator-location/remove_nbs_dep into lp:indicator-location

  1. remove_nbs_dep
  2. Merge into trunk.16.10
Proposed by Łukasz Zemczak
Status: Merged
Approved by: dobey
Approved revision: 171
Merged at revision: 169
Proposed branch: lp:~sil2100/indicator-location/remove_nbs_dep
Merge into: lp:indicator-location
Diff against target: 62 lines (+17/-4)
3 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+13/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~sil2100/indicator-location/remove_nbs_dep
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+321431@code.launchpad.net

Commit message

Switch the libubuntu-app-launch2-dev dependency to libubuntu-app-launch3-dev as the former is no longer built from source.

Description of the change

Switch the libubuntu-app-launch2-dev dependency to libubuntu-app-launch3-dev as the former is no longer built from source.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:169
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1888/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1895
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1677/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1677/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1677/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1677/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1677/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1677/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/9/rebuild

review: Needs Fixing (continuous-integration)
lp:~sil2100/indicator-location/remove_nbs_dep updated
170. By Łukasz Zemczak

Add changelog entry

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:170
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1889/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1896
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1678/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1678/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1678/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1678/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1678/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1678/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/10/rebuild

review: Needs Fixing (continuous-integration)
lp:~sil2100/indicator-location/remove_nbs_dep updated
171. By Łukasz Zemczak

Switch the cmake dependency as well.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:171
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1890
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1897
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1679/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1679
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1679/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/11/rebuild

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-02-07 19:13:16 +0000
3+++ CMakeLists.txt 2017-03-30 10:15:54 +0000
4@@ -29,7 +29,7 @@
5
6 include (FindPkgConfig)
7 pkg_check_modules (SERVICE_DEPS REQUIRED
8- ubuntu-app-launch-2
9+ ubuntu-app-launch-3
10 url-dispatcher-1
11 gio-unix-2.0>=2.36
12 glib-2.0>=2.36
13@@ -57,7 +57,7 @@
14 if (NOT DOS2UNIX_COMMAND)
15 message(WARNING "Cannot find dos2unix: formatcode target will not be available")
16 else()
17- find_program(CLANG_FORMAT_COMMAND NAMES clang-format-3.6 clang-format-3.5)
18+ find_program(CLANG_FORMAT_COMMAND NAMES clang-format clang-format-3.6 clang-format-3.5)
19 if (NOT CLANG_FORMAT_COMMAND)
20 message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
21 endif()
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2017-02-10 17:10:08 +0000
25+++ debian/changelog 2017-03-30 10:15:54 +0000
26@@ -1,3 +1,16 @@
27+indicator-location (13.10.0+17.04.20170210-0ubuntu3) UNRELEASED; urgency=medium
28+
29+ * Switch the libubuntu-app-launch2-dev dependency to
30+ libubuntu-app-launch3-dev as the former is no longer built from source.
31+
32+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 30 Mar 2017 12:03:12 +0200
33+
34+indicator-location (13.10.0+17.04.20170210-0ubuntu2) zesty; urgency=medium
35+
36+ * Build-depend on clang-format, not on obsolete clang-format-3.6.
37+
38+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 22 Feb 2017 09:00:55 -0800
39+
40 indicator-location (13.10.0+17.04.20170210-0ubuntu1) zesty; urgency=medium
41
42 * Remove old autostart files.
43
44=== modified file 'debian/control'
45--- debian/control 2017-02-07 19:13:16 +0000
46+++ debian/control 2017-03-30 10:15:54 +0000
47@@ -12,13 +12,13 @@
48 intltool (>= 0.35.0),
49 lcov,
50 libglib2.0-dev (>= 2.36),
51- libubuntu-app-launch2-dev,
52+ libubuntu-app-launch3-dev,
53 liburl-dispatcher1-dev,
54 python,
55 libproperties-cpp-dev,
56 # for code formatting
57 astyle,
58- clang-format-3.6,
59+ clang-format,
60 dos2unix,
61 # for systemd unit
62 systemd,

Subscribers

People subscribed via source and target branches