persistent-cache-cpp

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

  1. merge-devel
  2. Merge into trunk
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-17 22:35:54 +0000
3+++ debian/changelog 2016-05-05 05:50:50 +0000
4@@ -1,3 +1,9 @@
5+persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu2) yakkety; urgency=medium
6+
7+ * No-change rebuild to pick up -fPIE on amd64.
8+
9+ -- Graham Inggs <ginggs@ubuntu.com> Wed, 04 May 2016 17:55:45 +0200
10+
11 persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu1) xenial; urgency=medium
12
13 [ Michi Henning ]
14
15=== modified file 'tests/copyright/check_copyright.sh'
16--- tests/copyright/check_copyright.sh 2015-12-10 05:30:29 +0000
17+++ tests/copyright/check_copyright.sh 2016-05-05 05:50:50 +0000
18@@ -35,7 +35,7 @@
19 exit 0
20 }
21
22-ignore_pat="\\.sci$"
23+ignore_pat="\\.sci$|debian|HACKING|README"
24
25 #
26 # 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: