From 334d8e5241103e1c490348b2db0c38621506b0eb Mon Sep 17 00:00:00 2001
From: Olivier Jolly <olivier@pcedev.com>
Date: Mon, 1 Feb 2016 00:03:45 +0100
Subject: [PATCH] Prepare files for 0.7.0 release

---
 README.rst               | 65 +++++++++++++++++++++++++++++++++++++++-
 rnsutils/xrnireencode.py |  2 +-
 setup.py                 |  4 +--
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 42e01a6..e19119e 100644
--- a/README.rst
+++ b/README.rst
@@ -19,7 +19,7 @@ Alternatively, RnsUtils can be run directly from sources after a git pull::
     cd rnsutils && python setup.py install
 
 
-sf2toXrni
+sf2toxrni
 ---------
 
 **sf2toxrni** is a command line utility which convert SoundFont 2 instruments into renoise instruments (.xrni).
@@ -94,6 +94,69 @@ from SoundFont 2 instruments only.
     * vibrato
     * initial volume attenuation (always minus infinite in result, it seems like it'd be a pita to support otherwise)
 
+sfztoxrni
+---------
+
+Similarly to the **sf2toxrni** converter, **sfztoxrni** convert SFZ files into renoise instruments (.xrni).
+Renoise supporting now natively SFZ files, this converter is only useful on SFZ instruments needing
+more than one modulation set (different ADHSR settings depending on the velocity/key mapping) or
+a more aggressive sample filename search (like for SFZ built under case insensitive filesystem and read in
+case sensitive filesystem). As SFZ support in Renoise will progress, this converter will be deprecated.
+
+::
+
+    usage: sfztoxrni [-h] [-d] [-e {none,flac,ogg}] [-q] [-o OUTPUT_DIR]
+                     [-t TEMPLATE] [-u] [--no-unused]
+                     sfz_filename [sfz_filename ...]
+
+    GPL v3+ 2016 Olivier Jolly
+
+    positional arguments:
+      sfz_filename          input file in SFZ format
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      -d, --debug           debug parsing [default: False]
+      -e {none,flac,ogg}, --encode {none,flac,ogg}
+                            encode samples into given format [default: none]
+      -q, --quiet           quiet operation [default: False]
+      -o OUTPUT_DIR, --ouput-dir OUTPUT_DIR
+                            output directory [default: current directory]
+      -t TEMPLATE           template filename [default: empty-31.xrni]
+      -u, --unused          show unused generators [default: True]
+      --no-unused
+
+    Convert SFZ file into renoise instrument
+
+
+xrnireencode
+------------
+
+**Xrnireencode** is a command line utility to reencode samples in renoise instrument (.xrni).
+It can convert to **flac** or **ogg** one or more instruments given on command line.
+
+::
+
+    usage: xrnireencode [-h] [-d] [-e {flac,ogg}] [-q] [-o OUTPUT_DIR]
+                        xrni_filename [xrni_filename ...]
+
+    GPL v3+ 2016 Olivier Jolly
+
+    positional arguments:
+      xrni_filename         input file in XRNI format
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      -d, --debug           debug parsing [default: False]
+      -e {flac,ogg}, --encode {flac,ogg}
+                            encode samples into given format [default: flac]
+      -q, --quiet           quiet operation [default: False]
+      -o OUTPUT_DIR, --ouput-dir OUTPUT_DIR
+                            output directory [default: current directory]
+
+    Reencode samples in renoise instrument
+
+
 Library use
 -----------
 
diff --git a/rnsutils/xrnireencode.py b/rnsutils/xrnireencode.py
index 215d6dd..2bb0854 100644
--- a/rnsutils/xrnireencode.py
+++ b/rnsutils/xrnireencode.py
@@ -36,7 +36,7 @@ def main(argv=None):
     program_build_date = "%s" % __updated__
 
     program_version_string = '%%prog %s (%s)' % (program_version, program_build_date)
-    program_longdesc = '''Convert SFZ file into renoise instrument'''
+    program_longdesc = '''Reencode samples in renoise instrument'''
     program_license = "GPL v3+ 2016 Olivier Jolly"
 
     if argv is None:
diff --git a/setup.py b/setup.py
index b68577e..9cc1202 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.6.1',
+    version='0.7.0',
 
     description='Renoise library and utilities',
     long_description=long_description,
@@ -87,7 +87,7 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['lxml', 'sf2utils'],
+    install_requires=['lxml', 'sf2utils>=0.7.0'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,