[grass] 11/20: Move image files to /usr/share, symlink them from /usr/lib.

Bas Couwenberg sebastic at xs4all.nl
Wed Sep 3 22:27:16 UTC 2014 

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

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

commit 1efea680e0edd3e6f6a5e0bc4c3be209b0f1b8fd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 23 12:50:14 2014 +0200

    Move image files to /usr/share, symlink them from /usr/lib.
---
 debian/changelog            |  1 +
 debian/grass-gui.dirs       |  1 +
 debian/grass-gui.dirs.in    |  1 +
 debian/grass-gui.install    |  5 +++++
 debian/grass-gui.install.in |  5 +++++
 debian/grass-gui.links      | 43 +++++++++++++++++++++++++++++++++++++++++++
 debian/grass-gui.links.in   | 43 +++++++++++++++++++++++++++++++++++++++++++
 debian/rules                | 20 +++++++++++++++++++-
 8 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b54cc04..d402d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Don't use hardening-includes, but dpkg-buildflags only.
   * Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
   * Add lintian overrides for hardening-no-fortify-functions false positives.
+  * Move image files to /usr/share, symlink them from /usr/lib.
 
  -- M. Hamish Bowman <hamish.webmail at gmail.com>  Mon, 11 Aug 2014 18:09:42 +1200
 
diff --git a/debian/grass-gui.dirs b/debian/grass-gui.dirs
new file mode 100644
index 0000000..badba4a
--- /dev/null
+++ b/debian/grass-gui.dirs
@@ -0,0 +1 @@
+usr/share/grass64
diff --git a/debian/grass-gui.dirs.in b/debian/grass-gui.dirs.in
new file mode 100644
index 0000000..f9ab983
--- /dev/null
+++ b/debian/grass-gui.dirs.in
@@ -0,0 +1 @@
+usr/share/grass at VERSION@
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
index 8d4aa01..a0bb9b5 100644
--- a/debian/grass-gui.install
+++ b/debian/grass-gui.install
@@ -9,3 +9,8 @@ usr/lib/grass64/etc/v.digit
 usr/lib/grass64/etc/wxpython
 usr/lib/grass64/bin/v.digit
 usr/lib/grass64/bin/xganim
+usr/share/grass64/bwidget
+usr/share/grass64/etc/dm
+usr/share/grass64/etc/gm
+usr/share/grass64/etc/gui
+usr/share/grass64/etc/nviz2.2
diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in
index 046ab8f..901a003 100644
--- a/debian/grass-gui.install.in
+++ b/debian/grass-gui.install.in
@@ -9,3 +9,8 @@ usr/lib/grass at VERSION@/etc/v.digit
 usr/lib/grass at VERSION@/etc/wxpython
 usr/lib/grass at VERSION@/bin/v.digit
 usr/lib/grass at VERSION@/bin/xganim
+usr/share/grass at VERSION@/bwidget
+usr/share/grass at VERSION@/etc/dm
+usr/share/grass at VERSION@/etc/gm
+usr/share/grass at VERSION@/etc/gui
+usr/share/grass at VERSION@/etc/nviz2.2
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
new file mode 100644
index 0000000..28abf0b
--- /dev/null
+++ b/debian/grass-gui.links
@@ -0,0 +1,43 @@
+usr/share/grass64/bwidget/images usr/lib/grass64/bwidget/images
+usr/share/grass64/etc/dm/barscale.gif usr/lib/grass64/etc/dm/barscale.gif
+usr/share/grass64/etc/dm/chart.gif usr/lib/grass64/etc/dm/chart.gif
+usr/share/grass64/etc/dm/cmd.gif usr/lib/grass64/etc/dm/cmd.gif
+usr/share/grass64/etc/dm/columns.gif usr/lib/grass64/etc/dm/columns.gif
+usr/share/grass64/etc/dm/copy.gif usr/lib/grass64/etc/dm/copy.gif
+usr/share/grass64/etc/dm/cut.gif usr/lib/grass64/etc/dm/cut.gif
+usr/share/grass64/etc/dm/dig.gif usr/lib/grass64/etc/dm/dig.gif
+usr/share/grass64/etc/dm/display.all.gif usr/lib/grass64/etc/dm/display.all.gif
+usr/share/grass64/etc/dm/display.gif usr/lib/grass64/etc/dm/display.gif
+usr/share/grass64/etc/dm/display.region.gif usr/lib/grass64/etc/dm/display.region.gif
+usr/share/grass64/etc/dm/dtext.gif usr/lib/grass64/etc/dm/dtext.gif
+usr/share/grass64/etc/dm/erase.gif usr/lib/grass64/etc/dm/erase.gif
+usr/share/grass64/etc/dm/fly.gif usr/lib/grass64/etc/dm/fly.gif
+usr/share/grass64/etc/dm/frames.gif usr/lib/grass64/etc/dm/frames.gif
+usr/share/grass64/etc/dm/fttext.gif usr/lib/grass64/etc/dm/fttext.gif
+usr/share/grass64/etc/dm/grass.gif usr/lib/grass64/etc/dm/grass.gif
+usr/share/grass64/etc/dm/grid.gif usr/lib/grass64/etc/dm/grid.gif
+usr/share/grass64/etc/dm/group.gif usr/lib/grass64/etc/dm/group.gif
+usr/share/grass64/etc/dm/intro.gif usr/lib/grass64/etc/dm/intro.gif
+usr/share/grass64/etc/dm/labels.gif usr/lib/grass64/etc/dm/labels.gif
+usr/share/grass64/etc/dm/legend.gif usr/lib/grass64/etc/dm/legend.gif
+usr/share/grass64/etc/dm/measure.gif usr/lib/grass64/etc/dm/measure.gif
+usr/share/grass64/etc/dm/new.gif usr/lib/grass64/etc/dm/new.gif
+usr/share/grass64/etc/dm/nviz.gif usr/lib/grass64/etc/dm/nviz.gif
+usr/share/grass64/etc/dm/open.gif usr/lib/grass64/etc/dm/open.gif
+usr/share/grass64/etc/dm/pan.gif usr/lib/grass64/etc/dm/pan.gif
+usr/share/grass64/etc/dm/position.gif usr/lib/grass64/etc/dm/position.gif
+usr/share/grass64/etc/dm/print.gif usr/lib/grass64/etc/dm/print.gif
+usr/share/grass64/etc/dm/query.gif usr/lib/grass64/etc/dm/query.gif
+usr/share/grass64/etc/dm/raster.gif usr/lib/grass64/etc/dm/raster.gif
+usr/share/grass64/etc/dm/rgbhis.gif usr/lib/grass64/etc/dm/rgbhis.gif
+usr/share/grass64/etc/dm/save.gif usr/lib/grass64/etc/dm/save.gif
+usr/share/grass64/etc/dm/thematic.gif usr/lib/grass64/etc/dm/thematic.gif
+usr/share/grass64/etc/dm/vector.gif usr/lib/grass64/etc/dm/vector.gif
+usr/share/grass64/etc/dm/xganim.gif usr/lib/grass64/etc/dm/xganim.gif
+usr/share/grass64/etc/dm/zoom.back.gif usr/lib/grass64/etc/dm/zoom.back.gif
+usr/share/grass64/etc/dm/zoom.gif usr/lib/grass64/etc/dm/zoom.gif
+usr/share/grass64/etc/gm/intro.gif usr/lib/grass64/etc/gm/intro.gif
+usr/share/grass64/etc/gui/icons usr/lib/grass64/etc/gui/icons
+usr/share/grass64/etc/gui/images usr/lib/grass64/etc/gui/images
+usr/share/grass64/etc/nviz2.2/bitmaps/flythrough usr/lib/grass64/etc/nviz2.2/bitmaps/flythrough
+usr/share/grass64/etc/nviz2.2/bitmaps/trash.gif usr/lib/grass64/etc/nviz2.2/bitmaps/trash.gif
diff --git a/debian/grass-gui.links.in b/debian/grass-gui.links.in
new file mode 100644
index 0000000..1383995
--- /dev/null
+++ b/debian/grass-gui.links.in
@@ -0,0 +1,43 @@
+usr/share/grass at VERSION@/bwidget/images usr/lib/grass at VERSION@/bwidget/images
+usr/share/grass at VERSION@/etc/dm/barscale.gif usr/lib/grass at VERSION@/etc/dm/barscale.gif
+usr/share/grass at VERSION@/etc/dm/chart.gif usr/lib/grass at VERSION@/etc/dm/chart.gif
+usr/share/grass at VERSION@/etc/dm/cmd.gif usr/lib/grass at VERSION@/etc/dm/cmd.gif
+usr/share/grass at VERSION@/etc/dm/columns.gif usr/lib/grass at VERSION@/etc/dm/columns.gif
+usr/share/grass at VERSION@/etc/dm/copy.gif usr/lib/grass at VERSION@/etc/dm/copy.gif
+usr/share/grass at VERSION@/etc/dm/cut.gif usr/lib/grass at VERSION@/etc/dm/cut.gif
+usr/share/grass at VERSION@/etc/dm/dig.gif usr/lib/grass at VERSION@/etc/dm/dig.gif
+usr/share/grass at VERSION@/etc/dm/display.all.gif usr/lib/grass at VERSION@/etc/dm/display.all.gif
+usr/share/grass at VERSION@/etc/dm/display.gif usr/lib/grass at VERSION@/etc/dm/display.gif
+usr/share/grass at VERSION@/etc/dm/display.region.gif usr/lib/grass at VERSION@/etc/dm/display.region.gif
+usr/share/grass at VERSION@/etc/dm/dtext.gif usr/lib/grass at VERSION@/etc/dm/dtext.gif
+usr/share/grass at VERSION@/etc/dm/erase.gif usr/lib/grass at VERSION@/etc/dm/erase.gif
+usr/share/grass at VERSION@/etc/dm/fly.gif usr/lib/grass at VERSION@/etc/dm/fly.gif
+usr/share/grass at VERSION@/etc/dm/frames.gif usr/lib/grass at VERSION@/etc/dm/frames.gif
+usr/share/grass at VERSION@/etc/dm/fttext.gif usr/lib/grass at VERSION@/etc/dm/fttext.gif
+usr/share/grass at VERSION@/etc/dm/grass.gif usr/lib/grass at VERSION@/etc/dm/grass.gif
+usr/share/grass at VERSION@/etc/dm/grid.gif usr/lib/grass at VERSION@/etc/dm/grid.gif
+usr/share/grass at VERSION@/etc/dm/group.gif usr/lib/grass at VERSION@/etc/dm/group.gif
+usr/share/grass at VERSION@/etc/dm/intro.gif usr/lib/grass at VERSION@/etc/dm/intro.gif
+usr/share/grass at VERSION@/etc/dm/labels.gif usr/lib/grass at VERSION@/etc/dm/labels.gif
+usr/share/grass at VERSION@/etc/dm/legend.gif usr/lib/grass at VERSION@/etc/dm/legend.gif
+usr/share/grass at VERSION@/etc/dm/measure.gif usr/lib/grass at VERSION@/etc/dm/measure.gif
+usr/share/grass at VERSION@/etc/dm/new.gif usr/lib/grass at VERSION@/etc/dm/new.gif
+usr/share/grass at VERSION@/etc/dm/nviz.gif usr/lib/grass at VERSION@/etc/dm/nviz.gif
+usr/share/grass at VERSION@/etc/dm/open.gif usr/lib/grass at VERSION@/etc/dm/open.gif
+usr/share/grass at VERSION@/etc/dm/pan.gif usr/lib/grass at VERSION@/etc/dm/pan.gif
+usr/share/grass at VERSION@/etc/dm/position.gif usr/lib/grass at VERSION@/etc/dm/position.gif
+usr/share/grass at VERSION@/etc/dm/print.gif usr/lib/grass at VERSION@/etc/dm/print.gif
+usr/share/grass at VERSION@/etc/dm/query.gif usr/lib/grass at VERSION@/etc/dm/query.gif
+usr/share/grass at VERSION@/etc/dm/raster.gif usr/lib/grass at VERSION@/etc/dm/raster.gif
+usr/share/grass at VERSION@/etc/dm/rgbhis.gif usr/lib/grass at VERSION@/etc/dm/rgbhis.gif
+usr/share/grass at VERSION@/etc/dm/save.gif usr/lib/grass at VERSION@/etc/dm/save.gif
+usr/share/grass at VERSION@/etc/dm/thematic.gif usr/lib/grass at VERSION@/etc/dm/thematic.gif
+usr/share/grass at VERSION@/etc/dm/vector.gif usr/lib/grass at VERSION@/etc/dm/vector.gif
+usr/share/grass at VERSION@/etc/dm/xganim.gif usr/lib/grass at VERSION@/etc/dm/xganim.gif
+usr/share/grass at VERSION@/etc/dm/zoom.back.gif usr/lib/grass at VERSION@/etc/dm/zoom.back.gif
+usr/share/grass at VERSION@/etc/dm/zoom.gif usr/lib/grass at VERSION@/etc/dm/zoom.gif
+usr/share/grass at VERSION@/etc/gm/intro.gif usr/lib/grass at VERSION@/etc/gm/intro.gif
+usr/share/grass at VERSION@/etc/gui/icons usr/lib/grass at VERSION@/etc/gui/icons
+usr/share/grass at VERSION@/etc/gui/images usr/lib/grass at VERSION@/etc/gui/images
+usr/share/grass at VERSION@/etc/nviz2.2/bitmaps/flythrough usr/lib/grass at VERSION@/etc/nviz2.2/bitmaps/flythrough
+usr/share/grass at VERSION@/etc/nviz2.2/bitmaps/trash.gif usr/lib/grass at VERSION@/etc/nviz2.2/bitmaps/trash.gif
diff --git a/debian/rules b/debian/rules
index fc72e07..a2005b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ versions:
 templates: $(patsubst %.in,%,$(wildcard debian/*.in))
 
 debian/% :: debian/%.in
-	sed -e 's/@VERSION@/$(VERSION)/' -e 's/@ABI@/$(ABI)/' $< >$@
+	sed -e 's/@VERSION@/$(VERSION)/g' -e 's/@ABI@/$(ABI)/g' $< >$@
 
 configure: config.status
 config.status: 
@@ -235,6 +235,24 @@ install-arch: build-arch
 	ln -fs /usr/lib/$(shell objdump -p /usr/lib/`gdal-config --libs | cut -d' ' -f2 | sed -e 's/-l/lib/'`.so | grep SONAME | cut -d' ' -f18) \
 		debian/tmp/usr/lib/$(BASE_NAME)/lib/libgdal.so
 
+	# Move image files from /usr/lib/$(BASE_NAME) to /usr/share/$(BASE_NAME)
+	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/bwidget
+	mv debian/tmp/usr/lib/$(BASE_NAME)/bwidget/images/ debian/tmp/usr/share/$(BASE_NAME)/bwidget/
+
+	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/etc/dm
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/dm/*.gif debian/tmp/usr/share/$(BASE_NAME)/etc/dm/
+
+	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/etc/gm
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/gm/intro.gif debian/tmp/usr/share/$(BASE_NAME)/etc/gm/
+
+	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/etc/gui
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/gui/icons/ debian/tmp/usr/share/$(BASE_NAME)/etc/gui/
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/gui/images/ debian/tmp/usr/share/$(BASE_NAME)/etc/gui/
+
+	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/etc/nviz2.2/bitmaps
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/bitmaps/flythrough/ debian/tmp/usr/share/$(BASE_NAME)/etc/nviz2.2/bitmaps/
+	mv debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/bitmaps/trash.gif debian/tmp/usr/share/$(BASE_NAME)/etc/nviz2.2/bitmaps/
+
 install-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i

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