upstart

Merge lp:~jamesodhunt/upstart/upstream-correct-copyright-notices into lp:upstart

  1. upstream-correct-copyright-notices
  2. Merge into trunk
Proposed by James Hunt
Status: Merged
Merged at revision: 1283
Proposed branch: lp:~jamesodhunt/upstart/upstream-correct-copyright-notices
Merge into: lp:upstart
Diff against target: 164 lines (+5/-13)
14 files modified
ChangeLog (+4/-0)
configure.ac (+1/-1)
init/conf.c (+0/-1)
init/environ.c (+0/-1)
init/environ.h (+0/-1)
init/job_process.c (+0/-1)
init/job_process.h (+0/-1)
init/main.c (+0/-1)
init/tests/test_conf.c (+0/-1)
init/tests/test_control.c (+0/-1)
init/tests/test_environ.c (+0/-1)
init/tests/test_job_class.c (+0/-1)
init/tests/test_job_process.c (+0/-1)
util/reboot.c (+0/-1)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/upstream-correct-copyright-notices
Reviewer Review Type Date Requested Status
Upstart Developers Pending
Review via email: mp+63360@code.launchpad.net

Description of the change

Corrected copyright notices.

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 'ChangeLog'
2--- ChangeLog 2011-05-12 20:42:28 +0000
3+++ ChangeLog 2011-06-03 10:28:24 +0000
4@@ -1,3 +1,7 @@
5+2011-05-31 James Hunt <james.hunt@ubuntu.com>
6+
7+ * Corrected copyright notices.
8+
9 2011-05-12 Marc - A. Dahlhaus <mad@wol.de>
10
11 * init/job_class.h (JobClass): Add kill signal member
12
13=== modified file 'configure.ac'
14--- configure.ac 2011-03-22 17:53:17 +0000
15+++ configure.ac 2011-06-03 10:28:24 +0000
16@@ -2,7 +2,7 @@
17
18 AC_PREREQ(2.61)
19 AC_INIT([upstart], [1.3], [upstart-devel@lists.ubuntu.com])
20-NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
21+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
22 AC_CONFIG_SRCDIR([init/main.c])
23 AC_CONFIG_MACRO_DIR([m4])
24
25
26=== modified file 'init/conf.c'
27--- init/conf.c 2011-03-15 18:44:09 +0000
28+++ init/conf.c 2011-06-03 10:28:24 +0000
29@@ -2,7 +2,6 @@
30 *
31 * conf.c - configuration management
32 *
33- * Copyright © 2011 Google Inc.
34 * Copyright © 2009 Canonical Ltd.
35 * Author: Scott James Remnant <scott@netsplit.com>.
36 *
37
38=== modified file 'init/environ.c'
39--- init/environ.c 2011-03-16 22:42:48 +0000
40+++ init/environ.c 2011-06-03 10:28:24 +0000
41@@ -2,7 +2,6 @@
42 *
43 * environ.c - environment table utilities
44 *
45- * Copyright © 2011 Google Inc.
46 * Copyright © 2009 Canonical Ltd.
47 * Author: Scott James Remnant <scott@netsplit.com>.
48 *
49
50=== modified file 'init/environ.h'
51--- init/environ.h 2011-03-16 22:42:48 +0000
52+++ init/environ.h 2011-06-03 10:28:24 +0000
53@@ -1,6 +1,5 @@
54 /* upstart
55 *
56- * Copyright © 2011 Google Inc.
57 * Copyright © 2009 Canonical Ltd.
58 * Author: Scott James Remnant <scott@netsplit.com>.
59 *
60
61=== modified file 'init/job_process.c'
62--- init/job_process.c 2011-05-12 20:42:28 +0000
63+++ init/job_process.c 2011-06-03 10:28:24 +0000
64@@ -2,7 +2,6 @@
65 *
66 * job_process.c - job process handling
67 *
68- * Copyright © 2011 Google Inc.
69 * Copyright © 2011 Canonical Ltd.
70 * Author: Scott James Remnant <scott@netsplit.com>.
71 *
72
73=== modified file 'init/job_process.h'
74--- init/job_process.h 2011-05-12 19:21:16 +0000
75+++ init/job_process.h 2011-06-03 10:28:24 +0000
76@@ -1,6 +1,5 @@
77 /* upstart
78 *
79- * Copyright © 2011 Google Inc.
80 * Copyright © 2009 Canonical Ltd.
81 * Author: Scott James Remnant <scott@netsplit.com>.
82 *
83
84=== modified file 'init/main.c'
85--- init/main.c 2011-03-16 22:54:56 +0000
86+++ init/main.c 2011-06-03 10:28:24 +0000
87@@ -1,6 +1,5 @@
88 /* upstart
89 *
90- * Copyright © 2011 Google Inc.
91 * Copyright © 2010 Canonical Ltd.
92 * Author: Scott James Remnant <scott@netsplit.com>.
93 *
94
95=== modified file 'init/tests/test_conf.c'
96--- init/tests/test_conf.c 2011-02-17 23:38:17 +0000
97+++ init/tests/test_conf.c 2011-06-03 10:28:24 +0000
98@@ -2,7 +2,6 @@
99 *
100 * test_conf.c - test suite for init/conf.c
101 *
102- * Copyright © 2011 Google Inc.
103 * Copyright © 2009 Canonical Ltd.
104 * Author: Scott James Remnant <scott@netsplit.com>.
105 *
106
107=== modified file 'init/tests/test_control.c'
108--- init/tests/test_control.c 2011-03-16 22:42:48 +0000
109+++ init/tests/test_control.c 2011-06-03 10:28:24 +0000
110@@ -2,7 +2,6 @@
111 *
112 * test_dbus.c - test suite for init/dbus.c
113 *
114- * Copyright © 2011 Google Inc.
115 * Copyright © 2010 Canonical Ltd.
116 * Author: Scott James Remnant <scott@netsplit.com>.
117 *
118
119=== modified file 'init/tests/test_environ.c'
120--- init/tests/test_environ.c 2011-03-16 22:42:48 +0000
121+++ init/tests/test_environ.c 2011-06-03 10:28:24 +0000
122@@ -2,7 +2,6 @@
123 *
124 * test_environ.c - test suite for init/environ.c
125 *
126- * Copyright © 2011 Google Inc.
127 * Copyright © 2009 Canonical Ltd.
128 * Author: Scott James Remnant <scott@netsplit.com>.
129 *
130
131=== modified file 'init/tests/test_job_class.c'
132--- init/tests/test_job_class.c 2011-05-12 20:42:28 +0000
133+++ init/tests/test_job_class.c 2011-06-03 10:28:24 +0000
134@@ -2,7 +2,6 @@
135 *
136 * test_job_class.c - test suite for init/job_class.c
137 *
138- * Copyright © 2011 Google Inc.
139 * Copyright © 2010 Canonical Ltd.
140 * Author: Scott James Remnant <scott@netsplit.com>.
141 *
142
143=== modified file 'init/tests/test_job_process.c'
144--- init/tests/test_job_process.c 2011-05-12 19:21:16 +0000
145+++ init/tests/test_job_process.c 2011-06-03 10:28:24 +0000
146@@ -2,7 +2,6 @@
147 *
148 * test_job_process.c - test suite for init/job_process.c
149 *
150- * Copyright © 2011 Google Inc.
151 * Copyright © 2011 Canonical Ltd.
152 * Author: Scott James Remnant <scott@netsplit.com>.
153 *
154
155=== modified file 'util/reboot.c'
156--- util/reboot.c 2011-03-16 22:18:22 +0000
157+++ util/reboot.c 2011-06-03 10:28:24 +0000
158@@ -1,6 +1,5 @@
159 /* upstart
160 *
161- * Copyright © 2011 Google Inc.
162 * Copyright © 2010 Canonical Ltd.
163 * Author: Scott James Remnant <scott@netsplit.com>.
164 *

Subscribers

People subscribed via source and target branches