From bdc50241acf69d58d926330844a29987920a5e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 11:17:10 +0200
Subject: [PATCH 1/6] don't build on bleed and fail because $TRAVIS_TAG is
 empty

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 96b73031c8..9691024f2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,6 @@ deploy:
     - build/openra_$DOTVERSION_all.deb
   skip_cleanup: true
   on:
-    all_branches: true
+    all_branches: false
     tags: true
     repo: OpenRA/OpenRA

From 2ca6bb51026e4e3c177167d08018fc7ce20c1c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 11:34:04 +0200
Subject: [PATCH 2/6] only install packaging tools before deploying

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9691024f2d..80c7ab57f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: c
 
 # Make sure build dependencies are installed.
 install:
- - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown
+ - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6
 cache: apt
 
 # Run the build script
@@ -35,6 +35,7 @@ notifications:
     skip_join: true
 
 before_deploy:
+ - sudo apt-get install nsis markdown dpkg rpm
  - DOTVERSION=`echo $TRAVIS_TAG | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build

From 7c28351ce30944f15a6077a839f9714f1f832179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 11:39:23 +0200
Subject: [PATCH 3/6] fix /home/travis/rpmbuild/*: No such file or directory

---
 packaging/linux/rpm/buildpackage.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index b5e88ee430..e11fbe49d8 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -6,6 +6,8 @@ then
     exit $E_BADARGS
 fi
 
+mkdir ~/rpmbuild/
+
 # Replace any dashes in the version string with periods
 PKGVERSION=`echo $1 | sed "s/-/\\./g"`
 

From 83f11745f7f3ee8982ce428cf5f4e562be6fa4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 11:45:25 +0200
Subject: [PATCH 4/6] remove the wait so that CI can finish

---
 packaging/linux/buildpackage.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index baf2c87d2d..efbc11ac18 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -62,5 +62,3 @@ if [ $? -ne 0 ]; then
 fi
 popd
 
-wait
-

From 87ddbddf2f23ff65405cfb05dfb23b704d03e422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 11:58:01 +0200
Subject: [PATCH 5/6] try an absolute path instead

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 80c7ab57f2..26dadaf8f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_deploy:
  - DOTVERSION=`echo $TRAVIS_TAG | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
- - ./package-all.sh $TRAVIS_TAG build
+ - ./package-all.sh $TRAVIS_TAG $PWD/build/
 deploy:
   provider: releases
   api_key:

From 4b3935b01073cd26a643eb865aaf8da4da951e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 12:14:26 +0200
Subject: [PATCH 6/6] enforce bash usage to avoid problems on Ubuntu with dash

---
 packaging/linux/buildpackage.sh | 6 +++---
 packaging/package-all.sh        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index efbc11ac18..928b9474e1 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -40,7 +40,7 @@ cd packaging/linux
 
 pushd deb
 echo "Building Debian package."
-./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
 if [ $? -ne 0 ]; then
     echo "Debian package build failed."
 fi
@@ -48,7 +48,7 @@ popd
 
 pushd pkgbuild
 echo "Building Arch-Linux package."
-sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
 if [ $? -ne 0 ]; then
     echo "Arch-Linux package build failed."
 fi
@@ -56,7 +56,7 @@ popd
 
 pushd rpm
 echo "Building RPM package."
-sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
+bash buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
 if [ $? -ne 0 ]; then
     echo "RPM package build failed."
 fi
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 642897aebb..ea1f4f4aea 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -89,7 +89,7 @@ popd
 
 pushd osx
 echo "Zipping OS X package"
-sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
+bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "OS X package build failed."
 fi
@@ -97,7 +97,7 @@ popd
 
 pushd linux
 echo "Building Linux packages"
-sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
+bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "Linux package build failed."
 fi