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

debian/changelog

+tarantool (1.4.6+20120524-1) unstable; urgency=low
+
+  * Fix version number.
+  * Fix tarantool_instance: user could not to define 'file_descriptors'
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Thu, 24 May 2012 12:57:27 +0400
+
+tarantool (1.4.5+20120522-1) unstable; urgency=low
+
+  * New git snapshot: upstream upgraded libtarantool.
+
+ -- Dmitry E. Oboukhov <unera@debian.org>  Tue, 22 May 2012 22:55:07 +0400
+
 tarantool (1.4.5+20120510-1) unstable; urgency=low
 
   * New git snapshot (it provides script_dir option).

debian/control

@@ -38,7 +38,7 @@ Package: tarantool
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, tarantool-common
-Suggests: libmr-tarantool-perl
+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:

debian/scripts/tarantool_instance

@@ -63,6 +63,10 @@ SOCKETS=`grep \
     | tail -n 1 \
     | sed 's/[^[:digit:]]//g'`
 
+if test -z $SOCKETS; then
+    SOCKETS=1023
+fi
+
 if ! test -x $PID_DIR; then
     install -otarantool -gtarantool -d -m0750 $PID_DIR
 fi