From 3997a471e3da7fb5761eea5bf63f2670a595aa1d Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Fri, 11 Apr 2014 14:25:24 +0400
Subject: [PATCH] Cleanup debian/control.
---
debian/control | 83 ++++----------------------
debian/libtarantool-dev.install | 1 -
debian/tarantool-client.install | 1 -
debian/tarantool-client.manpages | 1 -
debian/tarantool-dev.install | 7 ---
debian/tarantool-modules.install | 0
debian/tarantool-sophia-module.install | 1 -
debian/tarantool-sql-module.install | 1 -
8 files changed, 12 insertions(+), 83 deletions(-)
delete mode 100644 debian/libtarantool-dev.install
delete mode 100644 debian/tarantool-client.install
delete mode 100644 debian/tarantool-client.manpages
delete mode 100644 debian/tarantool-dev.install
create mode 100644 debian/tarantool-modules.install
delete mode 100644 debian/tarantool-sophia-module.install
delete mode 100644 debian/tarantool-sql-module.install
diff --git a/debian/control b/debian/control
index 3acb2dda4b..ae8761fa79 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,16 @@ Description: Tarantool in-memory database - common files
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
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tarantool-dbg (<< 1.5.2),
+ tarantool-common (<< 1.6~),
+ tarantool-client (<< 1.6~),
+ tarantool-client-dbg (<< 1.6~),
+ tarantool-plugins (<< 1.6~),
+ tarantool-mysql-plugin (<< 1.6~),
+ tarantool-postgresql-plugin (<< 1.6~)
+Recommends: tarantool-common (>= 1.6),
+ tarantool-modules
Description: In-memory database with Lua application server
Tarantool is an in-memory database and Lua application server.
Its key properties include:
@@ -46,16 +53,6 @@ Description: In-memory database with Lua application server
.
This package provides Tarantool server.
-Package: tarantool-dev
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: optional
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends},
- tarantool (= ${binary:Version}),
-Description: Tarantool in-memory database - development headers
- Tarantool is an in-memory database and Lua application server.
- This package provides server headers needed to build pluggable modules.
-
Package: tarantool-modules
Conflicts: tarantool-plugins (<< 1.5.3)
Replaces: tarantool-plugins (<< 1.5.3)
@@ -72,21 +69,9 @@ Description: Tarantool in-memory database - all plug-ins bundle
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})
-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)
+Replaces: tarantool-postgresql-plugin
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -99,6 +84,7 @@ Description: Tarantool in-memory database - PostgreSQL connector
Package: tarantool-mysql-module
Conflicts: tarantool-mysql-plugin (<< 1.5.3)
+Replaces: tarantool-mysql-plugin
Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -109,48 +95,3 @@ Description: Tarantool in-memory database - MySQL connector
This package contains a connector to MySQL database for Tarantool
Lua stored procedures.
-Package: tarantool-sophia-module
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends},
- tarantool (= ${binary:Version})
-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
- Tarantool Lua stored procedures.
-
-Package: tarantool-client
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: tarantool-client-dbg
-Description: Tarantool in-memory database - command line client
- Tarantool is an in-memory database and Lua application server.
- This package provides a command line client for Tarantool
- server with support of readline, command history, reader of
- server binary logs and snapshot files.
-
-Package: tarantool-client-dbg
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- tarantool-client (= ${binary:Version})
-Description: Tarantool in-memory database - client debugging symbols
- Tarantool is an in-memory database and Lua application server.
- This package provides debugging symbols for the command line
- client.
-
-Package: libtarantool-dev
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Priority: optional
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-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 headers for tarantool client.
diff --git a/debian/libtarantool-dev.install b/debian/libtarantool-dev.install
deleted file mode 100644
index 2463980f44..0000000000
--- a/debian/libtarantool-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-connector/c/include/tp.h /usr/include/tarantool/1.5/
diff --git a/debian/tarantool-client.install b/debian/tarantool-client.install
deleted file mode 100644
index 11adc51c83..0000000000
--- a/debian/tarantool-client.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/tarantool
diff --git a/debian/tarantool-client.manpages b/debian/tarantool-client.manpages
deleted file mode 100644
index 5055008511..0000000000
--- a/debian/tarantool-client.manpages
+++ /dev/null
@@ -1 +0,0 @@
-build-area/doc/man/tarantool.1
diff --git a/debian/tarantool-dev.install b/debian/tarantool-dev.install
deleted file mode 100644
index 3e4a86d244..0000000000
--- a/debian/tarantool-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-/usr/include/tarantool/1.6/config.h
-/usr/include/tarantool/1.6/lauxlib.h
-/usr/include/tarantool/1.6/luaconf.h
-/usr/include/tarantool/1.6/lua.h
-/usr/include/tarantool/1.6/lua.hpp
-/usr/include/tarantool/1.6/luajit.h
-/usr/include/tarantool/1.6/lualib.h
diff --git a/debian/tarantool-modules.install b/debian/tarantool-modules.install
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/debian/tarantool-sophia-module.install b/debian/tarantool-sophia-module.install
deleted file mode 100644
index 0155383399..0000000000
--- a/debian/tarantool-sophia-module.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/tarantool/1.6/box/sophia.so
diff --git a/debian/tarantool-sql-module.install b/debian/tarantool-sql-module.install
deleted file mode 100644
index b6b4813fca..0000000000
--- a/debian/tarantool-sql-module.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/tarantool/1.6/box/net/sql.lua
--
GitLab