[grass] 06/06: 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:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository grass.
commit 97bb7624a3d248f0061b5b001849ad5979c7ae0b
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 | 29 +++++++++++-----------------
debian/grass-gui.links.in | 29 +++++++++++-----------------
debian/rules | 48 ++++++++++-------------------------------------
4 files changed, 33 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d68f133..b0fddd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ grass (7.0.3-4) 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 20:20:29 +0200
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
old mode 100644
new mode 100755
index b12ca07..a7d7736
--- a/debian/grass-gui.links
+++ b/debian/grass-gui.links
@@ -1,21 +1,14 @@
+#!/bin/sh
+
+cat <<DIRS
usr/share/grass70/gui/icons usr/lib/grass70/gui/icons
usr/share/grass70/gui/images usr/lib/grass70/gui/images
+DIRS
-usr/share/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg
-usr/share/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg
-usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.png
-usr/share/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass70/gui/wxpython/iclass/iclass_frame.jpg
-usr/share/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg
-usr/share/grass70/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass70/gui/wxpython/psmap/psmap_frame.jpg
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png
-usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sample_areas.png
-usr/share/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass70/gui/wxpython/timeline/timeline_2D.jpg
-usr/share/grass70/gui/wxpython/tplot/tplot.png usr/lib/grass70/gui/wxpython/tplot/tplot.png
-usr/share/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass70/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 f79f433..26ed913 100644
--- a/debian/grass-gui.links.in
+++ b/debian/grass-gui.links.in
@@ -1,21 +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/gmodeler_frame.png usr/lib/grass at VERSION@/gui/wxpython/gmodeler/gmodeler_frame.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 dee5c23..21d5c2c 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
@@ -190,46 +190,18 @@ install-arch-stamp:
# Move image files from /usr/lib/$(BASE_NAME) to /usr/share/$(BASE_NAME)
mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui
- mv debian/tmp/usr/lib/$(BASE_NAME)/gui/icons/ debian/tmp/usr/share/$(BASE_NAME)/gui/
+ 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/
+ 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
- mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/gmodeler
- mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/gmodeler/gmodeler_frame.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/
+ 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
touch $@
--
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