9 files changed, 77 insertions, 120 deletions
diff --git a/backends/epoc/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/epoc/S60/scummvm-CVS-SymbianS60v1.pkg
index 5392b857d7..d95ea72456 100644
--- a/backends/epoc/S60/scummvm-CVS-SymbianS60v1.pkg
+++ b/backends/epoc/S60/scummvm-CVS-SymbianS60v1.pkg
@@ -6,28 +6,21 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60"},(0x101f9b57),0,80,0
+#{"ScummVM S60v1"},(0x101f9b57),0,80,0
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
 
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\ScummVMS60.app"-"!:\system\apps\ScummVMS60\ScummVMS60.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVMS60\ScummVM.exe"
-
-; AIF application information file
-"\epoc32\release\armi\urel\ScummVMS60.aif"-"!:\system\apps\ScummVMS60\ScummVMS60.aif"
-
-; Resource file
-"\epoc32\release\armi\urel\ScummVMS60.rsc"-"!:\system\apps\ScummVMS60\ScummVMS60.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Launcher, Application, AIF & Resource file
+"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
+"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
+"\epoc32\release\armi\urel\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+"\epoc32\release\armi\urel\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/S60/scummvm-CVS-SymbianS60v2.pkg b/backends/epoc/S60/scummvm-CVS-SymbianS60v2.pkg
index 17aa77ef15..b2eb086488 100644
--- a/backends/epoc/S60/scummvm-CVS-SymbianS60v2.pkg
+++ b/backends/epoc/S60/scummvm-CVS-SymbianS60v2.pkg
@@ -6,28 +6,21 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60"},(0x101f9b57),0,80,3
+#{"ScummVM S60v2"},(0x101f9b57),0,80,3
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
 
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\ScummVMS60.app"-"!:\system\apps\ScummVMS60\ScummVMS60.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVMS60\ScummVM.exe"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\ScummVMS60\ScummVMS60.aif"-"!:\system\apps\ScummVMS60\ScummVMS60.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\ScummVMS60\ScummVMS60.rsc"-"!:\system\apps\ScummVMS60\ScummVMS60.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Launcher, Application, AIF & Resource file
+"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
+"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 17aa77ef15..dc73df4b63 100644
--- a/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -6,28 +6,21 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60"},(0x101f9b57),0,80,3
+#{"ScummVM S60v3"},(0x101f9b57),0,80,3
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
 
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\ScummVMS60.app"-"!:\system\apps\ScummVMS60\ScummVMS60.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVMS60\ScummVM.exe"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\ScummVMS60\ScummVMS60.aif"-"!:\system\apps\ScummVMS60\ScummVMS60.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\ScummVMS60\ScummVMS60.rsc"-"!:\system\apps\ScummVMS60\ScummVMS60.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Launcher, Application, AIF & Resource file
+"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
+"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg b/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
index 2809128a95..5f72d6d905 100644
--- a/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
+++ b/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
@@ -8,23 +8,19 @@
 ; UID is the app's UID
 #{"ScummVM S80"},(0x101f9b57),0,80,3
 
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\ScummVMS80.app"-"!:\system\apps\ScummVMS80\ScummVMS80.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVMS80\ScummVM.exe"
+; Platform type
+(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
 
-; AIF application information file
-"\epoc32\data\z\system\apps\ScummVMS80\ScummVMS80.aif"-"!:\system\apps\ScummVMS80\ScummVMS80.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\ScummVMS80\ScummVMS80.rsc"-"!:\system\apps\ScummVMS80\ScummVMS80.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Launcher, Application, AIF & Resource file
+"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
+"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/S90/scummvm-CVS-SymbianS90.pkg b/backends/epoc/S90/scummvm-CVS-SymbianS90.pkg
index 942a445103..1471a02f0b 100644
--- a/backends/epoc/S90/scummvm-CVS-SymbianS90.pkg
+++ b/backends/epoc/S90/scummvm-CVS-SymbianS90.pkg
@@ -8,23 +8,19 @@
 ; UID is the app's UID
 #{"ScummVM S90"},(0x101f9b57),0,80,3
 
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\ScummVMS90.app"-"!:\system\apps\ScummVMS90\ScummVMS90.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVMS90\ScummVM.exe"
+; Platform type
+(0x101FBE04), 0, 0, 0, {"Series90ProductID"}
 
-; AIF application information file
-"\epoc32\data\z\system\apps\ScummVMS90\ScummVMS90.aif"-"!:\system\apps\ScummVMS90\ScummVMS90.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\ScummVMS90\ScummVMS90.rsc"-"!:\system\apps\ScummVMS90\ScummVMS90.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Launcher, Application, AIF & Resource file
+"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
+"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2.pkg b/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
index 9dd919fb31..2ebf7580f9 100644
--- a/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
+++ b/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
@@ -6,27 +6,20 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM"},(0x101f9b57),0,80,3
+#{"ScummVM UIQ2"},(0x101f9b57),0,80,3
 
 ; Platform type
 (0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
 
-; Application file
+; Application, AIF & Resource file
 "\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
-
-; AIF application information file
 "\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
-
-; Resource file
 "\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
-
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg b/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
index 8002d66f20..a07149b702 100644
--- a/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
+++ b/backends/epoc/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
@@ -6,27 +6,20 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM"},(0x101f9b57),0,80,3
+#{"ScummVM SE"},(0x101f9b57),0,80,3
 
 ; Platform type
 (0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
 
-; Application file
+; Application, AIF & Resource file
 "\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
-
-; AIF application information file
 "\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
-
-; Resource file
 "\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
 
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
-
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
diff --git a/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 9dd919fb31..6c1f21cd95 100644
--- a/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -2,32 +2,32 @@
 ;;; ScummVM .PKG file for .SIS gegeration
 ;;;
 
-; Languages
-;&EN
 
-; UID is the app's UID
-#{"ScummVM"},(0x101f9b57),0,80,3
-
-; Platform type
-(0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
+; List of localised vendor names - one per language. At least one must be provided (English [EN]).
+; List must correspond to list of languages specified elsewhere in the .pkg
+%{"ScummVM"}
+; The non-localised, globally unique vendor name (mandatory)
+:"ScummVM"
 
-; Application file
-"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
+; UID is the app's UID
+#{"ScummVM UIQ3"},(0xA0000657),0,80,3
 
-; Resource file
-"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
+; ProductID for UIQ 3.0
+; Product/platform version UID, Major, Minor, Build, Product ID
+(0x101F6300), 3, 0, 0, {"UIQ30ProductID"}
 
-; Empty .placeholder file, ensures creation of c:\documents\ScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\ScummVM\.placeholder"
+; Application, AIF & Resource file
+"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"-"!:\sys\bin\ScummVM.exe"
+"\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"-"!:\resource\apps\ScummVM\ScummVM.rsc"
+"\uiq3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-"!:\resource\apps\scummvm_loc.rsc"
+"\uiq3\epoc32\data\Z\resource\APPS\scummvm.MBM"-"!:\resource\apps\scummvm.MBM"
+"\uiq3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\ScummVM\scummvm.ini",FILENULL
-""-"c:\documents\ScummVM\scummvm.stdout.txt",FILENULL
-""-"c:\documents\ScummVM\scummvm.stderr.txt",FILENULL
-""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
+""-"!:\shared\ScummVM\scummvm.ini",FILENULL
+""-"!:\shared\ScummVM\scummvm.stdout.txt",FILENULL
+""-"!:\shared\ScummVM\scummvm.stderr.txt",FILENULL
+""-"!:\shared\ScummVM\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
 ; It will remove the config file, std***.txt files & dirs on uninstall.
 \ No newline at end of file
diff --git a/backends/epoc/mmp/initial_mmps.zip b/backends/epoc/mmp/initial_mmps.zip
index a99d5a12da..4509dffb2c 100644
--- a/backends/epoc/mmp/initial_mmps.zip
+++ b/backends/epoc/mmp/initial_mmps.zip