[Fusionforge-commits] r9619 - in trunk/gforge: packaging/control packaging/dirs packaging/links plugins/mediawiki/etc plugins/mediawiki/etc/httpd.d plugins/mediawiki/packaging/control plugins/mediawiki/packaging/dirs plugins/mediawiki/packaging/links

Christian Bayle cbayle at libremir.placard.fr.eu.org
Tue Apr 27 22:23:18 CEST 2010


Author: cbayle
Date: 2010-04-27 22:23:18 +0200 (Tue, 27 Apr 2010)
New Revision: 9619

Added:
   trunk/gforge/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki
   trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki
   trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki.shortdesc
   trunk/gforge/plugins/mediawiki/packaging/dirs/plugin-mediawiki
   trunk/gforge/plugins/mediawiki/packaging/links/plugin-mediawiki
Removed:
   trunk/gforge/packaging/control/160plugin-mediawiki
   trunk/gforge/packaging/control/160plugin-mediawiki.shortdesc
   trunk/gforge/packaging/dirs/plugin-mediawiki
   trunk/gforge/packaging/links/plugin-mediawiki
   trunk/gforge/plugins/mediawiki/etc/cron.d/
   trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
Log:
Move/change mediawiki stuffs in packaging struct


Deleted: trunk/gforge/packaging/control/160plugin-mediawiki
===================================================================
--- trunk/gforge/packaging/control/160plugin-mediawiki	2010-04-27 20:18:52 UTC (rev 9618)
+++ trunk/gforge/packaging/control/160plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -1,4 +0,0 @@
-Package: @OLDPACKAGE at -plugin-mediawiki
-Architecture: all
-Depends: @OLDPACKAGE at -common (>= 4.8), @OLDPACKAGE at -db-postgresql (>= 4.8) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.8) | @OLDPACKAGE at -web, mediawiki (>= 1:1.15~), php5-cli, ${misc:Depends}
-Description: Mediawiki plugin for FusionForge

Deleted: trunk/gforge/packaging/control/160plugin-mediawiki.shortdesc
===================================================================
--- trunk/gforge/packaging/control/160plugin-mediawiki.shortdesc	2010-04-27 20:18:52 UTC (rev 9618)
+++ trunk/gforge/packaging/control/160plugin-mediawiki.shortdesc	2010-04-27 20:23:18 UTC (rev 9619)
@@ -1 +0,0 @@
- This plugin allows each project to embed Mediawiki under a tab.

Deleted: trunk/gforge/packaging/dirs/plugin-mediawiki
===================================================================
--- trunk/gforge/packaging/dirs/plugin-mediawiki	2010-04-27 20:18:52 UTC (rev 9618)
+++ trunk/gforge/packaging/dirs/plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -1,11 +0,0 @@
-etc/gforge/plugins/mediawiki
-etc/mediawiki-extensions/extensions-available
-usr/share/gforge/plugins/mediawiki/bin
-usr/share/gforge/plugins/mediawiki/common
-usr/share/gforge/plugins/mediawiki/cronjobs
-usr/share/gforge/etc/httpd.d
-usr/share/gforge/etc/cron.d
-usr/share/mediawiki/skins
-usr/share/mediawiki/skins/fusionforge
-var/lib/gforge/plugins/mediawiki/projects
-var/lib/gforge/plugins/mediawiki/master

Deleted: trunk/gforge/packaging/links/plugin-mediawiki
===================================================================
--- trunk/gforge/packaging/links/plugin-mediawiki	2010-04-27 20:18:52 UTC (rev 9618)
+++ trunk/gforge/packaging/links/plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -1,73 +0,0 @@
-/usr/share/gforge/plugins/mediawiki/www/LocalSettings.php /var/lib/gforge/plugins/mediawiki/master/LocalSettings.php
-/usr/share/gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php /var/lib/gforge/plugins/mediawiki/master/skins/FusionForge.php
-/usr/share/gforge/plugins/mediawiki/mediawiki-skin/fusionforge/fusionforge.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/fusionforge.css
-
-/usr/share/mediawiki/CREDITS /var/lib/gforge/plugins/mediawiki/master/CREDITS
-/usr/share/mediawiki/INSTALL /var/lib/gforge/plugins/mediawiki/master/INSTALL
-/usr/share/mediawiki/bin /var/lib/gforge/plugins/mediawiki/master/bin
-/usr/share/mediawiki/maintenance /var/lib/gforge/plugins/mediawiki/master/maintenance
-/usr/share/mediawiki/Makefile /var/lib/gforge/plugins/mediawiki/master/Makefile
-/usr/share/mediawiki/api.php5 /var/lib/gforge/plugins/mediawiki/master/api.php5
-/usr/share/mediawiki/index.php5 /var/lib/gforge/plugins/mediawiki/master/index.php5
-/usr/share/mediawiki/opensearch_desc.php5 /var/lib/gforge/plugins/mediawiki/master/opensearch_desc.php5
-/usr/share/mediawiki/docs /var/lib/gforge/plugins/mediawiki/master/docs
-/usr/share/mediawiki/AdminSettings.sample /var/lib/gforge/plugins/mediawiki/master/AdminSettings.sample
-/usr/share/mediawiki/thumb.php5 /var/lib/gforge/plugins/mediawiki/master/thumb.php5
-/usr/share/mediawiki/img_auth.php /var/lib/gforge/plugins/mediawiki/master/img_auth.php
-/usr/share/mediawiki/HISTORY /var/lib/gforge/plugins/mediawiki/master/HISTORY
-/usr/share/mediawiki/api.php /var/lib/gforge/plugins/mediawiki/master/api.php
-/usr/share/mediawiki/thumb.php /var/lib/gforge/plugins/mediawiki/master/thumb.php
-/usr/share/mediawiki/redirect.phtml /var/lib/gforge/plugins/mediawiki/master/redirect.phtml
-/usr/share/mediawiki/install-utils.inc /var/lib/gforge/plugins/mediawiki/master/install-utils.inc
-/usr/share/mediawiki/COPYING /var/lib/gforge/plugins/mediawiki/master/COPYING
-/usr/share/mediawiki/languages /var/lib/gforge/plugins/mediawiki/master/languages
-/usr/share/mediawiki/README /var/lib/gforge/plugins/mediawiki/master/README
-/usr/share/mediawiki/php5.php5 /var/lib/gforge/plugins/mediawiki/master/php5.php5
-/usr/share/mediawiki/opensearch_desc.php /var/lib/gforge/plugins/mediawiki/master/opensearch_desc.php
-/usr/share/mediawiki/UPGRADE /var/lib/gforge/plugins/mediawiki/master/UPGRADE
-/usr/share/mediawiki/StartProfiler.php /var/lib/gforge/plugins/mediawiki/master/StartProfiler.php
-/usr/share/mediawiki/index.php /var/lib/gforge/plugins/mediawiki/master/index.php
-/usr/share/mediawiki/trackback.php5 /var/lib/gforge/plugins/mediawiki/master/trackback.php5
-/usr/share/mediawiki/FAQ /var/lib/gforge/plugins/mediawiki/master/FAQ
-/usr/share/mediawiki/serialized /var/lib/gforge/plugins/mediawiki/master/serialized
-/usr/share/mediawiki/extensions /var/lib/gforge/plugins/mediawiki/master/extensions
-/usr/share/mediawiki/RELEASE-NOTES /var/lib/gforge/plugins/mediawiki/master/RELEASE-NOTES
-/usr/share/mediawiki/redirect.php5 /var/lib/gforge/plugins/mediawiki/master/redirect.php5
-/usr/share/mediawiki/includes /var/lib/gforge/plugins/mediawiki/master/includes
-/usr/share/mediawiki/wiki.phtml /var/lib/gforge/plugins/mediawiki/master/wiki.phtml
-/usr/share/mediawiki/profileinfo.php /var/lib/gforge/plugins/mediawiki/master/profileinfo.php
-/usr/share/mediawiki/math /var/lib/gforge/plugins/mediawiki/master/math
-/usr/share/mediawiki/redirect.php /var/lib/gforge/plugins/mediawiki/master/redirect.php
-/usr/share/mediawiki/img_auth.php5 /var/lib/gforge/plugins/mediawiki/master/img_auth.php5
-/usr/share/mediawiki/trackback.php /var/lib/gforge/plugins/mediawiki/master/trackback.php
-
-/usr/share/mediawiki/skins/monobook/link_icon.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/link_icon.gif
-/usr/share/mediawiki/skins/monobook/file_icon.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/file_icon.gif
-/usr/share/mediawiki/skins/monobook/required.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/required.gif
-/usr/share/mediawiki/skins/monobook/rtl.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/rtl.css
-/usr/share/mediawiki/skins/monobook/wiki-indexed.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/wiki-indexed.png
-/usr/share/mediawiki/skins/monobook/user.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/user.gif
-/usr/share/mediawiki/skins/monobook/audio.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/audio.png
-/usr/share/mediawiki/skins/monobook/wiki.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/wiki.png
-/usr/share/mediawiki/skins/monobook/mail_icon.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/mail_icon.gif
-/usr/share/mediawiki/skins/monobook/FF2Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/FF2Fixes.css
-/usr/share/mediawiki/skins/monobook/bullet.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/bullet.gif
-/usr/share/mediawiki/skins/monobook/headbg.jpg /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/headbg.jpg
-/usr/share/mediawiki/skins/monobook/external-rtl.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/external-rtl.png
-/usr/share/mediawiki/skins/monobook/IE55Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/IE55Fixes.css
-/usr/share/mediawiki/skins/monobook/Opera9Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/Opera9Fixes.css
-/usr/share/mediawiki/skins/monobook/IE50Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/IE50Fixes.css
-/usr/share/mediawiki/skins/monobook/news_icon.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/news_icon.png
-/usr/share/mediawiki/skins/monobook/Opera7Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/Opera7Fixes.css
-/usr/share/mediawiki/skins/monobook/document.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/document.png
-/usr/share/mediawiki/skins/monobook/KHTMLFixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/KHTMLFixes.css
-/usr/share/mediawiki/skins/monobook/lock_icon.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/lock_icon.gif
-/usr/share/mediawiki/skins/monobook/external.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/external.png
-/usr/share/mediawiki/skins/monobook/discussionitem_icon.gif /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/discussionitem_icon.gif
-/usr/share/mediawiki/skins/monobook/video.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/video.png
-/usr/share/mediawiki/skins/monobook/IE60Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/IE60Fixes.css
-/usr/share/mediawiki/skins/monobook/main.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/main.css
-/usr/share/mediawiki/skins/monobook/IE70Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/IE70Fixes.css
-/usr/share/mediawiki/skins/monobook/Opera6Fixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/Opera6Fixes.css
-/usr/share/mediawiki/skins/monobook/magnify-clip.png /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/magnify-clip.png
-/usr/share/mediawiki/skins/monobook/IEMacFixes.css /var/lib/gforge/plugins/mediawiki/master/skins/fusionforge/IEMacFixes.css

Deleted: trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-04-27 20:18:52 UTC (rev 9618)
+++ trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -1,17 +0,0 @@
-# 03mediawiki begin
-<Directory {var_lib_gforge}/plugins/mediawiki>
-        Options +FollowSymLinks -Indexes
-        AllowOverride All
-        order allow,deny
-        allow from all
-        # Allow mediawiki to connect to gforge
-        Include {gforge_etc}/httpd.secrets
-        php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:."
-</Directory>
-
-# some directories must be protected
-<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/images>
-        Options -FollowSymLinks
-        AllowOverride None
-</DirectoryMatch>
-# 03mediawiki end

Copied: trunk/gforge/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki (from rev 9618, trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki)
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -0,0 +1,21 @@
+# 61plugin-mediawiki begin
+RedirectMatch 301 ^({sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
+AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php {usr_share_gforge}/www/plugins/mediawiki/index.php
+AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/wikidata/$1/images/$2
+
+<Directory {var_lib_gforge}/plugins/mediawiki>
+        Options +FollowSymLinks -Indexes
+        AllowOverride All
+        order allow,deny
+        allow from all
+        # Allow mediawiki to connect to gforge
+        Include {gforge_etc}/httpd.secrets
+        php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:{usr_share_gforge}/plugins:/usr/share/php:."
+</Directory>
+
+# some directories must be protected
+<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/images>
+        Options -FollowSymLinks
+        AllowOverride None
+</DirectoryMatch>
+# 61plugin-mediawiki end

Copied: trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki (from rev 9618, trunk/gforge/packaging/control/160plugin-mediawiki)
===================================================================
--- trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -0,0 +1,4 @@
+Package: @OLDPACKAGE at -plugin-mediawiki
+Architecture: all
+Depends: @OLDPACKAGE at -common (>= 4.8), @OLDPACKAGE at -db-postgresql (>= 4.8) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.8) | @OLDPACKAGE at -web, mediawiki (>= 1:1.15~), php5-cli, ${misc:Depends}
+Description: Mediawiki plugin for FusionForge

Copied: trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki.shortdesc (from rev 9618, trunk/gforge/packaging/control/160plugin-mediawiki.shortdesc)
===================================================================
--- trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki.shortdesc	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/packaging/control/160plugin-mediawiki.shortdesc	2010-04-27 20:23:18 UTC (rev 9619)
@@ -0,0 +1 @@
+ This plugin allows each project to embed Mediawiki under a tab.

Copied: trunk/gforge/plugins/mediawiki/packaging/dirs/plugin-mediawiki (from rev 9618, trunk/gforge/packaging/dirs/plugin-mediawiki)
===================================================================
--- trunk/gforge/plugins/mediawiki/packaging/dirs/plugin-mediawiki	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/packaging/dirs/plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -0,0 +1,10 @@
+etc/gforge/plugins/mediawiki
+etc/mediawiki-extensions/extensions-available
+usr/share/gforge/plugins/mediawiki/bin
+usr/share/gforge/plugins/mediawiki/common
+usr/share/gforge/plugins/mediawiki/cronjobs
+usr/share/gforge/www/plugins/mediawiki
+usr/share/gforge/etc/httpd.d
+usr/share/mediawiki/skins
+usr/share/mediawiki/skins/fusionforge
+var/lib/gforge/plugins/mediawiki/wikidata

Copied: trunk/gforge/plugins/mediawiki/packaging/links/plugin-mediawiki (from rev 9618, trunk/gforge/packaging/links/plugin-mediawiki)
===================================================================
--- trunk/gforge/plugins/mediawiki/packaging/links/plugin-mediawiki	                        (rev 0)
+++ trunk/gforge/plugins/mediawiki/packaging/links/plugin-mediawiki	2010-04-27 20:23:18 UTC (rev 9619)
@@ -0,0 +1,13 @@
+../../../../mediawiki/api.php			usr/share/gforge/www/plugins/mediawiki/api.php
+../../../../mediawiki/extensions		usr/share/gforge/www/plugins/mediawiki/extensions
+../../../../mediawiki/img_auth.php		usr/share/gforge/www/plugins/mediawiki/img_auth.php
+../../../../mediawiki/includes			usr/share/gforge/www/plugins/mediawiki/includes
+../../../../mediawiki/index.php			usr/share/gforge/www/plugins/mediawiki/index.php
+../../../../mediawiki/languages			usr/share/gforge/www/plugins/mediawiki/languages
+../../../../mediawiki/maintenance		usr/share/gforge/www/plugins/mediawiki/maintenance
+../../../../mediawiki/opensearch_desc.php	usr/share/gforge/www/plugins/mediawiki/opensearch_desc.php
+../../../../mediawiki/profileinfo.php		usr/share/gforge/www/plugins/mediawiki/profileinfo.php
+../../../../mediawiki/redirect.php		usr/share/gforge/www/plugins/mediawiki/redirect.php
+../../../../mediawiki/StartProfiler.php		usr/share/gforge/www/plugins/mediawiki/StartProfiler.php
+../../../../mediawiki/thumb.php			usr/share/gforge/www/plugins/mediawiki/thumb.php
+../../../../mediawiki/trackback.php		usr/share/gforge/www/plugins/mediawiki/trackback.php




More information about the Fusionforge-commits mailing list