From 7ed09ca72321354f2c8b0c26119b7f4e5bfed702 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Mon, 12 Aug 2013 15:28:39 +0400
Subject: [PATCH] New Debian release
---
debian/changelog | 12 ++++++
debian/control | 2 +-
debian/copyright | 104 ++---------------------------------------------
debian/rules | 1 +
4 files changed, 18 insertions(+), 101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b6a4e44fb..a8cb47a1fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.
+ - tarantool-plugins has 'any' architecture: it depends on plugins
+ that contain ELF-files.
+ - Fix FTBFS with Debian/kFreeBSD, closes: #715358.
+
+ -- 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.
diff --git a/debian/control b/debian/control
index 0a4f01872c..aed7007c48 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Description: high performance key/value storage server
This package provides tarantool server.
Package: tarantool-plugins
-Architecture: all
+Architecture: any
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends},
tarantool (= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index 977f46ebfb..12331689a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,6 +41,9 @@ License:
required by the GPL in this and the other files of this package. If you do
not delete the provisions above, a recipient may use your version of this
file under either the BSD or the GPL.
+ .
+ Debian systems, full text of GPLv2 license is alailable in
+ /usr/share/common-licenses/GPL-2.
Files: third_party/crc32.c
Copyright: 1986 Gary S. Brown.
@@ -283,105 +286,6 @@ License:
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-Files: connector/connector/php/*
-Copyright: 1997-2008 The PHP Group
-License:
- This source file is subject to version 3.01 of the PHP license
- that is bundled with this package in the file LICENSE, and is
- available through the world-wide-web at the following url:
- .
- http://www.php.net/license/3_01.txt
- .
- If you did not receive a copy of the PHP license and are unable to
- obtain it through the world-wide-web, please send a note to
- license@php.net so we can mail you a copy immediately.
- .
- .
- --------------------------------------------------------------------
- The PHP License, version 3.01
- Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
- --------------------------------------------------------------------
- .
- Redistribution and use in source and binary forms, with or without
- modification, is 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 "PHP" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact group@php.net.
- .
- 4. Products derived from this software may not be called "PHP", nor
- may "PHP" appear in their name, without prior written permission
- from group@php.net. You may indicate that your software works in
- conjunction with PHP by saying "Foo for PHP" instead of calling
- it "PHP Foo" or "phpfoo"
- .
- 5. The PHP Group may publish revised and/or new versions of the
- license from time to time. Each version will be given a
- distinguishing version number.
- Once covered code has been published under a particular version
- of the license, you may always continue to use it under the terms
- of that version. You may also choose to use such covered code
- under the terms of any subsequent version of the license
- published by the PHP Group. No one other than the PHP Group has
- the right to modify the terms applicable to covered code created
- under this License.
- .
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes PHP software, freely available from
- <http://www.php.net/software/>".
- .
- THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
- ANY EXPRESSED 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 PHP
- DEVELOPMENT TEAM OR ITS 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 software consists of voluntary contributions made by many
- individuals on behalf of the PHP Group.
- .
- The PHP Group can be contacted via Email at group@php.net.
- .
- For more information on the PHP Group and the PHP project,
- please see <http://www.php.net>.
- .
- PHP includes the Zend Engine, freely available at
- <http://www.zend.com>.
-
-Files: debian/*
-Copyright: 2011 Dmitry E. Oboukhov <unera@debian.org>
-License: GPLv3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program 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 General Public License for more details.
- .
- On debian systems full text of GPLv3 license can be found in file:
- /usr/share/common-licenses/GPL-3
-
Files: third_party/lua-cjson/*
Copyright: 2010-2012 Mark Pulford <mark@kyne.com.au>
License:
@@ -404,7 +308,7 @@ License:
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Files: *
+Files: debian/* *
Copyright: Aleksey Demakov,
Aleksey Mashanov,
Alexandre Kalendarev,
diff --git a/debian/rules b/debian/rules
index d6f51b20a4..f5da2e36e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
DEB_BUILDDIR := build-area
+DEB_INSTALL_DOCS := -XTODO -XAUTHORS
tarball: clean
git describe > VERSION
--
GitLab