From eb2d16c574e4f93692917574f532848a4ca9a50b Mon Sep 17 00:00:00 2001 From: fuzzgun Date: Mon, 3 Jun 2013 20:13:52 +0100 Subject: [PATCH 1/2] debian build script improvements --- Makefile | 6 +++--- debian.sh | 12 +++++++++++- src/shared.py | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 07ce9fcf..0991ad56 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ APP=pybitmessage -VERSION=0.3.2 -DEST_SHARE=/usr/share +VERSION=0.3.211 +DEST_SHARE=$(DESTDIR)/usr/share DEST_APP=$(DEST_SHARE)/$(APP) all: @@ -8,7 +8,7 @@ all: debug: source: - tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git + tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs install: mkdir -m 755 -p $(DEST_APP) diff --git a/debian.sh b/debian.sh index 7c71a3d4..69bdcba8 100755 --- a/debian.sh +++ b/debian.sh @@ -7,15 +7,25 @@ #!/bin/bash APP=pybitmessage +PREV_VERSION=0.3.2 VERSION=0.3.2 ARCH_TYPE=all +#update version numbers automatically - so you don't have to +sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile +sed -i 's/'''${PREV_VERSION}'''/'''${VERSION}'''/g' src/shared.py + # Create a source archive make clean +# change the directory name to pybitmessage-version +mv ../PyBitmessage ../${APP}-${VERSION} make source # Build the package -fakeroot dpkg-buildpackage -A +dpkg-buildpackage -A + +# change the directory name back +mv ../${APP}-${VERSION} ../PyBitmessage gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb gpg -ba ../${APP}_${VERSION}.orig.tar.gz diff --git a/src/shared.py b/src/shared.py index 815cd637..1aaa0d3a 100644 --- a/src/shared.py +++ b/src/shared.py @@ -1,4 +1,4 @@ -softwareVersion = '0.3.2' +softwareVersion = '0.3.211' import threading import sys From b296d9d39ff4177230a1dc159583c2ade35a5da6 Mon Sep 17 00:00:00 2001 From: fuzzgun Date: Mon, 3 Jun 2013 20:22:02 +0100 Subject: [PATCH 2/2] Remove invalid characters from debian/changelog --- Makefile | 2 +- debian/changelog | 94 ++++++++++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index 0991ad56..6f415786 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ APP=pybitmessage -VERSION=0.3.211 +VERSION=0.3.2 DEST_SHARE=$(DESTDIR)/usr/share DEST_APP=$(DEST_SHARE)/$(APP) diff --git a/debian/changelog b/debian/changelog index b2c4984f..8c78203e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,71 +1,71 @@ pybitmessage (0.3.2-1) raring; urgency=low * Bugfix: Remove remaining references to the old myapp.trayIcon - - * Refactored message status-related code. API function getStatus - now returns one of these strings: notfound, msgqueued, - broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey, - doingmsgpow, msgsent, or ackreceived - - * Moved proof of work to low-priority multi-threaded child - processes - - * Added menu option to delete all trashed messages - - * Added inv flooding attack mitigation - - * On Linux, when selecting Show Bitmessage, do not maximize - automatically - - * Store tray icons in bitmessage_icons_rc.py - -- Jonathan Warren (4096 bits) Mon, 03 June 2013 12:06:00 +0100 + * Refactored message status-related code. API function getStatus + now returns one of these strings: notfound, msgqueued, + broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey, + doingmsgpow, msgsent, or ackreceived + + * Moved proof of work to low-priority multi-threaded child + processes + + * Added menu option to delete all trashed messages + + * Added inv flooding attack mitigation + + * On Linux, when selecting Show Bitmessage, do not maximize + automatically + + * Store tray icons in bitmessage_icons_rc.py + + -- Bob Mottram (4096 bits) Mon, 03 June 2013 20:17:00 +0100 pybitmessage (0.3.1-1) raring; urgency=low - * Added new API commands: getDeterministicAddress, + * Added new API commands: getDeterministicAddress, addSubscription, deleteSubscription - - * TCP Connection timeout for non-fully-established connections + + * TCP Connection timeout for non-fully-established connections now 20 seconds - - * Don't update the time we last communicated with a node unless - the connection is fully established. This will allow us to - forget about active but non-Bitmessage nodes which have made - it into our knownNodes file. - - * Prevent incoming connection flooding from crashing - singleListener thread. Client will now only accept one - connection per remote node IP - - * Bugfix: Worker thread crashed when doing a POW to send out + + * Don't update the time we last communicated with a node unless + the connection is fully established. This will allow us to + forget about active but non-Bitmessage nodes which have made + it into our knownNodes file. + + * Prevent incoming connection flooding from crashing + singleListener thread. Client will now only accept one + connection per remote node IP + + * Bugfix: Worker thread crashed when doing a POW to send out a v2 pubkey (bug introduced in 0.3.0) - + * Wrap all sock.shutdown functions in error handlers - + * Put all 'commit' commands within SQLLocks - + * Bugfix: If address book label is blank, Bitmessage wouldn't show message (bug introduced in 0.3.0) - + * Messaging menu item selects the oldest unread message - + * Standardize on 'Quit' rather than 'Exit' - + * [OSX] Try to seek homebrew installation of OpenSSL - + * Prevent multiple instances of the application from running - + * Show 'Connected' or 'Connection Lost' indicators - - * Use only 9 half-open connections on Windows but 32 for + + * Use only 9 half-open connections on Windows but 32 for everyone else - - * Added appIndicator (a more functional tray icon) and Ubuntu + + * Added appIndicator (a more functional tray icon) and Ubuntu Messaging Menu integration - - * Changed Debian install directory and run script name based - on Github issue #135 + + * Changed Debian install directory and run script name based + on Github issue #135 -- Jonathan Warren (4096 bits) Sat, 25 May 2013 12:06:00 +0100