Merge lp:~mordred/quickly/add-apache-license into lp:quickly

Proposed by Monty Taylor
Status: Merged
Merged at revision: 522
Proposed branch: lp:~mordred/quickly/add-apache-license
Merge into: lp:quickly
Diff against target: 15 lines (+11/-0)
1 file modified
data/templates/ubuntu-application/available_licenses/header_Apache-2.0 (+11/-0)
To merge this branch: bzr merge lp:~mordred/quickly/add-apache-license
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+26097@code.launchpad.net

Description of the change

Adds support for the Apache License.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks a lot for your merge proposal.

From what I understand, the Apache license needs to have a file copied in copying in the project directory. There is one at /usr/share/common-licenses/Apache-2.0. Am I right?

For it to be copied automatically to the project directory, you need to name the file header_Apache-2.0.

review: Needs Information
Revision history for this message
Monty Taylor (mordred) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/27/2010 02:34 AM, Didier Roche wrote:
> Review: Needs Information Thanks a lot for your merge proposal.
>
>> From what I understand, the Apache license needs to have a file
>> copied in copying in the project directory. There is one at
>> /usr/share/common-licenses/Apache-2.0. Am I right?
>
> For it to be copied automatically to the project directory, you need
> to name the file header_Apache-2.0.

Aha! Cool. I have learned two new things. Will fix and resubmit.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkv+kZoACgkQ2Jv7/VK1RgFP9ACgpVet8n3FVTwlHFuTRP3xPfAm
rcwAn1I1SykZdJ7u5dSA+U1QjqmWWDZC
=rwEu
-----END PGP SIGNATURE-----

509. By Monty Taylor

Renamed header_APACHE to header_Apache-2.0 to enable copying the full license
text in from /usr/share/common-licenses

Revision history for this message
Monty Taylor (mordred) wrote :

Made the name change.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks a lot. I'll merge this in 0.5.X as soon as 0.4.3 is out.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/templates/ubuntu-application/available_licenses/header_Apache-2.0'
2--- data/templates/ubuntu-application/available_licenses/header_Apache-2.0 1970-01-01 00:00:00 +0000
3+++ data/templates/ubuntu-application/available_licenses/header_Apache-2.0 2010-05-27 15:55:45 +0000
4@@ -0,0 +1,11 @@
5+Licensed under the Apache License, Version 2.0 (the "License");
6+you may not use this file except in compliance with the License.
7+You may obtain a copy of the License at
8+
9+ http://www.apache.org/licenses/LICENSE-2.0
10+
11+Unless required by applicable law or agreed to in writing, software
12+distributed under the License is distributed on an "AS IS" BASIS,
13+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+See the License for the specific language governing permissions and
15+limitations under the License.

Subscribers

People subscribed via source and target branches