From 42fb44ddc95f979d8f27c4d480fafa9e8210b18b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sam@superduper.net>
Date: Sun, 30 Nov 2014 12:23:04 -0800
Subject: [PATCH] Fix name of LICENSE file in MANIFEST.in

This avoids a warning during build (and during pip install).

Also, fix license parameter in setup.py. This param should
be the name of the license, not the file containing the
license. Since this package is dual licensed I copied the
syntax used in setuptools itself which is "XXX or YYY".
---
 MANIFEST.in | 2 +-
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 926cc7b..a5021c6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
 include README.rst
-include LICENSE.txt
+include LICENSE
diff --git a/setup.py b/setup.py
index 741f73e..dfd30bc 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
         'nose',
         'termcolor',
     ],
-    license='LICENSE',
+    license='MIT or BSD',
     entry_points={
         'nose.plugins.0.10': [
             'nosetimer = nosetimer.plugin:TimerPlugin',