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

[Leo Iannacone]

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

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 01:24:01 +0000
+++ debian/changelog	2014-02-22 10:48:32 +0000
@@ -1,3 +1,9 @@
+php-adodb (5.04-7ubuntu1) trusty; urgency=medium
+
+  * Install ini file in correct location with PHP 5.5 (LP: #1243568).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 22 Feb 2014 11:19:51 +0100
+
 php-adodb (5.04-7build2) saucy; urgency=low
 
   * Rebuild for PHP 5.5.

=== modified file 'debian/control'
--- debian/control	2012-01-24 21:59:00 +0000
+++ debian/control	2014-02-22 10:48:32 +0000
@@ -1,7 +1,8 @@
 Source: php-adodb
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP Maintainers <[e-mail]>
 Uploaders: Raphael Geissert <[e-mail]>
 Build-Depends: debhelper (>= 6.0.7~), php5-dev (>= 5.2.0), cdbs (>= 0.4.52~)
 Standards-Version: 3.9.2

=== modified file 'debian/rules'
--- debian/rules	2012-01-24 21:59:00 +0000
+++ debian/rules	2014-02-22 10:48:32 +0000
@@ -18,5 +18,5 @@
 
 install/php5-$(EXTN)::
 	install -D -m 644 modules/$(EXTN).so $(BUILD)$(PHP_EX)/$(EXTN).so
-	install -D -m 644 debian/$(EXTN).ini $(BUILD)/etc/php5/conf.d/$(EXTN).ini
+	install -D -m 644 debian/$(EXTN).ini $(BUILD)/etc/php5/mods-available/$(EXTN).ini
 	echo "php:Depends=phpapi-`php-config5 --phpapi`" >> $(BUILD).substvars