[Pkg-mediawiki-commits] r295 - in mediawiki/trunk/debian: . patches
Jonathan Wiltshire
jmw at alioth.debian.org
Sun Jan 15 00:00:42 UTC 2012
Author: jmw
Date: 2012-01-15 00:00:42 +0000 (Sun, 15 Jan 2012)
New Revision: 295
Added:
mediawiki/trunk/debian/NEWS
Modified:
mediawiki/trunk/debian/changelog
mediawiki/trunk/debian/control
mediawiki/trunk/debian/control.in
mediawiki/trunk/debian/mediawiki.dirs
mediawiki/trunk/debian/mediawiki.docs
mediawiki/trunk/debian/mediawiki.install
mediawiki/trunk/debian/mediawiki.links
mediawiki/trunk/debian/mediawiki.postinst
mediawiki/trunk/debian/mediawiki.postrm
mediawiki/trunk/debian/patches/fix_invalid_sql.patch
mediawiki/trunk/debian/patches/mimetypes.patch
mediawiki/trunk/debian/patches/suppress_warnings.patch
mediawiki/trunk/debian/patches/texvc_location.patch
mediawiki/trunk/debian/rules
Log:
First cut at packaging 1.18.1
Added: mediawiki/trunk/debian/NEWS
===================================================================
--- mediawiki/trunk/debian/NEWS (rev 0)
+++ mediawiki/trunk/debian/NEWS 2012-01-15 00:00:42 UTC (rev 295)
@@ -0,0 +1,17 @@
+mediawiki (1:1.18.1-1) UNRELEASED; urgency=low
+
+ SQL structure changes are required for this release of mediawiki.
+ This does not take place automatically and mediawiki will not function
+ until they are completed.
+
+ For upgrades of mediawiki, the $wgDBadminuser and $wgDBadminpassword variables
+ probably need setting in /etc/mediawiki/AdminSettings.php. The user chosen for
+ this role should have all roles granted on the database (debian-sys-maint
+ might be a good choice for this).
+
+ /etc/mediawiki/AdminSettings.php should be owned by root and set 0600.
+
+ When everything is prepared, start the update by running (as root):
+ php /usr/share/mediawiki/maintenance/update.php
+
+ -- Jonathan Wiltshire <jmw at debian.org> Sat, 14 Jan 2012 21:20:46 +0000
Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/changelog 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,6 +1,12 @@
-mediawiki (1:1.17.0-1) UNRELEASED; urgency=low
+mediawiki (1:1.18.1-1) UNRELEASED; urgency=low
+ * New upstream release (Closes: #613791, #619159, #550940, #460831)
* Remove patches integrated upstream in this version
+ * Standards version 3.9.2
+ * Drop mediawiki-math binary package, it is no longer shipped upstream
+ * Add sqlite3 to Recommends (Closes: #612212)
+ * Use system copies of javascript libraries where available
+ * Document upgrade procedure in debian/NEWS
-- Jonathan Wiltshire <jmw at debian.org> Sat, 14 Jan 2012 23:47:48 +0000
Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/control 2012-01-15 00:00:42 UTC (rev 295)
@@ -3,17 +3,19 @@
Priority: optional
Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1),
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
debhelper (>= 7.0.1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
Homepage: http://www.mediawiki.org/
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
Vcs-SVN: svn://svn.debian.org/svn/pkg-mediawiki/mediawiki/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-mediawiki/mediawiki/trunk/
Package: mediawiki
Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends}
-Recommends: mysql-server | postgresql-contrib, php5-cli
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, libjs-jquery-tablesorter, ${misc:Depends}
+Recommends: mysql-server | postgresql-contrib, php5-cli, python
Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
Description: website engine for collaborative work
MediaWiki is a wiki engine (a program for creating a collaboratively
@@ -25,24 +27,3 @@
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-math
-Architecture: any
-Depends: ${interpreter:Depends}, texlive-latex-base,
- ghostscript, imagemagick,
- ${shlibs:Depends}, ${misc:Depends}
-Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
-Recommends: mediawiki, latex-cjk-all, texlive-latex-extra
-Description: math rendering plugin for MediaWiki
- 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 contains the math rendering plugin.
-
Modified: mediawiki/trunk/debian/control.in
===================================================================
--- mediawiki/trunk/debian/control.in 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/control.in 2012-01-15 00:00:42 UTC (rev 295)
@@ -6,14 +6,14 @@
Build-Depends: @cdbs@,
debhelper (>= 7.0.1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
Homepage: http://www.mediawiki.org/
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
Vcs-SVN: svn://svn.debian.org/svn/pkg-mediawiki/mediawiki/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-mediawiki/mediawiki/trunk/
Package: mediawiki
Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends}
-Recommends: mysql-server | postgresql-contrib, php5-cli
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, libjs-jquery-tablesorter, ${misc:Depends}
+Recommends: mysql-server | postgresql-contrib, php5-cli, python
Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
Description: website engine for collaborative work
MediaWiki is a wiki engine (a program for creating a collaboratively
@@ -25,24 +25,3 @@
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-math
-Architecture: any
-Depends: ${interpreter:Depends}, texlive-latex-base,
- ghostscript, imagemagick,
- ${shlibs:Depends}, ${misc:Depends}
-Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
-Recommends: mediawiki, latex-cjk-all, texlive-latex-extra
-Description: math rendering plugin for MediaWiki
- 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 contains the math rendering plugin.
-
Modified: mediawiki/trunk/debian/mediawiki.dirs
===================================================================
--- mediawiki/trunk/debian/mediawiki.dirs 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.dirs 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,2 +1,2 @@
-var/lib/mediawiki/images
etc/mediawiki
+var/lib/mediawiki/config
Modified: mediawiki/trunk/debian/mediawiki.docs
===================================================================
--- mediawiki/trunk/debian/mediawiki.docs 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.docs 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,5 +1,5 @@
docs
-RELEASE-NOTES
+CREDITS
FAQ
-HISTORY
+README
UPGRADE
Modified: mediawiki/trunk/debian/mediawiki.install
===================================================================
--- mediawiki/trunk/debian/mediawiki.install 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.install 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,2 +1,2 @@
-*.php *.phtml includes index.php install-utils.inc languages maintenance skins usr/share/mediawiki
-config extensions var/lib/mediawiki
+*.php *.phtml includes index.php languages maintenance mw-config resources skins usr/share/mediawiki
+cache extensions images var/lib/mediawiki
Modified: mediawiki/trunk/debian/mediawiki.links
===================================================================
--- mediawiki/trunk/debian/mediawiki.links 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.links 2012-01-15 00:00:42 UTC (rev 295)
@@ -5,3 +5,5 @@
var/lib/mediawiki/config usr/share/mediawiki/config
var/lib/mediawiki/images usr/share/mediawiki/images
var/lib/mediawiki/extensions usr/share/mediawiki/extensions
+usr/share/mediawiki/mw-config var/lib/mediawiki/mw-config
+usr/share/mediawiki/resources var/lib/mediawiki/resources
Modified: mediawiki/trunk/debian/mediawiki.postinst
===================================================================
--- mediawiki/trunk/debian/mediawiki.postinst 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.postinst 2012-01-15 00:00:42 UTC (rev 295)
@@ -49,8 +49,10 @@
fi
done
- chown -R www-data:www-data /var/lib/mediawiki/config /var/lib/mediawiki/images
- chmod 700 /var/lib/mediawiki/config /var/lib/mediawiki/images
+ #chown -R www-data:www-data /var/lib/mediawiki/config /var/lib/mediawiki/images
+ chown -R www-data:www-data /var/lib/mediawiki/cache /var/lib/mediawiki/images
+ #chmod 700 /var/lib/mediawiki/config /var/lib/mediawiki/images
+ chmod 700 /var/lib/mediawiki/cache /var/lib/mediawiki/images
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: mediawiki/trunk/debian/mediawiki.postrm
===================================================================
--- mediawiki/trunk/debian/mediawiki.postrm 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/mediawiki.postrm 2012-01-15 00:00:42 UTC (rev 295)
@@ -17,7 +17,6 @@
;;
esac
-
#DEBHELPER#
exit 0
Modified: mediawiki/trunk/debian/patches/fix_invalid_sql.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_invalid_sql.patch 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/patches/fix_invalid_sql.patch 2012-01-15 00:00:42 UTC (rev 295)
@@ -7,11 +7,9 @@
| ^
Reference: https://evolvis.org/tracker/t_follow.php/1377
-Index: mediawiki-1.15.5/includes/Title.php
-===================================================================
---- mediawiki-1.15.5.orig/includes/Title.php 2011-07-06 12:11:08.000000000 +0200
-+++ mediawiki-1.15.5/includes/Title.php 2011-07-06 12:11:17.000000000 +0200
-@@ -2710,8 +2710,7 @@
+--- mediawiki-1.18.0.orig/includes/Title.php
++++ mediawiki-1.18.0/includes/Title.php
+@@ -3217,8 +3217,7 @@
'pr_expiry' => 'pr_expiry'
),
array( 'pr_page' => $pageid ),
Modified: mediawiki/trunk/debian/patches/mimetypes.patch
===================================================================
--- mediawiki/trunk/debian/patches/mimetypes.patch 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/patches/mimetypes.patch 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,16 +1,13 @@
-Index: mediawiki-1.15.2/includes/DefaultSettings.php
-===================================================================
---- mediawiki-1.15.2.orig/includes/DefaultSettings.php 2010-03-15 12:01:58.000000000 -0500
-+++ mediawiki-1.15.2/includes/DefaultSettings.php 2010-03-15 12:01:58.000000000 -0500
-@@ -825,8 +825,8 @@
+--- mediawiki-1.18.0.orig/includes/DefaultSettings.php
++++ mediawiki-1.18.0/includes/DefaultSettings.php
+@@ -826,8 +826,8 @@
$wgVerifyMimeType = true;
/** Sets the mime type definition file to use by MimeMagic.php. */
-$wgMimeTypeFile = "includes/mime.types";
-+#$wgMimeTypeFile= "includes/mime.types";
-#$wgMimeTypeFile= "/etc/mime.types";
++#$wgMimeTypeFile= "includes/mime.types";
+$wgMimeTypeFile = "/etc/mime.types";
#$wgMimeTypeFile= null; #use built-in defaults only.
/** Sets the mime type info file to use by MimeMagic.php. */
-
Modified: mediawiki/trunk/debian/patches/suppress_warnings.patch
===================================================================
--- mediawiki/trunk/debian/patches/suppress_warnings.patch 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/patches/suppress_warnings.patch 2012-01-15 00:00:42 UTC (rev 295)
@@ -2,9 +2,9 @@
Suppress warnings from being run within FusionForge’s gforge-plugin-mediawiki
---- mediawiki-1.17.0.orig/includes/GlobalFunctions.php
-+++ mediawiki-1.17.0/includes/GlobalFunctions.php
-@@ -3069,7 +3069,7 @@
+--- mediawiki-1.18.0.orig/includes/GlobalFunctions.php
++++ mediawiki-1.18.0/includes/GlobalFunctions.php
+@@ -3105,7 +3105,7 @@
session_id( $sessionId );
}
wfSuppressWarnings();
Modified: mediawiki/trunk/debian/patches/texvc_location.patch
===================================================================
--- mediawiki/trunk/debian/patches/texvc_location.patch 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/patches/texvc_location.patch 2012-01-15 00:00:42 UTC (rev 295)
@@ -1,13 +1,14 @@
-Index: mediawiki-1.15.2/includes/DefaultSettings.php
-===================================================================
---- mediawiki-1.15.2.orig/includes/DefaultSettings.php 2010-03-08 16:52:50.000000000 -0600
-+++ mediawiki-1.15.2/includes/DefaultSettings.php 2010-03-15 12:03:01.000000000 -0500
-@@ -3714,7 +3714,7 @@
+--- mediawiki-1.18.0.orig/includes/DefaultSettings.php
++++ mediawiki-1.18.0/includes/DefaultSettings.php
+@@ -3873,8 +3873,11 @@
+ * the MediaWiki package and have latex, dvips, gs (ghostscript), andconvert
+ * (ImageMagick) installed and available in the PATH.
+ * Please see math/README for more information.
++ * For Debian, install the mediawiki-math package and the following line will
++ * use the system texvc binary
*/
$wgUseTeX = false;
- /** Location of the texvc binary */
--$wgTexvc = $IP . '/math/texvc';
+$wgTexvc = '/usr/bin/texvc';
- /**
- * Texvc background color
- * use LaTeX color format as used in \special function
+
+ /* @} */ # end LaTeX }
+
Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules 2012-01-14 23:50:00 UTC (rev 294)
+++ mediawiki/trunk/debian/rules 2012-01-15 00:00:42 UTC (rev 295)
@@ -8,17 +8,6 @@
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
# Then check manually if everything's ok
-DEB_DH_SHLIBDEPS_ARGS := -Xdebian/mediawiki-math/usr/bin/texvc.bc
-
-
-build/mediawiki-math:: $(MANPAGES)
- if [ -x /usr/bin/ocamlopt ]; then\
- make -C math texvc;\
- else\
- make -C math texvc.bc;\
- mv math/texvc.bc math/texvc;\
- fi
-
%.1: %.xml
xsltproc -nonet -o $@ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
@@ -31,32 +20,33 @@
dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
"`echo "$$i" | sed -e s#debian/mediawiki/usr/share/mediawiki/#var/lib/mediawiki/#`"; \
done
+ # Use system javascript libraries
+ rm debian/mediawiki/usr/share/mediawiki/resources/jquery/jquery.js
+ rm debian/mediawiki/usr/share/mediawiki/resources/jquery.tipsy/jquery.tipsy.js
+ dh_link usr/share/javascript/jquery/jquery.min.js usr/share/mediawiki/resources/jquery/jquery.js
+ dh_link usr/share/javascript/jquery-tipsy/jquery.tipsy.min.js usr/share/mediawiki/resources/jquery.tipsy/jquery.tipsy.js; \
+ for lib in cookie form tablesorter; do \
+ rm debian/mediawiki/usr/share/mediawiki/resources/jquery/jquery.$$lib.js; \
+ dh_link usr/share/javascript/jquery-$$lib/jquery.$$lib.min.js usr/share/mediawiki/resources/jquery/jquery.$$lib.js; \
+ echo $$lib; \
+ done
# Remove Makefiles
find debian/mediawiki/ -iname makefile -exec rm {} \;
# License added to copyright file:
rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/ksh/LICENSE
+ rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
+ rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
+ rm -f debian/mediawiki/var/lib/mediawiki/extensions/ParserFunctions/COPYING
# Put debian version for mediawiki version..
sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
-binary-install/mediawiki-math::
- if [ -x /usr/bin/ocamlopt ]; then\
- echo "interpreter:Depends=" >> debian/mediawiki-math.substvars;\
- else\
- echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki-math.substvars;\
- fi
-
-
binary-predeb/mediawiki::
find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
-binary-predeb/mediawiki-math::
- find debian/mediawiki-math -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
-
clean::
rm -f $(MANPAGES)
- [ ! -d math ] || make -C math clean
debconf-updatepo
More information about the Pkg-mediawiki-commits
mailing list