]> granicus.if.org Git - postgis/commitdiff
Install desktop file and application icons for shp2pgsql-gui (Sebastiaan Couwenberg)
authorRegina Obe <lr@pcorp.us>
Sat, 4 Jun 2016 18:10:50 +0000 (18:10 +0000)
committerRegina Obe <lr@pcorp.us>
Sat, 4 Jun 2016 18:10:50 +0000 (18:10 +0000)
References #3571 for PostGIS 2.3

git-svn-id: http://svn.osgeo.org/postgis/trunk@14932 b70326c6-7e19-0410-871a-916f4a2858ee

12 files changed:
loader/Makefile.in
loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png [new file with mode: 0644]
loader/shp2pgsql-gui.desktop [new file with mode: 0644]

index 80956fcbeae04ccef3d82d71e8af8ce750aa31e8..1b4842ffeb3d1e58c3d1151964a06cfd18b117d6 100644 (file)
@@ -114,14 +114,40 @@ $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core
 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/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png b/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..3b318f3
Binary files /dev/null and b/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png b/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..22a2c8f
Binary files /dev/null and b/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png b/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..03daa6e
Binary files /dev/null and b/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png b/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..af10309
Binary files /dev/null and b/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png b/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..5e0f34c
Binary files /dev/null and b/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png b/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..b9e79db
Binary files /dev/null and b/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png b/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..b8bcadb
Binary files /dev/null and b/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png b/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..fa24730
Binary files /dev/null and b/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png b/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..21d7063
Binary files /dev/null and b/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png differ
diff --git a/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png b/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png
new file mode 100644 (file)
index 0000000..87d9b0d
Binary files /dev/null and b/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png differ
diff --git a/loader/shp2pgsql-gui.desktop b/loader/shp2pgsql-gui.desktop
new file mode 100644 (file)
index 0000000..7014243
--- /dev/null
@@ -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;