From 4413c2b4f71889c7ac5d5f243c8063bcf60a9d76 Mon Sep 17 00:00:00 2001
From: Michael Lazar <lazar.michael22@gmail.com>
Date: Tue, 2 Aug 2016 22:37:59 -0700
Subject: [PATCH] Upping version.

---
 AUTHORS.rst        |  2 ++
 CHANGELOG.rst      | 30 ++++++++++++++++++++++++++++++
 rtv.1              | 12 ++++++++++--
 rtv/__version__.py |  2 +-
 setup.cfg          |  2 ++
 tox.ini            |  3 +--
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index e9e35f3..8a2921c 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -10,6 +10,7 @@ Thanks to the following people for their contributions to this project.
 * `Théo Piboubès <https://github.com/TheoPib>`_
 * `Yusuke Sakamoto <https://github.com/yskmt>`_
 * `Johnathan Jenkins <https://github.com/shaggytwodope>`_
+* `tyjak <https://github.com/tyjak>`_
 * `Gustavo Zambonin <https://github.com/zambonin>`_
 * `mekhami <https://github.com/mekhami>`_
 * `obosob <https://github.com/obosob>`_
@@ -18,6 +19,7 @@ Thanks to the following people for their contributions to this project.
 * `mardiqwop <https://github.com/mardiqwop>`_
 * `Shawn Hind <https://github.com/shawnhind>`_
 * `5225225 <https://github.com/5225225>`_
+* `Alex Kahan <https://github.com/alexk307>`_
 * `JuanPablo <https://github.com/juanpabloaj>`_
 * `Robert Greener <https://github.com/ragreener1>`_
 * `afloofloo <https://github.com/afloofloo>`_
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c728377..1c4830c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,7 @@
 RTV Changelog
 =============
 
+.. _1.11.0: http://github.com/michael-lazar/rtv/releases/tag/v1.11.0
 .. _1.10.0: http://github.com/michael-lazar/rtv/releases/tag/v1.10.0
 .. _1.9.1: http://github.com/michael-lazar/rtv/releases/tag/v1.9.1
 .. _1.9.0: http://github.com/michael-lazar/rtv/releases/tag/v1.9.0
@@ -19,6 +20,35 @@ RTV Changelog
 .. _1.2.1: http://github.com/michael-lazar/rtv/releases/tag/v1.2.1
 .. _1.2: http://github.com/michael-lazar/rtv/releases/tag/v1.2
 
+--------------------
+1.11.0_ (2016-08-02)
+--------------------
+Features
+
+* Added the ability to open image and video urls with the user's mailcap file.
+* New ``--enable-media`` and ``copy-mailcap`` commands to support mailcap.
+* New command `w` to save submissions and comments.
+* New command `p` to toggle between the front page and the last visited subreddit.
+* New command `S` to view subscribed multireddits.
+* Extended ``/`` prompt to work with users, multireddits, and domains.
+* New page ``/u/saved`` to view saved submissions.
+* You can now specify the sort period by appending **-(period)**,
+  E.g. **/r/python/top-week**.
+
+Bugfixes
+
+* Terminal title is now only set when $DISPLAY is present.
+* Urlview now works on the submission as well as comments.
+* Fixed text encoding when using urlview.
+* Removed `futures` dependency from the python 3 wheel.
+* Unhandled resource warnings on exit are now ignored.
+
+Documentation
+
+* Various README updates.
+* Updated asciinema demo video.
+* Added script to update the AUTHORS.rst file.
+
 --------------------
 1.10.0_ (2016-07-11)
 --------------------
diff --git a/rtv.1 b/rtv.1
index 43571c3..9c016e4 100644
--- a/rtv.1
+++ b/rtv.1
@@ -1,8 +1,8 @@
-.TH "RTV" "1" "July 12, 2016" "Version 1.10.0" "Usage and Commands"
+.TH "RTV" "1" "August 03, 2016" "Version 1.11.0" "Usage and Commands"
 .SH NAME
 RTV - Reddit Terminal Viewer
 .SH SYNOPSIS
-rtv [\-h] [\-V] [\-s SUBREDDIT] [\-l LINK] [\-\-log FILE] [\-\-config FILE] [\-\-ascii] [\-\-monochrome] [\-\-non\-persistent] [\-\-clear\-auth] [\-\-copy\-config]
+rtv [\-h] [\-V] [\-s SUBREDDIT] [\-l LINK] [\-\-log FILE] [\-\-config FILE] [\-\-ascii] [\-\-monochrome] [\-\-non\-persistent] [\-\-clear\-auth] [\-\-copy\-config] [\-\-copy\-mailcap] [\-\-enable\-media]
 .SH DESCRIPTION
 Reddit Terminal Viewer is a lightweight browser for www.reddit.com built into a
 terminal window.
@@ -51,6 +51,14 @@ Remove any saved user data before launching
 \fB\-\-copy\-config\fR
 Copy the default configuration to {HOME}/.config/rtv/rtv.cfg
 
+.TP
+\fB\-\-copy\-mailcap\fR
+Copy an example mailcap configuration to {HOME}/.mailcap
+
+.TP
+\fB\-\-enable\-media\fR
+Open external links using programs defined in the mailcap config
+
 
 .SH CONTROLS
 Move the cursor using either the arrow keys or Vim-style movement.
diff --git a/rtv/__version__.py b/rtv/__version__.py
index 18284e2..c861780 100644
--- a/rtv/__version__.py
+++ b/rtv/__version__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '1.10.0'
+__version__ = '1.11.0'
diff --git a/setup.cfg b/setup.cfg
index 4563e46..a9cf834 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,5 +8,7 @@ requires-dist =
     six
     requests
     kitchen
+    beautifulsoup4
+    mailcap-fix
     futures; python_version=="2.6" or python_version=="2.7"
     
diff --git a/tox.ini b/tox.ini
index fbe4662..a0a70ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,7 @@ deps =
     pytest
     pylint
     mock
-    # Waiting for vcrpy to release https://github.com/kevin1024/vcrpy/pull/196
-    git+https://github.com/kevin1024/vcrpy.git
+    vcrpy
 commands = 
     pylint --rcfile .pylintrc rtv/ -E
     py.test -v {posargs}