diff options
Diffstat (limited to 'dists/android')
-rw-r--r-- | dists/android/AndroidManifest.xml | 10 | ||||
-rw-r--r-- | dists/android/AndroidManifest.xml.in | 10 | ||||
-rwxr-xr-x | dists/android/mkplugin.sh | 2 | ||||
-rw-r--r-- | dists/android/plugin-manifest.xml | 14 | ||||
-rw-r--r-- | dists/android/plugin-manifest.xml.in | 14 | ||||
-rw-r--r-- | dists/android/res/layout/main.xml | 2 |
6 files changed, 26 insertions, 26 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index a25048fe28..e7778fdf61 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -2,11 +2,11 @@ <!-- NB: android:versionCode needs to be bumped for formal releases --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" + package="org.scummvm.scummvm" android:versionCode="@ANDROID_VERSIONCODE@" android:versionName="1.5.0git" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + android:sharedUserId="org.scummvm.scummvm"> <!-- This version works on Android 1.5 (SDK 3) and newer, but we want Android 2.2 (SDK 8) defaults and features. --> @@ -31,8 +31,8 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden"> - <meta-data android:name="org.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <meta-data android:name="org.scummvm.unpacker.nextActivity" + android:value="org.scummvm.scummvm/.ScummVMActivity"/> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> @@ -40,7 +40,7 @@ </activity> </application> - <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" + <permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN" android:label="@string/scummvm_perm_plugin_label" android:description="@string/scummvm_perm_plugin_desc" android:protectionLevel="signature"/> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 32444a03f0..8f7887eaf5 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -2,11 +2,11 @@ <!-- NB: android:versionCode needs to be bumped for formal releases --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" + package="org.scummvm.scummvm" android:versionCode="@ANDROID_VERSIONCODE@" android:versionName="@VERSION@" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + android:sharedUserId="org.scummvm.scummvm"> <!-- This version works on Android 1.5 (SDK 3) and newer, but we want Android 2.2 (SDK 8) defaults and features. --> @@ -31,8 +31,8 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden"> - <meta-data android:name="org.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <meta-data android:name="org.scummvm.unpacker.nextActivity" + android:value="org.scummvm.scummvm/.ScummVMActivity"/> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> @@ -40,7 +40,7 @@ </activity> </application> - <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN" + <permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN" android:label="@string/scummvm_perm_plugin_label" android:description="@string/scummvm_perm_plugin_desc" android:protectionLevel="signature"/> diff --git a/dists/android/mkplugin.sh b/dists/android/mkplugin.sh index 1811fc0475..30a7ef66d6 100755 --- a/dists/android/mkplugin.sh +++ b/dists/android/mkplugin.sh @@ -11,6 +11,6 @@ TEMPLATE=$3 PLUGIN_VERSION_CODE=$4 TARGET=$5 -PLUGIN_DESC=`sed -n s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p` < $CONFIGURE +PLUGIN_DESC=`sed -n "s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p" < $CONFIGURE` sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml index 728beb1de3..51b39be3b1 100644 --- a/dists/android/plugin-manifest.xml +++ b/dists/android/plugin-manifest.xml @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@" + package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@" android:versionCode="@PLUGIN_VERSION_CODE@" android:versionName="1.5.0git" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + android:sharedUserId="org.scummvm.scummvm"> <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" /> <application android:label="@string/app_name" android:description="@string/app_desc" android:icon="@drawable/scummvm"> - <receiver android:name="org.inodes.gus.scummvm.PluginProvider" - android:process="org.inodes.gus.scummvm"> + <receiver android:name="org.scummvm.scummvm.PluginProvider" + android:process="org.scummvm.scummvm"> <intent-filter> - <action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/> + <action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/> <category android:name="android.intent.category.INFO"/> </intent-filter> - <meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB" + <meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB" android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" /> </receiver> </application> - <uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/> + <uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/> <uses-configuration android:reqFiveWayNav="true" android:reqKeyboardType="qwerty"/> diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in index ab0a63a0cf..4b429097ae 100644 --- a/dists/android/plugin-manifest.xml.in +++ b/dists/android/plugin-manifest.xml.in @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@" + package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@" android:versionCode="@PLUGIN_VERSION_CODE@" android:versionName="@VERSION@" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + android:sharedUserId="org.scummvm.scummvm"> <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" /> <application android:label="@string/app_name" android:description="@string/app_desc" android:icon="@drawable/scummvm"> - <receiver android:name="org.inodes.gus.scummvm.PluginProvider" - android:process="org.inodes.gus.scummvm"> + <receiver android:name="org.scummvm.scummvm.PluginProvider" + android:process="org.scummvm.scummvm"> <intent-filter> - <action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/> + <action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/> <category android:name="android.intent.category.INFO"/> </intent-filter> - <meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB" + <meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB" android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" /> </receiver> </application> - <uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/> + <uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/> <uses-configuration android:reqFiveWayNav="true" android:reqKeyboardType="qwerty"/> diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml index 7b633c416d..8b0d515d62 100644 --- a/dists/android/res/layout/main.xml +++ b/dists/android/res/layout/main.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<org.inodes.gus.scummvm.EditableSurfaceView +<org.scummvm.scummvm.EditableSurfaceView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/main_surface" android:layout_width="fill_parent" |