Control: tags -1 patch Control: found -1 1:1.19.7+dfsg-1 On Sun, Mar 24, 2013 at 10:33:35AM -0400, David Prévot wrote:
> As stated in /usr/share/mediawiki/includes/libs/README (that should be > stripped away from the binary package by the way): > > The classes in this directory ./includes/libs are considered standalone > from the remainder of the MediaWiki codebase. They do not call on any > other > portions of MediaWiki code, and can be used in other projects without > dependency issues. > > So it would be nice to ship them in a standalone binary package, in > order to be used by other packages (e.g. owncloud). 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. Regards David
Index: debian/mediawiki-classes.install =================================================================== --- debian/mediawiki-classes.install (révision 0) +++ debian/mediawiki-classes.install (révision 0) @@ -0,0 +1 @@ +includes/libs/*.php usr/share/mediawiki/includes/libs Index: debian/control =================================================================== --- debian/control (révision 464) +++ debian/control (copie de travail) @@ -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~), @@ -36,3 +36,24 @@ 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.7+dfsg-2~) +Replaces: mediawiki (<< 1:1.19.7+dfsg-2~) +Description: website engine for collaborative work - standalone classes + 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. + . + 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. Index: debian/changelog =================================================================== --- debian/changelog (révision 464) +++ debian/changelog (copie de travail) @@ -1,3 +1,9 @@ +mediawiki (1:1.19.7+dfsg-2) UNRELEASED; urgency=low + + * Provide includes/libs in mediawiki-classes (Closes: #703837) + + -- David Prévot <taf...@debian.org> Tue, 25 Jun 2013 17:05:02 -0400 + mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low * New low-impact upstream security release Index: debian/rules =================================================================== --- debian/rules (révision 464) +++ debian/rules (copie de travail) @@ -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