[Git][debian-gis-team/pyspectral][master] 2 commits: Align paths in install & links files.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / pyspectral


Commits:
1fbe7814 by Bas Couwenberg at 2018-12-29T20:20:15Z
Align paths in install & links files.

- - - - -
10185752 by Bas Couwenberg at 2018-12-29T20:20:48Z
Reorder rules in order of execution.

- - - - -


3 changed files:

- debian/python3-pyspectral-doc.install
- debian/python3-pyspectral-doc.links
- debian/rules


Changes:

=====================================
debian/python3-pyspectral-doc.install
=====================================
@@ -1,2 +1,2 @@
 debian/png/mersi2_rsr_band_0040_0070_missingbands.png usr/share/doc/python3-pyspectral/html/_static
-debian/png/mersi2_rsr_band_0040_0070.png usr/share/doc/python3-pyspectral/html/_static
+debian/png/mersi2_rsr_band_0040_0070.png              usr/share/doc/python3-pyspectral/html/_static


=====================================
debian/python3-pyspectral-doc.links
=====================================
@@ -1,10 +1,10 @@
-usr/share/doc/python3-pyspectral/html/_static/mersi2_rsr_band_0040_0070.png usr/share/doc/python3-pyspectral/html/_images/mersi2_rsr_band_0040_0070.png
-usr/share/doc/python3-pyspectral/html/_static/mersi2_rsr_band_0040_0070_missingbands.png usr/share/doc/python3-pyspectral/html/_images/mersi2_rsr_band_0040_0070_missingbands.png
-usr/share/doc/python3-pyspectral/html/_static/olci_ch1.png usr/share/doc/python3-pyspectral/html/_images/olci_ch1.png
-usr/share/doc/python3-pyspectral/html/_static/pyspectral_header_montage.png usr/share/doc/python3-pyspectral/html/_images/pyspectral_header_montage.png
-usr/share/doc/python3-pyspectral/html/_static/rsr_band_1080.png usr/share/doc/python3-pyspectral/html/_images/rsr_band_1080.png
-usr/share/doc/python3-pyspectral/html/_static/rsr_band_M10.png usr/share/doc/python3-pyspectral/html/_images/rsr_band_M10.png
-usr/share/doc/python3-pyspectral/html/_static/solar_irradiance.png usr/share/doc/python3-pyspectral/html/_images/solar_irradiance.png
-usr/share/doc/python3-pyspectral/html/_static/solar_irradiance_wnum.png usr/share/doc/python3-pyspectral/html/_images/solar_irradiance_wnum.png
-usr/share/doc/python3-pyspectral/html/_static/sun-satellite-viewing.png usr/share/doc/python3-pyspectral/html/_images/sun-satellite-viewing.png
+usr/share/doc/python3-pyspectral/html/_static/mersi2_rsr_band_0040_0070.png                                usr/share/doc/python3-pyspectral/html/_images/mersi2_rsr_band_0040_0070.png
+usr/share/doc/python3-pyspectral/html/_static/mersi2_rsr_band_0040_0070_missingbands.png                   usr/share/doc/python3-pyspectral/html/_images/mersi2_rsr_band_0040_0070_missingbands.png
+usr/share/doc/python3-pyspectral/html/_static/olci_ch1.png                                                 usr/share/doc/python3-pyspectral/html/_images/olci_ch1.png
+usr/share/doc/python3-pyspectral/html/_static/pyspectral_header_montage.png                                usr/share/doc/python3-pyspectral/html/_images/pyspectral_header_montage.png
+usr/share/doc/python3-pyspectral/html/_static/rsr_band_1080.png                                            usr/share/doc/python3-pyspectral/html/_images/rsr_band_1080.png
+usr/share/doc/python3-pyspectral/html/_static/rsr_band_M10.png                                             usr/share/doc/python3-pyspectral/html/_images/rsr_band_M10.png
+usr/share/doc/python3-pyspectral/html/_static/solar_irradiance.png                                         usr/share/doc/python3-pyspectral/html/_images/solar_irradiance.png
+usr/share/doc/python3-pyspectral/html/_static/solar_irradiance_wnum.png                                    usr/share/doc/python3-pyspectral/html/_images/solar_irradiance_wnum.png
+usr/share/doc/python3-pyspectral/html/_static/sun-satellite-viewing.png                                    usr/share/doc/python3-pyspectral/html/_images/sun-satellite-viewing.png
 usr/share/doc/python3-pyspectral/html/_static/truecolor_composite_20170518_nrk_reception_cropped_thumb.png usr/share/doc/python3-pyspectral/html/_images/truecolor_composite_20170518_nrk_reception_cropped_thumb.png


=====================================
debian/rules
=====================================
@@ -13,13 +13,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r *.egg-info
 
-override_dh_auto_install:
-	dh_auto_install
-
-	for f in debian/tmp/usr/bin/*.py; do \
-		mv $$f $$(dirname $$f)/$$(basename $$f .py);\
-	done
-
 override_dh_auto_build: export http_proxy=127.0.0.1:9
 override_dh_auto_build: export https_proxy=127.0.0.1:9
 override_dh_auto_build:
@@ -28,3 +21,10 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. python3 -m sphinx -N -bhtml doc build/html # HTML generator
 	# PYTHONPATH=. python3 -m sphinx -N -bman doc build/man # Manpage generator
 endif
+
+override_dh_auto_install:
+	dh_auto_install
+
+	for f in debian/tmp/usr/bin/*.py; do \
+		mv $$f $$(dirname $$f)/$$(basename $$f .py);\
+	done



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyspectral/compare/18a9e71ebfcb3175d10fc310fd24cbe1ddf4da96...1018575212e17c1007ec7714325f2fd2d7cc89b2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyspectral/compare/18a9e71ebfcb3175d10fc310fd24cbe1ddf4da96...1018575212e17c1007ec7714325f2fd2d7cc89b2
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/20181229/8837091e/attachment-0001.html>