Skip to content
Snippets Groups Projects
Commit e08b8f48 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/master' into 1.6

Conflicts:
	debian/control
parents ed74ffed c348735d
No related branches found
No related tags found
No related merge requests found
tarantool (1.6.7.588.g76bbd9c-1) unstable; urgency=medium
* Fix `libiberty | bintuils-dev, binutils-dev` B-D
* Convert tarantool-common to architecture-independent package.
* Disable kfreebsd - produced binaries have always been broken and
the upstream is unable to fix it.
* Use Maintainer and Uploaders fields properly
-- Roman Tsisyk <roman@tarantool.org> Sat, 16 Jan 2016 11:26:52 +0300
tarantool (1.6.7.551.ga5bafc5-1) unstable; urgency=medium
* Add zlib1g-dev to B-D (FTBFS), closes: #808516.
......
Source: tarantool
Priority: optional
Maintainer: Dmitry E. Oboukhov <unera@debian.org>
Uploaders: Andrey Drozdov <andrey@tarantool.org>,
Roman Tsisyk <roman@tarantool.org>
Maintainer: Roman Tsisyk <roman@tarantool.org>
Uploaders: Dmitry E. Oboukhov <unera@debian.org>
Build-Depends: cdbs, debhelper (>= 8),
cmake,
libreadline-dev,
libncurses5-dev,
libyaml-dev,
libiberty-dev | binutils-dev,
libbfd-dev | binutils-dev,
# Dependecies below are needed for fiber stack traces
# libiberty.so is provided by binutils-dev (<< 2.24) for wheezy and precise
libiberty-dev | binutils-dev (<< 2.24),
# libbfd-*.so
binutils-dev,
# zlib is implicitly needed by libbfd #808516
zlib1g-dev
Section: database
Standards-Version: 3.9.6
......@@ -18,7 +21,7 @@ VCS-Browser: https://github.com/tarantool/tarantool
VCS-Git: git://github.com/tarantool/tarantool.git
Package: tarantool-common
Architecture: i386 amd64 armhf arm64
Architecture: all
Priority: optional
Conflicts: tarantool-common (<< 1.5.3),
tarantool-lts-common,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment