Merge pull request #184 from fuzzgun/master

Debian packaging improvements and fixes
This commit is contained in:
Jonathan Warren 2013-06-03 13:02:27 -07:00
commit 81d691d84a
4 changed files with 61 additions and 51 deletions

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)

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

2
debian/changelog vendored
View File

@ -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

View File

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