Ubuntu
wikidiff2 package

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

  1. Trusty (14.04)
  2. fix-1243568+opentagfix
  3. Merge into trusty
Proposed by Leo Iannacone
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~l3on/ubuntu/trusty/wikidiff2/fix-1243568+opentagfix
Merge into: lp:ubuntu/trusty/wikidiff2
Diff against target: 54 lines (+13/-4)
5 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/dirs (+1/-1)
debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php (+1/-1)
debian/install (+1/-1)
To merge this branch: bzr merge lp:~l3on/ubuntu/trusty/wikidiff2/fix-1243568+opentagfix
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+207786@code.launchpad.net

Description of the change

* 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).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-16 01:49:32 +0000
3+++ debian/changelog 2014-02-22 11:51:18 +0000
4@@ -1,3 +1,11 @@
5+wikidiff2 (0.0.1+svn109581-1ubuntu1) trusty; urgency=medium
6+
7+ * Install ini file in correct location with PHP 5.5 (LP: #1243568).
8+ * debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php:
9+ + better php open tag (LP: #1243119).
10+
11+ -- Leo Iannacone <l3on@ubuntu.com> Sat, 22 Feb 2014 12:41:21 +0100
12+
13 wikidiff2 (0.0.1+svn109581-1build1) saucy; urgency=low
14
15 * Rebuild for PHP 5.5.
16
17=== modified file 'debian/control'
18--- debian/control 2012-06-20 19:04:43 +0000
19+++ debian/control 2014-02-22 11:51:18 +0000
20@@ -1,7 +1,8 @@
21 Source: wikidiff2
22 Section: web
23 Priority: optional
24-Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel@lists.alioth.debian.org>
27 Uploaders: Romain Beauxis <toots@rastageeks.org>, Jonathan Wiltshire <jmw@debian.org>
28 Build-Depends: debhelper (>= 9), php5-dev, libthai-dev, pkg-config
29 Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
30
31=== modified file 'debian/dirs'
32--- debian/dirs 2012-06-20 19:04:43 +0000
33+++ debian/dirs 2014-02-22 11:51:18 +0000
34@@ -1,1 +1,1 @@
35-etc/php5/conf.d
36+etc/php5/mods-available
37
38=== modified file 'debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php'
39--- debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php 2012-06-20 19:04:43 +0000
40+++ debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php 2014-02-22 11:51:18 +0000
41@@ -1,4 +1,4 @@
42-<?
43+<?php
44
45 $wgExtensionCredits['wikidiff2'][] = array(
46 'name' => 'Wikidiff2',
47
48=== modified file 'debian/install'
49--- debian/install 2012-06-20 19:04:43 +0000
50+++ debian/install 2014-02-22 11:51:18 +0000
51@@ -1,2 +1,2 @@
52-wikidiff2.ini etc/php5/conf.d
53+wikidiff2.ini etc/php5/mods-available
54 debian/etc/mediawiki-extensions etc

Subscribers

People subscribed via source and target branches

to all changes: