From b8ee5b316d2d8e71e6ffd612a54656117230d023 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Thu, 7 Feb 2013 14:47:04 +0000
Subject: [PATCH] update adaway to 2.0.1

---
 metadata/org.adaway.txt | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index cf4a9f3315..4838ef1bea 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -6,18 +6,19 @@ Issue Tracker:http://code.google.com/p/ad-away/issues/list
 Donate:http://flattr.com/thing/369138
 FlattrID:369138
 
-Summary:Ad blocker
+Summary:Block advertisements
 Description:
-An ad blocker using the hosts file.
+An ad blocker that uses the hosts file.
 
 Permissions:
 *'''Internet access''': To download hosts files
 *'''SD card''': To export lists to SD card
 *'''Wakelock''': Wake up phone when AdAway updates in background
 
-Help with translating AdAway on [https://www.transifex.net/projects/p/adaway Transifex].
-Donations are welcome in the f-droid.org repo: so it is possible to
-donate from within the app with this build, and we don't take any cut ;-).
+Help with translating AdAway on 
+[https://www.transifex.net/projects/p/adaway Transifex].
+Donations are welcome in the f-droid.org repo so it is possible to
+donate using a number of methods within the app with this build.
 
 Requires Root: Yes. The hosts files is located in /system which is normally read-only.
 .
@@ -45,16 +46,21 @@ Build Version:1.34,35,f2568b1,subdir=org_adaway/,buildjni=no,prebuild=android up
 Build Version:1.35,36,7442d5d,subdir=org_adaway/,buildjni=no,prebuild=android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations
 Build Version:1.36,37,83fc713,subdir=org_adaway/,buildjni=no,prebuild=android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations
 Build Version:1.37,38,70da32b567122b701cdcb1609b780eb85732028f,subdir=org_adaway/,buildjni=no,prebuild=android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations
-Build Version:2.0,39,!srclib problems 1f8e90beb0,subdir=AdAway,srclibs=RootCommands@c940b0e503,\
-init=rm android-libs/Donations/custom_rules.xml,\
-update=.;android-libs/Donations;android-libs/ActionBarSherlock,prebuild=\
-rm -rf ../update_zip libs/root-commands-1.2.jar && \
+Build Version:2.1,40,v2.1,subdir=AdAway,srclibs=RootCommands@c940b0e503,\
+extlibs=htmlcleaner/htmlcleaner-2.2.jar,init=rm android-libs/Donations/custom_rules.xml && \
+git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner,\
+update=.;android-libs/Donations;android-libs/ActionBarSherlock;\
+android-libs/HtmlSpanner/htmlspanner,prebuild=\
+rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && \
+cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && \
 echo "android.library.reference.3=$$RootCommands$$" >> project.properties && \
+echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties && \
+find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \
 cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
-android-libs/Donations/src/org/donations/,buildjni=no
+android-libs/Donations/src/org/donations/,buildjni=yes
 
 Auto Update Mode:None
-Update Check Mode:Market
+Update Check Mode:Tags
 Current Version:2.1
 Current Version Code:40