From 8f1fc2a7a6acc72d71e7257e19c5f9a902563442 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Wed, 5 Nov 2014 16:20:14 +0100
Subject: [PATCH] Release version 3.1.1.

---
 Makefile         | 2 +-
 debian/changelog | 9 +++++----
 pgloader.spec    | 5 ++++-
 src/params.lisp  | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index bd5c97a..364f763 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # pgloader build tool
 APP_NAME   = pgloader
-VERSION    = 3.1.0
+VERSION    = 3.1.1
 
 # use either sbcl or ccl
 CL	   = sbcl
diff --git a/debian/changelog b/debian/changelog
index 152102b..f424b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-<<<<<<< HEAD
-=======
 pgloader (3.1.1+dfsg-1) unstable; urgency=medium
 
   * Fix --root-dir option when target directory doesn't exists (Closes:#767288)
-
+  * New release, lots of bugfixes
+  * Add support for CAST rules for SQLite
+  * Code refactoring
+  * New file based sources filters and options
+  
  -- Dimitri Fontaine <dim@tapoueh.org>  Mon, 03 Nov 2014 16:08:19 +0300
 
->>>>>>> rel_3_1_stable
 pgloader (3.1.0+dfsg-3) unstable; urgency=medium
 
   * Fix build dependencies problems, see Bug#765162
diff --git a/pgloader.spec b/pgloader.spec
index 81497c6..7cd8815 100644
--- a/pgloader.spec
+++ b/pgloader.spec
@@ -1,6 +1,6 @@
 Summary:            extract, transform and load data into PostgreSQL
 Name:               pgloader
-Version:            3.1.0
+Version:            3.1.1
 Release:            22%{?dist}
 License:            The PostgreSQL Licence
 Group:              System Environment/Base
@@ -40,6 +40,9 @@ echo '-b /usr/bin/pgloader' > $RPM_BUILD_ROOT/etc/prelink.conf.d/%{name}.conf
 /etc/prelink.conf.d/%{name}.conf
 
 %changelog
+* Wed Nov 5 2014 Dimitri Fontaine <dimitri@2ndQuadrant.fr> - 3.1.1-22
+- Release 3.1.1
+
 * Wed Sep 10 2014 Dimitri Fontaine <dimitri@2ndQuadrant.fr> - 3.1.0-22
 - Release 3.1.0
 
diff --git a/src/params.lisp b/src/params.lisp
index 5704c24..47956c1 100644
--- a/src/params.lisp
+++ b/src/params.lisp
@@ -33,11 +33,11 @@
 
 (in-package :pgloader.params)
 
-(defparameter *release* nil
+(defparameter *release* t
   "non-nil when this build is a release build.")
 
 (defparameter *major-version* "3.1")
-(defparameter *minor-version* "1")
+(defparameter *minor-version* "2")
 
 (defun git-hash ()
   "Return the current abbreviated git hash of the development tree."