Update icons

CMakeLists.txt

@@ -620,16 +620,8 @@ if(CPACK)
         "${PROJECT_SOURCE_DIR}/Packaging/nix/README.txt"
       DESTINATION "share/diasurgical/${project_name}"
     )
-    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/16.png"
-      DESTINATION "share/icons/hicolor/16x16/apps"
-      RENAME "${project_name}.png"
-    )
-    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/Diablo_32.png"
-      DESTINATION "share/icons/hicolor/32x32/apps"
-      RENAME "${project_name}.png"
-    )
-    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/Diablo_48.png"
-      DESTINATION "share/icons/hicolor/48x48/apps"
+    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/icon.png"
+      DESTINATION "share/icons/hicolor/512x512/apps"
       RENAME "${project_name}.png"
     )
     install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
@@ -637,7 +629,7 @@ if(CPACK)
     )
 
     # -G DEB
-    set(CPACK_PACKAGE_CONTACT "kai@gnukai.com")
+    set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk")
     set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
     set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 

Packaging/debian/rules

@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 export COMPILE_FLAGS="-O0"
 export DEB_BUILD_MAINT_OPTIONS = hardening=-all
-export DEB_CFLAGS_MAINT_APPEND  = -Wno-error 
+export DEB_CFLAGS_MAINT_APPEND  = -Wno-error
 export DEB_LDFLAGS_MAINT_APPEND = -Wno-error
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 GIT_VERSION_DEVILUTIONX ?= $(shell pwd | tail -c 23 | cut -c-5)
@@ -21,17 +21,12 @@ override_dh_auto_install:
 	install -pdm755 debian/diablo-data/usr/share/games/diablo/
 	test -f "../diabdat.mpq" && cp ../diabdat.mpq debian/diablo-data/usr/share/games/diablo/ || true
 	dh_auto_install
-	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
+	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/512x512/apps/
 	install -pdm755 debian/devilutionx/usr/share/applications/
 	install -pdm755 debian/devilutionx/usr/share/fonts/truetype/
-	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/16x16/apps/
-	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/32x32/apps/
-	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
 	install -pdm755 debian/devilutionx/usr/share/games/diablo/
-	install -Dm664 Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/devilutionx.png 
-	install -Dm664 Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/devilutionx.png 
-	install -Dm664 Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/devilutionx.png 
+	install -Dm664 Packaging/resources/icon.png debian/devilutionx/usr/share/icons/hicolor/512x512/apps/devilutionx.png
 	install -Dm664 Packaging/fedora/devilutionx.desktop debian/devilutionx/usr/share/applications/
 	install -Dm664 Packaging/resources/CharisSILB.ttf debian/devilutionx/usr/share/fonts/truetype/
-	install -Dm755 obj-${DEB_HOST_MULTIARCH}/devilutionx debian/devilutionx/usr/share/games/diablo/ 
+	install -Dm755 obj-${DEB_HOST_MULTIARCH}/devilutionx debian/devilutionx/usr/share/games/diablo/
 

Packaging/fedora/devilutionx.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:		devilutionx
-Version:	0.5.0
+Version:	1.1.0
 Release:	1%{?dist}
 Summary:	Diablo I engine for modern operating systems
 
@@ -16,7 +16,7 @@ Requires:	SDL2_ttf SDL2_mixer libsodium
 
 %description
 Diablo I devolved - magic behind the 1996 computer game
-Note: Devilution requires an original copy of diabdat.mpq. None of the Diablo 1 game assets are provided by this package! 
+Note: Devilution requires an original copy of diabdat.mpq. None of the Diablo 1 game assets are provided by this package!
 
 %prep
 %setup -q -n devilutionX-%{version}
@@ -35,23 +35,17 @@ make INSTALL_ROOT=%{buildroot}
 cd ..
 mkdir -p %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-install -p -D -m644 Packaging/resources/16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -D -m644 Packaging/resources/Diablo_32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -D -m644 Packaging/resources/Diablo_48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/
+install -p -D -m644 Packaging/resources/icon.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
 
 install -m 755 build/devilutionx %{buildroot}%{_bindir}/%{name}
-desktop-file-install --remove-category="Qt" --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} 
+desktop-file-install --remove-category="Qt" --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 %files
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/fonts/truetype/CharisSILB.ttf
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
 
 %post
 # print info