From c4bcf1d8838d7e7db91b83f17b0bf3fd9a094930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 26 Jan 2014 17:14:16 +0100
Subject: [PATCH] Use subdir in dashclock, remove basename

---
 metadata/net.nurik.roman.dashclock.txt            |  6 ++++--
 metadata/net.nurik.roman.dashclock/basename.patch | 13 -------------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 metadata/net.nurik.roman.dashclock/basename.patch

diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt
index 06dde75f57..ed5566ed32 100644
--- a/metadata/net.nurik.roman.dashclock.txt
+++ b/metadata/net.nurik.roman.dashclock.txt
@@ -42,9 +42,11 @@ $PWD/main/src/main/aidl;$PWD/api/src/main/aidl" >> main/src/main/ant.properties
 
 Build:1.6,30
     commit=v1.6
+    subdir=main
     gradle=yes
-    patch=code_30.patch;disable_gplay.diff;basename.patch
-    prebuild=echo "sdk.dir=$ANDROID_HOME" > local.properties && ln -s main/build
+    patch=code_30.patch;disable_gplay.diff
+    prebuild=echo "sdk.dir=$ANDROID_HOME" > ../local.properties && \
+        sed -i '/^project\.archivesBaseName/d' build.gradle
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
diff --git a/metadata/net.nurik.roman.dashclock/basename.patch b/metadata/net.nurik.roman.dashclock/basename.patch
deleted file mode 100644
index a8e67cd592..0000000000
--- a/metadata/net.nurik.roman.dashclock/basename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/main/build.gradle b/main/build.gradle
-index 14b8eb7..c7acb15 100644
---- a/main/build.gradle
-+++ b/main/build.gradle
-@@ -25,7 +25,7 @@ buildscript {
- 
- apply plugin: 'android'
- 
--project.archivesBaseName = "dashclock"
-+project.archivesBaseName = "DashClock"
- 
- repositories {
-     mavenCentral()