From 0febe11eb023710d16d0527d6fe0efa666f0d325 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 5 Apr 2013 17:02:02 +0100
Subject: [PATCH 1/2] Make it easier to reference another app's signature

---
 config.sample.py        | 3 +++
 fdroidserver/publish.py | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/config.sample.py b/config.sample.py
index f0e0369f..e81ab5f1 100644
--- a/config.sample.py
+++ b/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.
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index c0791d27..dce4d497 100644
--- a/fdroidserver/publish.py
+++ b/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)

From acadbdbaa96d7189bda6f3ef41fed6fb3fa0b533 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sun, 7 Apr 2013 19:39:53 +0100
Subject: [PATCH 2/2] XChange srclib

---
 fdroidserver/common.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9a43045b..80e5f46a 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1654,6 +1654,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)