diff --git a/CMakeLists.txt b/CMakeLists.txt index 050aa79bf..1cc7c797f 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Packaging/cpi-gamesh/Devilution.png b/Packaging/cpi-gamesh/Devilution.png index 1bb11fbaf..9b919839a 100644 Binary files a/Packaging/cpi-gamesh/Devilution.png and b/Packaging/cpi-gamesh/Devilution.png differ diff --git a/Packaging/debian/rules b/Packaging/debian/rules index 7a019d7ea..c5b984f2a 100755 --- a/Packaging/debian/rules +++ b/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/ diff --git a/Packaging/fedora/devilutionx.spec b/Packaging/fedora/devilutionx.spec index a7b1f05af..e61ab31c2 100644 --- a/Packaging/fedora/devilutionx.spec +++ b/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 diff --git a/Packaging/macOS/AppIcon.icns b/Packaging/macOS/AppIcon.icns index b868a5da6..3fd638107 100644 Binary files a/Packaging/macOS/AppIcon.icns and b/Packaging/macOS/AppIcon.icns differ diff --git a/Packaging/resources/16.png b/Packaging/resources/16.png deleted file mode 100644 index 4bfeebc31..000000000 Binary files a/Packaging/resources/16.png and /dev/null differ diff --git a/Packaging/resources/Diablo_32.png b/Packaging/resources/Diablo_32.png deleted file mode 100644 index db6bcbc1b..000000000 Binary files a/Packaging/resources/Diablo_32.png and /dev/null differ diff --git a/Packaging/resources/Diablo_48.png b/Packaging/resources/Diablo_48.png deleted file mode 100644 index 8dd5e9868..000000000 Binary files a/Packaging/resources/Diablo_48.png and /dev/null differ diff --git a/Packaging/resources/icon.png b/Packaging/resources/icon.png new file mode 100644 index 000000000..0d05168ef Binary files /dev/null and b/Packaging/resources/icon.png differ diff --git a/Packaging/resources/icon_solid.png b/Packaging/resources/icon_solid.png new file mode 100644 index 000000000..854bd1f75 Binary files /dev/null and b/Packaging/resources/icon_solid.png differ diff --git a/Packaging/switch/icon.jpg b/Packaging/switch/icon.jpg index c869f3a31..73708fff2 100644 Binary files a/Packaging/switch/icon.jpg and b/Packaging/switch/icon.jpg differ diff --git a/Packaging/windows/icon.ico b/Packaging/windows/icon.ico index 3fec6d7d0..9fa049874 100644 Binary files a/Packaging/windows/icon.ico and b/Packaging/windows/icon.ico differ