Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit e05c1c0

Browse files
committed
Fix licensing
1 parent 562a672 commit e05c1c0

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

AUTHORS.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
The code is based off `vdirsyncer <https://github.com/untitaker/vdirsyncer>`_'s
2+
filesystem storage.
3+
4+
Contributors
5+
============
6+
7+
In alphabetical order:
8+
9+
- Ben Boeckel
10+
- Christian Geier
11+
- Clément Mondon
12+
- Hugo Osvaldo Barrera
13+
- Julian Mehne
14+
- Markus Unterwaditzer
15+
- Michael Adler
16+
- Thomas Weißschuh

LICENSE

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
This is free and unencumbered software released into the public domain.
1+
Copyright (c) 2015-2016 Markus Unterwaditzer & contributors (see AUTHORS.rst)
22

3-
Anyone is free to copy, modify, publish, use, compile, sell, or
4-
distribute this software, either in source code form or as a compiled
5-
binary, for any purpose, commercial or non-commercial, and by any
6-
means.
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of
4+
this software and associated documentation files (the "Software"), to deal in
5+
the Software without restriction, including without limitation the rights to
6+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7+
of the Software, and to permit persons to whom the Software is furnished to do
8+
so, subject to the following conditions:
79

8-
In jurisdictions that recognize copyright laws, the author or authors
9-
of this software dedicate any and all copyright interest in the
10-
software to the public domain. We make this dedication for the benefit
11-
of the public at large and to the detriment of our heirs and
12-
successors. We intend this dedication to be an overt act of
13-
relinquishment in perpetuity of all present and future rights to this
14-
software under copyright law.
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
1512

16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19-
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22-
OTHER DEALINGS IN THE SOFTWARE.
23-
24-
For more information, please refer to <http://unlicense.org/>
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

README.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ Tools to read and write from/to `vdirs
1010

1111
Look at the source code for usage for now.
1212

13-
Based off vdirsyncer's ``filesystem`` storage, see ``VDIRSYNCER_AUTHORS.rst``.
14-
1513
License
1614
=======
1715

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
author='Markus Unterwaditzer',
1818
author_email='markus@unterwaditzer.net',
1919
url='https://github.com/vdirsyncer/python-vdir',
20-
license='Public domain/Unlicense',
20+
license='MIT',
2121
packages=['vdir'],
2222
long_description=open('README.rst').read(),
2323
install_requires=['atomicwrites'],

0 commit comments

Comments
 (0)