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

[Leo Iannacone]

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

[Sebastien Bacher (seb128)]

Thanks, merged in https://launchpad.net/ubuntu/trusty/+source/php-ps/1.3.7-1ubuntu1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 01:35:38 +0000
+++ debian/changelog	2014-02-22 11:07:05 +0000
@@ -1,3 +1,9 @@
+php-ps (1.3.7-1ubuntu1) trusty; urgency=medium
+
+  * Install ini file in correct location with PHP 5.5 (LP: #1243568).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 22 Feb 2014 12:01:19 +0100
+
 php-ps (1.3.7-1build1) saucy; urgency=low
 
   * Rebuild for PHP 5.5.

=== modified file 'debian/control'
--- debian/control	2011-05-25 18:46:21 +0000
+++ debian/control	2014-02-22 11:07:05 +0000
@@ -1,7 +1,8 @@
 Source: php-ps
 Section: php
 Priority: optional
-Maintainer: Uwe Steinmann <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Uwe Steinmann <[e-mail]>
 Build-Depends: debhelper (>> 5.0.0), xsltproc, php5-dev, pslib-dev (>= 0.2.3), libgd2-xpm-dev (>> 2.0.0)
 Standards-Version: 3.7.2
 

=== modified file 'debian/rules'
--- debian/rules	2008-02-11 08:34:04 +0000
+++ debian/rules	2014-02-22 11:07:05 +0000
@@ -90,8 +90,8 @@
 #		chmod 644 debian/$(PACKAGE_NAME)/usr/lib/php4/$$VERSION/*.so'
 	mkdir -p debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)
 	install -m 644 -o root -g root tmp/modules$*/$(PECL_PKG_NAME).so debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)/$(PECL_PKG_NAME).so
-	mkdir -p debian/$(BIN_PACKAGE_NAME)/etc/php$*/conf.d
-	cp debian/$(PECL_PKG_NAME).ini debian/$(BIN_PACKAGE_NAME)/etc/php$*/conf.d
+	mkdir -p debian/$(BIN_PACKAGE_NAME)/etc/php$*/mods-available
+	cp debian/$(PECL_PKG_NAME).ini debian/$(BIN_PACKAGE_NAME)/etc/php$*/mods-available
 
 # Build architecture-independent files here.
 binary-indep: