debian/changelog

-python-cartopy (0.17.0+dfsg-3) UNRELEASED; urgency=medium
+python-cartopy (0.17.0+dfsg-3) unstable; urgency=medium
 
+  * Team upload.
   * Bump Standards-Version to 4.3.0, no changes.
+  * Don't install subdirectories twice.
+    (closes: #921886)
+  * Fix symlinks to python-cartopy-data provided directories.
+    (closes: #921887)
+  * Don't include test output in binary packages.
 
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Dec 2018 23:05:43 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 10 Feb 2019 08:45:15 +0100
 
 python-cartopy (0.17.0+dfsg-2) unstable; urgency=medium
 

debian/python-cartopy-data.install

-lib/cartopy/data/raster               usr/share/cartopy/data/raster
-lib/cartopy/data/shapefiles           usr/share/cartopy/data/shapefiles
-lib/cartopy/tests/mpl/baseline_images usr/share/cartopy/tests/mpl/baseline_images
+lib/cartopy/data/raster               usr/share/cartopy/data/
+lib/cartopy/data/shapefiles           usr/share/cartopy/data/
+lib/cartopy/tests/mpl/baseline_images usr/share/cartopy/tests/mpl/

debian/rules

@@ -36,10 +36,10 @@ override_dh_install:
 	dh_install
 
 	# Remove documentation outside usr/share/doc
-	$(RM) debian/*/usr/share/cartopy/data/shapefiles/shapefiles/gshhs/README.TXT
+	$(RM) debian/*/usr/share/cartopy/data/shapefiles/gshhs/README.TXT
 
-	# Remove executable bit from lock files
-	chmod -x debian/*/usr/lib/python*/dist-packages/cartopy_test_output/*/*.lock
+	# Don't include test output
+	$(RM) -r debian/*/usr/lib/python*/dist-packages/cartopy_test_output
 
 override_dh_python2:
 	dh_python2