Merge branch 'master' of github.com:selwin/ua-parser

Conflicts:
	setup.py

LICENSE.txt

@@ -0,0 +1,15 @@
+The data contained in regexes.yaml is Copyright 2009 Google Inc. and available under the Apache License, Version 2.0.
+
+The original python code is Copyright 2008 Google Inc. and is available under the Apache License, Version 2.0.
+
+The JS port is Copyright 2010 Tobie Langel and is available under your choice of MIT or Apache Version 2.0 license.
+
+The PHP port is Copyright (c) 2011-2012 Dave Olsen and is available under the MIT license.
+
+The Java port is Copyright (c) 2012 Twitter, Inc and is available under the Apache License, Version 2.0.
+
+The D port is Copyright (c) 2012 Shripad K and is available under the MIT license.
+
+The C# port is Copyright (c) 2012 Søren Enemærke and is available under the Apache License, Version 2.0.
+
+The Perl port is Copyright (c) 2012 Mamod Mehyar and is available under the Perl License, Version 5.10.1.

py/ua_parser/__init__.py

@@ -0,0 +1 @@
+VERSION = (0, 3, 0)

setup.py

@@ -32,9 +32,9 @@ def run(self):
 
 
 setup(
-    name='ua_parser',
-    version='1.0',
-    description='',
+    name='ua-parser',
+    version='0.3.0',
+    description="Python port of Browserscope's user agent parser",
     author='PBS',
     author_email='[email protected]',
     packages=find_packages('py'),
@@ -45,9 +45,7 @@ def run(self):
     include_package_data=True,
     package_data={'': ['README.markdown']},
     data_files=[('data', ['regexes.yaml'])],
-    install_requires=[
-        'pyyaml',
-    ],
+    install_requires=['pyyaml'],
     cmdclass={'install': install, 'develop': install},
     classifiers=[
         'Development Status :: 4 - Beta',