Merge pull request #439 from Atheros1/master

Small package modifications
This commit is contained in:
Jonathan Warren 2013-08-25 11:11:18 -07:00
commit 83f3d81251
10 changed files with 28 additions and 14 deletions

View File

@ -7,7 +7,8 @@ PREFIX?=/usr/local
all: all:
debug: debug:
source: source:
tar -cvzf ../${APP}_${VERSION}.orig.tar.gz ../${APP}-${VERSION} --exclude-vcs tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs
gzip -f9n ../${APP}_${VERSION}.orig.tar
install: install:
mkdir -p ${DESTDIR}/usr mkdir -p ${DESTDIR}/usr
mkdir -p ${DESTDIR}${PREFIX} mkdir -p ${DESTDIR}${PREFIX}

View File

@ -4,7 +4,7 @@ APP=pybitmessage
PREV_VERSION=0.3.5 PREV_VERSION=0.3.5
VERSION=0.3.5 VERSION=0.3.5
RELEASE=1 RELEASE=1
ARCH_TYPE=`uname -m` ARCH_TYPE=any
CURRDIR=`pwd` CURRDIR=`pwd`
SOURCE=archpackage/${APP}-${VERSION}.tar.gz SOURCE=archpackage/${APP}-${VERSION}.tar.gz

View File

@ -3,13 +3,13 @@ pkgname=pybitmessage
pkgver=0.3.5 pkgver=0.3.5
pkgrel=1 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." 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=('i686' 'x86_64') arch=('any')
url="https://github.com/Bitmessage/PyBitmessage" url="https://github.com/Bitmessage/PyBitmessage"
license=('MIT') license=('MIT')
groups=() groups=()
depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'gst123') depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl' 'mpg123')
makedepends=() makedepends=()
optdepends=('python2-gevent') optdepends=('python2-gevent: Python network library that uses greenlet and libevent for easy and scalable concurrency')
provides=() provides=()
conflicts=() conflicts=()
replaces=() replaces=()
@ -19,7 +19,7 @@ install=
changelog= changelog=
source=($pkgname-$pkgver.tar.gz) source=($pkgname-$pkgver.tar.gz)
noextract=() noextract=()
md5sums=() md5sums=(ebf89129571571198473559b4b2e552c)
build() { build() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr ./configure --prefix=/usr

View File

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.3.4 PREV_VERSION=0.3.5
VERSION=0.3.5 VERSION=0.3.5
RELEASE=1 RELEASE=1
ARCH_TYPE=`uname -m` ARCH_TYPE=all
DIR=${APP}-${VERSION} DIR=${APP}-${VERSION}
if [ $ARCH_TYPE == "x86_64" ]; then if [ $ARCH_TYPE == "x86_64" ]; then

3
debian/changelog vendored
View File

@ -14,7 +14,8 @@ pybitmessage (0.3.5-1) raring; urgency=low
* Added Russian translation * Added Russian translation
* Added search support in the UI * Added search support in the UI
* Added 'make uninstall' * Added 'make uninstall'
* To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1 if PKCS5_PBKDF2_HMAC is unavailable * To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1
if PKCS5_PBKDF2_HMAC is unavailable
* Added better warnings for OSX users who are using old versions of Python * Added better warnings for OSX users who are using old versions of Python
* Repaired debian packaging * Repaired debian packaging
* Altered Makefile to avoid needing to chase changes * Altered Makefile to avoid needing to chase changes

4
debian/control vendored
View File

@ -1,4 +1,5 @@
Source: pybitmessage Source: pybitmessage
Section: mail
Priority: extra Priority: extra
Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to> Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
Build-Depends: debhelper (>= 9.0.0) Build-Depends: debhelper (>= 9.0.0)
@ -7,8 +8,7 @@ Homepage: https://github.com/Bitmessage/PyBitmessage
Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git
Package: pybitmessage Package: pybitmessage
Section: mail Architecture: all
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, gst123 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, gst123
Suggests: libmessaging-menu-dev Suggests: libmessaging-menu-dev
Description: Send encrypted messages Description: Send encrypted messages

View File

@ -26,7 +26,7 @@ packagemonkey -n "PyBitmessage" --version "0.3.5" --dir "." -l "mit" \
--dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, " \ --dependspuppy "openssl, python-qt4, sqlite3, sqlite3-dev, " \
"python-openssl, python-sip, gst123" \ "python-openssl, python-sip, gst123" \
--dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl, gst123" \ --dependsarch "python2, qt4, python2-pyqt4, sqlite, openssl, gst123" \
--suggestsarch "python2-gevent" --pythonversion 2 \ --suggestsarch "python2-gevent: Python network library that uses greenlet and libevent for easy and scalable concurrency" --pythonversion 2 \
--dependsebuild "dev-libs/openssl, dev-python/PyQt4[${PYTHON_USEDEP}]" \ --dependsebuild "dev-libs/openssl, dev-python/PyQt4[${PYTHON_USEDEP}]" \
--buildebuild "\${PYTHON_DEPS}" --pythonreq "sqlite" \ --buildebuild "\${PYTHON_DEPS}" --pythonreq "sqlite" \
--repository "https://github.com/Bitmessage/PyBitmessage.git" --repository "https://github.com/Bitmessage/PyBitmessage.git"

View File

@ -1 +1 @@
pybitmessage-0.3.5-1|PyBitmessage|0.3.5|1|Internet;mailnews;|7.2M||pybitmessage-0.3.5-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5| pybitmessage-0.3.5-1|PyBitmessage|0.3.5|1|Internet;mailnews;|3.8M||pybitmessage-0.3.5-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|

View File

@ -6,6 +6,7 @@ License: MIT
URL: https://github.com/Bitmessage/PyBitmessage URL: https://github.com/Bitmessage/PyBitmessage
Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to> Packager: Bob Mottram (4096 bits) <bob@robotics.uk.to>
Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz Source0: http://yourdomainname.com/src/%{name}_%{version}.orig.tar.gz
BuildArch: noarch
Group: Office/Email Group: Office/Email
Requires: python, PyQt4, openssl-compat-bitcoin-libs, gst123 Requires: python, PyQt4, openssl-compat-bitcoin-libs, gst123
@ -83,7 +84,8 @@ make install -B DESTDIR=%{buildroot} PREFIX=/usr
- Added Russian translation - Added Russian translation
- Added search support in the UI - Added search support in the UI
- Added 'make uninstall' - Added 'make uninstall'
- To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1 if PKCS5_PBKDF2_HMAC is unavailable - To improve OSX support, use PKCS5_PBKDF2_HMAC_SHA1
if PKCS5_PBKDF2_HMAC is unavailable
- Added better warnings for OSX users who are using old versions of Python - Added better warnings for OSX users who are using old versions of Python
- Repaired debian packaging - Repaired debian packaging
- Altered Makefile to avoid needing to chase changes - Altered Makefile to avoid needing to chase changes

View File

@ -1072,12 +1072,22 @@ class MyForm(QtGui.QMainWindow):
if 'linux' in sys.platform: if 'linux' in sys.platform:
# Note: QSound was a nice idea but it didn't work # Note: QSound was a nice idea but it didn't work
if '.mp3' in soundFilename: if '.mp3' in soundFilename:
gst_available=False
try: try:
subprocess.call(["gst123", soundFilename], subprocess.call(["gst123", soundFilename],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
gst_available=True
except: except:
print "WARNING: gst123 must be installed in order to play mp3 sounds" print "WARNING: gst123 must be installed in order to play mp3 sounds"
if not gst_available:
try:
subprocess.call(["mpg123", soundFilename],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
gst_available=True
except:
print "WARNING: mpg123 must be installed in order to play mp3 sounds"
else: else:
try: try:
subprocess.call(["aplay", soundFilename], subprocess.call(["aplay", soundFilename],