Skip to content

New debian release #5256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

New debian release #5256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,6 @@ src/box/sql/parse.h
src/box/sql/parse.c
src/box/sql/opcodes.h
src/box/sql/opcodes.c

*.dll
*.exe
Comment on lines +154 to +156
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those files are not generated during build or testing, so I don't see a reason to place them to gitignore. Excluding them from tarballs should be enough to fix the lintian warning.

10 changes: 10 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
tarantool (2.6.0-1) unstable; urgency=medium
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to publish a stable (x.y.z where z >= 2, 2.4.2 ATM) or at least a beta (z.y.1, 2.5.1 ATM) release. x.y.0 is alpha. However x.y.0.0 is practically same as x.(y-1).1.0. (We're working on the relevant documentation.)

Anyway, I see that you already pushed 2.6.0-0-g47aa4e01e to Debian Sid, so it is just note for future updates.


* New upstream version.
* Fixed debian/rules (drop dh_systemd), closes: #958615
* To build the package with SysV use INIT_VARIANT=sysv environment tag.
* Drop exe/dll from source (lintian warnings).
* Closes other lintian warnings (copyright).

-- Dmitry E. Oboukhov <unera@debian.org> Sat, 22 Aug 2020 13:56:57 +0300

tarantool (1.7.5.46.gd98815384-1) unstable; urgency=medium

* Stabilization of Vinyl storage engine.
Expand Down
7 changes: 4 additions & 3 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ Source: tarantool
Priority: optional
Maintainer: Roman Tsisyk <roman@tarantool.org>
Uploaders: Dmitry E. Oboukhov <unera@debian.org>
Build-Depends: cdbs (>= 0.4.100), debhelper (>= 9), dpkg-dev (>= 1.16.1~),
# Enable systemd for Debian Jessie+ and Ubuntu Wily+
dh-systemd (>= 1.22) | sysvinit (<< 2.88dsf-59) | upstart (<< 1.13),
Build-Depends:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Trailing whitespace.

cdbs (>= 0.4.100),
debhelper (>= 9.2),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not it be >= 9.20160709 (according to #958615)? It seems, it'll break our build for Debian Jessie, but it is EOL and maybe this is good time to drop its support. Debian Stretch has debhelper-10.2.5.

dpkg-dev (>= 1.16.1~),
cmake,
libreadline-dev,
libncurses5-dev,
Expand Down
24 changes: 12 additions & 12 deletions debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ Upstream-Name: tarantool
Upstream-Contact: dev@tarantool.org
Source: https://github.com/tarantool/tarantool

Files: *
Copyright: 2010-2015 Tarantool AUTHORS:
Aleksandr Lyapunov, Aleksey Demakov, Aleksey Mashanov,
Alexandre Kalendarev, Andrey Drozdov, Anton Barabanov,
Damien Lefortier, Dmitry E. Oboukhov, Dmitry Simonenko,
Eugene Blikh, Eugene Shadrin, Konstantin Knizhnik, Konstantin Osipov,
Konstantin Shulgin, Mons Anderson, Marko Kevac, Oleg Tsarev,
Pavel Cherenkov, Roman Antipin, Roman Tokarev, Roman Tsisyk,
Teodor Sigaev, Timofey Khryukin, Veniamin Gvozdikov, Vassiliy Soshnikov,
Vladimir Rudnyh, Yuriy Nevinitsin, Yuriy Vostrikov
License: BSD-2-Clause

Files: third_party/libev/* third_party/coro/* third_party/libeio/*
Copyright: 2007-2012 Marc Alexander Lehmann.
License: BSD-2-Clause or GPL-2+
Expand Down Expand Up @@ -263,18 +275,6 @@ Files: src/proc_title.c
Copyright: 2000-2010, PostgreSQL Global Development Group
License: BSD-2-Clause

Files: *
Copyright: 2010-2015 Tarantool AUTHORS:
Aleksandr Lyapunov, Aleksey Demakov, Aleksey Mashanov,
Alexandre Kalendarev, Andrey Drozdov, Anton Barabanov,
Damien Lefortier, Dmitry E. Oboukhov, Dmitry Simonenko,
Eugene Blikh, Eugene Shadrin, Konstantin Knizhnik, Konstantin Osipov,
Konstantin Shulgin, Mons Anderson, Marko Kevac, Oleg Tsarev,
Pavel Cherenkov, Roman Antipin, Roman Tokarev, Roman Tsisyk,
Teodor Sigaev, Timofey Khryukin, Veniamin Gvozdikov, Vassiliy Soshnikov,
Vladimir Rudnyh, Yuriy Nevinitsin, Yuriy Vostrikov
License: BSD-2-Clause

License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down
13 changes: 7 additions & 6 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/make -f


INIT_VARIANT ?= systemd
VERSION := $(shell dpkg-parsechangelog|grep ^Version|awk '{print $$2}')
UVERSION := $(shell echo $(VERSION)|sed 's/-[[:digit:]]\+$$//')

ifneq ($(wildcard /usr/bin/dh_systemd_start),)
ifeq ($(INIT_VARIANT),systemd)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe now is good time to just enable it unconditionally. All Debian and Ubuntu distros, which offers something else by default, already gone.

WITH_SYSTEMD:=ON
else
WITH_SYSTEMD:=OFF
Expand Down Expand Up @@ -36,7 +36,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk

debian/tarantool-common.install:
ifneq ($(wildcard /usr/bin/dh_systemd_start),)
ifeq ($(INIT_VARIANT),systemd)
cp -p debian/tarantool-common.install.systemd.in $@
else
cp -p debian/tarantool-common.install.sysvinit.in $@
Expand All @@ -47,10 +47,11 @@ build-indep: debian/tarantool-common.install
tarball: clean
git describe --long --always > VERSION
tar --exclude=.git --exclude=debian \
--exclude=doc/www \
--exclude=doc/sphinx \
--exclude='*.dll' --exclude='*.exe' \
--exclude=doc/www \
--exclude=doc/sphinx \
--exclude=src/lib/small/debian \
--exclude=src/lib/msgpuck/debian \
--exclude=src/lib/msgpuck/debian \
--exclude=test-run/lib/tarantool-python/debian \
--exclude=third_party/luafun/debian \
--exclude=FreeBSD \
Expand Down
2 changes: 2 additions & 0 deletions debian/source/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ extend-diff-ignore = "src/lib/small/test"
extend-diff-ignore = "third_party/.*/debian/"
extend-diff-ignore = "third_party/luajit/doc"
extend-diff-ignore = "third_party/luafun/(tests|doc)"
extend-diff-ignore = ".*\.dll$"
extend-diff-ignore = ".*\.exe$"