Merge commit 'refs/merge-requests/112' of git://gitorious.org/f-droid/fdroidserver...

Conflicts:
	fdroidserver/build.py

diff --cc fdroidserver/build.py
index 03b519a79da823c13d0cd6933a686e8b9f2bd978,bc7d6b4ee69281fc5d593ab72e15f2a1b8fa7a41..2d9e736b276e77c6f0a3af98681a96ba28750a77
--- 1/fdroidserver/build.py
--- 2/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -354,8 -352,8 +354,8 @@@ def build_local(app, thisbuild, vcs, bu
              m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]",
                      output, re.S|re.M)
          if not m:
-             # This format is found in com.botbrew.basil for example...
-             m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/target/([^$]+)\.ap_\]",
 -            # This format is found in com.yubico.yubitotp for example...
++            # This format is found in com.yubico.yubitotp and com.botbrew.basil for example...
+             m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^$]+)\.ap_,",
                      output, re.S|re.M)
          if not m:
              print output