Skip to content

Commit 3db3764

Browse files
committed
Dual-licence the code under GPL and Revised BSD Licence.
1 parent 0d5ee2f commit 3db3764

File tree

5 files changed

+36
-18
lines changed

5 files changed

+36
-18
lines changed

COPYING.BSD

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Copyright 2012 Sven Marnach
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
* Redistributions of source code must retain the above copyright notice,
7+
this list of conditions and the following disclaimer.
8+
* Redistributions in binary form must reproduce the above copyright notice,
9+
this list of conditions and the following disclaimer in the documentation
10+
and/or other materials provided with the distribution.
11+
* The names of its contributors may not be used to endorse or promote
12+
products derived from this software without specific prior written
13+
permission.
14+
15+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
16+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18+
DISCLAIMED. IN NO EVENT SHALL SVEN MARNACH BE LIABLE FOR ANY DIRECT, INDIRECT,
19+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
20+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
22+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
23+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
File renamed without changes.

README.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ Licence
6060

6161
PyExifTool is free software: you can redistribute it and/or modify
6262
it under the terms of the GNU General Public License as published by
63-
the Free Software Foundation, either version 3 of the License, or
64-
(at your option) any later version.
63+
the Free Software Foundation, either version 3 of the licence, or
64+
(at your option) any later version, or the BSD licence.
6565

6666
PyExifTool is distributed in the hope that it will be useful,
6767
but WITHOUT ANY WARRANTY; without even the implied warranty of
68-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69-
GNU General Public License for more details.
68+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
7069

71-
You should have received a copy of the GNU General Public License
72-
along with PyExifTool. If not, see http://www.gnu.org/licenses/.
70+
See COPYING.GPL or COPYING.BSD for more details.

exiftool.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
#
77
# PyExifTool is free software: you can redistribute it and/or modify
88
# it under the terms of the GNU General Public License as published by
9-
# the Free Software Foundation, either version 3 of the License, or
10-
# (at your option) any later version.
9+
# the Free Software Foundation, either version 3 of the licence, or
10+
# (at your option) any later version, or the BSD licence.
1111
#
1212
# PyExifTool is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1615
#
17-
# You should have received a copy of the GNU General Public License
18-
# along with PyExifTool. If not, see <http://www.gnu.org/licenses/>.
16+
# See COPYING.GPL or COPYING.BSD for more details.
1917

2018
"""
2119
PyExifTool is a Python library to communicate with an instance of Phil

setup.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
#
66
# PyExifTool is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
8-
# the Free Software Foundation, either version 3 of the License, or
9-
# (at your option) any later version.
8+
# the Free Software Foundation, either version 3 of the licence, or
9+
# (at your option) any later version, or the BSD licence.
1010
#
1111
# PyExifTool is distributed in the hope that it will be useful,
1212
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
# GNU General Public License for more details.
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1514
#
16-
# You should have received a copy of the GNU General Public License
17-
# along with PyExifTool. If not, see <http://www.gnu.org/licenses/>.
15+
# See COPYING.GPL or COPYING.BSD for more details.
1816

1917
from distutils.core import setup
2018

0 commit comments

Comments
 (0)