[Pkg-mediawiki-commits] r361 - mediawiki/experimental/debian

[Thorsten Glaser]

Author: tg
Date: 2012-07-26 15:27:25 +0000 (Thu, 26 Jul 2012)
New Revision: 361

Modified:
   mediawiki/experimental/debian/changelog
   mediawiki/experimental/debian/control
   mediawiki/experimental/debian/rules
   mediawiki/experimental/debian/watch
Log:
oh well, it wasn't enough

* add myself to uploaders (if anyone complains, no need to merge
  this back into trunk from experimental when such thing is done;
  if not, okay)
* shut lintian up a bit


Modified: mediawiki/experimental/debian/changelog
===================================================================
--- mediawiki/experimental/debian/changelog	2012-07-26 15:09:07 UTC (rev 360)
+++ mediawiki/experimental/debian/changelog	2012-07-26 15:27:25 UTC (rev 361)
@@ -3,8 +3,9 @@
   * Fix invalid XHTML caused by code not honouring $wgHtml5
   * Quell some PHP warnings from sloppy code
   * Do the wfSuppressWarnings patch used with FusionForge right
+  * Add myself to Uploaders and quieten lintian a bit
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jul 2012 17:05:48 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 26 Jul 2012 17:26:36 +0200
 
 mediawiki (1:1.19.1-2) UNRELEASED; urgency=low
 

Modified: mediawiki/experimental/debian/control
===================================================================
--- mediawiki/experimental/debian/control	2012-07-26 15:09:07 UTC (rev 360)
+++ mediawiki/experimental/debian/control	2012-07-26 15:27:25 UTC (rev 361)
@@ -2,7 +2,7 @@
 Section: web
 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>
+Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>, Thorsten Glaser <tg at mirbsd.de>
 Build-Depends: debhelper (>= 9),
  dh-buildinfo,
  ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf

Modified: mediawiki/experimental/debian/rules
===================================================================
--- mediawiki/experimental/debian/rules	2012-07-26 15:09:07 UTC (rev 360)
+++ mediawiki/experimental/debian/rules	2012-07-26 15:27:25 UTC (rev 361)
@@ -6,9 +6,14 @@
 
 override_dh_install:
 	dh_install
+	# Ugh. This is easier than patching, though.
+	chmod a+x debian/mediawiki/usr/share/mediawiki/includes/normal/UtfNormalTest2.php
 	# Now some tidying up is required
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/compare_schemas.pl
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/mediawiki_mysql2postgres.pl
+	chmod a+x debian/mediawiki/var/lib/mediawiki/extensions/ConfirmEdit/captcha.py
+	chmod a-x debian/mediawiki/usr/share/mediawiki/resources/jquery/images/marker.png
+	chmod a-x debian/mediawiki/var/lib/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
 	find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
 	while read i; do \
 		dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
@@ -33,6 +38,7 @@
 	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
+	rm -f debian/mediawiki/var/lib/mediawiki/extensions/Nuke/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

Modified: mediawiki/experimental/debian/watch
===================================================================
--- mediawiki/experimental/debian/watch	2012-07-26 15:09:07 UTC (rev 360)
+++ mediawiki/experimental/debian/watch	2012-07-26 15:27:25 UTC (rev 361)
@@ -1,8 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3