r81735 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81734‎ | r81735 | r81736 >
Date:12:51, 8 February 2011
Author:mark
Status:deferred
Tags:
Comment:
php5-wikidiff2 (1.1.0-2) lucid; urgency=low

* Include a config file so the extension loads
Modified paths:
  • /trunk/extensions/wikidiff2/debian/changelog (modified) (history)
  • /trunk/extensions/wikidiff2/debian/conffiles (added) (history)
  • /trunk/extensions/wikidiff2/debian/control (modified) (history)
  • /trunk/extensions/wikidiff2/debian/rules (modified) (history)
  • /trunk/extensions/wikidiff2/wikidiff2.ini (added) (history)

Diff [purge]

Index: trunk/extensions/wikidiff2/debian/control
@@ -2,11 +2,11 @@
33 Section: web
44 Priority: optional
55 Maintainer: Tim Starling <tstarling@wikimedia.org>
6 -Build-Depends: debhelper (>= 7.0.50), php5-dev, libthai-dev
 6+Build-Depends: debhelper (>= 7.0.50), php5-dev, libthai-dev, pkg-config
77 Standards-Version: 3.7.2
88
99 Package: php5-wikidiff2
1010 Architecture: any
11 -Depends: ${shlibs:Depends}, ${misc:Depends}, php5-common
 11+Depends: ${shlibs:Depends}, ${misc:Depends}, php5-common, libthai0
1212 Description: MediaWiki diff plugin for PHP 5
1313 Faster diff plugin for MediaWiki under PHP 5
Index: trunk/extensions/wikidiff2/debian/changelog
@@ -1,3 +1,9 @@
 2+php5-wikidiff2 (1.1.0-2) lucid; urgency=low
 3+
 4+ * Include a config file so the extension loads
 5+
 6+ -- Mark Bergsma <mark@wikimedia.org> Tue, 08 Feb 2011 12:50:21 +0000
 7+
28 php5-wikidiff2 (1.1.0-1) lucid; urgency=low
39
410 * New non-swig version
Index: trunk/extensions/wikidiff2/debian/conffiles
@@ -0,0 +1 @@
 2+/etc/php5/conf.d/wikidiff2.ini
Index: trunk/extensions/wikidiff2/debian/rules
@@ -7,7 +7,6 @@
88 %:
99 dh $@
1010
11 -
1211 override_dh_auto_configure:
1312 # Slightly hacked here to make it work with other PHP installations
1413 # earlier in the path, so I don't have to make chroots. Really it should just
@@ -19,3 +18,5 @@
2019
2120 override_dh_auto_install:
2221 INSTALL_ROOT=$(CURDIR)/debian/php5-wikidiff2 make install
 22+ install -m 0755 -d $(CURDIR)/debian/php5-wikidiff2/etc/php5/conf.d
 23+ install -m 0644 wikidiff2.ini $(CURDIR)/debian/php5-wikidiff2/etc/php5/conf.d/wikidiff2.ini
Index: trunk/extensions/wikidiff2/wikidiff2.ini
@@ -0,0 +1 @@
 2+extension=php_wikidiff2.so

Status & tagging log