[postgis] 01/01: Install desktop file and application icons for shp2pgsql-gui.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Jun 3 16:40:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository postgis.
commit 19593d8b4672288ef4daac2f06025ff586a17c34
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jun 3 15:40:30 2016 +0200
Install desktop file and application icons for shp2pgsql-gui.
---
debian/changelog | 1 +
debian/icons/hicolor/16x16/apps/shp2pgsql-gui.png | Bin 0 -> 1429 bytes
debian/icons/hicolor/22x22/apps/shp2pgsql-gui.png | Bin 0 -> 1772 bytes
debian/icons/hicolor/24x24/apps/shp2pgsql-gui.png | Bin 0 -> 2035 bytes
debian/icons/hicolor/32x32/apps/shp2pgsql-gui.png | Bin 0 -> 3031 bytes
debian/icons/hicolor/36x36/apps/shp2pgsql-gui.png | Bin 0 -> 3633 bytes
debian/icons/hicolor/40x40/apps/shp2pgsql-gui.png | Bin 0 -> 4269 bytes
debian/icons/hicolor/42x42/apps/shp2pgsql-gui.png | Bin 0 -> 4473 bytes
debian/icons/hicolor/48x48/apps/shp2pgsql-gui.png | Bin 0 -> 5485 bytes
debian/icons/hicolor/64x64/apps/shp2pgsql-gui.png | Bin 0 -> 6257 bytes
debian/icons/hicolor/8x8/apps/shp2pgsql-gui.png | Bin 0 -> 608 bytes
debian/patches/hicolor-icons.patch | 71 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 11 ++++
debian/source/include-binaries | 10 +++
15 files changed, 94 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8ee0398..c5ada7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ postgis (2.2.2+dfsg-3) UNRELEASED; urgency=medium
[ Bas Couwenberg ]
* Disable tests on ppc64, fails to change owner and permissions.
+ * Install desktop file and application icons for shp2pgsql-gui.
[ Markus Wanner ]
* Re-rename the -scripts package to include the postgis version
diff --git a/debian/icons/hicolor/16x16/apps/shp2pgsql-gui.png b/debian/icons/hicolor/16x16/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..3b318f3
Binary files /dev/null and b/debian/icons/hicolor/16x16/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/22x22/apps/shp2pgsql-gui.png b/debian/icons/hicolor/22x22/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..22a2c8f
Binary files /dev/null and b/debian/icons/hicolor/22x22/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/24x24/apps/shp2pgsql-gui.png b/debian/icons/hicolor/24x24/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..03daa6e
Binary files /dev/null and b/debian/icons/hicolor/24x24/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/32x32/apps/shp2pgsql-gui.png b/debian/icons/hicolor/32x32/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..af10309
Binary files /dev/null and b/debian/icons/hicolor/32x32/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/36x36/apps/shp2pgsql-gui.png b/debian/icons/hicolor/36x36/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..5e0f34c
Binary files /dev/null and b/debian/icons/hicolor/36x36/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/40x40/apps/shp2pgsql-gui.png b/debian/icons/hicolor/40x40/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..b9e79db
Binary files /dev/null and b/debian/icons/hicolor/40x40/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/42x42/apps/shp2pgsql-gui.png b/debian/icons/hicolor/42x42/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..b8bcadb
Binary files /dev/null and b/debian/icons/hicolor/42x42/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/48x48/apps/shp2pgsql-gui.png b/debian/icons/hicolor/48x48/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..fa24730
Binary files /dev/null and b/debian/icons/hicolor/48x48/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/64x64/apps/shp2pgsql-gui.png b/debian/icons/hicolor/64x64/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..21d7063
Binary files /dev/null and b/debian/icons/hicolor/64x64/apps/shp2pgsql-gui.png differ
diff --git a/debian/icons/hicolor/8x8/apps/shp2pgsql-gui.png b/debian/icons/hicolor/8x8/apps/shp2pgsql-gui.png
new file mode 100644
index 0000000..87d9b0d
Binary files /dev/null and b/debian/icons/hicolor/8x8/apps/shp2pgsql-gui.png differ
diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch
new file mode 100644
index 0000000..d31a3ff
--- /dev/null
+++ b/debian/patches/hicolor-icons.patch
@@ -0,0 +1,71 @@
+Description: Install desktop file and applications icons for shp2pgsql-gui.
+ Related FreeDesktop.org standards:
+ * Desktop Entry Specification
+ https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+ * Icon Theme Specification
+ https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#install_icons
+ .
+ The 48x48 icon is required byt the Icon Theme Specification,
+ and the 22x22 up to 64x64 icons are required by the Debian Policy:
+ https://www.debian.org/doc/debian-policy/ch-opersys.html#s-menus
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/postgis/ticket/3571
+
+--- /dev/null
++++ b/loader/shp2pgsql-gui.desktop
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Type=Application
++Name=shp2pgsql-gui
++GenericName=GUI for Shapefile to PostGIS import tool
++Comment=Import shapefiles into PostGIS databases
++Categories=Geography;Science;Geoscience;
++Exec=shp2pgsql-gui
++Icon=shp2pgsql-gui
++Terminal=false
++Keywords=spatial;postgis;postgresql;gis;
+--- a/loader/Makefile.in
++++ b/loader/Makefile.in
+@@ -114,14 +114,40 @@ $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgs
+ installdir:
+ @mkdir -p $(DESTDIR)$(bindir)
+
+-install: installdir
++install-desktop:
++ifdef gtk_build
++ mkdir -p $(DESTDIR)$(datadir)/applications
++ $(INSTALL_DATA) shp2pgsql-gui.desktop $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop
++endif
++
++ICON_SIZES = 8x8 16x16 22x22 24x24 32x32 36x36 40x40 42x42 48x48 64x64
++
++install-icons:
++ifdef gtk_build
++ for size in $(ICON_SIZES); do \
++ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps; \
++ $(INSTALL_DATA) icons/hicolor/$${size}/apps/shp2pgsql-gui.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps/shp2pgsql-gui.png; \
++ done
++endif
++
++install: installdir install-desktop install-icons
+ ifdef gtk_build
+ $(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-GUI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
+ endif
+ $(LIBTOOL) --mode=install $(INSTALL) $(PGSQL2SHP-CLI) "$(DESTDIR)$(bindir)/$(PGSQL2SHP-CLI)"
+ $(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-CLI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI)"
+
+-uninstall:
++uninstall-desktop:
++ifdef gtk_build
++ rm -f $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop
++endif
++
++uninstall-icons:
++ifdef gtk_build
++ rm -f $(DESTDIR)$(datadir)/icons/hicolor/*/apps/shp2pgsql-gui.png
++endif
++
++uninstall: uninstall-desktop uninstall-icons
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(PGSQL2SHP-CLI)"
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI)"
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
diff --git a/debian/patches/series b/debian/patches/series
index 32f6ef4..d68332d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
link-liblwgeom
relax-test-timing-constraints.patch
+hicolor-icons.patch
diff --git a/debian/rules b/debian/rules
index f9416e0..ba8f17b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,6 +113,8 @@ clean: debian/control
dh_testdir
dh_testroot
+ rm -rf loader/icons/
+
# Clean all separate build directories.
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
@@ -149,6 +151,8 @@ configuration-stamp:
dh_autoreconf autoconf
dh_autotools-dev_updateconfig
+ cp -r debian/icons/ loader/
+
# Copy sources required to build extensions for all but the most
# recent Postgres version. Unfortunately, Postgis doesn't support
# vpath builds.
@@ -308,6 +312,13 @@ install-arch: build-arch
mkdir -p $(CURDIR)/debian/postgis-gui/usr/bin
mv $(CURDIR)/debian/postgis/usr/bin/*gui $(CURDIR)/debian/postgis-gui/usr/bin/
+# Move desktop file and application icons from the NEWEST_POSTGRES_VERSION build
+ mkdir -p $(CURDIR)/debian/postgis-gui/usr/share
+ mv $(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/applications \
+ $(CURDIR)/debian/postgis-gui/usr/share/
+ mv $(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/icons \
+ $(CURDIR)/debian/postgis-gui/usr/share/
+
dh_install -s
binary: binary-arch binary-indep
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..4aad1cc
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,10 @@
+debian/icons/hicolor/8x8/apps/shp2pgsql-gui.png
+debian/icons/hicolor/16x16/apps/shp2pgsql-gui.png
+debian/icons/hicolor/22x22/apps/shp2pgsql-gui.png
+debian/icons/hicolor/24x24/apps/shp2pgsql-gui.png
+debian/icons/hicolor/32x32/apps/shp2pgsql-gui.png
+debian/icons/hicolor/36x36/apps/shp2pgsql-gui.png
+debian/icons/hicolor/40x40/apps/shp2pgsql-gui.png
+debian/icons/hicolor/42x42/apps/shp2pgsql-gui.png
+debian/icons/hicolor/48x48/apps/shp2pgsql-gui.png
+debian/icons/hicolor/64x64/apps/shp2pgsql-gui.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list