From 1ccc3bd6b95bb9023542a50f3289d36c467c34a3 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Thu, 8 Jul 2010 10:43:55 -0700
Subject: [PATCH] improve readme/description using ReST; add trove classifiers

---
 README   | 36 +++++++++++++++++++-----------------
 setup.py | 27 ++++++++++++++-------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/README b/README
index c941ab8e0..84544bc84 100644
--- a/README
+++ b/README
@@ -1,6 +1,3 @@
-beets
-=====
-
 Beets is the media library management system for obsessive-compulsive music
 geeks.
 
@@ -8,15 +5,15 @@ The purpose of beets is to get your music collection right once and for all.
 It catalogs your collection, automatically improving its metadata as it goes.
 It then provides a bouquet of tools for manipulating and accessing your music.
 
-Here's an example of beets' brainy tag corrector doing its thing:
+Here's an example of beets' brainy tag corrector doing its thing::
 
-    $ beet import ~/music/ladytron
-    Tagging: Ladytron - Witching Hour
-    (Distance: 0.016165)
-     * Last One Standing -> The Last One Standing
-     * Beauty -> Beauty*2
-     * White Light Generation -> Whitelightgenerator
-     * All the Way -> All the Way...
+  $ beet import ~/music/ladytron
+  Tagging: Ladytron - Witching Hour
+  (Distance: 0.016165)
+   * Last One Standing -> The Last One Standing
+   * Beauty -> Beauty*2
+   * White Light Generation -> Whitelightgenerator
+   * All the Way -> All the Way...
 
 Because beets is designed as a library, you can easily write Python programs
 that manipulate your music for you. Report tracks encoded at less than
@@ -28,16 +25,21 @@ play music in your beets library using a staggering variety of interfaces.
 
 
 Read More
-=========
+---------
 
-Learn more about beets at its Web site: http://beets.radbox.org/
+Learn more about beets at `its Web site`_.
 
-Check out the Getting Started guide to learn about installing and using beets:
-http://code.google.com/p/beets/wiki/GettingStarted
+Check out the `Getting Started`_ guide to learn about installing and using
+beets.
+
+.. _its Web site: http://beets.radbox.org/
+.. _Getting Started: http://code.google.com/p/beets/wiki/GettingStarted
 
 
 Authors
-=======
+-------
 
-Beets is by Adrian Sampson <adrian@radbox.org>.
+Beets is by `Adrian Sampson`_.
+
+.. _Adrian Sampson: mailto:adrian@radbox.org
 
diff --git a/setup.py b/setup.py
index 775046633..02e028ded 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,13 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
+import os
 from setuptools import setup
 
+def _read(fn):
+    path = os.path.join(os.path.dirname(__file__), fn)
+    return open(path).read()
+
 setup(name='beets',
       version='1.0b2',
       description='music tagger and library organizer',
@@ -24,19 +29,7 @@ setup(name='beets',
       url='http://beets.radbox.org/',
       license='MIT',
       platforms='ALL',
-      long_description="""Beets is a media library management system
-      for obsessive-compulsive music geeks.
-
-      The purpose of beets is to get your music collection right once
-      and for all. It catalogs your collection, automatically
-      improving its metadata as it goes using the MusicBrainz database.
-      It then provides a set of tools for manipulating and accessing
-      your music.
-      
-      Beets also includes a music player that implements the MPD
-      protocol, so you can play music in your beets library using any
-      MPD client.
-      """,
+      long_description=_read('README'),
 
       packages=[
           'beets',
@@ -52,5 +45,13 @@ setup(name='beets',
           'munkres',
           'eventlet >= 0.9.3',
       ],
+
+      classifiers=[
+          'Topic :: Multimedia :: Sound/Audio',
+          'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',
+          'License :: OSI Approved :: MIT License',
+          'Environment :: Console',
+          'Development Status :: 4 - Beta',
+      ],
 )