Merge branch 'master' of https://github.com/tarantool/tarantool

debian/control

@@ -18,7 +18,7 @@ VCS-Browser: https://github.com/tarantool/tarantool
 VCS-Git: git://github.com/tarantool/tarantool.git
 
 Package: tarantool-common
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64
 Priority: optional
 Conflicts: tarantool-common (<< 1.5.3),
  tarantool-lts-common,
@@ -47,7 +47,7 @@ Description: Tarantool in-memory database - common files
  and log files.
 
 Package: tarantool
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, binutils, libgomp1, libyaml-0-2
 Replaces: tarantool-lts
@@ -84,7 +84,7 @@ Description: In-memory database with a Lua application server
  This package provides Tarantool command line interpreter and server.
 
 Package: tarantool-dev
-Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64
 Priority: optional
 Section: libdevel
 Replaces: tarantool-lts-dev
@@ -107,5 +107,5 @@ 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 develoment files needed to build pluggable
+ This package provides server development files needed to build pluggable
  modules.

debian/copyright

@@ -221,43 +221,6 @@ License: Expat
 Files: src/lib/salad/rope.c
 Copyright: 1993-1994 by Xerox Corporation.
 License: BSD-2-Clause
- 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: third_party/base64.[ch]
 Copyright: Chris Venter <chris.venter@gmail.com>