[Pkg-mediawiki-commits] [wikidiff2] 04/06: Remove PHP configuration, recommend MW 1.27.1+

[Kunal Mehta]

This is an automated email from the git hooks/post-receive script.

legoktm-guest pushed a commit to branch master
in repository wikidiff2.

commit 0bf9c67aab8769f75d3799bf571152c7155955d7
Author: Kunal Mehta <legoktm at member.fsf.org>
Date:   Tue Aug 30 18:35:20 2016 -0700

    Remove PHP configuration, recommend MW 1.27.1+
    
    As of MediaWiki 1.27.1, the PHP configuration setting is no longer
    needed.
---
 debian/control                                                |  2 +-
 .../mediawiki-extensions/extensions-available/wikidiff2.php   | 11 -----------
 .../etc/mediawiki-extensions/extensions-enabled/wikidiff2.php |  1 -
 debian/install                                                |  1 -
 debian/php-wikidiff2.maintscript                              |  3 +++
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 5a13ac9..6979a13 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/wikidiff2.git
 Package: php-wikidiff2
 Architecture: any
 Depends: php | php-cli, ${misc:Depends}, ${shlibs:Depends}, ${php:Depends}
-Recommends: mediawiki
+Recommends: mediawiki (>= 1:1.27.1-1)
 Description: external diff engine for mediawiki
  Wikidiff2 is a PHP module providing external diff
  engine for MediaWiki. It performs word-level 
diff --git a/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php b/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php
deleted file mode 100644
index 7099d86..0000000
--- a/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$wgExtensionCredits['wikidiff2'][] = array(
-    'name' => 'Wikidiff2',
-    'version' => '',
-    'author' => 'Tim Starling',
-    'description' => 'external diff engine for MediaWiki',
-    'url' => 'https://www.mediawiki.org/wiki/Extension:Wikidiff2'
-);
-
-$wgExternalDiffEngine = 'wikidiff2';
diff --git a/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php b/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php
deleted file mode 120000
index 6565502..0000000
--- a/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php
+++ /dev/null
@@ -1 +0,0 @@
-../extensions-available/wikidiff2.php
\ No newline at end of file
diff --git a/debian/install b/debian/install
index c106911..40d4416 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1 @@
 wikidiff2.ini 	etc/php/7.0/mods-available
-debian/etc/mediawiki-extensions	etc
diff --git a/debian/php-wikidiff2.maintscript b/debian/php-wikidiff2.maintscript
new file mode 100644
index 0000000..a06cece
--- /dev/null
+++ b/debian/php-wikidiff2.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/mediawiki-extensions/extensions-enabled/wikidiff2.php 1.4.1-1
+rm_conffile /etc/mediawiki-extensions/extensions-available/wikidiff2.php 1.4.1-1
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wikidiff2.git