diff -Nru speedtest-cli-0.3.0/debian/changelog speedtest-cli-0.3.1/debian/changelog --- speedtest-cli-0.3.0/debian/changelog 2014-07-17 06:52:18.000000000 +0000 +++ speedtest-cli-0.3.1/debian/changelog 2014-10-04 10:03:51.000000000 +0000 @@ -1,7 +1,19 @@ -speedtest-cli (0.3.0-1) unstable; urgency=medium +speedtest-cli (0.3.1-1) unstable; urgency=medium * New upstream version + * Update standards version to 3.9.6 + + -- Jonathan Carter Sat, 04 Oct 2014 10:40:38 +0200 + +speedtest-cli (0.3.0-2) unstable; urgency=medium + + * Add embedded twosix code license (Closes: #760907) + -- Jonathan Carter Thu, 02 Oct 2014 20:44:15 +0200 + +speedtest-cli (0.3.0-1) unstable; urgency=medium + + * New upstream version * Upload sponsored by Petter Reinholdtsen. -- Jonathan Carter Wed, 16 Jul 2014 20:18:09 +0200 diff -Nru speedtest-cli-0.3.0/debian/control speedtest-cli-0.3.1/debian/control --- speedtest-cli-0.3.0/debian/control 2014-04-12 19:53:11.000000000 +0000 +++ speedtest-cli-0.3.1/debian/control 2014-10-04 09:38:51.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jonathan Carter Build-Depends: debhelper (>= 9.0.0), python, python-setuptools -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://github.com/sivel/speedtest-cli/ XS-Python-Version: >= 2.7 diff -Nru speedtest-cli-0.3.0/debian/copyright speedtest-cli-0.3.1/debian/copyright --- speedtest-cli-0.3.0/debian/copyright 2014-02-13 18:13:43.000000000 +0000 +++ speedtest-cli-0.3.1/debian/copyright 2014-10-02 13:55:01.000000000 +0000 @@ -6,6 +6,10 @@ Copyright: 2013 Matt Martz License: Apache-2.0 +Files: speedtest_cli.py +Copyright: "print_()" is Copyright (c) 2010-2014 Benjamin Peterson +License: Expat + Files: debian/* Copyright: 2014 Jonathan Carter License: Apache-2.0 @@ -26,3 +30,21 @@ On Debian systems, the complete text of the Apache License 2.0 can be found in "/usr/share/common-licenses/Apache-2.0" +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff -Nru speedtest-cli-0.3.0/speedtest_cli.py speedtest-cli-0.3.1/speedtest_cli.py --- speedtest-cli-0.3.0/speedtest_cli.py 2014-06-28 00:37:02.000000000 +0000 +++ speedtest-cli-0.3.1/speedtest_cli.py 2014-08-05 17:56:05.000000000 +0000 @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -__version__ = '0.3.0' +__version__ = '0.3.1' # Some global variables we use source = None @@ -342,7 +342,7 @@ distance """ - uh = urlopen('http://c.speedtest.net/speedtest-servers-static.php') + uh = urlopen('http://www.speedtest.net/speedtest-servers-static.php') serversxml = [] while 1: serversxml.append(uh.read(10240)) @@ -412,7 +412,7 @@ h.request("GET", urlparts[2]) r = h.getresponse() total = (timeit.default_timer() - start) - except (HTTPError, URLError): + except (HTTPError, URLError, socket.error): cum.append(3600) continue text = r.read(9)