diff --git a/debian/changelog b/debian/changelog
index 8635588b77866d6b18e073444c96aac0870dd3cf..4121b2db1bd96176e219aeb93914ccd14713ce6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tarantool (1.5.2.20.g5f5d924-1) unstable; urgency=low
+
+ * Rebuild for Debian/unstable (tarantar binary).
+
+ -- Dmitry E. Oboukhov <unera@debian.org> Sat, 21 Dec 2013 13:18:28 +0400
+
+tarantool (1.5.2.16.g18b8e4e-1) unstable; urgency=low
+
+ * New Debian snapshot.
+ - Drop legacy packages (libtarantool*).
+ - Drop tarantool-dbg.
+ - Don't strip tarantool_box (it uses debug symbols runtime).
+
+ -- Dmitry E. Oboukhov <unera@debian.org> Fri, 20 Dec 2013 15:44:11 +0400
+
tarantool (1.5.1.302.gd906190-1) unstable; urgency=low
* New Debian snapshot.
diff --git a/debian/control b/debian/control
index 1feb107a79895a2c9fc6d39088d65f03bc20ce8b..4e0c8d920c5a8677d79e4347b1512cf8c78f96ea 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.3
+Standards-Version: 3.9.4
Homepage: http://tarantool.org/
VCS-Browser: https://github.com/tarantool/tarantool
VCS-Git: git://github.com/tarantool/tarantool.git
@@ -29,6 +29,7 @@ Package: tarantool
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}, tarantool-common
+Conflicts: tarantool-dbg (<< 1.5.2)
Suggests: tarantool-dbg, tarantool-client, libdr-tarantool-perl
Description: In-memory database with Lua application server
Tarantool is an in-memory database and Lua application server.
@@ -78,16 +79,6 @@ Description: Tarantool in-memory database - MySQL connector
This package contains a connector to MySQL database for Tarantool
Lua stored procedures.
-Package: tarantool-dbg
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- tarantool (= ${binary:Version})
-Description: Tarantool in-memory database - debugging symbols
- Tarantool is an in-memory database and Lua application server.
- This package provides debugging symbols for Tarantool server.
-
Package: tarantool-client
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
@@ -113,24 +104,6 @@ Description: Tarantool in-memory database - client debugging symbols
#
## Disable client for 1.6
#
-# Package: libtarantool1
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: optional
-# Depends: ${shlibs:Depends}, ${misc:Depends}
-# Description: Tarantool in-memory database - C client library
-# Tarantool is an in-memory database and Lua application server.
-# This package provides C-connector library for Tarantool.
-#
-# Package: libtarantool1-dbg
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: extra
-# Section: debug
-# Depends: ${shlibs:Depends}, ${misc:Depends},
-# libtarantool1 (= ${binary:Version})
-# Description: Tarantool in-memory database - C client library debugging symbols
-# Tarantool is an in-memory database and Lua application server.
-# This package provides debugging symbols for libtarantool1.
-#
# Package: libtarantool-dev
# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
# Priority: optional
@@ -143,57 +116,3 @@ Description: Tarantool in-memory database - client debugging symbols
# Description: Tarantool in-memory database - development headers
# Tarantool is an in-memory database and Lua application server.
# This package provides headers for libtarantool* libraries.
-#
-# Package: libtarantoolnet1
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: optional
-# Depends: ${shlibs:Depends}, ${misc:Depends}
-# Description: Tarantool in-memory database - networking client
-# Tarantool is an in-memory database and Lua application server.
-# This package provides C-connector library for Tarantool (network).
-#
-# Package: libtarantoolnet1-dbg
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: extra
-# Section: debug
-# Depends: ${shlibs:Depends}, ${misc:Depends},
-# libtarantoolnet1 (= ${binary:Version})
-# Description: Tarantool in-memory database - client library - debug symbols
-# Tarantool is an in-memory database and Lua application server.
-# This package provides debugging symbols for libtarantoolnet1.
-#
-# Package: libtarantoolsql1
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: optional
-# Depends: ${shlibs:Depends}, ${misc:Depends}
-# Description: Tarantool in-memory database - SQL library
-# This package provides SQL-parser library for tarantool client library.
-#
-# Package: libtarantoolsql1-dbg
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: extra
-# Section: debug
-# Depends: ${shlibs:Depends}, ${misc:Depends},
-# libtarantoolsql1 (= ${binary:Version})
-# Description: Tarantool in-memory database - SQL library - debugging symbols
-# Tarantool is an in-memory database and Lua application server.
-# This package provides debug symbols for libtarantoolsql1.
-#
-# Package: libtarantoolrpl1
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: optional
-# Depends: ${shlibs:Depends}, ${misc:Depends}
-# Description: Tarantool in-memory database - replication client
-# Tarantool is an in-memory database and Lua application server.
-# This package provides C-connector library for tarantool
-# (xlog and replication support).
-#
-# Package: libtarantoolrpl1-dbg
-# Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-# Priority: extra
-# Section: debug
-# Depends: ${shlibs:Depends}, ${misc:Depends},
-# libtarantoolsql1 (= ${binary:Version})
-# Description: Tarantool in-memory database - client library debugging symbols
-# Tarantool is an in-memory database and Lua application server.
-# This package provides debug symbols for libtarantoolrpl1.
diff --git a/debian/libtarantool-dev.install b/debian/libtarantool-dev.install
index a0d82291e6361fde7d299d008a7f0bb8110766e9..421ba8d242f16f41eb703cb6e3ec2820a7babc27 100644
--- a/debian/libtarantool-dev.install
+++ b/debian/libtarantool-dev.install
@@ -1,10 +1 @@
-build-area/connector/c/tnt/*.so /usr/lib/
-build-area/connector/c/tnt/*.a /usr/lib/
-build-area/connector/c/tntnet/*.so /usr/lib/
-build-area/connector/c/tntnet/*.a /usr/lib/
-build-area/connector/c/tntsql/*.so /usr/lib/
-build-area/connector/c/tntsql/*.a /usr/lib/
-build-area/connector/c/tntrpl/*.so /usr/lib/
-build-area/connector/c/tntrpl/*.a /usr/lib/
-connector/c/include/tarantool/* /usr/include/tarantool/
-
+connector/c/include/tp.h /usr/include/tarantool/
diff --git a/debian/libtarantool1.install b/debian/libtarantool1.install
deleted file mode 100644
index 05946c9e73256160e434d2193c4c68e0c75f26dc..0000000000000000000000000000000000000000
--- a/debian/libtarantool1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-build-area/connector/c/tnt/libtarantool.so.1.1 /usr/lib/
-build-area/connector/c/tnt/libtarantool.so.1 /usr/lib/
diff --git a/debian/libtarantoolnet1.install b/debian/libtarantoolnet1.install
deleted file mode 100644
index 9a0a7db22af7e54fc0afe1f7ff7103fd03af8142..0000000000000000000000000000000000000000
--- a/debian/libtarantoolnet1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-build-area/connector/c/tntnet/libtarantoolnet.so.1.1 /usr/lib/
-build-area/connector/c/tntnet/libtarantoolnet.so.1 /usr/lib/
diff --git a/debian/libtarantoolrpl1.install b/debian/libtarantoolrpl1.install
deleted file mode 100644
index b424e52df2aef88f920504d6769884d180ea83b5..0000000000000000000000000000000000000000
--- a/debian/libtarantoolrpl1.install
+++ /dev/null
@@ -1,3 +0,0 @@
-build-area/connector/c/tntrpl/libtarantoolrpl.so.1.1 /usr/lib/
-build-area/connector/c/tntrpl/libtarantoolrpl.so.1 /usr/lib/
-
diff --git a/debian/libtarantoolsql1.install b/debian/libtarantoolsql1.install
deleted file mode 100644
index 43329b1c83cfed47e57cc151fb9e7186955a9461..0000000000000000000000000000000000000000
--- a/debian/libtarantoolsql1.install
+++ /dev/null
@@ -1,3 +0,0 @@
-build-area/connector/c/tntsql/libtarantoolsql.so.1.1 /usr/lib/
-build-area/connector/c/tntsql/libtarantoolsql.so.1 /usr/lib/
-
diff --git a/debian/rules b/debian/rules
index 43a5dd30745815f77f5343f44ab9253e96ece737..43521a371209ce4ed96fa0b7ae05b4e90f138fac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,9 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
# -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
# -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
-DEB_SHLIBDEPS_INCLUDE := /usr/lib/tarantool/plugins
-DEB_INSTALL_DOCS_ALL := -XTODO -XAUTHORS
+DEB_SHLIBDEPS_INCLUDE := /usr/lib/tarantool/plugins
+DEB_INSTALL_DOCS_ALL := -XTODO -XAUTHORS
+DEB_DH_STRIP_ARGS_tarantool := -X/usr/bin/tarantool_box
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
@@ -51,10 +52,12 @@ clean::
rm -f doc/tnt.ent
rm -f www-data.in/download
-install/tarantool-dbg::
- rm -fr debian/tarantool-dbg/usr/share/doc/tarantool-dbg
+# install/tarantool-dbg::
+# rm -fr debian/tarantool-dbg/usr/share/doc/tarantool-dbg
install/tarantool::
+ pod2man -c 'tarantar' \
+ debian/tarantar.pod > build-area/tarantar.1
# make -C build-area test-force || /bin/true
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000000000000000000000000000000000000..f9a32493cb5e205837517700f5deec9c2e0ea516
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+tarantool source: outdated-autotools-helper-file third_party/libeio/config.guess 2012-02-10
+tarantool source: outdated-autotools-helper-file third_party/libeio/config.sub 2012-02-10
+tarantool source: outdated-autotools-helper-file third_party/libev/config.guess 2008-01-23
+tarantool source: outdated-autotools-helper-file third_party/libev/config.sub 2008-01-16
diff --git a/debian/tarantar.pod b/debian/tarantar.pod
new file mode 100644
index 0000000000000000000000000000000000000000..a2333e0049566da7880a03a5d6d584d9a277e5f0
--- /dev/null
+++ b/debian/tarantar.pod
@@ -0,0 +1,38 @@
+=head1 NAME
+
+tarantar - tarantool xlog compression utility.
+
+=head1 SINOPSYS
+
+Usage: C<< tarantar <options> <tarantool_config> >>
+
+=head2 OPTIONS
+
+=over
+
+=item -c, --create
+
+create snapshot file
+
+=item -i, --interval <sec>
+
+periodically create snapshot
+
+
+=item -n, --lsn <u64>
+
+snapshot lsn (latest by default)
+
+=item -l, --limit <limit>
+
+memory limit (bytes)
+
+=item -help
+
+display the helpscreen and exit
+
+=item -v, --version
+
+display version information and exit
+
+=back
diff --git a/debian/tarantool.install b/debian/tarantool.install
index 6c89b00b9309dc91e947adda24fb3a7b0e39451e..1e3064698802f5e4fab56aa62e9f6eef65545bb2 100644
--- a/debian/tarantool.install
+++ b/debian/tarantool.install
@@ -1 +1,2 @@
usr/bin/tarantool_box
+usr/bin/tarantar
diff --git a/debian/tarantool.lintian-overrides b/debian/tarantool.lintian-overrides
new file mode 100644
index 0000000000000000000000000000000000000000..2ac5d38564f4eca9362a5208cf74eafdc91591f7
--- /dev/null
+++ b/debian/tarantool.lintian-overrides
@@ -0,0 +1 @@
+tarantool: unstripped-binary-or-object usr/bin/tarantool_box
diff --git a/debian/tarantool.manpages b/debian/tarantool.manpages
index 0610c2eb17f233c2e11904c6d97936b6b3bf206c..18028ea12fcbeff1f2dd6814bb39cc0e53e0ec3f 100644
--- a/debian/tarantool.manpages
+++ b/debian/tarantool.manpages
@@ -1,2 +1,3 @@
build-area/doc/man/tarantool_box.1
+build-area/tarantar.1
diff --git a/src/lua/init.cc b/src/lua/init.cc
index da323de1ee67fc860b0a31d846086805084085e6..759e82f5f77a89e97e7707d9a7dc34728467cf30 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -176,7 +176,7 @@ lbox_print(struct lua_State *L)
tbuf_append(out, "\t", 1);
}
}
- say_info("%s", tbuf_str(out));
+ say_info("%.*s", out->size, tbuf_str(out));
return 0;
}