Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/263023
Change subject: Remove jquery.validate.js, and assorted changes ...................................................................... Remove jquery.validate.js, and assorted changes * Remove jquery.validate.js due to lintian missing source warnings. It has also been removed upstream in 4a40a5d21729008e. * The version is now +dfsg, and the uscan repack code will add that suffix. * Remove outdated $Id lines from SVN * Properly suppress lintian false positive for an oojs-ui file Change-Id: I6cde512dbcf2c33ea2adbcb326ef4cba071f8312 --- M changelog M copyright M mediawiki.lintian-overrides M mediawiki.prerm A patches/remove_jquery_validate_definition.patch M patches/series A source/lintian-overrides M watch 8 files changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/23/263023/1 diff --git a/changelog b/changelog index 4b0aa5a..554beb2 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,4 @@ -mediawiki (1:1.25.5-1) unstable; urgency=medium +mediawiki (1:1.25.5+dfsg-1) unstable; urgency=medium * Upgraded to new upstream release * Remove unneeded patches diff --git a/copyright b/copyright index 7847968..e1bc31a 100644 --- a/copyright +++ b/copyright @@ -2,6 +2,7 @@ Upstream-Name: MediaWiki Upstream-Contact: Kunal Mehta <[email protected]> Source: https://releases.wikimedia.org/mediawiki/ +Files-Excluded: resources/lib/jquery/jquery.validate.js Files: * Copyright: 2001-2015, MediaWiki developers diff --git a/mediawiki.lintian-overrides b/mediawiki.lintian-overrides index 7959408..6d8ac94 100644 --- a/mediawiki.lintian-overrides +++ b/mediawiki.lintian-overrides @@ -1,6 +1,3 @@ -# $Id: mediawiki.lintian-overrides 554 2014-06-26 07:57:33Z tg $ -#- - # this is ok, a Conflicts is not needed mediawiki: breaks-without-version mediawiki-extensions-fckeditor @@ -36,6 +33,3 @@ # MediaWiki has local patches and a newer version mediawiki: embedded-php-library usr/share/mediawiki/extensions-core/SyntaxHighlight_GeSHi/geshi/geshi.php please use php-geshi -# These files are fine -mediawiki: source-is-missing resources/lib/jquery/jquery.validate.js -mediawiki: source-is-missing vendor/oojs/oojs-ui/demos/pages/dialogs.js diff --git a/mediawiki.prerm b/mediawiki.prerm index 535bcd2..051c146 100644 --- a/mediawiki.prerm +++ b/mediawiki.prerm @@ -1,5 +1,4 @@ #!/bin/sh -# $Id: mediawiki.prerm 522 2014-03-24 09:00:57Z tg $ # From MirOS: contrib/hosted/tg/deb/jupp/debian/jupp.prerm,v 1.4 2011/09/06 20:07:39 tg Exp $ set -e diff --git a/patches/remove_jquery_validate_definition.patch b/patches/remove_jquery_validate_definition.patch new file mode 100644 index 0000000..ca1953b --- /dev/null +++ b/patches/remove_jquery_validate_definition.patch @@ -0,0 +1,14 @@ +Index: mediawiki-1.25.5/resources/Resources.php +=================================================================== +--- mediawiki-1.25.5.orig/resources/Resources.php 2015-12-20 17:02:09.000000000 -0800 ++++ mediawiki-1.25.5/resources/Resources.php 2016-01-07 16:17:03.573909964 -0800 +@@ -316,9 +316,6 @@ + 'scripts' => 'resources/lib/jquery/jquery.ba-throttle-debounce.js', + 'targets' => array( 'desktop', 'mobile' ), + ), +- 'jquery.validate' => array( +- 'scripts' => 'resources/lib/jquery/jquery.validate.js', +- ), + 'jquery.xmldom' => array( + 'scripts' => 'resources/lib/jquery/jquery.xmldom.js', + ), diff --git a/patches/series b/patches/series index 44ab27c..1646ce2 100644 --- a/patches/series +++ b/patches/series @@ -1,2 +1,3 @@ +remove_jquery_validate_definition.patch mimetypes.patch debian_specific_config.patch diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 0000000..65284de --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,2 @@ +# lintian bug +mediawiki: source-is-missing vendor/oojs/oojs-ui/demos/pages/dialogs.js diff --git a/watch b/watch index c448cf6..50e9689 100644 --- a/watch +++ b/watch @@ -1,4 +1,4 @@ version=3 -opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \ -https://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz \ +opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/,repacksuffix=+dfsg" \ +https://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz -- To view, visit https://gerrit.wikimedia.org/r/263023 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cde512dbcf2c33ea2adbcb326ef4cba071f8312 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
