From f847b15e46072ef0577979389077de9fd9d15589 Mon Sep 17 00:00:00 2001 From: Pawel Kolodziejski Date: Thu, 24 Sep 2020 17:19:37 +0200 Subject: [PATCH] ALL: Added missing theme renames for distribution --- Makefile.common | 2 +- dists/debian/residualvm.install | 2 +- dists/irix/residualvm.idb | 2 +- dists/redhat/residualvm.spec | 2 +- dists/redhat/residualvm.spec.in | 2 +- dists/residualvm.rc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1104dd0707f..e4df5c46ca6 100644 --- a/Makefile.common +++ b/Makefile.common @@ -296,7 +296,7 @@ DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT) endif # Themes files -DIST_FILES_THEMES=modern.zip +DIST_FILES_THEMES=residualvm.zip ifdef USE_TRANSLATION DIST_FILES_THEMES+=translations.dat endif diff --git a/dists/debian/residualvm.install b/dists/debian/residualvm.install index a76f57de8b5..2acc73c7f50 100644 --- a/dists/debian/residualvm.install +++ b/dists/debian/residualvm.install @@ -3,5 +3,5 @@ icons/residualvm.xpm usr/share/pixmaps dists/residualvm.desktop usr/share/applications dists/engine-data/*.lab usr/share/residualvm dists/engine-data/*.m4b usr/share/residualvm -gui/themes/modern.zip usr/share/residualvm +gui/themes/residualvm.zip usr/share/residualvm residualvm usr/games diff --git a/dists/irix/residualvm.idb b/dists/irix/residualvm.idb index b1d3933a330..6f86efd1ccb 100644 --- a/dists/irix/residualvm.idb +++ b/dists/irix/residualvm.idb @@ -14,7 +14,7 @@ f 0644 root sys usr/ResidualVM/share/pixmaps/residualvm.xpm residualvm.xpm resid f 0644 root sys usr/ResidualVM/share/residualvm/residualvm-grim-patch.lab residualvm-grim-patch.lab residualvm.sw.eoe f 0644 root sys usr/ResidualVM/share/residualvm/residualvm-emi-patch.m4b residualvm-emi-patch.m4b residualvm.sw.eoe f 0644 root sys usr/ResidualVM/share/residualvm/myst3.dat myst3.dat residualvm.sw.eoe -f 0644 root sys usr/ResidualVM/share/residualvm/modern.zip modern.zip residualvm.sw.eoe +f 0644 root sys usr/ResidualVM/share/residualvm/residualvm.zip residualvm.zip residualvm.sw.eoe l 0000 root sys usr/bin/residualvm residualvm residualvm.sw.eoe symval(/usr/ResidualVM/residualvm) f 0644 root sys usr/lib/filetype/local/ResidualVM.ftr ResidualVM.ftr residualvm.sw.eoe exitop('if test -r $rbase/usr/lib/filetype/Makefile ; then chroot $rbase /sbin/sh -c "cd /usr/lib/filetype ; make -u > /dev/null" ; fi') f 0644 root sys usr/lib/filetype/local/iconlib/ResidualVM.fti ResidualVM.fti residualvm.sw.eoe exitop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -add "Category:File Name:/usr/ResidualVM/residualvm" -syspage Games; fi') removeop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -remove "Category:File Name:/usr/ResidualVM/residualvm" -syspage Games; fi') diff --git a/dists/redhat/residualvm.spec b/dists/redhat/residualvm.spec index fe6683ba7c0..038ccc06e62 100644 --- a/dists/redhat/residualvm.spec +++ b/dists/redhat/residualvm.spec @@ -52,7 +52,7 @@ install -m644 -D dists/residualvm.6 %{buildroot}%{_mandir}/man6/residualvm.6 install -m644 -D icons/residualvm.xpm %{buildroot}%{_datadir}/pixmaps/residualvm.xpm install -m644 -D icons/residualvm.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/residualvm.svg install -m644 -D dists/redhat/residualvm48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/residualvm.png -install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/residualvm/modern.zip +install -m644 -D gui/themes/residualvm.zip %{buildroot}%{_datadir}/residualvm/residualvm.zip install -m644 -D dists/engine-data/residualvm-grim-patch.lab %{buildroot}%{_datadir}/residualvm/residualvm-grim-patch.lab install -m644 -D dists/engine-data/residualvm-emi-patch.m4b %{buildroot}%{_datadir}/residualvm/residualvm-emi-patch.m4b install -m644 -D dists/engine-data/myst3.dat %{buildroot}%{_datadir}/residualvm/myst3.dat diff --git a/dists/redhat/residualvm.spec.in b/dists/redhat/residualvm.spec.in index 15f8691cf27..2840a361f86 100644 --- a/dists/redhat/residualvm.spec.in +++ b/dists/redhat/residualvm.spec.in @@ -52,7 +52,7 @@ install -m644 -D dists/residualvm.6 %{buildroot}%{_mandir}/man6/residualvm.6 install -m644 -D icons/residualvm.xpm %{buildroot}%{_datadir}/pixmaps/residualvm.xpm install -m644 -D icons/residualvm.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/residualvm.svg install -m644 -D dists/redhat/residualvm48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/residualvm.png -install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/residualvm/modern.zip +install -m644 -D gui/themes/residualvm.zip %{buildroot}%{_datadir}/residualvm/residualvm.zip install -m644 -D dists/engine-data/residualvm-grim-patch.lab %{buildroot}%{_datadir}/residualvm/residualvm-grim-patch.lab install -m644 -D dists/engine-data/residualvm-emi-patch.m4b %{buildroot}%{_datadir}/residualvm/residualvm-emi-patch.m4b install -m644 -D dists/engine-data/myst3.dat %{buildroot}%{_datadir}/residualvm/myst3.dat diff --git a/dists/residualvm.rc b/dists/residualvm.rc index 0f69b43fa9c..670f5f8f2b6 100644 --- a/dists/residualvm.rc +++ b/dists/residualvm.rc @@ -24,7 +24,7 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip" scummremastered.zip FILE "gui/themes/scummremastered.zip" #endif // ResidualVM specific START -modern.zip FILE "gui/themes/modern.zip" +residualvm.zip FILE "gui/themes/residualvm.zip" #ifdef BUILTIN_RESOURCES #if PLUGIN_ENABLED_STATIC(GRIM)