Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/debian/changelog
+++ b/debian/changelog
 python-cartopy (0.16.0+dfsg1-1) unstable; urgency=medium

+  [ Antonio Valentino ]
  * New upstream release (Closes: #854167).
  * Update copyright file.
  * Set compat to 11.
@@ -25,6 +26,20 @@ python-cartopy (0.16.0+dfsg1-1) unstable; urgency=medium
  * debian/rules
    - switch to pytst

+  [ Bas Couwenberg ]
+  * Update Repository URL to use HTTPS in upstream metadata.
+  * Update Homepage URL to use HTTPS.
+  * Reorder dependencies.
+  * Capitalize first letter in short description.
+  * Update watch file to handle common issues.
+  * Update copyright file, changes:
+    - Use standalone license paragraphs
+    - Fix PSF license terms (Python-2.0)
+    - Use standard public-domain license shortname
+  * Update gbp.conf conform the Debian GIS Policy.
+  * Refresh patches.
+  * Align paths in install and link files.
+
 -- Antonio Valentino <antonio.valentino@tiscali.it>  Fri, 08 Jun 2018 20:18:37 +0000

 python-cartopy (0.14.2+dfsg1-2) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@@ -31,22 +31,22 @@ Build-Depends: cython,
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-cartopy
 Vcs-Git: https://salsa.debian.org/debian-gis-team/python-cartopy.git
-Homepage: http://scitools.org.uk/cartopy/
+Homepage: https://scitools.org.uk/cartopy/

 Package: python-cartopy
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${python:Depends},
+Depends: python-cartopy-data (= ${source:Version}),
         ${shlibs:Depends},
-         python-cartopy-data (= ${source:Version})
+         ${python:Depends},
+         ${misc:Depends}
 Suggests: python-gdal,
          python-matplotlib,
          python-owslib,
          python-pil,
          python-pyepsg,
          python-scipy
-Description: cartographic library for Python 2
+Description: Cartographic library for Python 2
 Cartopy is a Python package designed to make drawing maps for data analysis
 and visualisation easy.
 .
@@ -64,17 +64,17 @@ Description: cartographic library for Python 2
 Package: python3-cartopy
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${python3:Depends},
+Depends: python-cartopy-data (= ${source:Version}),
         ${shlibs:Depends},
-         python-cartopy-data (= ${source:Version})
+         ${python3:Depends},
+         ${misc:Depends}
 Suggests: python3-gdal,
          python3-matplotlib,
          python3-owslib,
          python3-pil,
          python3-pyepsg,
          python3-scipy
-Description: cartographic library for Python 3
+Description: Cartographic library for Python 3
 Cartopy is a Python package designed to make drawing maps for data analysis
 and visualisation easy.
 .

--- a/debian/copyright
+++ b/debian/copyright
@@ -11,67 +11,59 @@ Comment: The upstream release is repacked in order to exclude the non-free
 Files-Excluded: lib/cartopy/data/netcdf/*

 Files: *
-Copyright: British Crown Copyright 2010 - 2018, Met Office
+Copyright:            British Crown
+           2010-2018, Met Office
+License: LGPL-3+
+
+Files: docs/source/_static/version_switch.js
+Copyright: 2013, Python Software Foundation
+License: Python-2.0
+
+Files: docs/source/sphinxext/plot_directive.py
+Copyright: 2012-2016, The matplotlib development team
+Comment: This file is lifted from the change proposed in
+ <https://github.com/matplotlib/matplotlib/pull/6213>.
+License: matplotlib
+
+Files: lib/cartopy/data/raster/natural_earth/*
+Copyright: None
+Comment: http://www.naturalearthdata.com/about/terms-of-use/
+License: public-domain
+ All versions of Natural Earth raster + vector map data found on this website
+ are in the public domain. You may use the maps in any manner, including
+ modifying the content and design, electronic dissemination, and offset
+ printing. The primary authors, Tom Patterson and Nathaniel Vaughn Kelso, and
+ all other contributors renounce all financial claim to the maps and invites
+ you to use them for personal, educational, and commercial purposes.
+ .
+ No permission is needed to use Natural Earth. Crediting the authors is
+ unnecessary.
+
+Files: lib/cartopy/data/raster/sample/*
+Copyright: None
+Comment: https://earthdata.nasa.gov/faq#ed-rapid-response-faq
+License: public-domain
+ All Rapid Response images are in the public domain and can be freely used and
+ reproduced for any purpose.
+
+Files: lib/cartopy/data/shapefiles/gshhs/*
+Copyright: Paul Wessel and Walter H. F. Smith
+Comment: http://www.soest.hawaii.edu/pwessel/gshhg/
 License: LGPL-3+

 Files: debian/*
-Copyright: 2016 Ghislain Antony Vaillant <ghisvail@gmail.com>
+Copyright: 2016, Ghislain Antony Vaillant <ghisvail@gmail.com>
 License: LGPL-3+

-Files: docs/source/_static/version_switch.js
-Copyright: 2013 Python Software Foundation
-License: PSF
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
- .
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF hereby
- grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
- analyze, test, perform and/or display publicly, prepare derivative works,
- distribute, and otherwise use Python alone or in any derivative version,
- provided, however, that PSF's License Agreement and PSF's notice of copyright,
- i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- 2011, 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version prepared by
- Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee.  This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
+License: LGPL-3+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; version 3 of the License, or (at
+ your option) any later version.
 .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
+ On Debian systems, the complete text of version 3 of the GNU Lesser
+ General Public License can be found in `/usr/share/common-licenses/LGPL-3'.

-Files: docs/source/sphinxext/plot_directive.py
-Copyright: 2012-2016 The matplotlib development team
 License: matplotlib
 License agreement for matplotlib versions 1.3.0 and later
 =========================================================
@@ -122,40 +114,197 @@ License: matplotlib
 8. By copying, installing or otherwise using matplotlib ,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
-Comment: This file is lifted from the change proposed in
- <https://github.com/matplotlib/matplotlib/pull/6213>.

-Files: lib/cartopy/data/raster/natural_earth/*
-Copyright: None
-License: Public-Domain-1
- All versions of Natural Earth raster + vector map data found on this website
- are in the public domain. You may use the maps in any manner, including
- modifying the content and design, electronic dissemination, and offset
- printing. The primary authors, Tom Patterson and Nathaniel Vaughn Kelso, and
- all other contributors renounce all financial claim to the maps and invites
- you to use them for personal, educational, and commercial purposes.
+License: Python-2.0
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
 .
- No permission is needed to use Natural Earth. Crediting the authors is
- unnecessary.
-Comment: http://www.naturalearthdata.com/about/terms-of-use/
-
-Files: lib/cartopy/data/raster/sample/*
-Copyright: None
-License: Public-Domain-2
- All Rapid Response images are in the public domain and can be freely used and
- reproduced for any purpose.
-Comment: https://earthdata.nasa.gov/faq#ed-rapid-response-faq
-
-Files: lib/cartopy/data/shapefiles/gshhs/*
-Copyright: Paul Wessel and Walter H. F. Smith
-License: LGPL-3+
-Comment: http://www.soest.hawaii.edu/pwessel/gshhg/
-
-License: LGPL-3+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; version 3 of the License, or (at
- your option) any later version.
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
 .
- On Debian systems, the complete text of version 3 of the GNU Lesser
- General Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+ Reserved" are retained in Python alone or in any derivative version
+ prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+ .
+ BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+ -------------------------------------------
+ .
+ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+ .
+ 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+ office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+ Individual or Organization ("Licensee") accessing and otherwise using
+ this software in source or binary form and its associated
+ documentation ("the Software").
+ .
+ 2. Subject to the terms and conditions of this BeOpen Python License
+ Agreement, BeOpen hereby grants Licensee a non-exclusive,
+ royalty-free, world-wide license to reproduce, analyze, test, perform
+ and/or display publicly, prepare derivative works, distribute, and
+ otherwise use the Software alone or in any derivative version,
+ provided, however, that the BeOpen Python License is retained in the
+ Software, alone or in any derivative version prepared by Licensee.
+ .
+ 3. BeOpen is making the Software available to Licensee on an "AS IS"
+ basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+ SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+ AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+ DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 5. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 6. This License Agreement shall be governed by and interpreted in all
+ respects by the law of the State of California, excluding conflict of
+ law provisions. Nothing in this License Agreement shall be deemed to
+ create any relationship of agency, partnership, or joint venture
+ between BeOpen and Licensee. This License Agreement does not grant
+ permission to use BeOpen trademarks or trade names in a trademark
+ sense to endorse or promote products or services of Licensee, or any
+ third party. As an exception, the "BeOpen Python" logos available at
+ http://www.pythonlabs.com/logos.html may be used according to the
+ permissions granted on that web page.
+ .
+ 7. By copying, installing or otherwise using the software, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+ .
+ CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1)
+ --------------------------------------------------
+ .
+ IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
+ .
+ BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING,
+ INSTALLING OR OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE
+ DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
+ AGREEMENT.
+ .
+ 1. This LICENSE AGREEMENT is between the Corporation for National
+ Research Initiatives, having an office at 1895 Preston White Drive,
+ Reston, VA 20191 ("CNRI"), and the Individual or Organization
+ ("Licensee") accessing and otherwise using Python 1.6, beta 1
+ software in source or binary form and its associated documentation,
+ as released at the www.python.org Internet site on August 4, 2000
+ ("Python 1.6b1").
+ .
+ 2. Subject to the terms and conditions of this License Agreement, CNRI
+ hereby grants Licensee a non-exclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display
+ publicly, prepare derivative works, distribute, and otherwise use
+ Python 1.6b1 alone or in any derivative version, provided, however,
+ that CNRIs License Agreement is retained in Python 1.6b1, alone or
+ in any derivative version prepared by Licensee.
+ .
+ Alternately, in lieu of CNRIs License Agreement, Licensee may
+ substitute the following text (omitting the quotes): "Python 1.6,
+ beta 1, is made available subject to the terms and conditions in
+ CNRIs License Agreement. This Agreement may be located on the
+ Internet using the following unique, persistent identifier (known
+ as a handle): 1895.22/1011. This Agreement may also be obtained
+ from a proxy server on the Internet using the
+ URL:http://hdl.handle.net/1895.22/1011".
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python 1.6b1 or any part thereof, and wants to make
+ the derivative work available to the public as provided herein,
+ then Licensee hereby agrees to indicate in any such work the nature
+ of the modifications made to Python 1.6b1.
+ .
+ 4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS"
+ basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
+ FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6b1
+ WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+ SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+ LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY
+ THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. This License Agreement shall be governed by and interpreted in all
+ respects by the law of the State of Virginia, excluding conflict of
+ law provisions. Nothing in this License Agreement shall be deemed
+ to create any relationship of agency, partnership, or joint venture
+ between CNRI and Licensee. This License Agreement does not grant
+ permission to use CNRI trademarks or trade name in a trademark
+ sense to endorse or promote products or services of Licensee, or
+ any third party.
+ .
+ 8. By clicking on the "ACCEPT" button where indicated, or by copying,
+ installing or otherwise using Python 1.6b1, Licensee agrees to be
+ bound by the terms and conditions of this License Agreement.
+ .
+ ACCEPT
+ .
+ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+ --------------------------------------------------
+ .
+ Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+ The Netherlands. All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Stichting Mathematisch
+ Centrum or CWI not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.
+ .
+ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
 [DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
 upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
 debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
 upstream-tag = upstream/%(version)s
-debian-tag = debian/%(version)s
-sign-tags = True
+
+# Always use pristine-tar.
 pristine-tar = True
--- a/debian/patches/0001-Skip-tests-failing-on-i386-architectures.patch
+++ b/debian/patches/0001-Skip-tests-failing-on-i386-architectures.patch
@@ -2,15 +2,9 @@ From: Ghislain Antony Vaillant <ghisvail@gmail.com>
 Date: Sat, 14 Jan 2017 10:26:34 +0000
 Subject: Skip tests failing on i386 architectures

---
- lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
-index b6fb853..92abf8c 100644
 --- a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
 +++ b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
-@@ -22,6 +22,10 @@ from numpy.testing import assert_almost_equal
+@@ -22,6 +22,10 @@ from numpy.testing import assert_almost_
 
 import cartopy.crs as ccrs
 
@@ -21,7 +15,7 @@ index b6fb853..92abf8c 100644
 
 class TestLambertAzimuthalEqualArea(object):
     def test_default(self):
-@@ -33,9 +37,10 @@ class TestLambertAzimuthalEqualArea(object):
+@@ -33,9 +37,10 @@ class TestLambertAzimuthalEqualArea(obje
         assert_almost_equal(np.array(crs.x_limits),
                             [-12755636.1863, 12755636.1863],
                             decimal=4)

--- a/debian/patches/0002-Compatibility-with-proj5+over.patch
+++ b/debian/patches/0002-Compatibility-with-proj5+over.patch
@@ -4,13 +4,7 @@ Subject: Compatibility with proj5 +over

 See also https://github.com/OSGeo/proj.4/issues/985 and
 https://github.com/OSGeo/proj.4/issues/941.
---
- lib/cartopy/crs.py                     | 3 ++-
- lib/cartopy/tests/crs/test_mercator.py | 8 ++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)

-diff --git a/lib/cartopy/crs.py b/lib/cartopy/crs.py
-index 57fb8c0..ee2bda7 100644
 --- a/lib/cartopy/crs.py
 +++ b/lib/cartopy/crs.py
 @@ -964,7 +964,8 @@ class Mercator(Projection):
@@ -23,8 +17,6 @@ index 57fb8c0..ee2bda7 100644
         super(Mercator, self).__init__(proj4_params, globe=globe)
 
         # Calculate limits.
-diff --git a/lib/cartopy/tests/crs/test_mercator.py b/lib/cartopy/tests/crs/test_mercator.py
-index 522d5e9..5c04935 100644
 --- a/lib/cartopy/tests/crs/test_mercator.py
 +++ b/lib/cartopy/tests/crs/test_mercator.py
 @@ -26,7 +26,7 @@ def test_default():

--- a/debian/patches/0003-Compatibility-with-proj5-TM.patch
+++ b/debian/patches/0003-Compatibility-with-proj5-TM.patch
@@ -2,12 +2,6 @@ From: Antonio Valentino <antonio.valentino@tiscali.it>
 Date: Mon, 21 May 2018 22:08:04 +0000
 Subject: Compatibility with proj5 TM

---
- lib/cartopy/tests/crs/test_transverse_mercator.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/cartopy/tests/crs/test_transverse_mercator.py b/lib/cartopy/tests/crs/test_transverse_mercator.py
-index c25439f..f32fd79 100644
 --- a/lib/cartopy/tests/crs/test_transverse_mercator.py
 +++ b/lib/cartopy/tests/crs/test_transverse_mercator.py
 @@ -97,8 +97,8 @@ class TestOSNI(object):

--- a/debian/python-cartopy-data.install
+++ b/debian/python-cartopy-data.install
--- a/debian/python-cartopy.link
+++ b/debian/python-cartopy.link
--- a/debian/python3-cartopy.link
+++ b/debian/python3-cartopy.link
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -2,5 +2,5 @@ Bug-Database: https://github.com/SciTools/cartopy/issues
 Bug-Submit: https://github.com/SciTools/cartopy/issues/new
 Changelog: https://github.com/SciTools/cartopy/blob/master/docs/source/whats_new.rst
 Name: cartopy
-Repository: git@github.com:SciTools/cartopy.git
+Repository: https://github.com/SciTools/cartopy.git
 Repository-Browse: https://github.com/SciTools/cartopy
--- a/debian/watch
+++ b/debian/watch
 version=4
-opts=repacksuffix=+dfsg1,\
-dversionmangle=s/\+dfsg(\.?\d+)?$//,\
-uversionmangle=s/(rc|a|b|c)/~$1/,\
-filenamemangle=s/.+\/v?@ANY_VERSION@\.tar\.gz/cartopy-$1\.tar\.gz/ \
-https://github.com/SciTools/cartopy/tags .*/v?@ANY_VERSION@\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|c|beta|b|alpha|a)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*?)?(?:rel|v|cartopy)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/cartopy-$1.$2/,\
+repacksuffix=+dfsg \
+https://github.com/SciTools/cartopy/tags \
+(?:.*?/)?(?:rel|v|cartopy)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))