Merge commit 'refs/merge-requests/319' of https://gitorious.org/f-droid/fdroiddata into merge-requests/319

Conflicts:
	metadata/com.traffar.game_of_life.txt

metadata/com.traffar.game_of_life.txt

@@ -17,10 +17,10 @@ Features include:
 .
 
 Repo Type:git
-Repo:https://bitbucket.org/przemekr/game_of_life_agg.git
+Repo:https://bitbucket.org/przemekr/game_of_life_agg
 
-Build:20131217,1
-    commit=android20131217
+Build:0.1,1
+    commit=0.1
     subdir=android
     init=cd jni/SDL && \
         rm -rf src include SDL-2.0.1* && \
@@ -30,8 +30,18 @@ Build:20131217,1
         ln -s SDL2-2.0.1/include .
     buildjni=yes
 
-Auto Update Mode:None
+Build:0.2,2
+    commit=0.2
+    subdir=android
+    init=cd jni/SDL && \
+        rm -rf src include SDL-2.0.1* && \
+        wget http://libsdl.org/release/SDL2-2.0.1.tar.gz && \
+        tar xf SDL2-2.0.1.tar.gz && \
+        ln -s SDL2-2.0.1/src . && \
+        ln -s SDL2-2.0.1/include .
+    buildjni=yes
+
+Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:0.2
 Current Version Code:2
-

metadata/com.traffar.oware.txt

@@ -0,0 +1,36 @@
+Categories:Games
+License:GPLv3
+Web Site:https://bitbucket.org/przemekr/oware/wiki/Home
+Source Code:https://bitbucket.org/przemekr/oware/src
+Issue Tracker:https://bitbucket.org/przemekr/oware/issues
+
+Auto Name:Oware
+Summary:Oware -- abstract African board game.
+Description:
+Oware is a board strategy game of African origin. Among its many names are Ayò,
+Awalé, Wari, Ouri, Ouril or Uril.
+
+Move Your seeds along the board and grab scores from the opponent pits. Check 
+[http://en.wikipedia.org/wiki/Oware] for the game rules. 
+
+Play with a friend or against a computer player.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/przemekr/oware
+
+Build:0.1,1
+    commit=0.1
+    subdir=android
+    init=cd jni/SDL && \
+        rm -rf src include SDL-2.0.1* && \
+        wget http://libsdl.org/release/SDL2-2.0.1.tar.gz && \
+        tar xf SDL2-2.0.1.tar.gz && \
+        ln -s SDL2-2.0.1/src . && \
+        ln -s SDL2-2.0.1/include .
+    buildjni=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1