Merge branch 'master' into logging

Conflicts:
	fdroidserver/common.py

diff --cc fdroid
Simple merge

diff --cc fdroidserver/build.py
index 97a645ecca860ea0ce41131cf6cc50ea43a31a83,c151c69c3e7006b8427a3dd214502c921639b11c..96daeeb69ef1611fc95d31cdb37893d0436af1af
--- 1/fdroidserver/build.py
--- 2/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -612,12 -618,8 +601,8 @@@ def build_local(app, thisbuild, vcs, bu
  
      if p.returncode != 0:
          raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
 -    print "Successfully built version " + thisbuild['version'] + ' of ' + app['id']
 +    logging.info("Successfully built version " + thisbuild['version'] + ' of ' + app['id'])
  
-     # Find the apk name in the output...
-     if 'bindir' in thisbuild:
-         bindir = os.path.join(build_dir, thisbuild['bindir'])
- 
      if thisbuild['type'] == 'maven':
          stdout_apk = '\n'.join([
              line for line in p.stdout.splitlines() if any(a in line for a in ('.apk','.ap_'))])

diff --cc fdroidserver/checkupdates.py
Simple merge

diff --cc fdroidserver/common.py
index 5ac04d1cfdb37096ef6c682f231d5b2c3cd37515,3bca96d3c6666171e2912cb25a4167bae06385a7..ad4b7e420194f504a0476775d54e8482df07795b
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -988,8 -1013,20 +988,20 @@@ def prepare_source(vcs, app, build, bui
          if flavour in ['main', 'yes', '']:
              flavour = None
  
+         if 'target' in build:
+             n = build["target"].split('-')[1]
+             subprocess.call(['sed', '-i',
+                 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g',
+                 'build.gradle'], cwd=root_dir)
+             if '@' in build['gradle']:
+                 gradle_dir = os.path.join(root_dir, build['gradle'].split('@',1)[1])
+                 gradle_dir = os.path.normpath(gradle_dir)
+                 subprocess.call(['sed', '-i',
+                     's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g',
+                     'build.gradle'], cwd=gradle_dir)
+ 
      # Remove forced debuggable flags
 -    print "Removing debuggable flags..."
 +    logging.info("Removing debuggable flags")
      for path in manifest_paths(root_dir, flavour):
          if not os.path.isfile(path):
              continue

diff --cc fdroidserver/import.py
Simple merge

diff --cc fdroidserver/init.py
Simple merge

diff --cc fdroidserver/install.py
Simple merge

diff --cc fdroidserver/lint.py
Simple merge

diff --cc fdroidserver/metadata.py
Simple merge

diff --cc fdroidserver/publish.py
Simple merge

diff --cc fdroidserver/update.py
Simple merge