summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Sampson <adrian@radbox.org>2012-12-31 16:31:48 -0800
committerAdrian Sampson <adrian@radbox.org>2012-12-31 16:31:48 -0800
commit71fd8d5030267da295ffb170127f9ae568757fe9 (patch)
treedc84ae9f33a45dda456393d12ea08f7b34c1a2d2
parent3b56bf4b8b5c70e058e769801abc7b5b101dcdc5 (diff)
version numbers for 1.0rc2 release1.0rc2
-rw-r--r--beets/__init__.py2
-rw-r--r--docs/changelog.rst8
-rw-r--r--docs/conf.py2
-rwxr-xr-xsetup.py2
4 files changed, 9 insertions, 5 deletions
diff --git a/beets/__init__.py b/beets/__init__.py
index 1e826d660..49870a3e4 100644
--- a/beets/__init__.py
+++ b/beets/__init__.py
@@ -12,7 +12,7 @@
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
-__version__ = '1.0rc2-dev'
+__version__ = '1.0rc2'
__author__ = 'Adrian Sampson <adrian@radbox.org>'
import beets.library
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4305f8e35..89a776190 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,12 @@
Changelog
=========
-1.0rc2 (in development)
------------------------
+1.0rc2 (December 31, 2012)
+--------------------------
+
+This second release candidate follows quickly after rc1 and fixes a few small
+bugs found since that release. There were a couple of regressions and some bugs
+in a newly added plugin.
* :doc:`/plugins/echonest_tempo`: If the Echo Nest API limit is exceeded or a
communication error occurs, the plugin now waits and tries again instead of
diff --git a/docs/conf.py b/docs/conf.py
index 19e4a7336..578011eac 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,7 @@ project = u'beets'
copyright = u'2012, Adrian Sampson'
version = '1.0'
-release = '1.0rc2-dev'
+release = '1.0rc2'
pygments_style = 'sphinx'
diff --git a/setup.py b/setup.py
index eb43b6eb8..b624b559c 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ if 'sdist' in sys.argv:
shutil.copytree(os.path.join(docdir, '_build', 'man'), mandir)
setup(name='beets',
- version='1.0rc2-dev',
+ version='1.0rc2',
description='music tagger and library organizer',
author='Adrian Sampson',
author_email='adrian@radbox.org',