Skip to content

Commit 0f3ce6a

Browse files
cworth-ghcworth-gh
committed
Add the MPL as a new license option, in addition to the LGPL.
1 parent 31d0ddb commit 0f3ce6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2142
-932
lines changed

‎COPYING

+13-506
Large diffs are not rendered by default.

‎COPYING-LGPL-2.1

+510
Large diffs are not rendered by default.

‎COPYING-MPL-1.1

+470
Large diffs are not rendered by default.

‎ChangeLog

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2004-09-04 Carl Worth <[email protected]>
2+
3+
* COPYING:
4+
* COPYING-MPL-1.1:
5+
6+
* COPYING-LGPL-2.1: Add the MPL as a new license option, in
7+
addition to the LGPL.
8+
19
2004-08-14 Carl Worth <[email protected]>
210

311
* src/cairo_image_surface.c

‎src/cairo-color.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2002 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include "cairoint.h"

‎src/cairo-features.h.in

+29-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright � 2003 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
12+
*
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
18+
*
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl Worth <[email protected]>
1835
*/
1936

2037
#ifndef _CAIRO_CONFIG_H_

‎src/cairo-fixed.c

+29-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2003 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
12+
*
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
18+
*
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include "cairoint.h"

‎src/cairo-font.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2002 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include "cairoint.h"

‎src/cairo-gstate.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2002 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include <stdlib.h>

‎src/cairo-hull.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2003 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include "cairoint.h"

‎src/cairo-image-surface.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2003 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include "cairoint.h"

‎src/cairo-matrix.c

+27-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@
33
* Copyright © 2002 University of Southern California
44
*
55
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License version 2.1 as published by the Free Software Foundation.
6+
* modify it either under the terms of the GNU Lesser General Public
7+
* License version 2.1 as published by the Free Software Foundation
8+
* (the "LGPL") or, at your option, under the terms of the Mozilla
9+
* Public License Version 1.1 (the "MPL"). If you do not alter this
10+
* notice, a recipient may use your version of this file under either
11+
* the MPL or the LGPL.
812
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13+
* You should have received a copy of the LGPL along with this library
14+
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
15+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
* You should have received a copy of the MPL along with this library
17+
* in the file COPYING-MPL-1.1
1318
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
* Author: Carl D. Worth <[email protected]>
19+
* The contents of this file are subject to the Mozilla Public License
20+
* Version 1.1 (the "License"); you may not use this file except in
21+
* compliance with the License. You may obtain a copy of the License at
22+
* http://www.mozilla.org/MPL/
23+
*
24+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
25+
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
26+
* the specific language governing rights and limitations.
27+
*
28+
* The Original Code is the cairo graphics library.
29+
*
30+
* The Initial Developer of the Original Code is University of Southern
31+
* California.
32+
*
33+
* Contributor(s):
34+
* Carl D. Worth <[email protected]>
1835
*/
1936

2037
#include <stdlib.h>

0 commit comments

Comments
 (0)