On Tue, Jun 25, 2013 at 05:56:55PM -0400, David Prévot wrote: > > Please find attached a proposed patch to fix this issue. I’m happy to > update it following your guidance if you’d prefer another approach.
Please find attached the updated patch to the latest version of mediawiki, thanks in advance for considering it for your next upload. Regards David
diff -Nru mediawiki-1.19.8+dfsg/debian/changelog mediawiki-1.19.8+dfsg/debian/changelog
--- mediawiki-1.19.8+dfsg/debian/changelog 2013-09-05 11:08:44.000000000 -0400
+++ mediawiki-1.19.8+dfsg/debian/changelog 2013-09-06 17:38:41.000000000 -0400
@@ -1,3 +1,9 @@
+mediawiki (1:1.19.8+dfsg-2) UNRELEASED; urgency=low
+
+ * Provide includes/libs in mediawiki-classes (Closes: #703837)
+
+ -- David Prévot <taf...@debian.org> Fri, 06 Sep 2013 17:37:20 -0400
+
mediawiki (1:1.19.8+dfsg-1) unstable; urgency=low
* mediawiki-math is now called mediawiki-extensions-math
diff -Nru mediawiki-1.19.8+dfsg/debian/control mediawiki-1.19.8+dfsg/debian/control
--- mediawiki-1.19.8+dfsg/debian/control 2013-06-05 08:30:51.000000000 -0400
+++ mediawiki-1.19.8+dfsg/debian/control 2013-09-06 18:07:45.000000000 -0400
@@ -13,7 +13,7 @@
Package: mediawiki
Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite | php5-mysqlnd, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, ${misc:Depends}
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite | php5-mysqlnd, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, mediawiki-classes, ${misc:Depends}
Recommends: mysql-server | postgresql-contrib, php5-cli, python, php-wikidiff2, mediawiki-extensions-base
Suggests: imagemagick | php5-gd, mediawiki-extensions-math, memcached, clamav
Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
@@ -30,6 +30,27 @@
MediaWiki is a wiki engine (a program for creating a collaboratively
edited website). It is designed to handle heavy websites containing
library-like document collections, and supports user uploads of
+ images/sounds, multilingual content, TOC autogeneration, ISBN links,
+ etc.
+ .
+ Moreover, it keeps track of changes, so users can receive
+ notifications, view diffs and revert edits. This system has many
+ other features and can easily be extended.
+
+Package: mediawiki-classes
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: mediawiki (<< 1:1.19.8+dfsg-2~)
+Replaces: mediawiki (<< 1:1.19.8+dfsg-2~)
+Description: website engine for collaborative work - standalone classes
+ This package provides standalone classes from the remainder of the
+ MediaWiki codebase. They do not call on any other portions of MediaWiki
+ code, and can be used in portions of MediaWiki code, and can be used in
+ other projects without dependency issues.
+ .
+ MediaWiki is a wiki engine (a program for creating a collaboratively
+ edited website). It is designed to handle heavy websites containing
+ library-like document collections, and supports user uploads of
images/sounds, multilingual content, TOC autogeneration, ISBN links,
etc.
.
diff -Nru mediawiki-1.19.8+dfsg/debian/mediawiki-classes.install mediawiki-1.19.8+dfsg/debian/mediawiki-classes.install
--- mediawiki-1.19.8+dfsg/debian/mediawiki-classes.install 1969-12-31 20:00:00.000000000 -0400
+++ mediawiki-1.19.8+dfsg/debian/mediawiki-classes.install 2013-09-06 17:36:30.000000000 -0400
@@ -0,0 +1 @@
+includes/libs/*.php usr/share/mediawiki/includes/libs
diff -Nru mediawiki-1.19.8+dfsg/debian/rules mediawiki-1.19.8+dfsg/debian/rules
--- mediawiki-1.19.8+dfsg/debian/rules 2013-05-23 08:18:45.000000000 -0400
+++ mediawiki-1.19.8+dfsg/debian/rules 2013-09-06 17:36:50.000000000 -0400
@@ -42,6 +42,8 @@
# Put debian version for mediawiki version..
sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
+ # includes/libs is provided by mediawiki-classes
+ rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
override_dh_installdeb:
find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
signature.asc
Description: Digital signature
