Merge branch 'master' of github.com:mailru/tarantool

debian/changelog

+tarantool (1.4.9+20130620.1443-1) experimental; urgency=low
+
+  * New snapshot.
+   - Add postgresql-plugin package.
+   - Add mysql-plugin package.
+   - Add -plugins package (Now it depends on other plugin. Then it will
+     contain some internal tarantool plugins).
+   - Update debian/copyright.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Thu, 20 Jun 2013 14:42:48 +0400
+
 tarantool (1.4.9+20130611.2012-1) unstable; urgency=low
 
   * New snapshot, fix crash with gcc-4.7.3.

debian/control

@@ -9,7 +9,9 @@ Build-Depends: cdbs, debhelper (>= 8),
  python-daemon,
  python-pexpect,
  libncurses5-dev,
- binutils-dev
+ binutils-dev,
+ libmysqlclient-dev,
+ libpq-dev
 Section: database
 Standards-Version: 3.9.3
 Homepage: http://tarantool.org/
@@ -53,6 +55,70 @@ Description: high performance key/value storage server
  .
  This package provides tarantool server.
 
+Package: tarantool-plugins
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ tarantool (= ${binary:Version}),
+ tarantool-postgresql-plugin,
+ tarantool-mysql-plugin
+Suggests: libmr-tarantool-perl, libdr-tarantool-perl
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package provides (or depends on) all tarantool plugins.
+
+Package: tarantool-postgresql-plugin
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ tarantool (= ${binary:Version})
+Suggests: libmr-tarantool-perl, libdr-tarantool-perl
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package contains connector for PostgreSQL database for tarantool
+ lua stored procedures.
+
+Package: tarantool-mysql-plugin
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ tarantool (= ${binary:Version})
+Suggests: libmr-tarantool-perl, libdr-tarantool-perl
+Description: high performance key/value storage server
+ Tarantool is an open-source NoSQL database, developed by Mail.ru.
+ Its key properties include:
+ .
+  * all data is maintained in RAM
+  * data persistence is implemented using Write Ahead Log and snapshotting
+  * supports asynchronous replication and hot standby
+  * uses coroutines and asynchronous I/O to implement high-performance
+    lock-free access to data
+  * available on Linux and FreeBSD
+  * stored procedures in Lua are supported
+ .
+ This package contains connector for MySQL database for tarantool
+ lua stored procedures.
+
 Package: tarantool-dbg
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: extra

debian/copyright

@@ -382,6 +382,28 @@ License: GPLv3
  On debian systems full text of GPLv3 license can be found in file:
  /usr/share/common-licenses/GPL-3
 
+Files: third_party/lua-cjson/*
+Copyright: 2010-2012 Mark Pulford <mark@kyne.com.au>
+License:
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 Files: *
 Copyright: Aleksey Demakov,
  Aleksey Mashanov,

debian/rules

@@ -14,19 +14,19 @@ DEB_DH_INSTALLINIT_ARGS := --name=tarantool
 
 DEB_CMAKE_INSTALL_PREFIX := /usr
 DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
-    -DCMAKE_C_FLAGS="$(CFLAGS)" \
-    -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
-    -DCMAKE_CPP_FLAGS="$(CPPFLAGS)" \
-    -DCMAKE_LD_FLAGS="$(LDFLAGS)" \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_SYSCONF_DIR=/etc/tarantool \
-    -DCMAKE_LOCALSTATE_DIR=/var	\
-    -DENABLE_MYSQL=ON -DENABLE_PSQL=ON
+    -DCMAKE_LOCALSTATE_DIR=/var
+#     -DCMAKE_C_FLAGS="$(CFLAGS)" \
+#     -DCMAKE_LD_FLAGS="$(LDFLAGS)" \
 #     -DENABLE_STATIC=ON
+#     -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+#     -DCMAKE_CPP_FLAGS="$(CPPFLAGS)" \
 #    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 #    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
 
+DEB_SHLIBDEPS_INCLUDE := /usr/lib/tarantool/plugins
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk

debian/tarantool-mysql-plugin.install

+usr/lib/tarantool/plugins/libmysql.so
+

debian/tarantool-postgresql-plugin.install

+usr/lib/tarantool/plugins/libpg.so