Merge lp:~submarine/unity-scope-texdoc/bug1260105 into lp:unity-scope-texdoc

Proposed by Mark Tully
Status: Merged
Approved by: David Callé
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~submarine/unity-scope-texdoc/bug1260105
Merge into: lp:unity-scope-texdoc
Diff against target: 29 lines (+6/-2)
2 files modified
debian/copyright (+3/-1)
src/unity_texdoc_daemon.py (+3/-1)
To merge this branch: bzr merge lp:~submarine/unity-scope-texdoc/bug1260105
Reviewer Review Type Date Requested Status
David Callé Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+199064@code.launchpad.net

Commit message

Fix copyright attributions

Description of the change

Fixes the copyright attribution issue described in bug 1261015

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Callé (davidc3) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2013-03-13 13:14:52 +0000
3+++ debian/copyright 2013-12-16 01:04:45 +0000
4@@ -4,7 +4,9 @@
5 Upstream-Contact: Mark Tully <markjtully@gmail.com>
6
7 Files: *
8-Copyright: 2013 Mark Tully
9+Copyright: 2012 Frederik Elwert <frederik.elwert@web.de>
10+ 2012 Pawel Stolowski <stolowski@gmail.com>
11+ 2012 Mark Tully <markjtully@gmail.com>
12 License: GPL-3
13 This program is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15
16=== modified file 'src/unity_texdoc_daemon.py'
17--- src/unity_texdoc_daemon.py 2013-03-19 22:29:12 +0000
18+++ src/unity_texdoc_daemon.py 2013-12-16 01:04:45 +0000
19@@ -1,7 +1,9 @@
20 #! /usr/bin/python3
21 # -*- coding: utf-8 -*-
22
23-# Copyright(C) 2013 Mark Tully <markjtully@gmail.com>
24+# Copyright(C) 2012 Frederik Elwert <frederik.elwert@web.de>
25+# 2012 Pawel Stolowski <stolowski@gmail.com>
26+# 2012 Mark Tully <markjtully@gmail.com>
27 # This program is free software: you can redistribute it and/or modify it
28 # under the terms of the GNU General Public License version 3, as published
29 # by the Free Software Foundation.

Subscribers

People subscribed via source and target branches