Merge pull request 'renamed icon for application' (#26) from devel into master

Reviewed-on: YanTheKaller/ubl-settings-manager#26

Makefile

@@ -83,12 +83,11 @@ uninstall:
 	done
 	@$(RM) "/usr/bin/${PKGNAME}"
 	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
-	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ru.ublinux.${PKGNAME}.svg"
 	@$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
 	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
 	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
 	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png"
-	@$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
 	@$(RM) -d "/usr/share/${PKGNAME}/css"
 	@$(RM) -d "/usr/share/${PKGNAME}/ui"
 	@$(RM) -d "/usr/share/${PKGNAME}"
@@ -110,10 +109,10 @@ install: check uninstall
 	done
 	@for SIZE in 16 32 48; do \
 		install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \
+		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ru.ublinux.${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \
 	done
 	@install -dm755 /usr/share/icons/hicolor/scalable/apps
-	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg
+	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ru.ublinux.${PKGNAME}.svg
 	@install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} 
 	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop
 	@install -Dm755 /usr/share/${PKGNAME}/ -d ui

source/ubl-settings-manager.h

@@ -9,7 +9,7 @@
 #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
 #define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf"
 #define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf"
-#define AppIconPath "ubl-settings-manager"
+#define AppIconPath "ru.ublinux.ubl-settings-manager"
 #define AppBannerPath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager-banner.png"
 #define DesktopPath "/usr/share/applications/"
 #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/"