Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
e08b8f48
Commit
e08b8f48
authored
9 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into 1.6
Conflicts: debian/control
parents
ed74ffed
c348735d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+10
-0
10 additions, 0 deletions
debian/changelog
debian/control
+9
-6
9 additions, 6 deletions
debian/control
with
19 additions
and
6 deletions
debian/changelog
+
10
−
0
View file @
e08b8f48
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.
...
...
This diff is collapsed.
Click to expand it.
debian/control
+
9
−
6
View file @
e08b8f48
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,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment