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

Makefile

@@ -1,6 +1,6 @@
 APP=pybitmessage
 VERSION=0.3.2
-DEST_SHARE=/usr/share
+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)

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

debian/changelog

@@ -4,8 +4,8 @@ pybitmessage (0.3.2-1) raring; urgency=low
 
   * Refactored message status-related code. API function getStatus
     now returns one of these strings: notfound, msgqueued,
-	broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey, 
-	doingmsgpow, msgsent, or ackreceived
+    broadcastqueued, broadcastsent, doingpubkeypow, awaitingpubkey,
+    doingmsgpow, msgsent, or ackreceived
 
   * Moved proof of work to low-priority multi-threaded child
     processes
@@ -19,7 +19,7 @@ pybitmessage (0.3.2-1) raring; urgency=low
 
   * 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
 
@@ -31,12 +31,12 @@ pybitmessage (0.3.1-1) raring; urgency=low
 
   * 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.
+    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
+    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)

src/shared.py

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