[nautilus-python] Bump version to 1.2, update NEWS and README

[Adam Plumb <adamplumb src gnome org>]

commit 388aecb725ca48e159f6f33ce97b30307fbb09b4
Author: Adam Plumb <adamplumb gmail com>
Date:   Tue Jan 2 11:10:02 2018 -0500

    Bump version to 1.2, update NEWS and README

 NEWS         |   21 ++++++++++++---------
 README       |   26 +++++++++++++++++---------
 configure.in |    2 +-
 3 files changed, 30 insertions(+), 19 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8ce245e..b4c9569 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,8 @@
-<<<<<<< HEAD
-0.7.3:
-    - Use PyCapsule_Import for pygobject as well as pygtk
-    - Fixed bug #644399, in the property page example plugin, get the md5sum
-        of the file contents, not the file name
-    - Removed extraneous .cvsignore files
-    - Fixed the update-file-info-async example plugin
-=======
+1.2:
+    - Added capability to compile with python 3 support using PYTHON environment variable
+    - Fix #781232, Improve extension path loading semantics to follow XDG recommendations
+    - Fix #791208, require Nautilus 3.0 before importing extensions to prevent warnings
+
 1.1:
     - Added pygobject3 compatibility.  Retained pygobject 2.28.x compatibility.
         Updated extension examples to support pygobject3.
@@ -26,8 +23,14 @@
         $XDG_DATA_DIR/nautilus-python/extensions.  Extensions should be arch-independent now.
     - General clean up of the repository, removed old .cvsignore files
     - Updated the gtk-doc documentation and examples to work with new dynamic bindings.
->>>>>>> nautilus-3.0
 
+0.7.3:
+    - Use PyCapsule_Import for pygobject as well as pygtk
+    - Fixed bug #644399, in the property page example plugin, get the md5sum
+        of the file contents, not the file name
+    - Removed extraneous .cvsignore files
+    - Fixed the update-file-info-async example plugin
+    
 0.7.2:
     - Fix to get the PyCapsule patch to work even if there is no PyCapsule 
         object set up for pygtk.
diff --git a/README b/README
index 640c51d..460d789 100644
--- a/README
+++ b/README
@@ -6,23 +6,31 @@ introduced in Gnome 2.6.
 
 For examples and documentation check the examples sub directory.
 
-As of nautilus-python 0.7.0, scripts are also loaded from $XDG_DATA_DIR/nautilus-python/extensions,
-which includes ~/.local/share and /usr/share (or whatever your $XDG_DATA_DIR is 
-set to).
-
-Try to copy test.py to that directory for an example
-
 Requirements
 ============
 
 Nautilus  2.32.0
-Python    2.3
+Python    2.x or 3.x
 PyGObject 2.28.0
 
+As of v1.2.0 the nautilus-python bindings can be built with either python3
+or python2 support.  Ensure the $PYTHON environment variable is pointed
+at your preferred python executable before running configure or autogen.
+
+Running Extensions
+==================
+As of nautilus-python 1.2.0, scripts are loaded in the following order:
+
+  1. $XDG_DATA_HOME/nautilus-python/extensions (i.e. ~/.local/share/...)
+  2. nautilus_prefix/share/nautilus-python/extensions (i.e. ~/Development/...)
+  3. $XDG_DATA_DIRS/nautilus-python/extensions (i.e. /usr/share/...)
+
+Simply copy your python scripts into that folder and restart Nautilus.
+
 Problems
 ========
-It's currently not possible to reload the python file without
-restarting nautilus. That's a planned feature for future versions
+It's currently not possible to reload a python script without
+restarting nautilus.
 
 Run nautilus with the NAUTILUS_PYTHON_DEBUG=misc environment variable to 
 print out debug information.
diff --git a/configure.in b/configure.in
index 6d094a2..31f7460 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT
 
 PACKAGE=nautilus-python
-VERSION=1.1
+VERSION=1.2
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)