[grass] 04/04: Use dynamic list of wxpython images files to move to use /usr/share.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Apr 10 00:42:53 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master-svn
in repository grass.

commit 54ab9cace93f2a81ea2e5882dd782ba9b213bd62
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 9 22:31:04 2016 +0200

    Use dynamic list of wxpython images files to move to use /usr/share.
---
 debian/changelog          |  1 +
 debian/grass-gui.links    | 73 ++++++-------------------------------
 debian/grass-gui.links.in | 73 ++++++-------------------------------
 debian/rules              | 92 ++++++-----------------------------------------
 4 files changed, 33 insertions(+), 206 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 819e1a2..d81e313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ grass (7.1.svn20160409-1) UNRELEASED; urgency=medium
   * Drop explicit python-numpy dependency, included in ${python:Depends}
     via dh_numpy.
   * Have dh_python & dh_numpy act on specific packages only.
+  * Use dynamic list of wxpython images files to move to use /usr/share.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Apr 2016 12:50:12 +0200
 
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
old mode 100644
new mode 100755
index dc6407d..85b0b0e
--- a/debian/grass-gui.links
+++ b/debian/grass-gui.links
@@ -1,65 +1,14 @@
+#!/bin/sh
+
+cat <<DIRS
 usr/share/grass71/gui/icons  usr/lib/grass71/gui/icons
 usr/share/grass71/gui/images usr/lib/grass71/gui/images
+DIRS
 
-usr/share/grass71/gui/wxpython/animation/wxGUI_animation_tool.jpg               usr/lib/grass71/gui/wxpython/animation/wxGUI_animation_tool.jpg
-usr/share/grass71/gui/wxpython/dbmgr/dbmgr_frame.jpg                            usr/lib/grass71/gui/wxpython/dbmgr/dbmgr_frame.jpg
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_avg_map.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_avg_map.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_avg_run.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_avg_run.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_comment.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_comment.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_db.png                   usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_db.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_dlg_module.png           usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_dlg_module.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_intermediate_data.png    usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_intermediate_data.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_items.png                usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_items.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop.png                 usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop_dlg.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop_dlg.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop_final.png           usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_loop_final.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_lower_toolbar.png        usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_lower_toolbar.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mcomment.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mcomment.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mdb.png                  usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mdb.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mloop.png                usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mloop.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mmodule.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mmodule.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mmodulex.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mmodulex.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_avg.png            usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_avg.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_classification.png usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_classification.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_landslides.png     usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_landslides.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_properties.png     usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_properties.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_usle.png           usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_model_usle.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1o.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1o.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2o.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2o.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3o.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3o.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modul.png                usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modul.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modulex.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_modulex.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mraster.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mraster.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mraster3d.png            usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mraster3d.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mrelation.png            usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mrelation.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mvector.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_mvector.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_parameter.png            usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_parameter.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python.png               usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python_code.png          usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python_code.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python_code_result.png   usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_python_code_result.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_raster.png               usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_raster.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_raster3d.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_raster3d.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_relation.png             usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_relation.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_toolbar.png              usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_toolbar.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables.png            usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables_raster.png     usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables_raster.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables_run.png        usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_variables_run.png
-usr/share/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_vector.png               usr/lib/grass71/gui/wxpython/gmodeler/g_gui_gmodeler_vector.png
-usr/share/grass71/gui/wxpython/iclass/iclass_frame.jpg                          usr/lib/grass71/gui/wxpython/iclass/iclass_frame.jpg
-usr/share/grass71/gui/wxpython/mapswipe/mapswipe_tsunami.jpg                    usr/lib/grass71/gui/wxpython/mapswipe/mapswipe_tsunami.jpg
-usr/share/grass71/gui/wxpython/psmap/psmap_frame.jpg                            usr/lib/grass71/gui/wxpython/psmap/psmap_frame.jpg
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_1.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_1.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_2.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_2.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_3.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_3.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_4.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_4.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_5.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_5.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_6.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_6.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_7.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_7.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_8.png                    usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_8.png
-usr/share/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png         usr/lib/grass71/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png
-usr/share/grass71/gui/wxpython/timeline/timeline_2D.jpg                         usr/lib/grass71/gui/wxpython/timeline/timeline_2D.jpg
-usr/share/grass71/gui/wxpython/tplot/tplot.png                                  usr/lib/grass71/gui/wxpython/tplot/tplot.png
-usr/share/grass71/gui/wxpython/vdigit/vdigit_toolbar.jpg                        usr/lib/grass71/gui/wxpython/vdigit/vdigit_toolbar.jpg
+if [ -e debian/grass-gui.image-file-in-usr-lib.list ]; then \
+        while read file; do \
+		share=`echo "$file" | sed 's/debian\/tmp\/usr\/lib\//usr\/share\//'` ; \
+		lib=`echo "$file" | sed 's/debian\/tmp\///'` ; \
+		echo "$share $lib" ; \
+	done < debian/grass-gui.image-file-in-usr-lib.list ; \
+fi
diff --git a/debian/grass-gui.links.in b/debian/grass-gui.links.in
index ad56e57..26ed913 100644
--- a/debian/grass-gui.links.in
+++ b/debian/grass-gui.links.in
@@ -1,65 +1,14 @@
+#!/bin/sh
+
+cat <<DIRS
 usr/share/grass at VERSION@/gui/icons  usr/lib/grass at VERSION@/gui/icons
 usr/share/grass at VERSION@/gui/images usr/lib/grass at VERSION@/gui/images
+DIRS
 
-usr/share/grass at VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg               usr/lib/grass at VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg
-usr/share/grass at VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg                            usr/lib/grass at VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_avg_map.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_avg_map.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_avg_run.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_avg_run.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_comment.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_comment.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_db.png                   usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_db.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_dlg_module.png           usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_dlg_module.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_intermediate_data.png    usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_intermediate_data.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_items.png                usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_items.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop.png                 usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop_dlg.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop_dlg.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop_final.png           usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_loop_final.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_lower_toolbar.png        usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_lower_toolbar.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mcomment.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mcomment.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mdb.png                  usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mdb.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mloop.png                usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mloop.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mmodule.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mmodule.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mmodulex.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mmodulex.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_avg.png            usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_avg.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_classification.png usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_classification.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_landslides.png     usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_landslides.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_properties.png     usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_properties.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_usle.png           usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_model_usle.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1o.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1o.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2o.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2o.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3o.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3o.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modul.png                usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modul.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modulex.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_modulex.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mraster.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mraster.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mraster3d.png            usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mraster3d.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mrelation.png            usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mrelation.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mvector.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_mvector.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_parameter.png            usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_parameter.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python.png               usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python_code.png          usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python_code.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python_code_result.png   usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_python_code_result.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_raster.png               usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_raster.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_raster3d.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_raster3d.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_relation.png             usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_relation.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_toolbar.png              usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_toolbar.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables.png            usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables_raster.png     usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables_raster.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables_run.png        usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_variables_run.png
-usr/share/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_vector.png               usr/lib/grass at VERSION@/gui/wxpython/gmodeler/g_gui_gmodeler_vector.png
-usr/share/grass at VERSION@/gui/wxpython/iclass/iclass_frame.jpg                          usr/lib/grass at VERSION@/gui/wxpython/iclass/iclass_frame.jpg
-usr/share/grass at VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg                    usr/lib/grass at VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg
-usr/share/grass at VERSION@/gui/wxpython/psmap/psmap_frame.jpg                            usr/lib/grass at VERSION@/gui/wxpython/psmap/psmap_frame.jpg
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_1.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_1.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_2.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_2.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_3.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_3.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_4.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_4.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_5.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_5.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_6.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_6.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_7.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_7.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_8.png                    usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_8.png
-usr/share/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png         usr/lib/grass at VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png
-usr/share/grass at VERSION@/gui/wxpython/timeline/timeline_2D.jpg                         usr/lib/grass at VERSION@/gui/wxpython/timeline/timeline_2D.jpg
-usr/share/grass at VERSION@/gui/wxpython/tplot/tplot.png                                  usr/lib/grass at VERSION@/gui/wxpython/tplot/tplot.png
-usr/share/grass at VERSION@/gui/wxpython/vdigit/vdigit_toolbar.jpg                        usr/lib/grass at VERSION@/gui/wxpython/vdigit/vdigit_toolbar.jpg
+if [ -e debian/grass-gui.image-file-in-usr-lib.list ]; then \
+        while read file; do \
+		share=`echo "$file" | sed 's/debian\/tmp\/usr\/lib\//usr\/share\//'` ; \
+		lib=`echo "$file" | sed 's/debian\/tmp\///'` ; \
+		echo "$share $lib" ; \
+	done < debian/grass-gui.image-file-in-usr-lib.list ; \
+fi
diff --git a/debian/rules b/debian/rules
index fc89dfa..7535c0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ templates:
 	dh $@ --with autotools_dev,python2 --parallel
 
 override_dh_clean:
-	dh_clean build-arch-stamp install-arch-stamp
+	dh_clean build-arch-stamp install-arch-stamp debian/grass-gui.image-file-in-usr-lib.list
 
 	$(RM) lib/proj/nad2bin
 	$(RM) tools/timer/main.o
@@ -195,87 +195,15 @@ install-arch-stamp:
 	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/icons/  debian/tmp/usr/share/$(BASE_NAME)/gui/
 	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/images/ debian/tmp/usr/share/$(BASE_NAME)/gui/
 
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/animation
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/animation/wxGUI_animation_tool.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/animation/
-	
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/dbmgr
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/dbmgr/dbmgr_frame.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/dbmgr/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_avg_map.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_avg_run.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_comment.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_db.png                   debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_dlg_module.png           debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_intermediate_data.png    debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_items.png                debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_loop.png                 debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_loop_dlg.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_loop_final.png           debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_lower_toolbar.png        debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mcomment.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mdb.png                  debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mloop.png                debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mmodule.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mmodulex.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_model_avg.png            debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_model_classification.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_model_landslides.png     debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_model_properties.png     debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_model_usle.png           debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_1o.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_2o.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modis_3o.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modul.png                debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_modulex.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mraster.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mraster3d.png            debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mrelation.png            debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_mvector.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_parameter.png            debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_python.png               debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_python_code.png          debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_python_code_result.png   debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_raster.png               debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_raster3d.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_relation.png             debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_toolbar.png              debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_variables.png            debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_variables_raster.png     debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_variables_run.png        debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/g_gui_gmodeler_vector.png               debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/iclass
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/iclass/iclass_frame.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/iclass/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/mapswipe
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/mapswipe/mapswipe_tsunami.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/mapswipe/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/psmap
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/psmap/psmap_frame.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/psmap/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_1.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_2.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_3.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_4.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_5.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_6.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_7.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_8.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/rlisetup/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/timeline
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/timeline/timeline_2D.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/timeline/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/tplot
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/tplot/tplot.png debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/tplot/
-
-	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/vdigit
-	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/vdigit/vdigit_toolbar.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/vdigit/
+	find debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/ -type f \( -name "*.jpg" -or -name "*.png" \) -print | sort > debian/grass-gui.image-file-in-usr-lib.list
+
+	while read file; do \
+		dir=`dirname "$$file" | sed 's/usr\/lib\//usr\/share\//'` ; \
+		if [ ! -e "$$dir" ]; then \
+			mkdir -p "$$dir" ; \
+		fi ; \
+		mv "$$file" "$$dir" ; \
+	done < debian/grass-gui.image-file-in-usr-lib.list
 
 	# Remove empty files
 	find debian/tmp/ -type f -empty -name "class_graphical*" -print -delete

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git



More information about the Pkg-grass-devel mailing list