From 267ddfb3190a11b3034a42da4f75e0b380a413c6 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 23 Sep 2013 10:49:22 -0300
Subject: Improve release checklist and build_bundle script.

---
 pkg/linux/build_bundle.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh
index 520ff256..60151a80 100755
--- a/pkg/linux/build_bundle.sh
+++ b/pkg/linux/build_bundle.sh
@@ -34,16 +34,18 @@ BITMASK_BIN=$TEMPLATE_BUNDLE/bitmask
 BUNDLE_NAME=Bitmask-linux$ARCH-$VERSION
 
 # clean template
-rm $TEMPLATE_BUNDLE/CHANGELOG
-rm $TEMPLATE_BUNDLE/relnotes.txt
+rm -f $TEMPLATE_BUNDLE/CHANGELOG
+rm -f $TEMPLATE_BUNDLE/relnotes.txt
 rm -rf $TEMPLATE_BUNDLE/apps/leap
 rm -rf $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail}
 
 # checkout the latest tag in all repos
 for repo in $REPOSITORIES; do
     cd $REPOS_ROOT/$repo
-    git fetch
-    # checkout to the latest annotated tag, supress 'detached head' warning
+    git checkout master
+    git pull --ff-only origin master && git fetch
+    git reset --hard origin/master  # this avoids problems if you are in a commit far in the past
+    # checkout to the closest annotated tag, supress 'detached head' warning
     git checkout --quiet `git describe --abbrev=0`
 done
 
@@ -82,7 +84,7 @@ cp src/launcher $BITMASK_BIN
 
 # copy launcher.py to template bundle
 # e.g. TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/apps/
-cd $REPOS_ROOT/bitmask_client_launcher/src/
+cd $REPOS_ROOT/bitmask_launcher/src/
 cp launcher.py $TEMPLATE_BUNDLE/apps/
 
 # copy relnotes, joint changelog and LICENSE to TEMPLATE_BUNDLE
-- 
cgit v1.2.3


From 75cc4211ae959cad9500bb9ccec608129dc3f438 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 25 Sep 2013 10:29:32 -0400
Subject: add sphinx-pypi-upload helper package

---
 pkg/requirements-docs.pip | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkg')

diff --git a/pkg/requirements-docs.pip b/pkg/requirements-docs.pip
index 6966869c..ad14d003 100644
--- a/pkg/requirements-docs.pip
+++ b/pkg/requirements-docs.pip
@@ -1 +1,2 @@
 sphinx
+Sphinx-PyPI-upload
-- 
cgit v1.2.3


From ff32e6bda529fffa8aaf5ebb9abf9028e7f0917f Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 2 Oct 2013 12:16:22 -0400
Subject: update deps to reflect keymanager changes

---
 pkg/requirements.pip | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 154e51b4..269a4646 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -14,7 +14,6 @@ psutil
 ipaddr
 twisted
 qt4reactor
-python-gnupg
 python-daemon # this should not be needed for Windows.
 keyring
 
-- 
cgit v1.2.3


From 74f858aa290aa8e5da5a75cb80fe70e30559d39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 4 Oct 2013 12:01:25 -0300
Subject: Update release notes and dependencies

---
 pkg/requirements.pip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg')

diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 269a4646..bb1deb1b 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -17,9 +17,9 @@ qt4reactor
 python-daemon # this should not be needed for Windows.
 keyring
 
-leap.common>=0.3.2
+leap.common>=0.3.4
 leap.soledad.client>=0.4.0
-leap.keymanager>=0.2.0
+leap.keymanager>=0.3.3
 leap.mail>=0.3.2
 
 # Remove this when u1db fixes its dependency on oauth
-- 
cgit v1.2.3