Merge lp:~michihenning/persistent-cache-cpp/merge-devel into lp:persistent-cache-cpp

Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 26
Merged at revision: 25
Proposed branch: lp:~michihenning/persistent-cache-cpp/merge-devel
Merge into: lp:persistent-cache-cpp
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
tests/copyright/check_copyright.sh (+1/-1)
To merge this branch: bzr merge lp:~michihenning/persistent-cache-cpp/merge-devel
Reviewer Review Type Date Requested Status
Unity API Team Pending
Review via email: mp+293845@code.launchpad.net

Commit message

Fix for copyright test.

Description of the change

Changes from devel: Fix for copyright test.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-01-17 22:35:54 +0000
+++ debian/changelog 2016-05-05 05:50:50 +0000
@@ -1,3 +1,9 @@
1persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu2) yakkety; urgency=medium
2
3 * No-change rebuild to pick up -fPIE on amd64.
4
5 -- Graham Inggs <ginggs@ubuntu.com> Wed, 04 May 2016 17:55:45 +0200
6
1persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu1) xenial; urgency=medium7persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu1) xenial; urgency=medium
28
3 [ Michi Henning ]9 [ Michi Henning ]
410
=== modified file 'tests/copyright/check_copyright.sh'
--- tests/copyright/check_copyright.sh 2015-12-10 05:30:29 +0000
+++ tests/copyright/check_copyright.sh 2016-05-05 05:50:50 +0000
@@ -35,7 +35,7 @@
35 exit 035 exit 0
36}36}
3737
38ignore_pat="\\.sci$"38ignore_pat="\\.sci$|debian|HACKING|README"
3939
40#40#
41# We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories41# We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories

Subscribers

People subscribed via source and target branches

to all changes: