OPENPANDORA: Move all dist files into own folder under dists.

* Update OpenPandora bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.

14 files changed, 161 insertions, 22 deletions

diff --git a/backends/platform/openpandora/op-bundle.mk b/backends/platform/openpandora/op-bundle.mk
index 089430f43c..284a0497a8 100755
--- a/backends/platform/openpandora/op-bundle.mk
+++ b/backends/platform/openpandora/op-bundle.mk
@@ -14,15 +14,15 @@ op-bundle: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)/scummvm/icon"
 	$(MKDIR) "$(bundle_name)/scummvm/lib"
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/runscummvm.sh $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/PXML.xml $(bundle_name)/scummvm/data/
+	$(CP) $(srcdir)/dists/openpandora/runscummvm.sh $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/openpandora/PXML.xml $(bundle_name)/scummvm/data/
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/scummvm.png $(bundle_name)/scummvm/icon/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/dists/openpandora/icon/scummvm.png $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/dists/openpandora/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
 
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/README-OPENPANDORA $(bundle_name)/scummvm/docs/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/index.html $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/dists/openpandora/README-OPENPANDORA $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/dists/openpandora/index.html $(bundle_name)/scummvm/docs/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
 
@@ -50,15 +50,15 @@ op-pnd: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)/scummvm/icon"
 	$(MKDIR) "$(bundle_name)/scummvm/lib"
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/runscummvm.sh $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/PXML.xml $(bundle_name)/scummvm/data/
+	$(CP) $(srcdir)/dists/openpandora/runscummvm.sh $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/openpandora/PXML.xml $(bundle_name)/scummvm/data/
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/scummvm.png $(bundle_name)/scummvm/icon/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/dists/openpandora/icon/scummvm.png $(bundle_name)/scummvm/icon/
+	$(CP) $(srcdir)/dists/openpandora/icon/preview-pic.png  $(bundle_name)/scummvm/icon/
 
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/README-OPENPANDORA $(bundle_name)/scummvm/docs/
-	$(CP) $(srcdir)/backends/platform/openpandora/build/index.html $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/dists/openpandora/README-OPENPANDORA $(bundle_name)/scummvm/docs/
+	$(CP) $(srcdir)/dists/openpandora/index.html $(bundle_name)/scummvm/docs/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
 
@@ -75,9 +75,10 @@ endif
 
 	$(CP) $(libloc)/../arm-angstrom-linux-gnueabi/usr/lib/libFLAC.so.8.2.0 $(bundle_name)/scummvm/lib/libFLAC.so.8
 
-	$(srcdir)/backends/platform/openpandora/build/pnd_make.sh -p $(bundle_name).pnd -c -d $(bundle_name)/scummvm -x $(bundle_name)/scummvm/data/PXML.xml -i $(bundle_name)/scummvm/icon/scummvm.png
+	$(srcdir)/dists/openpandora/pnd_make.sh -p $(bundle_name).pnd -c -d $(bundle_name)/scummvm -x $(bundle_name)/scummvm/data/PXML.xml -i $(bundle_name)/scummvm/icon/scummvm.png
+
+	$(CP) $(srcdir)/dists/openpandora/README-PND.txt $(bundle_name)
 
-	$(CP) $(srcdir)/backends/platform/openpandora/build/README-PND.txt $(bundle_name)
 	tar -cvjf $(bundle_name)-pnd.tar.bz2 $(bundle_name).pnd $(bundle_name)/README-PND.txt
 	rm -R ./$(bundle_name)
 
diff --git a/backends/platform/openpandora/build/PXML.xml b/dists/openpandora/PXML.xml
index a87c49e2b8..896210bf01 100755..100644
--- a/backends/platform/openpandora/build/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -4,11 +4,11 @@
     <package id="scummvm.djwillis.0001">
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="1" minor="4" release="0" build="1" type="alpha"/>
+        <version major="1" minor="5" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
-        <title lang="en_US">ScummVM</title>
+        <title lang="en_US">ScummVM 1.5.0git</title>
         <titles>
-            <title lang="en_US">ScummVM</title>
+            <title lang="en_US">ScummVM 1.5.0git</title>
         </titles>
         <descriptions>
             <description lang="en_US">
@@ -25,7 +25,7 @@
         <exec command="./runscummvm.sh"/>
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="1" minor="4" release="0" build="1" type="alpha"/>
+        <version major="1" minor="5" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
         <title lang="en_US">ScummVM</title>
         <titles>
diff --git a/dists/openpandora/PXML.xml.in b/dists/openpandora/PXML.xml.in
new file mode 100644
index 0000000000..938e9cb24a
--- /dev/null
+++ b/dists/openpandora/PXML.xml.in
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">
+    <!-- This is the package, in our case ScummVM -->
+    <package id="scummvm.djwillis.0001">
+        <author name="DJWillis" website="http://www.scummvm.org/"/>
+        <!-- version type can be alpha, beta or release, set to release in branch -->
+        <version major="@VER_MAJOR@" minor="@VER_MINOR@" release="@VER_PATCH@" build="1" type="release"/>
+        <!-- Both title and titles are needed -->
+        <title lang="en_US">ScummVM @VERSION@</title>
+        <titles>
+            <title lang="en_US">ScummVM @VERSION@</title>
+        </titles>
+        <descriptions>
+            <description lang="en_US">
+                ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
+
+                ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam &amp; Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more.
+            </description>
+        </descriptions>
+        <icon src="icon/scummvm.png"/>
+    </package>
+
+    <!-- This is the application, the ScummVM binary -->
+    <application id="scummvm.djwillis.0001" appdata="scummvm">
+        <exec command="./runscummvm.sh"/>
+        <author name="DJWillis" website="http://www.scummvm.org/"/>
+        <!-- version type can be alpha, beta or release, set to release in branch -->
+        <version major="@VER_MAJOR@" minor="@VER_MINOR@" release="@VER_PATCH@" build="1" type="release"/>
+        <!-- Both title and titles are needed -->
+        <title lang="en_US">ScummVM</title>
+        <titles>
+            <title lang="en_US">ScummVM</title>
+        </titles>
+        <descriptions>
+            <description lang="en_US">
+                ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
+
+                ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam &amp; Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more.
+            </description>
+        </descriptions>
+        <licenses>
+            <license name="GPLv2" url="http://www.gnu.org/licenses/gpl-2.0.html" sourcecodeurl="http://www.scummvm.org"/>
+        </licenses>
+        <icon src="icon/scummvm.png"/>
+        <previewpics>
+            <pic src="icon/preview-pic.png"/>
+        </previewpics>
+        <info name="ScummVM Documentation" type="text/html" src="docs/index.html"/>
+        <categories>
+            <category name="Game">
+                <subcategory name="AdventureGame"/>
+            </category>
+        </categories>
+    </application>
+</PXML>
diff --git a/backends/platform/openpandora/build/PXML_schema.xsd b/dists/openpandora/PXML_schema.xsd
index 7c0d635016..7c0d635016 100644
--- a/backends/platform/openpandora/build/PXML_schema.xsd
+++ b/dists/openpandora/PXML_schema.xsd
diff --git a/backends/platform/openpandora/build/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index c8aabcbb7a..b3947975c0 100755..100644
--- a/backends/platform/openpandora/build/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM - OPENPANDORA SPECIFIC README
+ScummVM 1.5.0git - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-OPENPANDORA.in b/dists/openpandora/README-OPENPANDORA.in
new file mode 100644
index 0000000000..0a63a5938d
--- /dev/null
+++ b/dists/openpandora/README-OPENPANDORA.in
@@ -0,0 +1,19 @@
+ScummVM @VERSION@ - OPENPANDORA SPECIFIC README
+------------------------------------------------------------------------
+Please refer to the:
+
+ScummVM Forum: <http://forums.scummvm.org/>
+WiKi: <http://wiki.scummvm.org/index.php/OpenPandora>
+
+for the most current information on the port and any updates to this
+documentation.
+
+The wiki includes detailed instructions on how to use the port and 
+control information.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+OpenPandora backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/openpandora/build/README-PND.txt b/dists/openpandora/README-PND.txt
index 942c3a43e2..240936f755 100755..100644
--- a/backends/platform/openpandora/build/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM - OPENPANDORA README - HOW TO INSTALL
+ScummVM 1.5.0git - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/README-PND.txt.in b/dists/openpandora/README-PND.txt.in
new file mode 100644
index 0000000000..076c0e0a5c
--- /dev/null
+++ b/dists/openpandora/README-PND.txt.in
@@ -0,0 +1,38 @@
+ScummVM @VERSION@ - OPENPANDORA README - HOW TO INSTALL
+------------------------------------------------------------------------
+
+Please refer to the:
+
+ScummVM Forum: <http://forums.scummvm.org/>
+WiKi: <http://wiki.scummvm.org/index.php/OpenPandora>
+
+for the most current information on the port and any updates to this
+documentation.
+
+------------------------------------------------------------------------
+Installing:
+
+This archive contains ScummVM in a PND format ready to be copied to the
+OpenPandora and used.
+
+To install just copy the .pnd file from this archive to your device.
+
+You will need to place the .pnd file in a suitable location on your SD
+card.
+
+/pandora/desktop <- place here if you wish the icon to show on the
+			desktop. Documentation will show in the menu.
+
+/pandora/menu <- place here if you wish the icon to show on the
+			Xfce menu. Documentation will show in the menu.
+
+/pandora/apps <- place here if you wish the icon to show on the
+			desktop and in the menu. Documentation will show
+			in the menu.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+OpenPandora backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/openpandora/build/icon/preview-pic.png b/dists/openpandora/icon/preview-pic.png
index 2f4a536d30..2f4a536d30 100755..100644
--- a/backends/platform/openpandora/build/icon/preview-pic.png
+++ b/dists/openpandora/icon/preview-pic.png
diff --git a/backends/platform/openpandora/build/icon/scummvm.png b/dists/openpandora/icon/scummvm.png
index 128e59efc4..128e59efc4 100755..100644
--- a/backends/platform/openpandora/build/icon/scummvm.png
+++ b/dists/openpandora/icon/scummvm.png
diff --git a/backends/platform/openpandora/build/index.html b/dists/openpandora/index.html
index 34d381d0f8..d7238c1889 100755..100644
--- a/backends/platform/openpandora/build/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
 </h3>
 
 <h4>
-  <p>ScummVM: OpenPandora Specific Documentation</p>
+  <p>ScummVM 1.5.0git: OpenPandora Specific Documentation</p>
 </h4>
 
 <A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
 <A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
 
 <h4>
-  <p>ScummVM: General Documentation</p>
+  <p>ScummVM 1.5.0git: General Documentation</p>
 </h4>
 
 <A href="http://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/openpandora/index.html.in b/dists/openpandora/index.html.in
new file mode 100644
index 0000000000..42c8e8c147
--- /dev/null
+++ b/dists/openpandora/index.html.in
@@ -0,0 +1,26 @@
+<html>
+
+<h3>
+  <p>Welcome to the ScummVM!</p>
+</h3>
+
+<h4>
+  <p>ScummVM @VERSION@: OpenPandora Specific Documentation</p>
+</h4>
+
+<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
+<A href="http://scummvm.distant-earth.com/">ScummVM OpenPandora Website</a><br/>
+<A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
+
+<h4>
+  <p>ScummVM @VERSION@: General Documentation</p>
+</h4>
+
+<A href="http://www.scummvm.org/">ScummVM website</a><br/>
+<A href="docs/README">ScummVM README</a><br/>
+<A href="docs/NEWS">ScummVM NEWS</a><br/>
+<A href="docs/AUTHORS">ScummVM Authors</a><br/>
+<A href="docs/COPYRIGHT">ScummVM Copyright</a><br/>
+<A href="docs/COPYING">GPL Licence</a><br/>
+
+</html>
diff --git a/backends/platform/openpandora/build/pnd_make.sh b/dists/openpandora/pnd_make.sh
index 0c03e8154d..0c03e8154d 100755..100644
--- a/backends/platform/openpandora/build/pnd_make.sh
+++ b/dists/openpandora/pnd_make.sh
diff --git a/backends/platform/openpandora/build/runscummvm.sh b/dists/openpandora/runscummvm.sh
index 9c9d8362cb..9c9d8362cb 100755..100644
--- a/backends/platform/openpandora/build/runscummvm.sh
+++ b/dists/openpandora/runscummvm.sh