[Scummvm-git-logs] scummvm master -> 9393586ffe48beb6a6d9204348b4dbe7fa3c1bc9

[tsoliman]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1074d600d2 MAEMO: Update debian/rules for new files
9393586ffe KYRA: Update Maemo workaround


Commit: 1074d600d205bec453d28f00f7da326b35aee697
    https://github.com/scummvm/scummvm/commit/1074d600d205bec453d28f00f7da326b35aee697
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2019-09-24T11:19:28-05:00

Commit Message:
MAEMO: Update debian/rules for new files

Changed paths:
    backends/platform/maemo/debian/rules


diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 9fbdff6..1d4c0c8 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -48,30 +48,20 @@ install: build
 	install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
 # for optified version we can also add engine datafiles
-	install -m0644 dists/engine-data/access.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/cryomni3d.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/drascula.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/fonts.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/hugo.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/kyra.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/lure.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/mort.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/neverhood.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/queen.tbl debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/sky.cpt debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/teenagent.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/tony.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
-	install -m0644 dists/engine-data/wintermute.zip debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/*.dat debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/*.zip debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/*.ccs debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/*.tbl debian/scummvm/opt/scummvm/share
+	install -m0644 dists/engine-data/*.cpt debian/scummvm/opt/scummvm/share
 
 	install -m0644 -d debian/scummvm/usr/share/doc/scummvm
-	install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYING.OFL COPYRIGHT NEWS README debian/scummvm/usr/share/doc/scummvm
+	install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYING.OFL COPYRIGHT NEWS.md README.md debian/scummvm/usr/share/doc/scummvm
 binary: binary-arch
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs NEWS
+	dh_installchangelogs NEWS.md
 	dh_link
 	dh_strip
 	dh_fixperms


Commit: 9393586ffe48beb6a6d9204348b4dbe7fa3c1bc9
    https://github.com/scummvm/scummvm/commit/9393586ffe48beb6a6d9204348b4dbe7fa3c1bc9
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2019-09-24T11:19:34-05:00

Commit Message:
KYRA: Update Maemo workaround

Changed paths:
    engines/kyra/module.mk


diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index a45c0ac..57fe686 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -143,7 +143,7 @@ include $(srcdir)/rules.mk
 
 ifeq ($(BACKEND), maemo)
 #ugly workaround, screen.cpp crashes gcc version 3.4.4 (CodeSourcery ARM 2005q3-2) with anything but -O3
-$(MODULE)/screen.o: $(MODULE)/screen.cpp
+$(MODULE)/graphics/screen.o: $(MODULE)/graphics/screen.cpp
 	$(MKDIR) $(*D)/$(DEPDIR)
 	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) -O3 $(CPPFLAGS) -c $(<) -o $*.o
 endif