Release version 3.1.1.

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

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

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
 

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."