Merge the 0.3.1 release.release-0.3.1

4 files changed, 55 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index f1cb6d9..f6dc71c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,50 @@
+pyexiv2 0.3.1 "Challenges" - 2011-10-23
+---------------------------------------
+
+Dependencies:
+
+- Python ≥ 2.6
+- libexiv2 ≥ 0.19
+- boost.python ≥ 1.38
+
+Changes:
+
+- Compiles and tested against the latest libexiv2 (0.22)
+- Updated windows dependencies (iconv 1.14, libexiv2 0.22, python 2.7.2,
+  boost 1.47.0)
+
+Bugs fixed:
+
+- 802176: UnicodeDecodeError when opening a file with unicode characters in the
+  path
+- 815430: [win32] Saving previews to disk produces bogus JPEG files
+- 781464: Pentax MakerNote tags advertised with the wrong type, decoding their
+  value raises a ValueError
+- 786253: Exif headers with zero-denominator rational (fraction) types raise
+  DivideByZero exception unnecessarily
+- 797626: Cannot assign dates earlier than the year 1900
+- 797644: Timezone info is not correctly passed to libexiv2 when writing IPTC
+  and XMP tags
+- 823104: Setting an XMP tag from a value with incorrect type results in a
+  confusing KeyError being raised
+- 696240: pyexiv2-0.3.0 docs fail to build with sphinx-1.0.5
+- 736143: scons error
+- 813224: String representation of Rational not implemented
+
+Contributors:
+
+- Alex A. Naanou
+- Bob Swithers
+- Chris Mayo
+- Franz Buchinger
+- Hobson Lane
+- János Illés
+- Joe Borg
+- Olivier Tilloy
+- Petri Damstén
+- Rob Healey
+
+
 pyexiv2 0.3.0 "A Good Year" - 2010-12-31
 ----------------------------------------
 
diff --git a/doc/release_procedure.rst b/doc/release_procedure.rst
index 10bb596..b8a727a 100644
--- a/doc/release_procedure.rst
+++ b/doc/release_procedure.rst
@@ -8,7 +8,7 @@ Release branch
 
 Set the version number to release::
 
-  export VERSION=0.2.0
+  export VERSION=0.3.1
   export D=pyexiv2-$VERSION
 
 Branch to release::
@@ -69,15 +69,15 @@ Cross-compile::
 Build the installer and sign it::
 
   makensis win32-installer.nsi
-  gpg --armor --sign --detach-sig pyexiv2-0.2-setup.exe
+  gpg --armor --sign --detach-sig pyexiv2-$VERSION-setup.exe
 
 Publication
 ###########
 
 * Create a release for the milestone
-  (e.g. at https://launchpad.net/pyexiv2/+milestone/0.2/+addrelease)
+  (e.g. at https://launchpad.net/pyexiv2/+milestone/0.3.1/+addrelease)
 * Upload the source tarball and the windows installer
-  e.g. at https://launchpad.net/pyexiv2/0.2.x/0.2/+adddownloadfile
+  e.g. at https://launchpad.net/pyexiv2/0.3.x/0.3.1/+adddownloadfile
 * Change the status of all the bugs marked as "Fix Committed" in the milestone
   to "Fix Released"
 
diff --git a/src/pyexiv2/__init__.py b/src/pyexiv2/__init__.py
index 0ddb0e4..bc8f0d7 100644
--- a/src/pyexiv2/__init__.py
+++ b/src/pyexiv2/__init__.py
@@ -2,7 +2,7 @@
 
 # ******************************************************************************
 #
-# Copyright (C) 2006-2010 Olivier Tilloy <olivier@tilloy.net>
+# Copyright (C) 2006-2011 Olivier Tilloy <olivier@tilloy.net>
 #
 # This file is part of the pyexiv2 distribution.
 #
@@ -75,7 +75,7 @@ def _make_version(version_info):
 
 
 #: A tuple containing the three components of the version number: major, minor, micro.
-version_info = (0, 3, 0)
+version_info = (0, 3, 1)
 
 #: The version of the module as a string (major.minor.micro).
 __version__ = _make_version(version_info)
diff --git a/win32-installer.nsi b/win32-installer.nsi
index 6846236..1304368 100644
--- a/win32-installer.nsi
+++ b/win32-installer.nsi
@@ -1,4 +1,4 @@
-; Copyright (C) 2010 Olivier Tilloy <olivier@tilloy.net>
+; Copyright (C) 2011 Olivier Tilloy <olivier@tilloy.net>
 ;
 ; This program is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 !include nsDialogs.nsh
 !include LogicLib.nsh
 
-!define PYEXIV2_VERSION "0.3.0"
+!define PYEXIV2_VERSION "0.3.1"
 
 Name "pyexiv2 ${PYEXIV2_VERSION}"
 OutFile "pyexiv2-${PYEXIV2_VERSION}-setup.exe"