From 78c9043011a929f11dd8418454420439be241c76 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Fri, 20 Dec 2013 16:53:23 +0400
Subject: [PATCH] New Debian snapshot.
---
debian/changelog | 9 +++
debian/control | 97 +++---------------------------
debian/libtarantool-dev.install | 11 +---
debian/libtarantool1.install | 2 -
debian/libtarantoolnet1.install | 2 -
debian/libtarantoolrpl1.install | 3 -
debian/libtarantoolsql1.install | 3 -
debian/rules | 11 ++--
debian/source/lintian-overrides | 4 ++
debian/tarantar.pod | 38 ++++++++++++
debian/tarantool.install | 1 +
debian/tarantool.lintian-overrides | 1 +
debian/tarantool.manpages | 1 +
13 files changed, 70 insertions(+), 113 deletions(-)
delete mode 100644 debian/libtarantool1.install
delete mode 100644 debian/libtarantoolnet1.install
delete mode 100644 debian/libtarantoolrpl1.install
delete mode 100644 debian/libtarantoolsql1.install
create mode 100644 debian/source/lintian-overrides
create mode 100644 debian/tarantar.pod
create mode 100644 debian/tarantool.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index 8635588b77..365eee2e5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 0116e2e81f..89b48e04ff 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,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
@@ -79,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
@@ -111,87 +101,16 @@ Description: Tarantool in-memory database - client debugging symbols
This package provides debugging symbols for the command line
client.
-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
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libtarantool1 (= ${binary:Version}),
- libtarantoolnet1 (= ${binary:Version}),
- libtarantoolsql1 (= ${binary:Version}),
- libtarantoolrpl1 (= ${binary:Version})
-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
+Conflicts:
+ libtarantool1 (<< 1.5.2),
+ libtarantoolnet1 (<< 1.5.2),
+ libtarantoolsql1 (<< 1.5.2),
+ libtarantoolrpl1 (<< 1.5.2)
+Description: Tarantool in-memory database - development headers
Tarantool is an in-memory database and Lua application server.
- This package provides debug symbols for libtarantoolrpl1.
+ This package provides headers for tarantool client.
diff --git a/debian/libtarantool-dev.install b/debian/libtarantool-dev.install
index a0d82291e6..421ba8d242 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 05946c9e73..0000000000
--- 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 9a0a7db22a..0000000000
--- 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 b424e52df2..0000000000
--- 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 43329b1c83..0000000000
--- 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 43a5dd3074..fd6e86acb7 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,8 +52,8 @@ 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::
# make -C build-area test-force || /bin/true
@@ -67,5 +68,7 @@ install/tarantool-common::
pod2man -c 'snapshot rotate' \
debian/scripts/tarantool_snapshot_rotate \
> build-area/tarantool_snapshot_rotate.1
+ pod2man -c 'tarantar' \
+ debian/tarantar.pod > build-area/tarantar.1
install -m0755 extra/logger.pl \
debian/tarantool-common/usr/lib/tarantool/logger
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000000..f9a32493cb
--- /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 0000000000..a2333e0049
--- /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 6c89b00b93..8787ed76ce 100644
--- a/debian/tarantool.install
+++ b/debian/tarantool.install
@@ -1 +1,2 @@
usr/bin/tarantool_box
+client/tarantar/tarantar /usr/bin/
diff --git a/debian/tarantool.lintian-overrides b/debian/tarantool.lintian-overrides
new file mode 100644
index 0000000000..2ac5d38564
--- /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 0610c2eb17..18028ea12f 100644
--- a/debian/tarantool.manpages
+++ b/debian/tarantool.manpages
@@ -1,2 +1,3 @@
build-area/doc/man/tarantool_box.1
+build-area/tarantar.1
--
GitLab