Merge pull request #852 from Bitmessage/v0.6

V0.6

Author: Atheros1

.gitignore

@@ -5,4 +5,5 @@ src/build
 src/dist
 src/.project
 src/.pydevproject
-src/.settings/
+src/.settings/
+*.dll

COPYING

@@ -1,5 +1,5 @@
-Copyright (c) 2012-2015 Jonathan Warren
-Copyright (c) 2013-2015 The Bitmessage Developers
+Copyright (c) 2012-2016 Jonathan Warren
+Copyright (c) 2013-2016 The Bitmessage Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2012-2014 Jonathan Warren
-Copyright (c) 2013-2014 The Bitmessage Developers
+Copyright (c) 2012-2016 Jonathan Warren
+Copyright (c) 2013-2016 The Bitmessage Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

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

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`

archpackage/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Bob Mottram (4096 bits) <[email protected]>
 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')

compiletest.py

@@ -0,0 +1,20 @@
+#!/usr/bin/python2.7
+
+import ctypes
+import fnmatch
+import os
+import sys
+import traceback
+
+matches = []
+for root, dirnames, filenames in os.walk('src'):
+    for filename in fnmatch.filter(filenames, '*.py'):
+        matches.append(os.path.join(root, filename))
+
+for filename in matches:
+    source = open(filename, 'r').read() + '\n'
+    try:
+        compile(source, filename, 'exec')
+    except Exception as e:
+        ctypes.windll.user32.MessageBoxA(0, traceback.format_exc(), "Exception in " + filename, 1)
+        sys.exit(1)

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}

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 <[email protected]>  Mon, 2 May 2016 16:25:00 +0200
+
 pybitmessage (0.4.4-1) utopic; urgency=low
 
   * Added ability to limit network transfer rate

debian/copyright

@@ -3,11 +3,11 @@ Upstream-Name:
 Source: 
 
 Files: *
-Copyright: Copyright 2014 Bob Mottram (4096 bits) <[email protected]>
+Copyright: Copyright 2016 Bob Mottram (4096 bits) <[email protected]>
 License: MIT
 
 Files: debian/*
-Copyright: Copyright 2014 Bob Mottram (4096 bits) <[email protected]>
+Copyright: Copyright 2016 Bob Mottram (4096 bits) <[email protected]>
 License: MIT
 
 License: MIT