From 0851b759b068b54cb93937a56a7f2f0871dbe9af Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Mon, 2 May 2016 16:26:47 +0200
Subject: [PATCH] Update build scripts for 0.6

---
 Makefile                     |  7 ++++---
 arch.sh                      |  2 +-
 archpackage/PKGBUILD         |  2 +-
 debian.sh                    | 12 +++++++-----
 debian/changelog             |  9 +++++++++
 ebuild.sh                    |  2 +-
 puppy.sh                     |  2 +-
 rpmpackage/pybitmessage.spec |  2 +-
 slack.sh                     |  2 +-
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 3078ee94..fa1c4c91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 APP=pybitmessage
-VERSION=0.4.4
+APPDIR=`basename "\`pwd\`"`
+VERSION=0.6.0
 RELEASE=1
 ARCH_TYPE=`uname -m`
 PREFIX?=/usr/local
@@ -8,7 +9,7 @@ LIBDIR=lib
 all:
 debug:
 source:
-	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs
+	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APPDIR} --exclude-vcs
 	gzip -f9n ../${APP}_${VERSION}.orig.tar
 install:
 	mkdir -p ${DESTDIR}/usr
@@ -57,5 +58,5 @@ clean:
 	rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz
 
 sourcedeb:
-	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs --exclude 'debian'
+	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APPDIR} --exclude-vcs --exclude 'debian'
 	gzip -f9n ../${APP}_${VERSION}.orig.tar
diff --git a/arch.sh b/arch.sh
index 96d2e8d8..5f7982bb 100755
--- a/arch.sh
+++ b/arch.sh
@@ -2,7 +2,7 @@
 
 APP=pybitmessage
 PREV_VERSION=0.4.4
-VERSION=0.4.4
+VERSION=0.6.0
 RELEASE=1
 ARCH_TYPE=any
 CURRDIR=`pwd`
diff --git a/archpackage/PKGBUILD b/archpackage/PKGBUILD
index 5c2c78eb..9fd8eadd 100644
--- a/archpackage/PKGBUILD
+++ b/archpackage/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 pkgname=pybitmessage
-pkgver=0.4.4
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
 arch=('any')
diff --git a/debian.sh b/debian.sh
index 3a4edbe5..9caed2dc 100755
--- a/debian.sh
+++ b/debian.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.2
-VERSION=0.4.4
+PREV_VERSION=0.4.4
+VERSION=0.6.0
 RELEASE=1
 ARCH_TYPE=all
 DIR=${APP}-${VERSION}
+CURDIR=`pwd`
+SHORTDIR=`basename ${CURDIR}`
 
 if [ $ARCH_TYPE == "x86_64" ]; then
     ARCH_TYPE="amd64"
@@ -30,17 +32,17 @@ make clean
 make
 
 # Change the parent directory name to Debian format
-mv ../${APP} ../${DIR}
+mv ../${SHORTDIR} ../${DIR}
 
 # Create a source archive
 make sourcedeb
 
 # Build the package
-dpkg-buildpackage -F
+dpkg-buildpackage -F -us -uc
 
 # Sign files
 gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
 gpg -ba ../${APP}_${VERSION}.orig.tar.gz
 
 # Restore the parent directory name
-mv ../${DIR} ../${APP}
+mv ../${DIR} ../${SHORTDIR}
diff --git a/debian/changelog b/debian/changelog
index 415dc400..9fc04ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pybitmessage (0.6.0-1) trusty; urgency=low
+
+  * Bugfixes
+  * UI improvements
+  * performance and security improvements
+  * integration with email gateway (mailchuck.com)
+
+ -- Peter Surda <dev@mailchuck.com>  Mon, 2 May 2016 16:25:00 +0200
+
 pybitmessage (0.4.4-1) utopic; urgency=low
 
   * Added ability to limit network transfer rate
diff --git a/ebuild.sh b/ebuild.sh
index 11a6f5be..cd73685b 100755
--- a/ebuild.sh
+++ b/ebuild.sh
@@ -2,7 +2,7 @@
 
 APP=pybitmessage
 PREV_VERSION=0.4.4
-VERSION=0.4.4
+VERSION=0.6.0
 RELEASE=1
 SOURCEDIR=.
 ARCH_TYPE=`uname -m`
diff --git a/puppy.sh b/puppy.sh
index 48832734..a78e021c 100755
--- a/puppy.sh
+++ b/puppy.sh
@@ -2,7 +2,7 @@
 
 APP=pybitmessage
 PREV_VERSION=0.4.4
-VERSION=0.4.4
+VERSION=0.6.0
 RELEASE=1
 BUILDDIR=~/petbuild
 CURRDIR=`pwd`
diff --git a/rpmpackage/pybitmessage.spec b/rpmpackage/pybitmessage.spec
index 258636f8..1235251a 100644
--- a/rpmpackage/pybitmessage.spec
+++ b/rpmpackage/pybitmessage.spec
@@ -1,5 +1,5 @@
 Name: pybitmessage
-Version: 0.4.4
+Version: 0.6.0
 Release: 1%{?dist}
 Summary: Send encrypted messages
 License: MIT
diff --git a/slack.sh b/slack.sh
index c19ff954..f7495e46 100755
--- a/slack.sh
+++ b/slack.sh
@@ -2,7 +2,7 @@
 
 APP=pybitmessage
 PREV_VERSION=0.4.4
-VERSION=0.4.4
+VERSION=0.6.0
 RELEASE=1
 ARCH_TYPE=`uname -m`
 BUILDDIR=~/slackbuild