From 808d27e50560d2be84c66640d8fda24dc8af993c Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 8 Apr 2012 09:11:09 +0100
Subject: [PATCH] Updated bitcoin wallet to 2.01 and added testnet version

---
 build/extlib/.gitignore                |  1 +
 metadata/de.schildbach.wallet.txt      | 26 +++++++++++++-------
 metadata/de.schildbach.wallet_test.txt | 33 ++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 metadata/de.schildbach.wallet_test.txt

diff --git a/build/extlib/.gitignore b/build/extlib/.gitignore
index 0eedae0ebe..b5a90071a9 100644
--- a/build/extlib/.gitignore
+++ b/build/extlib/.gitignore
@@ -4,3 +4,4 @@ ActionBarSherlock/
 FacebookSDK/
 OI/
 JOpenDocument/
+BitcoinJWallet/
diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 98e8b5257a..61a5e8b7b5 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -13,18 +13,28 @@ Use this at your own risk, and be aware that if you lose access to the data
 of this application, you will lose any bitcoins contained in it. To back up
 the wallet, back up the files in /datadata/de.schildbach.wallet/files - you
 will need root access to do this.
+
+There's a separate version of this application that uses a test version of
+the Bitcoin network. It would be wise to use that first, to verify that
+everything works for you without using real Bitcoins.
 .
 
-Repo Type:git-svn
-Repo:http://bitcoin-wallet.googlecode.com/svn/
+Repo Type:git
+Repo:https://code.google.com/p/bitcoin-wallet/
 
-Build Version:1.48.2,66,680,subdir=branches/1.48-maintenance/,forceversion=yes,init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;
+#Note: there used to be build data for 1.48.2/66 but the source code for this
+#seems to have gone (it was in a maintenance branch) when the project went
+#from svn to git.
+Build Version:2.01,74,a55ef6822c9e,subdir=wallet,maven=yes,\
+bindir=wallet/target,\
+srclibs=BitcoinJWallet@31953d239555,\
+init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;,\
+prebuild=\
+mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+
+Update Check Mode:RepoManifest
 
-#Need to figure out the exact right version (it's an unspecified
-#non-released snapshot version) of the bitcoinj library to use - don't want to
-#break it!
-#Build Version:1.52,69,683,subdir=trunk,forceversion=yes,init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;
-Update Check Mode:Market
 Current Version:2.01
 Current Version Code:74
 
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
new file mode 100644
index 0000000000..af84832fef
--- /dev/null
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -0,0 +1,33 @@
+Category:System
+License:GPLv3
+Web Site:http://code.google.com/p/bitcoin-wallet/
+Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
+Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
+
+Summary:Bitcoin Wallet Test
+Description:
+A bitcoin wallet, allowing you to store, send and receive bitcoins on your
+device.
+
+This is a test version that uses the test Bitcoin network, not the real
+one.
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/bitcoin-wallet/
+
+#Note: there used to be build data for 1.48.2/66 but the source code for this
+#seems to have gone (it was in a maintenance branch) when the project went
+#from svn to git.
+Build Version:2.01_test,74,a55ef6822c9e,subdir=wallet,maven=yes,\
+bindir=wallet/target,\
+srclibs=BitcoinJWallet@31953d239555,\
+prebuild=\
+mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+
+Update Check Mode:RepoManifest
+
+Current Version:2.01
+Current Version Code:74
+