Merge branch 'master' of github.com:tarantool/tarantool-php

Author: bigbes

.travis.yml

@@ -15,6 +15,8 @@ python:
 cache: false
 
 env:
+  global:
+    - PRODUCT=php-tarantool
   matrix:
     - OS=el DIST=6 PACK=rpm
     - OS=el DIST=7 PACK=rpm
@@ -24,7 +26,8 @@ env:
     - OS=ubuntu DIST=trusty PACK=deb
     - OS=ubuntu DIST=precise PACK=deb
     - OS=ubuntu DIST=wily PACK=deb
-    - OS=ubuntu DIST=xenial PACK=deb
+#    phpize is, currently, broken on xenial. can't test, still not stable
+#    - OS=ubuntu DIST=xenial PACK=deb
     - OS=debian DIST=jessie PACK=deb
     - OS=debian DIST=wheezy PACK=deb
     - OS=debian DIST=stretch PACK=deb
@@ -43,7 +46,7 @@ matrix:
     - env: OS=ubuntu DIST=precise PACK=deb
     - env: OS=ubuntu DIST=trusty PACK=deb
     - env: OS=ubuntu DIST=wily PACK=deb
-    - env: OS=ubuntu DIST=xenial PACK=deb
+#    - env: OS=ubuntu DIST=xenial PACK=deb
     - env: OS=debian DIST=jessie PACK=deb
     - env: OS=debian DIST=wheezy PACK=deb
     - env: OS=debian DIST=stretch PACK=deb
@@ -65,7 +68,7 @@ matrix:
       php: 5.4
     - env: OS=ubuntu DIST=wily PACK=deb
       php: 5.4
-    - env: OS=ubuntu DIST=xenial PACK=deb
+#    - env: OS=ubuntu DIST=xenial PACK=deb
       php: 5.4
     - env: OS=debian DIST=jessie PACK=deb
       php: 5.4
@@ -91,7 +94,7 @@ matrix:
       php: 5.5
     - env: OS=ubuntu DIST=wily PACK=deb
       php: 5.5
-    - env: OS=ubuntu DIST=xenial PACK=deb
+#    - env: OS=ubuntu DIST=xenial PACK=deb
       php: 5.5
     - env: OS=debian DIST=jessie PACK=deb
       php: 5.5

README.md

@@ -65,8 +65,8 @@ Place it into project library path in your IDE.
 
 ## Configuration file
 
-* `tarantool.persistent` - Enable persistent connections (don't close connections between sessions) (defaults: True, can't be changed in runtime)
-* `tarantool.con_per_host` - Count of open connections to every Tarantool server to store (defaults: 5, can't be changed in runtime)
+* `tarantool.persistent` - Enable persistent connections (don't close connections between sessions) (defaults: True, **can't be changed in runtime**)
+* `tarantool.con_per_host` - Count of open connections to every Tarantool server to store (defaults: 5, **can't be changed in runtime**)
 * `tarantool.timeout` - Connection timeout (defaults: 10 seconds, can be changed in runtime)
 * `tarantool.retry_count` - Count of retries for connecting (defaults: 1, can be changed in runtime)
 * `tarantool.retry_sleep` - Sleep between connecting retries (defaults: 0.1 second, can be changed in runtime)

debian/changelog

@@ -1,17 +1,17 @@
-tarantool-php (1.6-1) unstable; urgency=medium
+php-tarantool (1.6-1) unstable; urgency=medium
 
   * New upstream version.
   * Relicensed as BSD. closes: #752655.
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Mon, 27 Oct 2014 18:46:34 +0300
 
-tarantool-php (1.0-2) unstable; urgency=low
+php-tarantool (1.0-2) unstable; urgency=low
 
   * Fixed debian/rules:clean section by ftp-master's review.
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Tue, 15 Apr 2014 22:29:26 +0400
 
-tarantool-php (1.0-1) unstable; urgency=low
+php-tarantool (1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #731850)
 

debian/control

@@ -1,9 +1,8 @@
-Source: tarantool-php
+Source: php-tarantool
 Priority: optional
 Maintainer: Dmitry E. Oboukhov <unera@debian.org>
-Build-Depends: debhelper (>= 9),
-               dh-php,
-               php-all-dev,
+Build-Depends: debhelper (>= 8),
+               php5-dev | php-all-dev,
                pkg-config
 Section: php
 Standards-Version: 3.9.4

debian/rules

@@ -34,6 +34,6 @@ tarball: clean
 	&& tar \
 		--exclude=debian \
 		--exclude=.git \
-		-czvf tarantool-php_$(version).orig.tar.gz \
-		tarantool-php-$(version)
+		-czvf php-tarantool_$(version).orig.tar.gz \
+		php-tarantool-$(version)
 

rpm/tarantool-php.spec renamed to rpm/php-tarantool.spec

@@ -44,14 +44,11 @@ rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 # Drop in the bit of configuration
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/tarantool.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %{php_extdir}/tarantool.so
-%{pecl_xmldir}/tarantool.xml
 %config(noreplace) %{php_inidir}/%{ini_name}