Merge lp:~stolowski/unity-api/license-check into lp:unity-api

Proposed by Paweł Stołowski on 2015-11-16
Status: Merged
Approved by: Michi Henning on 2015-11-16
Approved revision: 195
Merged at revision: 197
Proposed branch: lp:~stolowski/unity-api/license-check
Merge into: lp:unity-api
Diff against target: 29 lines (+8/-0)
2 files modified
debian/control (+2/-0)
test/copyright/check_copyright.sh (+6/-0)
To merge this branch: bzr merge lp:~stolowski/unity-api/license-check
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-11-16
Michi Henning (community) 2015-11-16 Approve on 2015-11-16
Review via email: mp+277544@code.launchpad.net

Commit Message

Depend on devscripts, needed by licensecheck. Disable licensecheck on xenial for now.

Description of the Change

License check - copied the fix and temporary workaround for xenial from unity-scopes-api.

To post a comment you must log in.
Michi Henning (michihenning) wrote :

Looks familiar :-)

review: Approve
196. By Paweł Stołowski on 2015-11-18

Also require lsb-release

197. By Paweł Stołowski on 2015-11-20

Merged trunk

198. By Paweł Stołowski on 2015-11-24

Added licensecheck bug # in the comment

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 2015-07-20 09:35:04 +0000
3+++ debian/control 2015-11-24 10:27:36 +0000
4@@ -4,6 +4,8 @@
5 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6 Build-Depends: cmake,
7 debhelper (>= 9),
8+ devscripts,
9+ lsb-release,
10 doxygen,
11 # To allow cross-compiling to work, we append :native
12 # to g++-4.9 so we don't try to run armhf g++
13
14=== modified file 'test/copyright/check_copyright.sh'
15--- test/copyright/check_copyright.sh 2013-06-26 23:47:34 +0000
16+++ test/copyright/check_copyright.sh 2015-11-24 10:27:36 +0000
17@@ -33,6 +33,12 @@
18 [ $# -lt 1 ] && usage
19 [ $# -gt 2 ] && usage
20
21+
22+# TODO: Temporary hack to work around broken licensecheck on xenial (see LP #1519292).
23+# Remove this once that is fixed.
24+distro=$(lsb_release -c -s)
25+[ "$distro" = "xenial" ] && exit 0
26+
27 ignore_pat="\\.sci$|CMakeFiles"
28
29 #

Subscribers

People subscribed via source and target branches

to all changes: