Skip to content

Commit 143c4bc

Browse files
author
Jonathan Warren
committed
manual merge
2 parents 1bf39db + d04b874 commit 143c4bc

26 files changed

Lines changed: 905 additions & 179 deletions

‎Makefile‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,45 @@
11
APP=pybitmessage
22
VERSION=0.3.4
3-
DEST_SHARE=${DESTDIR}/usr/share
4-
DEST_APP=${DEST_SHARE}/${APP}
3+
RELEASE=1
4+
ARCH_TYPE=`uname -m`
55

66
all:
7-
87
debug:
9-
108
source:
119
tar -cvzf ../${APP}_${VERSION}.orig.tar.gz ../${APP}-${VERSION} --exclude-vcs
12-
1310
install:
14-
mkdir -m 755 -p ${DESTDIR}/usr/bin
15-
mkdir -m 755 -p ${DEST_APP}
16-
mkdir -m 755 -p ${DEST_SHARE}/applications
17-
mkdir -m 755 -p ${DEST_APP}/images
18-
mkdir -m 755 -p ${DEST_APP}/pyelliptic
19-
mkdir -m 755 -p ${DEST_APP}/socks
20-
mkdir -m 755 -p ${DEST_APP}/bitmessageqt
21-
mkdir -m 755 -p ${DEST_APP}/translations
22-
mkdir -m 755 -p ${DEST_SHARE}/pixmaps
23-
mkdir -m 755 -p ${DEST_SHARE}/icons
24-
mkdir -m 755 -p ${DEST_SHARE}/icons/hicolor
25-
mkdir -m 755 -p ${DEST_SHARE}/icons/hicolor/scalable
26-
mkdir -m 755 -p ${DEST_SHARE}/icons/hicolor/scalable/apps
27-
mkdir -m 755 -p ${DEST_SHARE}/icons/hicolor/24x24
28-
mkdir -m 755 -p ${DEST_SHARE}/icons/hicolor/24x24/apps
29-
30-
cp -r src/* ${DEST_APP}
31-
install -m 755 debian/pybm ${DESTDIR}/usr/bin/${APP}
32-
33-
install -m 644 desktop/${APP}.desktop ${DEST_SHARE}/applications/${APP}.desktop
34-
install -m 644 src/images/can-icon-24px.png ${DEST_SHARE}/icons/hicolor/24x24/apps/${APP}.png
35-
install -m 644 desktop/can-icon.svg ${DEST_SHARE}/icons/hicolor/scalable/apps/${APP}.svg
36-
install -m 644 desktop/can-icon.svg ${DEST_SHARE}/pixmaps/${APP}.svg
37-
11+
mkdir -p ${DESTDIR}/usr
12+
mkdir -p ${DESTDIR}/usr/bin
13+
mkdir -m 755 -p ${DESTDIR}/usr/share
14+
mkdir -m 755 -p ${DESTDIR}/usr/share/man
15+
mkdir -m 755 -p ${DESTDIR}/usr/share/man/man1
16+
install -m 644 man/${APP}.1.gz ${DESTDIR}/usr/share/man/man1
17+
mkdir -m 755 -p ${DESTDIR}/usr/share/${APP}
18+
mkdir -m 755 -p ${DESTDIR}/usr/share/applications
19+
mkdir -m 755 -p ${DESTDIR}/usr/share/pixmaps
20+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons
21+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor
22+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/scalable
23+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
24+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/24x24
25+
mkdir -m 755 -p ${DESTDIR}/usr/share/icons/hicolor/24x24/apps
26+
install -m 644 desktop/${APP}.desktop ${DESTDIR}/usr/share/applications/${APP}.desktop
27+
install -m 644 desktop/icon24.png ${DESTDIR}/usr/share/icons/hicolor/24x24/apps/${APP}.png
28+
cp -rf src/* ${DESTDIR}/usr/share/${APP}
29+
echo '#!/bin/sh' > ${DESTDIR}/usr/bin/${APP}
30+
echo 'cd /usr/share/pybitmessage' >> ${DESTDIR}/usr/bin/${APP}
31+
echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}/usr/bin/${APP}
32+
chmod +x ${DESTDIR}/usr/bin/${APP}
3833
uninstall:
39-
rm -Rf "${DEST_APP}"
40-
rm -f "${DESTDIR}/usr/bin/${APP}"
41-
rm -f "${DEST_SHARE}/applications/${APP}.desktop"
42-
rm -f "${DEST_SHARE}/icons/hicolor/24x24/apps/${APP}.png"
43-
rm -f "${DEST_SHARE}/icons/hicolor/scalable/apps/${APP}.svg"
44-
rm -f "${DEST_SHARE}/pixmaps/${APP}.svg"
45-
34+
rm -f /usr/share/man/man1/${APP}.1.gz
35+
rm -rf /usr/share/${APP}
36+
rm -f /usr/bin/${APP}
37+
rm -f /usr/share/applications/${APP}.desktop
38+
rm -f /usr/share/icons/hicolor/scalable/apps/${APP}.svg
39+
/usr/share/pixmaps/${APP}.svg
4640
clean:
47-
rm -rf debian/${APP}
48-
rm -f ../${APP}_*.deb ../${APP}_*.asc ../${APP}_*.dsc ../${APP}*.changes
49-
rm -f *.sh~ src/*.pyc src/socks/*.pyc src/pyelliptic/*.pyc
50-
rm -f *.deb \#* \.#* debian/*.log debian/*.substvars
51-
rm -f Makefile~
41+
rm -f ${APP} \#* \.#* gnuplot* *.png debian/*.substvars debian/*.log
42+
rm -fr deb.* debian/${APP} rpmpackage/${ARCH_TYPE}
43+
rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc
44+
rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz
45+
rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz

‎arch.sh‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/bin/bash
2+
3+
APP=pybitmessage
4+
PREV_VERSION=0.3.4
5+
VERSION=0.3.4
6+
RELEASE=1
7+
ARCH_TYPE=`uname -m`
8+
CURRDIR=`pwd`
9+
SOURCE=archpackage/${APP}-${VERSION}.tar.gz
10+
11+
# Update version numbers automatically - so you don't have to
12+
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh puppy.sh ebuild.sh slack.sh
13+
sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
14+
sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
15+
sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
16+
sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
17+
sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
18+
sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
19+
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
20+
sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
21+
22+
23+
# Create the source code
24+
make clean
25+
rm -f archpackage/*.gz
26+
27+
# having the root directory called name-version seems essential
28+
mv ../${APP} ../${APP}-${VERSION}
29+
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
30+
31+
# rename the root directory without the version number
32+
mv ../${APP}-${VERSION} ../${APP}
33+
34+
# calculate the MD5 checksum
35+
CHECKSM=$(md5sum ${SOURCE})
36+
sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
37+
38+
cd archpackage
39+
40+
# Create the package
41+
tar -c -f ${APP}-${VERSION}.pkg.tar .
42+
sync
43+
xz ${APP}-${VERSION}.pkg.tar
44+
sync
45+
46+
# Move back to the original directory
47+
cd ${CURRDIR}
48+

‎archpackage/PKGBUILD‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
2+
pkgname=pybitmessage
3+
pkgver=0.3.4
4+
pkgrel=1
5+
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."
6+
arch=('i686' 'x86_64')
7+
url="https://github.com/Bitmessage/PyBitmessage"
8+
license=('MIT')
9+
groups=()
10+
depends=('python2' 'qt4' 'python2-pyqt4' 'sqlite' 'openssl')
11+
makedepends=()
12+
optdepends=('python2-gevent')
13+
provides=()
14+
conflicts=()
15+
replaces=()
16+
backup=()
17+
options=()
18+
install=
19+
changelog=
20+
source=($pkgname-$pkgver.tar.gz)
21+
noextract=()
22+
md5sums=()
23+
build() {
24+
cd "$srcdir/$pkgname-$pkgver"
25+
./configure --prefix=/usr
26+
make
27+
}
28+
package() {
29+
cd "$srcdir/$pkgname-$pkgver"
30+
make DESTDIR="$pkgdir/" install
31+
}

‎configure‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎debian.sh‎

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,46 @@
1-
# To build a debian package first ensure that the code exists
2-
# within a directory called pybitmessage-x.x.x (where the x's
3-
# are the version number), make sure that the VERSION parameter
4-
# within debian/rules and this script are correct, then run
5-
# this script.
6-
71
#!/bin/bash
82

93
APP=pybitmessage
10-
PREV_VERSION=0.3.3
4+
PREV_VERSION=0.3.4
115
VERSION=0.3.4
126
RELEASE=1
13-
ARCH_TYPE=all
7+
ARCH_TYPE=`uname -m`
8+
DIR=${APP}-${VERSION}
149

15-
#update version numbers automatically - so you don't have to
16-
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile
17-
sed -i 's/'''${PREV_VERSION}'''/'''${VERSION}'''/g' src/shared.py
10+
if [ $ARCH_TYPE == "x86_64" ]; then
11+
ARCH_TYPE="amd64"
12+
fi
13+
if [ $ARCH_TYPE == "i686" ]; then
14+
ARCH_TYPE="i386"
15+
fi
16+
17+
18+
# Update version numbers automatically - so you don't have to
19+
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile rpm.sh arch.sh puppy.sh ebuild.sh slack.sh
20+
sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec
21+
sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec
22+
sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD
23+
sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD
24+
sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs
25+
sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
26+
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
27+
sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
1828

19-
# Create a source archive
2029
make clean
21-
# change the directory name to pybitmessage-version
22-
mv ../PyBitmessage ../${APP}-${VERSION}
30+
make
31+
32+
# change the parent directory name to debian format
33+
mv ../${APP} ../${DIR}
34+
35+
# Create a source archive
2336
make source
2437

2538
# Build the package
26-
dpkg-buildpackage -A || exit 1
39+
dpkg-buildpackage -F
2740

28-
# change the directory name back
29-
mv ../${APP}-${VERSION} ../PyBitmessage
30-
31-
gpg -ba ../${APP}_${VERSION}-${RELEASE}_${ARCH_TYPE}.deb
41+
# sign files
42+
gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
3243
gpg -ba ../${APP}_${VERSION}.orig.tar.gz
44+
45+
# restore the parent directory name
46+
mv ../${DIR} ../${APP}

‎debian/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ pybitmessage (0.3.3-1) raring; urgency=low
1818
via Portage (Gentoo)
1919
* Fix message authentication bug
2020

21-
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Sun, 30 June 2013 11:23:00 +0100
21+
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Sat, 29 June 2013 11:23:00 +0100
2222

2323
pybitmessage (0.3.211-1) raring; urgency=low
2424

2525
* Removed multi-core proof of work
2626
as the multiprocessing module does not work well with
2727
pyinstaller's --onefile option.
2828

29-
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Sun, 30 June 2013 11:23:00 +0100
29+
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Fri, 28 June 2013 11:23:00 +0100
3030

3131
pybitmessage (0.3.2-1) raring; urgency=low
3232

‎debian/compat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8
1+
9

‎debian/control‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
Source: pybitmessage
2-
Section: contrib/comm
32
Priority: extra
4-
Maintainer: Jonathan Warren <jonathan@bitmessage.org>
5-
Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, libmessaging-menu-dev
6-
Standards-Version: 3.9.2
7-
Homepage: https://bitmessage.org/
8-
Vcs-Browser: https://github.com/Bitmessage/PyBitmessage
9-
Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git
3+
Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
4+
Build-Depends: debhelper (>= 9.0.0)
5+
Standards-Version: 3.9.4
6+
Homepage: https://github.com/Bitmessage/PyBitmessage
7+
Vcs-Git: https://github.com/fuzzgun/fin.git
108

119
Package: pybitmessage
12-
Architecture: all
13-
Depends: ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev, libmessaging-menu-dev
14-
Description: Send encrypted messages to another person or to many subscribers
15-
Bitmessage is a P2P communications protocol used to send encrypted messages
16-
to another person or to many subscribers. It is decentralized and trustless,
17-
meaning that you need-not inherently trust any entities like root certificate
18-
authorities. It uses strong authentication which means that the sender of a
19-
message cannot be spoofed, and it aims to hide "non-content" data, like the
20-
sender and receiver of messages, from passive eavesdroppers like those
21-
running warrantless wiretapping programs.
10+
Section: mail
11+
Architecture: any
12+
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7.0), openssl, python-qt4, libqt4-dev (>= 4.8.0), python-qt4-dev, sqlite3, libsqlite3-dev
13+
Suggests: libmessaging-menu-dev
14+
Description: Send encrypted messages
15+
Bitmessage is a P2P communications protocol used to send encrypted
16+
messages to another person or to many subscribers. It is decentralized and
17+
trustless, meaning that you need-not inherently trust any entities like
18+
root certificate authorities. It uses strong authentication which means
19+
that the sender of a message cannot be spoofed, and it aims to hide
20+
"non-content" data, like the sender and receiver of messages, from passive
21+
eavesdroppers like those running warrantless wiretapping programs.

‎debian/copyright‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Format: http://dep.debian.net/deps/dep5
2-
Upstream-Name: PyBitmessage
3-
Source: https://github.com/Bitmessage/PyBitmessage
1+
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name:
3+
Source:
44

55
Files: *
6-
Copyright: 2012 Jonathan Warren
6+
Copyright: Copyright 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to>
77
License: MIT
88

99
Files: debian/*
10-
Copyright: 2012 Jonathan Warren
10+
Copyright: Copyright 2013 Bob Mottram (4096 bits) <bob@robotics.uk.to>
1111
License: MIT
1212

1313
License: MIT
14-
Permission is hereby granted, free of charge, to any person obtaining a copy
15-
of this software and associated documentation files (the "Software"), to deal
16-
in the Software without restriction, including without limitation the rights
17-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
18-
copies of the Software, and to permit persons to whom the Software is
19-
furnished to do so, subject to the following conditions:
14+
Permission is hereby granted, free of charge, to any person obtaining a
15+
copy of this software and associated documentation files (the "Software"),
16+
to deal in the Software without restriction, including without limitation
17+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
18+
and/or sell copies of the Software, and to permit persons to whom the
19+
Software is furnished to do so, subject to the following conditions:
2020
.
21-
The above copyright notice and this permission notice shall be included in
22-
all copies or substantial portions of the Software.
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
2323
.
24-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
30-
THE SOFTWARE.
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
25+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
27+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
29+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
30+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎debian/manpages‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
man/pybitmessage.1.gz

0 commit comments

Comments
 (0)