citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:Bitmessage/PyBitmessage

Browse Source
This commit is contained in:
Jonathan Warren 2013-06-03 23:25:57 -04:00
commit 884a4120d6
4 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,6 +1,6 @@
APP=pybitmessage APP=pybitmessage
VERSION=0.3.2 VERSION=0.3.2
DEST_SHARE=/usr/share DEST_SHARE=$(DESTDIR)/usr/share
DEST_APP=$(DEST_SHARE)/$(APP) DEST_APP=$(DEST_SHARE)/$(APP)
all: all:
@ -8,7 +8,7 @@ all:
debug: debug:
source: source:
tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs
install: install:
mkdir -m 755 -p $(DEST_APP) mkdir -m 755 -p $(DEST_APP)

12
debian.sh
View File

@ -7,15 +7,25 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.3.2
VERSION=0.3.2 VERSION=0.3.2
ARCH_TYPE=all 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 # Create a source archive
make clean make clean
# change the directory name to pybitmessage-version
mv ../PyBitmessage ../${APP}-${VERSION}
make source make source
# Build the package # 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}-1_${ARCH_TYPE}.deb
gpg -ba ../${APP}_${VERSION}.orig.tar.gz gpg -ba ../${APP}_${VERSION}.orig.tar.gz

12
debian/changelog vendored
View File

@ -4,8 +4,8 @@ pybitmessage (0.3.2-1) raring; urgency=low
* Refactored message status-related code. API function getStatus * Refactored message status-related code. API function getStatus
now returns one of these strings: notfound, msgqueued, now returns one of these strings: notfound, msgqueued,
broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey, broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey,
doingmsgpow, msgsent, or ackreceived doingmsgpow, msgsent, or ackreceived
* Moved proof of work to low-priority multi-threaded child * Moved proof of work to low-priority multi-threaded child
processes processes
@ -19,7 +19,7 @@ pybitmessage (0.3.2-1) raring; urgency=low
* Store tray icons in bitmessage_icons_rc.py * Store tray icons in bitmessage_icons_rc.py
-- Jonathan Warren (4096 bits) <jonathan@bitmessage.org> Mon, 03 June 2013 12:06:00 +0100 -- Bob Mottram (4096 bits) <bob@robotics.uk.to> Mon, 03 June 2013 20:17:00 +0100
pybitmessage (0.3.1-1) raring; urgency=low pybitmessage (0.3.1-1) raring; urgency=low
@ -31,12 +31,12 @@ pybitmessage (0.3.1-1) raring; urgency=low
* Don't update the time we last communicated with a node unless * Don't update the time we last communicated with a node unless
the connection is fully established. This will allow us to the connection is fully established. This will allow us to
forget about active but non-Bitmessage nodes which have made forget about active but non-Bitmessage nodes which have made
it into our knownNodes file. it into our knownNodes file.
* Prevent incoming connection flooding from crashing * Prevent incoming connection flooding from crashing
singleListener thread. Client will now only accept one singleListener thread. Client will now only accept one
connection per remote node IP connection per remote node IP
* Bugfix: Worker thread crashed when doing a POW to send out * Bugfix: Worker thread crashed when doing a POW to send out
a v2 pubkey (bug introduced in 0.3.0) a v2 pubkey (bug introduced in 0.3.0)

2
src/shared.py
View File

@ -1,4 +1,4 @@
softwareVersion = '0.3.2' softwareVersion = '0.3.211'
import threading import threading
import sys import sys