Rename subsurface.svg to subsurface-icon.svg

In preparation for a subsurface-icon.h, this should avoid confusion
about whether "subsurface.h" is a core header file.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>

7 files changed, 7 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index da838bac9..7f8bd1541 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ XSLTDIR = $(DATADIR)/subsurface/xslt
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
 
 NAME = subsurface
-ICONFILE = $(NAME).svg
+ICONFILE = $(NAME)-icon.svg
 DESKTOPFILE = $(NAME).desktop
 MANFILES = $(NAME).1
 XSLTFILES = xslt/*.xslt
diff --git a/linux.c b/linux.c
index f8d3e88b4..bf5c21d94 100644
--- a/linux.c
+++ b/linux.c
@@ -128,7 +128,7 @@ int subsurface_fill_device_list(GtkListStore *store)
 
 const char *subsurface_icon_name()
 {
-	return "subsurface.svg";
+	return "subsurface-icon.svg";
 }
 
 const char *system_default_filename(void)
diff --git a/packaging/subsurface.spec b/packaging/subsurface.spec
index 53b96bc0b..e33ed2e43 100644
--- a/packaging/subsurface.spec
+++ b/packaging/subsurface.spec
@@ -37,7 +37,7 @@ rm %{buildroot}/%{_datadir}/icons/hicolor/icon-theme.cache
 %defattr(-,root,root)
 %{_bindir}/subsurface
 %{_datadir}/applications/subsurface.desktop
-%{_datadir}/icons/hicolor/scalable/apps/subsurface.svg
+%{_datadir}/icons/hicolor/scalable/apps/subsurface-icon.svg
 %{_datadir}/man/man1/subsurface.1.gz
 
 
diff --git a/packaging/windows/mingw-subsurface.spec b/packaging/windows/mingw-subsurface.spec
index e1335de1f..8bc04da45 100644
--- a/packaging/windows/mingw-subsurface.spec
+++ b/packaging/windows/mingw-subsurface.spec
@@ -43,7 +43,7 @@ make CC=%{_mingw32_target}-gcc PKGCONFIG=%{_mingw32_target}-pkg-config XML2CONFI
 mkdir -p $RPM_BUILD_ROOT/%{_mingw32_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mingw32_datadir}
 install -m 755 subsurface.exe $RPM_BUILD_ROOT/%{_mingw32_bindir}/subsurface.exe
-install -m 644 subsurface.svg $RPM_BUILD_ROOT/%{_mingw32_datadir}/subsurface.svg
+install -m 644 subsurface-icon.svg $RPM_BUILD_ROOT/%{_mingw32_datadir}/subsurface-icon.svg
 # this seems like a really ugly hack
 install -m 755 %{_mingw32_bindir}/libdivecomputer-0.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/libdivecomputer-0.dll
 install -m 755 %{_mingw32_bindir}/libcairo-2.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/libcairo-2.dll
@@ -106,7 +106,7 @@ install -m 755 %{_mingw32_bindir}/libatk-1.0-0.dll $RPM_BUILD_ROOT/%{_mingw32_bi
 %{_mingw32_bindir}/libpangowin32-1.0-0.dll
 %{_mingw32_bindir}/libatk-1.0-0.dll
 
-%{_mingw32_datadir}/subsurface.svg
+%{_mingw32_datadir}/subsurface-icon.svg
 
 
 %changelog
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index 5fdad4fff..59944d7df 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -99,7 +99,7 @@ Section
 
     # Files to include in installer
     File ..\..\subsurface.exe
-    File ..\..\subsurface.svg
+    File ..\..\subsurface-icon.svg
     File ..\..\xslt\jdivelog2subsurface.xslt
     File ..\..\xslt\SuuntoSDM.xslt
     File dll\iconv.dll
@@ -167,7 +167,7 @@ Section "Uninstall"
     Delete "$INSTDIR\freetype-config"
     Delete "$INSTDIR\subsurface.exe"
     Delete "$INSTDIR\subsurface.ico"
-    Delete "$INSTDIR\subsurface.svg"
+    Delete "$INSTDIR\subsurface-icon.svg"
     Delete "$INSTDIR\Uninstall.exe"
     RMDir /r "$INSTDIR\share"
     RMDir "$INSTDIR"
diff --git a/subsurface.bmp b/subsurface-icon.bmp
index db1ae18c1..db1ae18c1 100644
--- a/subsurface.bmp
+++ b/subsurface-icon.bmp
diff --git a/subsurface.svg b/subsurface-icon.svg
index 29410c8ee..29410c8ee 100644
--- a/subsurface.svg
+++ b/subsurface-icon.svg