[Pkg-mediawiki-commits] r490 - in mediawiki/branches/nmu-merge/debian: . etc

[Thorsten Glaser]

Author: tg
Date: 2013-12-31 09:50:30 +0000 (Tue, 31 Dec 2013)
New Revision: 490

Added:
   mediawiki/branches/nmu-merge/debian/mediawiki-classes.install
Modified:
   mediawiki/branches/nmu-merge/debian/changelog
   mediawiki/branches/nmu-merge/debian/control
   mediawiki/branches/nmu-merge/debian/etc/apache.conf
   mediawiki/branches/nmu-merge/debian/rules
Log:
merge mediawiki (1:1.19.8+dfsg-2.1) by David Pr?\195?\169vot <taffit at debian.org>

WARNING: this reverts Apache 2.2 compatibility in etc/apache.conf


Modified: mediawiki/branches/nmu-merge/debian/changelog
===================================================================
--- mediawiki/branches/nmu-merge/debian/changelog	2013-12-31 09:45:32 UTC (rev 489)
+++ mediawiki/branches/nmu-merge/debian/changelog	2013-12-31 09:50:30 UTC (rev 490)
@@ -1,3 +1,9 @@
+mediawiki (1:1.19.8+dfsg-2.1) unstable; urgency=low
+
+  * Provide includes/libs in mediawiki-classes (Closes: #703837)
+
+ -- David Prévot <taffit at debian.org>  Wed, 23 Oct 2013 11:29:27 -0400
+
 mediawiki (1:1.19.8+dfsg-2) unstable; urgency=low
 
   [ Thorsten Glaser ]

Modified: mediawiki/branches/nmu-merge/debian/control
===================================================================
--- mediawiki/branches/nmu-merge/debian/control	2013-12-31 09:45:32 UTC (rev 489)
+++ mediawiki/branches/nmu-merge/debian/control	2013-12-31 09:50:30 UTC (rev 490)
@@ -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.8+dfsg-2.1~)
+Replaces: mediawiki (<< 1:1.19.8+dfsg-2.1~)
+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.
+ .
+ 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.

Modified: mediawiki/branches/nmu-merge/debian/etc/apache.conf
===================================================================
--- mediawiki/branches/nmu-merge/debian/etc/apache.conf	2013-12-31 09:45:32 UTC (rev 489)
+++ mediawiki/branches/nmu-merge/debian/etc/apache.conf	2013-12-31 09:50:30 UTC (rev 490)
@@ -5,13 +5,7 @@
 <Directory /var/lib/mediawiki/>
 	Options +FollowSymLinks
 	AllowOverride All
-	<IfVersion >= 2.3>
-		Require all granted
-	</IfVersion>
-	<IfVersion < 2.3>
-		order allow,deny
-		allow from all
-	</IfVersion>
+	Require all granted
 </Directory>
 
 # some directories must be protected

Added: mediawiki/branches/nmu-merge/debian/mediawiki-classes.install
===================================================================
--- mediawiki/branches/nmu-merge/debian/mediawiki-classes.install	                        (rev 0)
+++ mediawiki/branches/nmu-merge/debian/mediawiki-classes.install	2013-12-31 09:50:30 UTC (rev 490)
@@ -0,0 +1 @@
+includes/libs/*.php usr/share/mediawiki/includes/libs

Modified: mediawiki/branches/nmu-merge/debian/rules
===================================================================
--- mediawiki/branches/nmu-merge/debian/rules	2013-12-31 09:45:32 UTC (rev 489)
+++ mediawiki/branches/nmu-merge/debian/rules	2013-12-31 09:50:30 UTC (rev 490)
@@ -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 {} \;