diff --git a/debian/changelog b/debian/changelog
index 4121b2db1bd96176e219aeb93914ccd14713ce6f..a5deced9aba6aa4047a615534c29399d2b10ddb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tarantool (1.5.3.53.ge2308d8-1) unstable; urgency=medium
+
+ * New Debian snapshot
+ + add sophia storage
+ + some fixes in box.net.box
+ + uses O_DIRECT options to create snapshots
+ + update documentation/manpagses
+ + memleak in tarantool client
+
+ -- Dmitry E. Oboukhov <unera@debian.org> Wed, 19 Feb 2014 18:37:26 +0400
+
tarantool (1.5.2.20.g5f5d924-1) unstable; urgency=low
* Rebuild for Debian/unstable (tarantar binary).
diff --git a/debian/control b/debian/control
index fee48df5a250e2a34e42db36a158e6dfb55ca5f0..d54d407fbc6043cdb200db3c32046e214f2aca4a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 8),
libmysqlclient-dev,
libpq-dev
Section: database
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://tarantool.org/
VCS-Browser: https://github.com/tarantool/tarantool
VCS-Git: git://github.com/tarantool/tarantool.git
@@ -46,6 +46,8 @@ Description: In-memory database with Lua application server
This package provides Tarantool server.
Package: tarantool-modules
+Conflicts: tarantool-plugins (<< 1.5.3)
+Replaces: tarantool-plugins (<< 1.5.3)
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -54,41 +56,43 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool-postgresql-module,
tarantool-mysql-module,
tarantool-sophia-module
-Suggests: tarantool-dbg, libdr-tarantool-perl
Description: Tarantool in-memory database - all plug-ins bundle
Tarantool is an in-memory database and Lua application server.
- This package provides (or depends on) all Tarantool plug-ins.
+ This package provides (or depends on) all Tarantool additional
+ modules.
Package: tarantool-sql-module
+Conflicts:
+ tarantool-postgresql-plugin (<< 1.5.3),
+ tarantool-mysql-plugin (<< 1.5.3)
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool (= ${binary:Version})
-Suggests: tarantool-dbg, libdr-tarantool-perl
Description: Tarantool in-memory database - PostgreSQL connector
Tarantool is an in-memory database and Lua application server.
This package contains a connector to PostgreSQL database for
Tarantool Lua stored procedures.
Package: tarantool-postgresql-module
+Conflicts: tarantool-postgresql-plugin (<< 1.5.3)
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool-sql-module (= ${binary:Version}),
tarantool (= ${binary:Version})
-Suggests: tarantool-dbg, libdr-tarantool-perl
Description: Tarantool in-memory database - PostgreSQL connector
Tarantool is an in-memory database and Lua application server.
This package contains a connector to PostgreSQL database for
Tarantool Lua stored procedures.
Package: tarantool-mysql-module
+Conflicts: tarantool-mysql-plugin (<< 1.5.3)
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool-sql-module (= ${binary:Version}),
tarantool (= ${binary:Version})
-Suggests: tarantool-dbg, libdr-tarantool-perl
Description: Tarantool in-memory database - MySQL connector
Tarantool is an in-memory database and Lua application server.
This package contains a connector to MySQL database for Tarantool
@@ -99,7 +103,6 @@ Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool (= ${binary:Version})
-Suggests: tarantool-dbg
Description: Tarantool in-memory database - sophia bindings
Tarantool is an in-memory database and Lua application server.
This package contains a bindings to the Sophia database for
diff --git a/debian/copyright b/debian/copyright
index 7268eb97cfcdab2bcbdffdc9a4b591ad36aaff5a..67069282cecd7d75547bc77b87ef772c93651d7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -495,6 +495,36 @@ License:
provided the above notices are retained, and a notice that the code was
modified is included with the above copyright notice.
+Files: third_party/base64.[ch]
+Copyright: Chris Venter <chris.venter@gmail.com>
+License:
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+ 1. Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
Files: debian/* *
Copyright: Aleksey Demakov,
Aleksey Mashanov,
diff --git a/src/trivia/config.h.cmake b/src/trivia/config.h.cmake
index 5f65003df199e1223eb7673a474dc5364c6d0174..1186519bf928e9b378c1bba27ceed23651b08af3 100644
--- a/src/trivia/config.h.cmake
+++ b/src/trivia/config.h.cmake
@@ -99,6 +99,10 @@
* Defined if this is a big-endian system.
*/
#cmakedefine HAVE_BYTE_ORDER_BIG_ENDIAN 1
+/*
+ * Defined if this platform supports openmp and it is enabled
+ */
+#cmakedefine HAVE_OPENMP 1
/*
* Set if compiler has __builtin_XXX methods.