Skip to content

Commit 4050103

Browse files
tuomasjjrasanentuomasjjrasanen
committed
Updated license information.
1 parent fcf5495 commit 4050103

7 files changed

Lines changed: 53 additions & 103 deletions

File tree

‎COPYING‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -620,57 +620,3 @@ Program, unless a warranty or assumption of liability accompanies a
620620
copy of the Program in return for a fee.
621621

622622
END OF TERMS AND CONDITIONS
623-
624-
How to Apply These Terms to Your New Programs
625-
626-
If you develop a new program, and you want it to be of the greatest
627-
possible use to the public, the best way to achieve this is to make it
628-
free software which everyone can redistribute and change under these terms.
629-
630-
To do so, attach the following notices to the program. It is safest
631-
to attach them to the start of each source file to most effectively
632-
state the exclusion of warranty; and each file should have at least
633-
the "copyright" line and a pointer to where the full notice is found.
634-
635-
<one line to give the program's name and a brief idea of what it does.>
636-
Copyright (C) <year> <name of author>
637-
638-
This program is free software: you can redistribute it and/or modify
639-
it under the terms of the GNU General Public License as published by
640-
the Free Software Foundation, either version 3 of the License, or
641-
(at your option) any later version.
642-
643-
This program is distributed in the hope that it will be useful,
644-
but WITHOUT ANY WARRANTY; without even the implied warranty of
645-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
646-
GNU General Public License for more details.
647-
648-
You should have received a copy of the GNU General Public License
649-
along with this program. If not, see <http://www.gnu.org/licenses/>.
650-
651-
Also add information on how to contact you by electronic and paper mail.
652-
653-
If the program does terminal interaction, make it output a short
654-
notice like this when it starts in an interactive mode:
655-
656-
<program> Copyright (C) <year> <name of author>
657-
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
658-
This is free software, and you are welcome to redistribute it
659-
under certain conditions; type `show c' for details.
660-
661-
The hypothetical commands `show w' and `show c' should show the appropriate
662-
parts of the General Public License. Of course, your program's commands
663-
might be different; for a GUI interface, you would use an "about box".
664-
665-
You should also get your employer (if you work as a programmer) or school,
666-
if any, to sign a "copyright disclaimer" for the program, if necessary.
667-
For more information on this, and how to apply and follow the GNU GPL, see
668-
<http://www.gnu.org/licenses/>.
669-
670-
The GNU General Public License does not permit incorporating your program
671-
into proprietary programs. If your program is a subroutine library, you
672-
may consider it more useful to permit linking proprietary applications with
673-
the library. If this is what you want to do, use the GNU Lesser General
674-
Public License instead of this License. But first, please read
675-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
676-

‎NEWS‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
0.3.3.
1+
0.4
2+
3+
- Libsuinput is included in the distribution.
4+
- Licensed under GPLv3.
5+
6+
0.3.3
27

38
- Explicit dependence on libsuinput.
49

‎README‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ Python-uinput provides a simple and easy to use API to the Linux uinput-system.
1313
General information
1414
===================
1515

16-
- **Author**: `Tuomas Räsänen <http://tuos.codegrove.org/>`_ <tuos@codegrove.org>
17-
- **Homepage**: http://codegrove.org/python-uinput/
18-
- **License**: GPLv3+ (see COPYING for details)
19-
- **Version**: 0.3.3
16+
- **Author**: `Tuomas Räsänen (tuos) <http://tuos.codegrove.org/>`_ <tuos@codegrove.org>
17+
- **Homepage**: http://codegrove.org/projects/python-uinput/
18+
- **License**: GPLv3 (see COPYING for details)
19+
- **Version**: 0.4
2020

2121
Requirements
2222
============
2323

2424
- Python 2.5.x+ and development files for it:
2525

26-
- On Ubuntu (from Code Grove ppa)::
26+
- On Ubuntu (from Codegrove ppa)::
2727

2828
sudo apt-get install python-dev
2929

3030
- libsuinput-dev
3131

32-
- On Ubuntu (from Code Grove ppa)::
32+
- On Ubuntu (from Codegrove ppa)::
3333

3434
sudo apt-get install libsuinput-dev
3535

@@ -60,11 +60,10 @@ Downloading
6060
===========
6161

6262
- Ubuntu package: https://launchpad.net/~tuos/+archive/codegrove
63-
- Tarball is available at: http://codegrove.org/python-uinput/releases/python-uinput-0.3.3.tar.gz
64-
- Tarballs of every release at: http://codegrove.org/python-uinput/releases/
65-
- Latest sources from public git-repository: http://github.com/tuos/python-uinput/ ::
63+
- Tarball is available at: http://pypi.python.org/packages/source/p/python-uinput/python-uinput-0.4.tar.gz
64+
- Latest sources from public bzr-repository: http://code.launchpad.net/python-uinput ::
6665

67-
git clone git://github.com/tuos/python-uinput.git
66+
bzr branch lp:python-uinput
6867

6968
Installing
7069
==========
@@ -86,5 +85,4 @@ The install-procedure adheres the "standard"::
8685
Bug reporting
8786
=============
8887

89-
Report bugs by sending email to tuos@codegrove.org or by opening an issue
90-
at http://github.com/tuos/python-uinput/issues .
88+
Report bugs at http://bugs.launchpad.net/python-uinput .

‎setup.py‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import os
44
import sys
5-
reload(sys).setdefaultencoding('utf-8')
65

76
from distutils.core import setup, Extension
87

@@ -16,24 +15,29 @@
1615
)
1716

1817
setup(name='python-uinput',
19-
version='0.3.3',
18+
provides='uinput',
19+
version='0.4',
2020
description='Python API to the Linux uinput-system.',
21-
author='Tuomas Räsänen',
21+
author='Tuomas Räsänen (tuos)',
2222
author_email='tuos@codegrove.org',
23-
url='http://codegrove.org/python-uinput/',
24-
download_url='http://codegrove.org/python-uinput/releases/python-uinput-0.3.3.tar.gz',
25-
package_dir={'uinput': 'src'},
26-
packages=['uinput'],
23+
url='http://codegrove.org/projects/python-uinput/',
24+
download_url='http://pypi.python.org/packages/source/p/python-uinput/python-uinput-0.4.tar.gz',
25+
package_dir={
26+
'uinput': 'src',
27+
},
28+
packages=[
29+
'uinput',
30+
],
2731
ext_modules=[suinput_module, bustypes_module],
28-
license='GPLv3+',
32+
license='License :: OSI Approved :: GNU General Public License (GPL)',
2933
platforms=['Linux'],
3034
classifiers=[
3135
"Development Status :: 3 - Alpha",
3236
"Intended Audience :: Developers",
3337
"License :: OSI Approved :: GNU General Public License (GPL)",
3438
"Operating System :: POSIX :: Linux",
3539
"Topic :: System :: Operating System Kernels :: Linux",
36-
"Programming Language :: Python :: 2.6",
40+
"Programming Language :: Python :: 2.5",
3741
"Programming Language :: C",
3842
],
3943
long_description="""

‎src/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
# Copyright © 2010 Tuomas Räsänen (tuos) <tuos@codegrove.org>
44

55
# This program is free software: you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation, either version 3 of the License, or
8-
# (at your option) any later version.
6+
# it under the terms of the GNU General Public License version 3 as
7+
# published by the Free Software Foundation.
98

109
# This program is distributed in the hope that it will be useful,
1110
# but WITHOUT ANY WARRANTY; without even the implied warranty of

‎src/bustypesmodule.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
Copyright © 2010 Tuomas Räsänen (tuos) <tuos@codegrove.org>
44
55
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
6+
it under the terms of the GNU General Public License version 3 as
7+
published by the Free Software Foundation.
98
109
This program is distributed in the hope that it will be useful,
1110
but WITHOUT ANY WARRANTY; without even the implied warranty of

‎src/suinputmodule.c‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
Copyright © 2010 Tuomas Räsänen (tuos) <tuos@codegrove.org>
44
55
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
6+
it under the terms of the GNU General Public License version 3 as
7+
published by the Free Software Foundation.
98
109
This program is distributed in the hope that it will be useful,
1110
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -186,35 +185,35 @@ static PyObject *pysuinput_destroy(PyObject *self, PyObject *args)
186185
}
187186

188187
static PyMethodDef pysuinputMethods[] = {
189-
{"uinput_open", pysuinput_open, METH_VARARGS,
190-
"uinput_open()\n\n"
191-
"Open the uinput device and return a file descriptor."
188+
{"open", pysuinput_open, METH_VARARGS,
189+
"open()\n\n"
190+
"Open an uinput device and return a file descriptor."
192191
},
193192

194-
{"uinput_write", pysuinput_write, METH_VARARGS,
195-
"uinput_write(uinput_fd, ev_type, ev_code, ev_value)\n\n"
196-
"Destory and close the uinput device.\n"
193+
{"write", pysuinput_write, METH_VARARGS,
194+
"write(uinput_fd, ev_type, ev_code, ev_value)\n\n"
195+
"Write an event to the uinput device.\n"
197196
},
198197

199-
{"uinput_set_capabilities", pysuinput_set_capabilities, METH_VARARGS,
200-
"uinput_set_capabilities(uinput_fd, ev_type, capabilities)\n\n"
201-
"Destory and close the uinput device.\n"
198+
{"set_capabilities", pysuinput_set_capabilities, METH_VARARGS,
199+
"set_capabilities(uinput_fd, ev_type, capabilities)\n\n"
200+
"Set the capabilities of the uinput device.\n"
202201
},
203202

204-
{"uinput_syn", pysuinput_syn, METH_VARARGS,
205-
"uinput_syn(uinput_fd, ev_type, ev_code, ev_value)\n\n"
206-
"Destory and close the uinput device.\n"
203+
{"syn", pysuinput_syn, METH_VARARGS,
204+
"syn(uinput_fd, ev_type, ev_code, ev_value)\n\n"
205+
"Write EV_SYN event to the uinput device.\n"
207206
},
208207

209-
{"uinput_destroy", pysuinput_destroy, METH_VARARGS,
210-
"uinput_destroy(uinput_fd)\n\n"
208+
{"destroy", pysuinput_destroy, METH_VARARGS,
209+
"destroy(uinput_fd)\n\n"
211210
"Destory and close the uinput device.\n"
212211
},
213212

214-
{"uinput_create", pysuinput_create, METH_VARARGS,
215-
"uinput_create(uinput_fd, name, bustype, vendor, product, version,\n"
216-
" ff_effects_max, absmin, absmax, absfuzz, absflat)\n\n"
217-
"Destory and close the uinput device.\n"
213+
{"create", pysuinput_create, METH_VARARGS,
214+
"create(uinput_fd, name, bustype, vendor, product, version,\n"
215+
" ff_effects_max, absmin, absmax, absfuzz, absflat)\n\n"
216+
"Create and initialize the uinput device with giver parameters.\n"
218217
},
219218

220219
{NULL, NULL, 0, NULL}

0 commit comments

Comments
 (0)