diff -Nru python-coverage-4.2+dfsg.1/debian/changelog python-coverage-4.2+dfsg.1/debian/changelog --- python-coverage-4.2+dfsg.1/debian/changelog 2016-09-24 00:03:52.000000000 -0500 +++ python-coverage-4.2+dfsg.1/debian/changelog 2017-05-23 13:23:23.000000000 -0500 @@ -1,3 +1,11 @@ +python-coverage (4.2+dfsg.1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Remove bundled javascript, prefer system libraries + (Closes: bug#740893) + + -- eevel Tue, 23 May 2017 13:19:41 -0500 + python-coverage (4.2+dfsg.1-2) unstable; urgency=medium * The “Niloy Neel” release. @@ -5,8 +13,7 @@ * Update my email address for Debian work. * debian/README.source: * Much more detail about how to build the source package from VCS. - * Specify current VCS for Debian packaging work. - * Convert UScan configuration to format version 4. + * Specify current VCS for Debian packaging work. * Convert UScan configuration to format version 4. * Add invocations of command-line programs to autopkgtests. Closes: bug#827464. Thanks to Barry Warsaw for the report. * Configure Sphinx build system to allow import of code during build. diff -Nru python-coverage-4.2+dfsg.1/debian/patches/fix_js.patch python-coverage-4.2+dfsg.1/debian/patches/fix_js.patch --- python-coverage-4.2+dfsg.1/debian/patches/fix_js.patch 1969-12-31 18:00:00.000000000 -0600 +++ python-coverage-4.2+dfsg.1/debian/patches/fix_js.patch 2017-05-23 17:06:30.000000000 -0500 @@ -0,0 +1,205 @@ +Description: + python-coverage (4.2+dfsg.1-2.1) UNRELEASED; urgency=medium + . + * Non-maintainer upload. + * Remove bundled javascript, prefer system libraries + (Closes: bug#740893) +Author: eevel +Bug-Debian: https://bugs.debian.org/740893 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: python-coverage-4.2+dfsg.1/coverage/html.py +=================================================================== +--- python-coverage-4.2+dfsg.1.orig/coverage/html.py ++++ python-coverage-4.2+dfsg.1/coverage/html.py +@@ -26,6 +26,7 @@ STATIC_PATH = [ + "/usr/share/javascript", + + # Our htmlfiles directory. ++ # As a fix for #740893, defer to system JS libraries. + os.path.join(os.path.dirname(__file__), "htmlfiles"), + ] + +@@ -73,7 +74,7 @@ def write_html(fname, html): + class HtmlReporter(Reporter): + """HTML reporting.""" + +- # These files will be copied from the htmlfiles directory to the output ++ # These files will be copied from /usr/share/javascript or the htmlfiles directory to the output + # directory. + STATIC_FILES = [ + ("style.css", ""), +Index: python-coverage-4.2+dfsg.1/coverage/htmlfiles/jquery.hotkeys.js +=================================================================== +--- python-coverage-4.2+dfsg.1.orig/coverage/htmlfiles/jquery.hotkeys.js ++++ /dev/null +@@ -1,99 +0,0 @@ +-/* +- * jQuery Hotkeys Plugin +- * Copyright 2010, John Resig +- * Dual licensed under the MIT or GPL Version 2 licenses. +- * +- * Based upon the plugin by Tzury Bar Yochay: +- * http://github.com/tzuryby/hotkeys +- * +- * Original idea by: +- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ +-*/ +- +-(function(jQuery){ +- +- jQuery.hotkeys = { +- version: "0.8", +- +- specialKeys: { +- 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", +- 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", +- 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", +- 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", +- 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", +- 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", +- 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta" +- }, +- +- shiftNums: { +- "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", +- "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", +- ".": ">", "/": "?", "\\": "|" +- } +- }; +- +- function keyHandler( handleObj ) { +- // Only care when a possible input has been specified +- if ( typeof handleObj.data !== "string" ) { +- return; +- } +- +- var origHandler = handleObj.handler, +- keys = handleObj.data.toLowerCase().split(" "); +- +- handleObj.handler = function( event ) { +- // Don't fire in text-accepting inputs that we didn't directly bind to +- if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || +- event.target.type === "text") ) { +- return; +- } +- +- // Keypress represents characters, not special keys +- var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], +- character = String.fromCharCode( event.which ).toLowerCase(), +- key, modif = "", possible = {}; +- +- // check combinations (alt|ctrl|shift+anything) +- if ( event.altKey && special !== "alt" ) { +- modif += "alt+"; +- } +- +- if ( event.ctrlKey && special !== "ctrl" ) { +- modif += "ctrl+"; +- } +- +- // TODO: Need to make sure this works consistently across platforms +- if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { +- modif += "meta+"; +- } +- +- if ( event.shiftKey && special !== "shift" ) { +- modif += "shift+"; +- } +- +- if ( special ) { +- possible[ modif + special ] = true; +- +- } else { +- possible[ modif + character ] = true; +- possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; +- +- // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" +- if ( modif === "shift+" ) { +- possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; +- } +- } +- +- for ( var i = 0, l = keys.length; i < l; i++ ) { +- if ( possible[ keys[i] ] ) { +- return origHandler.apply( this, arguments ); +- } +- } +- }; +- } +- +- jQuery.each([ "keydown", "keyup", "keypress" ], function() { +- jQuery.event.special[ this ] = { add: keyHandler }; +- }); +- +-})( jQuery ); +Index: python-coverage-4.2+dfsg.1/coverage/htmlfiles/jquery.isonscreen.js +=================================================================== +--- python-coverage-4.2+dfsg.1.orig/coverage/htmlfiles/jquery.isonscreen.js ++++ /dev/null +@@ -1,53 +0,0 @@ +-/* Copyright (c) 2010 +- * @author Laurence Wheway +- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) +- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. +- * +- * @version 1.2.0 +- */ +-(function($) { +- jQuery.extend({ +- isOnScreen: function(box, container) { +- //ensure numbers come in as intgers (not strings) and remove 'px' is it's there +- for(var i in box){box[i] = parseFloat(box[i])}; +- for(var i in container){container[i] = parseFloat(container[i])}; +- +- if(!container){ +- container = { +- left: $(window).scrollLeft(), +- top: $(window).scrollTop(), +- width: $(window).width(), +- height: $(window).height() +- } +- } +- +- if( box.left+box.width-container.left > 0 && +- box.left < container.width+container.left && +- box.top+box.height-container.top > 0 && +- box.top < container.height+container.top +- ) return true; +- return false; +- } +- }) +- +- +- jQuery.fn.isOnScreen = function (container) { +- for(var i in container){container[i] = parseFloat(container[i])}; +- +- if(!container){ +- container = { +- left: $(window).scrollLeft(), +- top: $(window).scrollTop(), +- width: $(window).width(), +- height: $(window).height() +- } +- } +- +- if( $(this).offset().left+$(this).width()-container.left > 0 && +- $(this).offset().left < container.width+container.left && +- $(this).offset().top+$(this).height()-container.top > 0 && +- $(this).offset().top < container.height+container.top +- ) return true; +- return false; +- } +-})(jQuery); diff -Nru python-coverage-4.2+dfsg.1/debian/patches/series python-coverage-4.2+dfsg.1/debian/patches/series --- python-coverage-4.2+dfsg.1/debian/patches/series 2016-09-24 00:03:52.000000000 -0500 +++ python-coverage-4.2+dfsg.1/debian/patches/series 2017-05-23 14:21:36.000000000 -0500 @@ -2,3 +2,4 @@ 02.rename-public-programs.patch 03.rename-debounce-library.patch 04.sphinx-add-code-path.patch +fix_js.patch