[postgis-tickets] r14933 - Install desktop file and application icons for shp2pgsql-gui (Sebastiaan Couwenberg)

Regina Obe lr at pcorp.us
Sat Jun 4 11:18:37 PDT 2016 

Author: robe
Date: 2016-06-04 11:18:37 -0700 (Sat, 04 Jun 2016)
New Revision: 14933

Added:
   branches/2.2/loader/icons/
   branches/2.2/loader/icons/hicolor/
   branches/2.2/loader/icons/hicolor/16x16/
   branches/2.2/loader/icons/hicolor/16x16/apps/
   branches/2.2/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/22x22/
   branches/2.2/loader/icons/hicolor/22x22/apps/
   branches/2.2/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/24x24/
   branches/2.2/loader/icons/hicolor/24x24/apps/
   branches/2.2/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/32x32/
   branches/2.2/loader/icons/hicolor/32x32/apps/
   branches/2.2/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/36x36/
   branches/2.2/loader/icons/hicolor/36x36/apps/
   branches/2.2/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/40x40/
   branches/2.2/loader/icons/hicolor/40x40/apps/
   branches/2.2/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/42x42/
   branches/2.2/loader/icons/hicolor/42x42/apps/
   branches/2.2/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/48x48/
   branches/2.2/loader/icons/hicolor/48x48/apps/
   branches/2.2/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/64x64/
   branches/2.2/loader/icons/hicolor/64x64/apps/
   branches/2.2/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png
   branches/2.2/loader/icons/hicolor/8x8/
   branches/2.2/loader/icons/hicolor/8x8/apps/
   branches/2.2/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png
   branches/2.2/loader/shp2pgsql-gui.desktop
Modified:
   branches/2.2/NEWS
   branches/2.2/loader/Makefile.in
Log:
Install desktop file and application icons for shp2pgsql-gui (Sebastiaan Couwenberg)
Closes #3571 for PostGIS 2.2

Modified: branches/2.2/NEWS
===================================================================
--- branches/2.2/NEWS	2016-06-04 18:10:50 UTC (rev 14932)
+++ branches/2.2/NEWS	2016-06-04 18:18:37 UTC (rev 14933)
@@ -7,6 +7,8 @@
            calculation
   - #3522, Handle POINT and MULTIPOINT correctly in ST_Subdivide
   - #3565, ST_SetPoint can crash backend
+  - #3571, Install desktop file and application icons 
+           for shp2pgsql-gui (Sebastiaan Couwenberg)
 
 
 PostGIS 2.2.2

Modified: branches/2.2/loader/Makefile.in
===================================================================
--- branches/2.2/loader/Makefile.in	2016-06-04 18:10:50 UTC (rev 14932)
+++ branches/2.2/loader/Makefile.in	2016-06-04 18:18:37 UTC (rev 14933)
@@ -114,14 +114,40 @@
 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)"

Added: branches/2.2/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/16x16/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/22x22/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/24x24/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/32x32/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/36x36/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/40x40/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/42x42/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/48x48/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/64x64/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png
===================================================================
(Binary files differ)


Property changes on: branches/2.2/loader/icons/hicolor/8x8/apps/shp2pgsql-gui.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.2/loader/shp2pgsql-gui.desktop
===================================================================
--- branches/2.2/loader/shp2pgsql-gui.desktop	                        (rev 0)
+++ branches/2.2/loader/shp2pgsql-gui.desktop	2016-06-04 18:18:37 UTC (rev 14933)
@@ -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;

More information about the postgis-tickets mailing list