Merge lp:~l3on/ubuntu/trusty/wikidiff2/fix-1243568+opentagfix into lp:ubuntu/trusty/wikidiff2

[Leo Iannacone]

* Install ini file in correct location with PHP 5.5 (LP: #1243568).
 * debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php:
   + better php open tag (LP: #1243119).

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 01:49:32 +0000
+++ debian/changelog	2014-02-22 11:51:18 +0000
@@ -1,3 +1,11 @@
+wikidiff2 (0.0.1+svn109581-1ubuntu1) trusty; urgency=medium
+
+  * Install ini file in correct location with PHP 5.5 (LP: #1243568).
+  * debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php:
+    + better php open tag (LP: #1243119).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 22 Feb 2014 12:41:21 +0100
+
 wikidiff2 (0.0.1+svn109581-1build1) saucy; urgency=low
 
   * Rebuild for PHP 5.5.
 
=== modified file 'debian/control'
--- debian/control	2012-06-20 19:04:43 +0000
+++ debian/control	2014-02-22 11:51:18 +0000
@@ -1,7 +1,8 @@
 Source: wikidiff2
 Section: web
 Priority: optional
-Maintainer: Mediawiki Maintenance Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Mediawiki Maintenance Team <[e-mail]>
 Uploaders: Romain Beauxis <[e-mail]>, Jonathan Wiltshire <[e-mail]>
 Build-Depends: debhelper (>= 9), php5-dev, libthai-dev, pkg-config
 Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
 
=== modified file 'debian/dirs'
--- debian/dirs	2012-06-20 19:04:43 +0000
+++ debian/dirs	2014-02-22 11:51:18 +0000
@@ -1,1 +1,1 @@
-etc/php5/conf.d
+etc/php5/mods-available
 
=== modified file 'debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php'
--- debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php	2012-06-20 19:04:43 +0000
+++ debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php	2014-02-22 11:51:18 +0000
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $wgExtensionCredits['wikidiff2'][] = array(
     'name' => 'Wikidiff2',
 
=== modified file 'debian/install'
--- debian/install	2012-06-20 19:04:43 +0000
+++ debian/install	2014-02-22 11:51:18 +0000
@@ -1,2 +1,2 @@
-wikidiff2.ini 	etc/php5/conf.d
+wikidiff2.ini 	etc/php5/mods-available
 debian/etc/mediawiki-extensions	etc