Merge lp:~l3on/ubuntu/trusty/php-interbase/fix-1243568 into lp:ubuntu/trusty/php-interbase

[Leo Iannacone]

Install ini file in correct location with PHP 5.5 (LP: #1243568).

[Dmitry Shachnev (mitya57)]

Thanks, uploaded. Please submit your fixes to Debian.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 08:56:03 +0000
+++ debian/changelog	2014-02-22 11:00:27 +0000
@@ -1,3 +1,9 @@
+php-interbase (5.4.6-0ubuntu3) trusty; urgency=medium
+
+  * Install ini file in correct location with PHP 5.5 (LP: #1243568).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 22 Feb 2014 11:55:07 +0100
+
 php-interbase (5.4.6-0ubuntu2) saucy; urgency=low
 
   * Rebuild for PHP 5.5.

=== modified file 'debian/rules'
--- debian/rules	2008-06-05 19:10:49 +0000
+++ debian/rules	2014-02-22 11:00:27 +0000
@@ -63,8 +63,8 @@
 
 	# Add here commands to install the package into debian/php[45]-interbase.
 	(ext=`/usr/bin/php-config5 --extension-dir`;mkdir -p debian/php5-interbase/$${ext};install -m 644 -o root -g root build-php5/modules/interbase.so debian/php5-interbase/$${ext}/interbase.so;)
-	mkdir -p debian/php5-interbase/etc/php5/conf.d
-	install -m 644 debian/interbase.ini debian/php5-interbase/etc/php5/conf.d/interbase.ini
+	mkdir -p debian/php5-interbase/etc/php5/mods-available
+	install -m 644 debian/interbase.ini debian/php5-interbase/etc/php5/mods-available/interbase.ini
 
 	touch install-stamp