fix up .desktop file

and add an icon

Author: jcupitt

Diff for: ChangeLog

@@ -1,3 +1,6 @@
+started 8.5.2 14/6/17
+- install icon, fix icon in desktop file
+
 started 8.5.1 22/1/17
 - fix a crash bug
 - make separate Image / Alpha menu, add Add, Extract, Drop

Diff for: Makefile.am

@@ -37,6 +37,8 @@ if UPDATE_DESKTOP
 install-data-hook:
 	-$(UPDATE_MIME_DATABASE) ${DESTDIR}$(datadir)/mime
 	-$(UPDATE_DESKTOP_DATABASE) ${DESTDIR}$(datadir)/applications
+	$(mkinstalldirs) ${DESTDIR}$(datadir)/icons/hicolor/128x128/apps
+	-cp share/nip2/data/nip2.png ${DESTDIR}$(datadir)/icons/hicolor/128x128/apps
 endif
 
 dist-hook:

Diff for: configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [8.5.1], [[email protected]])
+AC_INIT([nip2], [8.5.2], [[email protected]])
 
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
@@ -17,7 +17,7 @@ dnl
 
 m4_define([nip_major_version], [8])
 m4_define([nip_minor_version], [5])
-m4_define([nip_micro_version], [1])
+m4_define([nip_micro_version], [2])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 

Diff for: nip2.desktop.in

@@ -3,7 +3,7 @@ Name=@PACKAGE@
 Comment=Image manipulation program based on VIPS
 Comment[it]=Programma per la manipolazione di immagini basato su VIPS
 Exec=nip2 %F
-Icon=nip2
+Icon=nip2.png
 Terminal=false
 Type=Application
 Categories=Graphics;RasterGraphics;

Diff for: share/nip2/data/Makefile.am

@@ -6,7 +6,7 @@ nipdata_DATA = \
 	sRGB.icm \
 	macbeth_lab_d65.mat \
 	macbeth_lab_d50.mat \
-	vips-128.png \
+	nip2.png \
 	nip2-icon.ico \
 	cmyk.icm \
 	stock-tool-ink-22.png \

Diff for: share/nip2/data/vips-128.png renamed to share/nip2/data/nip2.png

@@ -367,8 +367,7 @@ about_build( iDialog *idlg, GtkWidget *work )
 	gtk_container_add( GTK_CONTAINER( work ), hb );
 	gtk_widget_show( hb );
 
-	image = image_new_from_file( 
-		"$VIPSHOME/share/$PACKAGE/data/vips-128.png" );
+	image = image_new_from_file( "$VIPSHOME/share/$PACKAGE/data/nip2.png" );
         gtk_box_pack_start( GTK_BOX( hb ), image, FALSE, FALSE, 2 );
 	gtk_widget_show( image );
 

Diff for: src/boxes.c

@@ -794,7 +794,7 @@ main_x_init( int *argc, char ***argv )
 	/* Set the default icon. 
 	 */
 	im_strncpy( buf, 
-		"$VIPSHOME/share/$PACKAGE/data/vips-128.png", FILENAME_MAX );
+		"$VIPSHOME/share/$PACKAGE/data/nip2.png", FILENAME_MAX );
 	path_expand( buf );
 	gtk_window_set_default_icon_from_file( buf, NULL );