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

[Leo Iannacone]

Please take a look at bug.

May this package need a release update?

uscan reports:
  Newest version on remote site is 5.5.9, local version is 5.4.6

Leo.

[Daniel Holbach (dholbach)]

Thanks. Uploaded. I just bumped the version number (and timestamp) because another upload happened in the meantime.

review: Approve

Unmerged revisions

19. By Leo Iannacone on 2014-02-15

install ini file in correct path - fix LP: #1243568

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-15 23:07:57 +0000
+++ debian/changelog	2014-02-15 12:23:26 +0000
@@ -1,3 +1,10 @@
+php-mcrypt (5.4.6-0ubuntu4) trusty; urgency=low
+
+  * Install ini file in correct location with PHP 5.5.
+    Thanks to Johannes Ballmann (LP: #1243568).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 15 Feb 2014 13:07:59 +0100
+
 php-mcrypt (5.4.6-0ubuntu3) saucy; urgency=low
 
   * Build with -g on aarch64-linux-gnu, not (pre-DWARF) -gstabs.

=== modified file 'debian/rules'
--- debian/rules	2013-10-15 23:07:57 +0000
+++ debian/rules	2014-02-15 12:23:26 +0000
@@ -76,8 +76,8 @@
 
 	# Add here commands to install the package into debian/php5-mcrypt.
 	(ext=`/usr/bin/php-config5 --extension-dir`;mkdir -p debian/php5-mcrypt/$${ext};install -m 644 -o root -g root build-php5/modules/mcrypt.so debian/php5-mcrypt/$${ext}/mcrypt.so;)
-	mkdir -p debian/php5-mcrypt/etc/php5/conf.d
-	install -m 644 debian/mcrypt.ini debian/php5-mcrypt/etc/php5/conf.d/mcrypt.ini
+	mkdir -p debian/php5-mcrypt/etc/php5/mods-available
+	install -m 644 debian/mcrypt.ini debian/php5-mcrypt/etc/php5/mods-available/mcrypt.ini
 
 	touch install-stamp