Indicator Date and Time

Merge lp:~didrocks/indicator-datetime/refreshcopyright into lp:indicator-datetime/13.04

  1. refreshcopyright
  2. Merge into trunk.13.04
Proposed by Didier Roche on 2012-11-22
Status: Merged
Approved by: Łukasz Zemczak on 2012-11-22
Approved revision: 199
Merged at revision: 199
Proposed branch: lp:~didrocks/indicator-datetime/refreshcopyright
Merge into: lp:indicator-datetime/13.04
Diff against target: 47 lines (+11/-7)
2 files modified
debian/changelog (+5/-0)
debian/copyright (+6/-7)
To merge this branch: bzr merge lp:~didrocks/indicator-datetime/refreshcopyright
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-11-22 Approve on 2012-11-22
PS Jenkins bot continuous-integration Pending
Review via email: mp+135605@code.launchpad.net

Commit Message

Refresh copyright

Description of the Change

Refresh copyright

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

+1

review: Approve

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 2012-11-19 13:55:12 +0000
3+++ debian/changelog 2012-11-22 08:27:24 +0000
4@@ -1,5 +1,6 @@
5 indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Mathieu Trudel-Lapierre ]
8 * Automatic snapshot from revision 197 (bootstrap):
9 - Add scaffolding for Google Tests. (LP: #985060)
10 - Add "check-news" to our AM_INIT_AUTOMAKE() call. (LP: #1075753)
11@@ -20,6 +21,10 @@
12 accordingly.
13 - Override dh_autoreconf to make it use autogen.sh from upstream.
14
15+ [ Didier Roche ]
16+ * debian/copyright:
17+ - Update the copyright
18+
19 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 16 Nov 2012 15:17:20 -0500
20
21 indicator-datetime (12.10.2-0ubuntu4) raring; urgency=low
22
23=== modified file 'debian/copyright'
24--- debian/copyright 2010-02-10 11:08:35 +0000
25+++ debian/copyright 2012-11-22 08:27:24 +0000
26@@ -9,15 +9,14 @@
27
28 Copyright:
29
30- Copyright (C) 2009 Canonical Ltd
31+ Copyright (C) 2009-2012 Canonical Ltd
32
33 License:
34-
35- This program is free software; you can redistribute it and/or
36- modify it under the terms of the GNU General Public License
37- as published by the Free Software Foundation; either version 3
38- of the License, or (at your option) any later version.
39-
40+
41+ This program is free software: you can redistribute it and/or modify it
42+ under the terms of the GNU General Public License version 3, as published
43+ by the Free Software Foundation.
44+
45 This program is distributed in the hope that it will be useful,
46 but WITHOUT ANY WARRANTY; without even the implied warranty of
47 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

Subscribers

People subscribed via source and target branches