diff --git a/debian/changelog b/debian/changelog
index 725a8426ff30e46fc72eaaf51c9bc61cc6d37dd3..935f73c5c937e6dc02f7f21acc9b1bd21b0aadc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,7 @@
-tarantool (1.5.3.157.g1c06d59-1) unstable; urgency=low
+tarantool (1.5.1.73.gd1b3db6-1) unstable; urgency=low
- * New snapshot.
+ * New snapshot
- Fix crashes with broken snapshot.
-
- -- Dmitry E. Oboukhov <unera@debian.org> Fri, 16 Aug 2013 15:09:06 +0400
-
-tarantool (1.5.3.120.g68b26b6-1) unstable; urgency=low
-
- * New snapshot.
- Cleanup debian/copyright (drop php-connector section).
- Drop empty TODO files from binary packages.
- debian/* relicensed as tarantool.
@@ -15,19 +9,14 @@ tarantool (1.5.3.120.g68b26b6-1) unstable; urgency=low
that contain ELF-files.
- Fix FTBFS with Debian/kFreeBSD, closes: #715358.
- Drop irrelevant debian/README.source.
-
- -- Dmitry E. Oboukhov <unera@debian.org> Mon, 12 Aug 2013 14:06:16 +0400
-
-tarantool (1.4.9+20130620.1443-1) experimental; urgency=low
-
- * New snapshot.
- Add postgresql-plugin package.
- Add mysql-plugin package.
- Add -plugins package (Now it depends on other plugin. Then it will
contain some internal tarantool plugins).
+ - Remove non-free rfc4627.txt.
- Update debian/copyright.
- -- Dmitry E. Oboukhov <unera@debian.org> Thu, 20 Jun 2013 14:42:48 +0400
+ -- Dmitry E. Oboukhov <unera@debian.org> Wed, 04 Sep 2013 12:45:34 +0400
tarantool (1.4.9+20130611.2012-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 12331689a8592b5a56d3ef88be493ef646f3ad08..7268eb97cfcdab2bcbdffdc9a4b591ad36aaff5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Upstream-Name: tarantool, tarantool-box
Upstream-Contact: tarantool-developers@lists.launchpad.net
Source: https://github.com/tarantool/tarantool
-Files: third_party/libev/* third_party/coro/*
-Copyright: 2007,2008,2009 Marc Alexander Lehmann.
+Files: third_party/libev/* third_party/coro/* third_party/libeio/*
+Copyright: 2007-2012 Marc Alexander Lehmann.
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -45,6 +45,83 @@ License:
Debian systems, full text of GPLv2 license is alailable in
/usr/share/common-licenses/GPL-2.
+Files: third_party/libev/event_compat.h
+Copyright: 2000-2004 Niels Provos <provos@citi.umich.edu>,
+ 2008 Marc Alexander Lehmann <libev@schmorp.de>
+License:
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: third_party/libev/ev.c
+Copyright: 2007-2012 Marc Alexander Lehmann <libeio@schmorp.de>,
+ 2011 Emanuele Giaquinta
+License:
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: third_party/coro/conftest.c
+Copyright: 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
+License:
+ This file is part of GNU Pth, a non-preemptive thread scheduling
+ library which can be found at http://www.gnu.org/software/pth/.
+ .
+ This file is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This file is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA, or contact Marc Lehmann <schmorp@schmorp.de>.
+ .
+ Debian systems, full text of LGPLv2.1 license is alailable in
+ /usr/share/common-licenses/LGPL-2.1
+
Files: third_party/crc32.c
Copyright: 1986 Gary S. Brown.
2004-2006 Intel Corporation - All Rights Reserved
@@ -77,6 +154,35 @@ License:
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
+Files: third_party/memrchr.c third_party/memmem.c
+Copyright: 2008 The NetBSD Foundation, Inc.
+License:
+ All rights reserved.
+ .
+ This code is derived from software contributed to The NetBSD Foundation
+ by Christos Zoulas.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
Files: third_party/memcached/*
Copyright: 2003, Danga Interactive, Inc.
License:
@@ -167,6 +273,30 @@ License:
Doug Lea and released to the public domain, as explained at
http://creativecommons.org/licenses/publicdomain
+Files: test/lib/yapps/*
+Copyright: 1999-2003 Amit J. Patel <amitp@cs.stanford.edu>
+ 2003-2004 by Matthias Urlichs <smurf@debian.org>
+License:
+ The MIT License (MIT)
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
Files: third_party/qsort_arg.c
third_party/queue.h
connector/c/tntsql/include/tnt_queue.h
@@ -308,6 +438,63 @@ License:
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Files: third_party/lua-cjson/g_fmt.c
+Copyright: 1991, 1996 by Lucent Technologies.
+License:
+ The author of this software is David M. Gay.
+ .
+ Permission to use, copy, modify, and distribute this software for any
+ purpose without fee is hereby granted, provided that this entire notice
+ is included in all copies of any software which is or includes a copy
+ or modification of this software and in all copies of the supporting
+ documentation for such software.
+ .
+ THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+ REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+
+Files: src/rope.c
+Copyright: 1993-1994 by Xerox Corporation.
+License:
+ Author: Hans-J. Boehm <boehm@parc.xerox.com>
+ .
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+ 1. Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ .
+ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ .
+ Permission is hereby granted to use or copy this program
+ for any purpose, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is granted,
+ provided the above notices are retained, and a notice that the code was
+ modified is included with the above copyright notice.
+
Files: debian/* *
Copyright: Aleksey Demakov,
Aleksey Mashanov,
diff --git a/debian/rules b/debian/rules
index b6bb0b937a00e5a5d422384a7b2bf7bf3bb03070..f5efc3aa58316892e9c4c42ead111236c36db8c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,9 @@ DEB_BUILDDIR := build-area
tarball: clean
git describe > VERSION
- cd .. && tar --exclude=.git --exclude=debian \
+ cd .. && tar --exclude=.git --exclude=debian \
+ --exclude=rfc4627.txt \
+ --exclude=doc/www-data/ycsb \
-czf tarantool_$(UVERSION).orig.tar.gz tarantool-$(UVERSION)
clean::
diff --git a/debian/scripts/tarantool_snapshot_rotate b/debian/scripts/tarantool_snapshot_rotate
index 0fd2c29cc0a76a6e07a3f7cdd3feadb5443eed21..c90705526c807a10c9f4d2a1c540cfdfea9f0474 100644
--- a/debian/scripts/tarantool_snapshot_rotate
+++ b/debian/scripts/tarantool_snapshot_rotate
@@ -245,8 +245,6 @@ The script understands some additional options in tarantool.cfg:
Count of snapshots to save (default = 10). COUNT=0 disables removing
old snapshots.
-=item
-
=back
=head1 OPTIONS