Merge git://gitorious.org/f-droid/fdroidserver

config.sample.py

@@ -41,6 +41,9 @@ keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
 #for particular applications. Normally, just leave it empty.
 keyaliases = {}
 keyaliases['com.example.app'] = 'example'
+#You can also force an app to use the same key alias as another one, using
+#the @ prefix.
+keyaliases['com.example.another.plugin'] = '@com.example.another'
 
 #The ssh path to the server's public web root directory. This is used for
 #uploading data, etc.

fdroidserver/common.py

@@ -1680,6 +1680,13 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
             return sdir
         return libdir
 
+    elif name == 'XChange':
+        sdir = os.path.join(extlib_dir, 'XChange')
+        vcs = getvcs('git',
+	    'https://github.com/timmolter/XChange', sdir, sdk_path)
+        vcs.gotorevision(ref)
+        return sdir
+
     raise BuildException('Unknown srclib ' + name)
 
 

fdroidserver/publish.py

@@ -84,6 +84,10 @@ def main():
             if appid in keyaliases:
                 # For this particular app, the key alias is overridden...
                 keyalias = keyaliases[appid]
+                if keyalias.startswith('@'):
+                    m = md5.new()
+                    m.update(keyalias[1:])
+                    keyalias = m.hexdigest()[:8]
             else:
                 m = md5.new()
                 m.update(appid)