[grass] 05/18: Update custom installation for GRASS 7.
Bas Couwenberg
sebastic at xs4all.nl
Sat Jan 24 02:03:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit 99cea04f36ca0a6b808af1c6b10168b5ac602e70
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 23 17:46:26 2015 +0100
Update custom installation for GRASS 7.
Changes:
- Also install 64x64 icon
- Also install AppStream metadata
- Don't install etc/{bwidget,dm,gm,nviz2.2}, removed upstream.
- Don't install SUBMITTING_*, removed upstream.
- Update paths for GUI icons & images.
- Update paths for programming-manual.
---
debian/grass-core.dirs | 1 +
debian/grass-core.dirs.in | 1 +
debian/grass-core.docs | 4 ---
debian/grass-core.install | 1 +
debian/grass-core.install.in | 1 +
debian/grass-doc.doc-base | 2 +-
debian/grass-gui.install | 18 ++------------
debian/grass-gui.install.in | 18 ++------------
debian/grass-gui.links | 45 ++-------------------------------
debian/grass-gui.links.in | 45 ++-------------------------------
debian/rules | 59 ++++++++++++++++----------------------------
11 files changed, 34 insertions(+), 161 deletions(-)
diff --git a/debian/grass-core.dirs b/debian/grass-core.dirs
index a644a80..fd619db 100644
--- a/debian/grass-core.dirs
+++ b/debian/grass-core.dirs
@@ -4,3 +4,4 @@ usr/share/doc/grass-core
usr/share/man
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
+usr/share/icons/hicolor/64x64/apps
diff --git a/debian/grass-core.dirs.in b/debian/grass-core.dirs.in
index b639d94..629871b 100644
--- a/debian/grass-core.dirs.in
+++ b/debian/grass-core.dirs.in
@@ -4,3 +4,4 @@ usr/share/doc/grass-core
usr/share/man
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
+usr/share/icons/hicolor/64x64/apps
diff --git a/debian/grass-core.docs b/debian/grass-core.docs
index 9174f7d..fa5cb3d 100644
--- a/debian/grass-core.docs
+++ b/debian/grass-core.docs
@@ -2,10 +2,6 @@ README
AUTHORS
COPYING
SUBMITTING
-SUBMITTING_DOCS
-SUBMITTING_PYTHON
-SUBMITTING_SCRIPTS
-SUBMITTING_TCLTK
contributors.csv
contributors_extra.csv
translators.csv
diff --git a/debian/grass-core.install b/debian/grass-core.install
index fb97c6c..10aecc4 100644
--- a/debian/grass-core.install
+++ b/debian/grass-core.install
@@ -8,4 +8,5 @@ usr/lib/grass70/lib
usr/lib/grass70/locale
usr/share/icons/hicolor
usr/share/applications
+usr/share/appdata
usr/bin/x-grass
diff --git a/debian/grass-core.install.in b/debian/grass-core.install.in
index 4d1112d..f7ef8f9 100644
--- a/debian/grass-core.install.in
+++ b/debian/grass-core.install.in
@@ -8,4 +8,5 @@ usr/lib/grass at VERSION@/lib
usr/lib/grass at VERSION@/locale
usr/share/icons/hicolor
usr/share/applications
+usr/share/appdata
usr/bin/x-grass
diff --git a/debian/grass-doc.doc-base b/debian/grass-doc.doc-base
index a7708d9..7a095a3 100644
--- a/debian/grass-doc.doc-base
+++ b/debian/grass-doc.doc-base
@@ -10,4 +10,4 @@ Section: Science/Geoscience
Format: HTML
Index: /usr/share/doc/grass-doc/html/index.html
-Files: /usr/share/doc/grass-doc/html/*.html /usr/share/doc/grass-doc/html/gem/*.html /usr/share/doc/grass-doc/html/nviz/*.html
+Files: /usr/share/doc/grass-doc/html/*.html
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
index fcc5668..b2b0442 100644
--- a/debian/grass-gui.install
+++ b/debian/grass-gui.install
@@ -1,16 +1,2 @@
-usr/lib/grass70/bwidget
-usr/lib/grass70/etc/dm
-usr/lib/grass70/etc/form
-usr/lib/grass70/etc/gui
-usr/lib/grass70/etc/gm
-usr/lib/grass70/etc/gtcltk
-usr/lib/grass70/etc/nviz2.2
-usr/lib/grass70/etc/v.digit
-usr/lib/grass70/etc/wxpython
-usr/lib/grass70/bin/v.digit
-usr/lib/grass70/bin/xganim
-usr/share/grass70/bwidget
-usr/share/grass70/etc/dm
-usr/share/grass70/etc/gm
-usr/share/grass70/etc/gui
-usr/share/grass70/etc/nviz2.2
+usr/lib/grass70/gui
+usr/share/grass70/gui
diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in
index 901a003..a9c6e71 100644
--- a/debian/grass-gui.install.in
+++ b/debian/grass-gui.install.in
@@ -1,16 +1,2 @@
-usr/lib/grass at VERSION@/bwidget
-usr/lib/grass at VERSION@/etc/dm
-usr/lib/grass at VERSION@/etc/form
-usr/lib/grass at VERSION@/etc/gui
-usr/lib/grass at VERSION@/etc/gm
-usr/lib/grass at VERSION@/etc/gtcltk
-usr/lib/grass at VERSION@/etc/nviz2.2
-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
+usr/lib/grass at VERSION@/gui
+usr/share/grass at VERSION@/gui
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
index 56b20b5..7a52469 100644
--- a/debian/grass-gui.links
+++ b/debian/grass-gui.links
@@ -1,43 +1,2 @@
-usr/share/grass70/bwidget/images usr/lib/grass70/bwidget/images
-usr/share/grass70/etc/dm/barscale.gif usr/lib/grass70/etc/dm/barscale.gif
-usr/share/grass70/etc/dm/chart.gif usr/lib/grass70/etc/dm/chart.gif
-usr/share/grass70/etc/dm/cmd.gif usr/lib/grass70/etc/dm/cmd.gif
-usr/share/grass70/etc/dm/columns.gif usr/lib/grass70/etc/dm/columns.gif
-usr/share/grass70/etc/dm/copy.gif usr/lib/grass70/etc/dm/copy.gif
-usr/share/grass70/etc/dm/cut.gif usr/lib/grass70/etc/dm/cut.gif
-usr/share/grass70/etc/dm/dig.gif usr/lib/grass70/etc/dm/dig.gif
-usr/share/grass70/etc/dm/display.all.gif usr/lib/grass70/etc/dm/display.all.gif
-usr/share/grass70/etc/dm/display.gif usr/lib/grass70/etc/dm/display.gif
-usr/share/grass70/etc/dm/display.region.gif usr/lib/grass70/etc/dm/display.region.gif
-usr/share/grass70/etc/dm/dtext.gif usr/lib/grass70/etc/dm/dtext.gif
-usr/share/grass70/etc/dm/erase.gif usr/lib/grass70/etc/dm/erase.gif
-usr/share/grass70/etc/dm/fly.gif usr/lib/grass70/etc/dm/fly.gif
-usr/share/grass70/etc/dm/frames.gif usr/lib/grass70/etc/dm/frames.gif
-usr/share/grass70/etc/dm/fttext.gif usr/lib/grass70/etc/dm/fttext.gif
-usr/share/grass70/etc/dm/grass.gif usr/lib/grass70/etc/dm/grass.gif
-usr/share/grass70/etc/dm/grid.gif usr/lib/grass70/etc/dm/grid.gif
-usr/share/grass70/etc/dm/group.gif usr/lib/grass70/etc/dm/group.gif
-usr/share/grass70/etc/dm/intro.gif usr/lib/grass70/etc/dm/intro.gif
-usr/share/grass70/etc/dm/labels.gif usr/lib/grass70/etc/dm/labels.gif
-usr/share/grass70/etc/dm/legend.gif usr/lib/grass70/etc/dm/legend.gif
-usr/share/grass70/etc/dm/measure.gif usr/lib/grass70/etc/dm/measure.gif
-usr/share/grass70/etc/dm/new.gif usr/lib/grass70/etc/dm/new.gif
-usr/share/grass70/etc/dm/nviz.gif usr/lib/grass70/etc/dm/nviz.gif
-usr/share/grass70/etc/dm/open.gif usr/lib/grass70/etc/dm/open.gif
-usr/share/grass70/etc/dm/pan.gif usr/lib/grass70/etc/dm/pan.gif
-usr/share/grass70/etc/dm/position.gif usr/lib/grass70/etc/dm/position.gif
-usr/share/grass70/etc/dm/print.gif usr/lib/grass70/etc/dm/print.gif
-usr/share/grass70/etc/dm/query.gif usr/lib/grass70/etc/dm/query.gif
-usr/share/grass70/etc/dm/raster.gif usr/lib/grass70/etc/dm/raster.gif
-usr/share/grass70/etc/dm/rgbhis.gif usr/lib/grass70/etc/dm/rgbhis.gif
-usr/share/grass70/etc/dm/save.gif usr/lib/grass70/etc/dm/save.gif
-usr/share/grass70/etc/dm/thematic.gif usr/lib/grass70/etc/dm/thematic.gif
-usr/share/grass70/etc/dm/vector.gif usr/lib/grass70/etc/dm/vector.gif
-usr/share/grass70/etc/dm/xganim.gif usr/lib/grass70/etc/dm/xganim.gif
-usr/share/grass70/etc/dm/zoom.back.gif usr/lib/grass70/etc/dm/zoom.back.gif
-usr/share/grass70/etc/dm/zoom.gif usr/lib/grass70/etc/dm/zoom.gif
-usr/share/grass70/etc/gm/intro.gif usr/lib/grass70/etc/gm/intro.gif
-usr/share/grass70/etc/gui/icons usr/lib/grass70/etc/gui/icons
-usr/share/grass70/etc/gui/images usr/lib/grass70/etc/gui/images
-usr/share/grass70/etc/nviz2.2/bitmaps/flythrough usr/lib/grass70/etc/nviz2.2/bitmaps/flythrough
-usr/share/grass70/etc/nviz2.2/bitmaps/trash.gif usr/lib/grass70/etc/nviz2.2/bitmaps/trash.gif
+usr/share/grass70/gui/icons usr/lib/grass70/gui/icons
+usr/share/grass70/gui/images usr/lib/grass70/gui/images
diff --git a/debian/grass-gui.links.in b/debian/grass-gui.links.in
index 1383995..4ad1f91 100644
--- a/debian/grass-gui.links.in
+++ b/debian/grass-gui.links.in
@@ -1,43 +1,2 @@
-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
+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
diff --git a/debian/rules b/debian/rules
index 2fd2ce3..02471e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,6 @@ true-clean:
rm -f lib/proj/nad2bin
rm -f tools/timer/main.o
- rm -f raster/r.le/r.le.setup/polytocell/*.o
rm -f raster/r.terraflow/IOStream/lib/src/libiostream.a
rm -f debian/$(BASE_NAME).1
rm -f error.log
@@ -163,13 +162,10 @@ install-arch: build-arch
# fix links
debian/fixpaths.sh $(CURDIR)/debian/tmp debian/tmp
-
+
# delete extra license files
- rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
- rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LGPL-2.1.txt
- rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/gem/skeleton/license
rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/license
-
+
# delete python compiled bytecode files (maybe dh_python2 takes care of this for us?)
for DIR in python/grass \
python/grass/lib \
@@ -231,17 +227,27 @@ install-arch: build-arch
# is there a better way to make these exist?
mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
+ mkdir -p debian/tmp/usr/share/icons/hicolor/64x64/apps
mkdir -p debian/tmp/usr/share/applications
install -m 644 debian/grass.xpm \
debian/tmp/usr/share/icons/hicolor/32x32/apps/$(BASE_NAME).xpm
install -m 644 gui/icons/grass-48x48.png \
debian/tmp/usr/share/icons/hicolor/48x48/apps/$(BASE_NAME).png
+ install -m 644 gui/icons/grass-64x64.png \
+ debian/tmp/usr/share/icons/hicolor/64x64/apps/$(BASE_NAME).png
install -m 644 gui/icons/grass.desktop \
debian/tmp/usr/share/applications/$(BASE_NAME).desktop
# n.b. 6.4.1 shipped with "grass65" as the Exec target
sed -i -e 's+Icon=grass+Icon=$(BASE_NAME)+' \
debian/tmp/usr/share/applications/$(BASE_NAME).desktop
+ # install AppStream metadata
+ mkdir -p debian/tmp/usr/share/appdata/
+ install -m 644 gui/icons/grass.appdata.xml \
+ debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
+ sed -i -e 's+<id type="desktop">grass.desktop</id>+<id type="desktop">$(BASE_NAME).desktop</id>+' \
+ debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
+
# install x-grass wrapper script
install -m 755 debian/x-grass debian/tmp/usr/bin/x-grass
@@ -249,31 +255,17 @@ install-arch: build-arch
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/
+ 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/images/ debian/tmp/usr/share/$(BASE_NAME)/gui/
install-indep: build-indep
dh_testdir -i
dh_testroot -i
install -m 644 -d debian/tmp
- -install -m 644 -d debian/tmp/programming-manual/html/search
- -install -m 644 ./html/* debian/tmp/programming-manual/html
- -install -m 644 ./html/search/* debian/tmp/programming-manual/html/search
- -rm -f debian/tmp/programming-manual/html/jquery.js
+ install -m 644 -d debian/tmp/programming-manual/html
+ cp -r debian/tmp/usr/lib/$(BASE_NAME)/docs/html/* debian/tmp/programming-manual/html/
+ rm -f debian/tmp/programming-manual/html/jquery.js
# Build architecture-independent files here.
binary-indep: install-arch install-indep
@@ -301,16 +293,7 @@ binary-arch: install-arch
dh_installexamples -a
dh_install -a
# delete duplicated grass-gui stuff from grass-core package
- for COMPONENT in bwidget \
- etc/dm \
- etc/form \
- etc/gm \
- etc/gui \
- etc/nviz2.2 \
- etc/v.digit \
- etc/wxpython \
- bin/v.digit \
- bin/xganim ; do \
+ for COMPONENT in gui wxpython; do \
rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \
done
dh_installmenu -a
@@ -318,13 +301,13 @@ binary-arch: install-arch
dh_lintian -a
dh_link -a
dh_python2
- dh_python2 /usr/lib/$(BASE_NAME)/etc
+ dh_python2 /usr/lib/$(BASE_NAME)/gui/
dh_strip -a
dh_compress -a -XAUTHORS
dh_fixperms -a
dh_makeshlibs -a -a
dh_installdeb -a
- dh_shlibdeps -a -l$(CURDIR)/debian/$(PKG_NAME)/usr/lib/$(BASE_NAME)/lib
+ dh_shlibdeps -a -l$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME)/lib
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
--
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