[Git][debian-gis-team/python-cartopy][master] 4 commits: Don't install subdirectories twice. (closes: #921886)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-cartopy


Commits:
9732b1ff by Bas Couwenberg at 2019-02-10T07:58:55Z
Don't install subdirectories twice. (closes: #921886)

- - - - -
537e2795 by Bas Couwenberg at 2019-02-10T07:58:56Z
Fix symlinks to python-cartopy-data provided directories. (closes: #921887)

- - - - -
d3dc1866 by Bas Couwenberg at 2019-02-10T07:58:56Z
Don't include test output in binary packages.

- - - - -
3e166ab3 by Bas Couwenberg at 2019-02-10T07:58:56Z
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/python-cartopy-data.install
- debian/python-cartopy.link → debian/python-cartopy.links
- debian/python3-cartopy.link → debian/python3-cartopy.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
-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 at debian.org>  Tue, 25 Dec 2018 23:05:43 +0100
+ -- Bas Couwenberg <sebastic at 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
=====================================
@@ -1,3 +1,3 @@
-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/python-cartopy.link → debian/python-cartopy.links
=====================================


=====================================
debian/python3-cartopy.link → debian/python3-cartopy.links
=====================================


=====================================
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



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/6a5c66774c9185c6eadc11cfa077ed3b45901b0c...3e166ab3be6dbb4fbbfd805e06046bde55969945

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/compare/6a5c66774c9185c6eadc11cfa077ed3b45901b0c...3e166ab3be6dbb4fbbfd805e06046bde55969945
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190210/42c9ee95/attachment-0001.html>