From 9f1f912079d97aca66cfee1cdc8e22004978014f Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Thu, 9 May 2013 11:33:23 +0100
Subject: [PATCH] update de.schildbach.wallet to 3.0.4

---
 metadata/de.schildbach.wallet.txt       |  9 +++++++--
 metadata/de.schildbach.wallet/pom.patch | 15 +++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 8210c420c9..1ea064e085 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -41,6 +41,7 @@ works for you without using real Bitcoins.
 .
 
 # BitcoinJWallet (author's fork) is rebased each version so old commits wont work
+# patches post 3.0 will also need re-doing
 Repo Type:git
 Repo:https://code.google.com/p/bitcoin-wallet/
 
@@ -62,13 +63,17 @@ prebuild=\
 cd ../integration-android && mvn3 install && cd ../wallet && \
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-# Build from prodnet branch which cherry picks some old commits and commits after tags
-# Use specific commit instead of git fetch origin && git checkout origin/prodnet
 Build Version:3.01,121,742241f59df1,maven=yes,patch=pom.patch,\
 bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
 sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
 cp -r $$BitcoinJWallet$$/ . && rm -rf market/
+Build Version:3.04,124,3efa5beb206e,maven=yes,patch=pom.patch,\
+bindir=wallet/target,srclibs=BitcoinJWallet@7cb7bfc11c11,prebuild=\
+cp -r $$BitcoinJWallet$$/ . && rm -rf market/
 
+# Build from prodnet branch which cherry picks some old commits and commits after tags
+# Use specific commit instead of git fetch origin && git checkout origin/prodnet
+# See wallet/README for info about which BitcoinJ branch to use
 Auto Update Mode:None
 # RM/Tags don't work
 Update Check Mode:Market
diff --git a/metadata/de.schildbach.wallet/pom.patch b/metadata/de.schildbach.wallet/pom.patch
index b6c909d5cd..3953073bbd 100644
--- a/metadata/de.schildbach.wallet/pom.patch
+++ b/metadata/de.schildbach.wallet/pom.patch
@@ -9,7 +9,7 @@ index 161602f..3f49016 100644
 -		<artifactId>base</artifactId>
 -		<version>1</version>
 +		<artifactId>wallet-parent</artifactId>
-+		<version>3.01</version>
++		<version>3.04</version>
  	</parent>
  
  	<dependencies>
@@ -26,7 +26,7 @@ index c26e0db..723fa26 100644
 -	<version>1</version>
 +	<artifactId>wallet-parent</artifactId>
 +	<name>wallet-parent</name>
-+	<version>3.01</version>
++	<version>3.04</version>
  	<packaging>pom</packaging>
  
  	<modules>
@@ -49,16 +49,7 @@ index 9e13ad5..a10247d 100644
 -		<artifactId>base</artifactId>
 -		<version>1</version>
 +		<artifactId>wallet-parent</artifactId>
-+		<version>3.01</version>
++		<version>3.04</version>
  	</parent>
  
  	<dependencies>
-@@ -53,7 +53,7 @@
- 		<dependency>
- 			<groupId>de.schildbach.wallet</groupId>
- 			<artifactId>bitcoinj</artifactId>
--			<version>0.8</version>
-+			<version>0.8-SNAPSHOT</version>
- 		</dependency>
- 
- 		<!-- de.schildbach.wallet.integration.android.* -->