Merge branch 'master' of git://github.com/stephane/django-pagination

Conflicts:
	MANIFEST.in
	setup.py

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ce3e326..b29e1e5 100644 (file)
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,3 +1,5 @@
+There are a lot more contributors, please check the git history for details.
+
 Eric Florenzano <floguy@gmail.com>
 Martin Mahner <martin@mahner.org>
-James Tauber <jtauber@gmail.com>
\ No newline at end of file
+James Tauber <jtauber@gmail.com>

diff --git a/MANIFEST.in b/MANIFEST.in
index 471e508..ff6e35d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
-include LICENSE.txt
+include COPYING 
 include CONTRIBUTORS.txt
 recursive-include docs *
-recursive-include pagination/templates/pagination *.html
-recursive-include pagination/locale *
\ No newline at end of file
+recursive-include linaro_django_pagination/templates/pagination *.html
+recursive-include linaro_django_pagination/locale *.po

diff --git a/setup.py b/setup.py
index 66a3976..fd5760c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
-version = '1.0.7.1'
-
 setup(
     name='linaro-django-pagination',
     version=version,
@@ -15,7 +13,7 @@ setup(
         "Environment :: Web Environment",
     ],
     keywords='pagination,django',
-    author='Eric Florenzano',
+    author='Zygmunt Krynicki',
     author_email='zygmunt.krynicki@linaro.org',
     url='http://launchpad.net/linaro-django-pagination/',
     license='BSD',