From b1195031e62093646b9d2ba73b9bc511cc5deabd Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Wed, 28 Dec 2011 14:32:37 +0100
Subject: [PATCH] Clone all the branches instead of the ref we're building, and
 cherry-pick the two commits that make building from a tag work

---
 dist/uploadtoppa.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist/uploadtoppa.sh b/dist/uploadtoppa.sh
index c4d29a323..bd8c162de 100755
--- a/dist/uploadtoppa.sh
+++ b/dist/uploadtoppa.sh
@@ -19,10 +19,11 @@ DIRECTORY=clementine
 rm -rfv $BASE/$DIRECTORY $BASE/*.diff.gz $BASE/*.tar.gz $BASE/*.dsc $BASE/*_source.changes
 
 # Checkout
-git init $DIRECTORY
+git clone $REPO $DIRECTORY
 cd $BASE/$DIRECTORY
-git fetch -t $REPO $REFSPEC
 git checkout $REFSPEC
+git cherry-pick -n 9e2e035ae1a25bc5f37a17ae7ea10ba7c37fb328
+git cherry-pick -n 5b9a273227648919c8c57c73df9c980c049eccc4
 
 # Generate changelog and maketarball.sh
 mkdir $BASE/$DIRECTORY/bin