diff --git a/COPYING b/COPYING index 078afb1b..e386f371 100644 --- a/COPYING +++ b/COPYING @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/LICENSE b/LICENSE index daaa84e7..de7d6159 100644 --- a/LICENSE +++ b/LICENSE @@ -17,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100755 index 00000000..161285e2 --- /dev/null +++ b/Makefile @@ -0,0 +1,45 @@ +APP=pybitmessage +VERSION=0.2.7 + +all: + +debug: + +source: + tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude=.git + +install: + mkdir -m 755 -p /usr/share/applications + mkdir -m 755 -p /usr/share/applications/$(APP) + mkdir -m 755 -p /usr/share/applications/$(APP)/images + mkdir -m 755 -p /usr/share/applications/$(APP)/pyelliptic + mkdir -m 755 -p /usr/share/applications/$(APP)/socks + mkdir -m 755 -p /usr/share/pixmaps + mkdir -m 755 -p /usr/share/icons + mkdir -m 755 -p /usr/share/icons/hicolor + mkdir -m 755 -p /usr/share/icons/hicolor/scalable + mkdir -m 755 -p /usr/share/icons/hicolor/scalable/apps + mkdir -m 755 -p /usr/share/icons/hicolor/24x24 + mkdir -m 755 -p /usr/share/icons/hicolor/24x24/apps + + install -m 644 src/*.ui /usr/share/applications/$(APP) + install -m 644 src/*.py /usr/share/applications/$(APP) + install -m 644 src/*.qrc /usr/share/applications/$(APP) + + install -m 644 src/images/*.png /usr/share/applications/$(APP)/images + install -m 644 src/images/*.ico /usr/share/applications/$(APP)/images + install -m 644 src/pyelliptic/* /usr/share/applications/$(APP)/pyelliptic + install -m 644 src/socks/* /usr/share/applications/$(APP)/socks + install -m 755 debian/pybm /usr/bin + + install -m 644 desktop/$(APP).desktop /usr/share/applications/$(APP)/$(APP).desktop + install -m 644 src/images/can-icon-24px.png /usr/share/icons/hicolor/24x24/apps/$(APP).png + install -m 644 desktop/can-icon.svg /usr/share/icons/hicolor/scalable/apps/$(APP).svg + install -m 644 desktop/can-icon.svg /usr/share/pixmaps/$(APP).svg + +clean: + rm -rf debian/$(APP) + rm -f ../$(APP)_*.deb ../$(APP)_*.asc ../$(APP)_*.dsc ../$(APP)*.changes + rm -f *.sh~ src/*.pyc src/socks/*.pyc src/pyelliptic/*.pyc + rm -f *.deb \#* \.#* debian/*.log debian/*.substvars + rm -f Makefile~ diff --git a/README.md b/README.md index f124c30d..979872f9 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ references ---------- * [project website](https://bitmessage.org) * [protocol specification](https://bitmessage.org/wiki/Protocol_specification) -* [whitepaper](https://bitmessage.org/bitmessage.pdf) \ No newline at end of file +* [whitepaper](https://bitmessage.org/bitmessage.pdf) diff --git a/debian.sh b/debian.sh new file mode 100755 index 00000000..fe4f477c --- /dev/null +++ b/debian.sh @@ -0,0 +1,21 @@ +# To build a debian package first ensure that the code exists +# within a directory called pybitmessage-x.x.x (where the x's +# are the version number), make sure that the VERSION parameter +# within debian/rules and this script are correct, then run +# this script. + +#!/bin/bash + +APP=pybitmessage +VERSION=0.2.7 +ARCH_TYPE=all + +# Create a source archive +make clean +make source + +# Build the package +fakeroot dpkg-buildpackage -A + +gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb +gpg -ba ../${APP}_${VERSION}.orig.tar.gz diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..b071b96f --- /dev/null +++ b/debian/changelog @@ -0,0 +1,9 @@ +pybitmessage (0.2.7-1) unstable; urgency=low + + * Added debian packaging + * Script to generate debian packages + * SVG icon for Gnome shell, etc + * Source moved int src directory for debian standards compatibility + * Trailing carriage return on COPYING LICENSE and README.md + + -- Bob Mottram (4096 bits) Tue, 1 Apr 2013 17:12:14 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..45a4fb75 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..d9f052fc --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: pybitmessage +Section: contrib/comm +Priority: extra +Maintainer: Jonathan Warren +Build-Depends: debhelper (>= 8.0.0), python, openssl +Standards-Version: 3.9.2 +Homepage: https://bitmessage.org/ +Vcs-Browser: https://github.com/Bitmessage/PyBitmessage +Vcs-Git: https://github.com/Bitmessage/PyBitmessage.git + +Package: pybitmessage +Architecture: all +Depends: ${misc:Depends}, python, openssl +Description: Send encrypted messages to another person or to many subscribers + 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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..4c5f69f3 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: PyBitmessage +Source: https://github.com/Bitmessage/PyBitmessage + +Files: * +Copyright: 2012 Jonathan Warren +License: MIT + +Files: debian/* +Copyright: 2012 Jonathan Warren +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. \ No newline at end of file diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ + diff --git a/debian/files b/debian/files new file mode 100644 index 00000000..dd2718fa --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +pybitmessage_0.2.7-1_all.deb contrib/comm extra diff --git a/debian/pybm b/debian/pybm new file mode 100644 index 00000000..1d90ee60 --- /dev/null +++ b/debian/pybm @@ -0,0 +1,4 @@ +#!/bin/bash +cd /usr/share/applications/pybitmessage +python bitmessagemain.py + diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..84eb9d38 --- /dev/null +++ b/debian/rules @@ -0,0 +1,68 @@ +#!/usr/bin/make -f +APP=pybitmessage + +DEST_MAIN = $(CURDIR)/debian/$(APP)/usr/bin +DEST_SHARE = $(CURDIR)/debian/$(APP)/usr/share + +build: build-stamp + make +build-stamp: + dh_testdir + touch build-stamp +clean: + dh_testdir + dh_testroot + rm -f build-stamp + dh_clean +install: build clean + dh_testdir + dh_testroot + dh_prep + dh_installdirs + mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr + mkdir -m 755 -p $(CURDIR)/debian/$(APP)/usr/bin + mkdir -m 755 -p $(DEST_SHARE)/applications + mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP) + mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/images + mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/pyelliptic + mkdir -m 755 -p $(DEST_SHARE)/applications/$(APP)/socks + mkdir -m 755 -p $(DEST_SHARE)/pixmaps + mkdir -m 755 -p $(DEST_SHARE)/icons + mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor + mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable + mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/scalable/apps + mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24 + mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor/24x24/apps + + install -m 644 $(CURDIR)/src/*.ui $(DEST_SHARE)/applications/$(APP) + install -m 644 $(CURDIR)/src/*.py $(DEST_SHARE)/applications/$(APP) + install -m 644 $(CURDIR)/src/*.qrc $(DEST_SHARE)/applications/$(APP) + + install -m 644 $(CURDIR)/src/images/*.png $(DEST_SHARE)/applications/$(APP)/images + install -m 644 $(CURDIR)/src/images/*.ico $(DEST_SHARE)/applications/$(APP)/images + install -m 644 $(CURDIR)/src/pyelliptic/* $(DEST_SHARE)/applications/$(APP)/pyelliptic + install -m 644 $(CURDIR)/src/socks/* $(DEST_SHARE)/applications/$(APP)/socks + install -m 755 $(CURDIR)/debian/pybm $(DEST_MAIN) + + install -m 644 $(CURDIR)/desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP)/$(APP).desktop + install -m 644 $(CURDIR)/src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png + install -m 644 $(CURDIR)/desktop/can-icon.svg $(DEST_SHARE)/icons/hicolor/scalable/apps/$(APP).svg + install -m 644 $(CURDIR)/desktop/can-icon.svg $(DEST_SHARE)/pixmaps/$(APP).svg +binary-indep: build install + dh_shlibdeps + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# dh_installexamples +# dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb +binary-arch: build install +binary: binary-indep +.PHONY: build clean binary-indep binary install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 00000000..8569d576 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,15 @@ +src/images/sent.png +src/images/can-icon-16px.png +src/images/addressbook.png +src/images/networkstatus.png +src/images/redicon.png +src/images/subscriptions.png +src/images/blacklist.png +src/images/can-icon-24px.png +src/images/identities.png +src/images/yellowicon.png +src/images/inbox.png +src/images/greenicon.png +src/images/can-icon.ico +src/images/send.png +desktop/can-icon.svg diff --git a/desktop/can-icon.svg b/desktop/can-icon.svg new file mode 100644 index 00000000..9b8a9ded --- /dev/null +++ b/desktop/can-icon.svg @@ -0,0 +1,173 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop/pybitmessage.desktop b/desktop/pybitmessage.desktop new file mode 100644 index 00000000..affd63d1 --- /dev/null +++ b/desktop/pybitmessage.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=PyBitmessage +GenericName=PyBitmessage +Comment=Send encrypted messages to another person or to many subscribers +Exec=pybm %U +Icon=pybitmessage +Terminal=false +Categories=Network diff --git a/about.py b/src/about.py similarity index 100% rename from about.py rename to src/about.py diff --git a/about.ui b/src/about.ui similarity index 100% rename from about.ui rename to src/about.ui diff --git a/addresses.py b/src/addresses.py similarity index 100% rename from addresses.py rename to src/addresses.py diff --git a/api client.py b/src/api client.py similarity index 100% rename from api client.py rename to src/api client.py diff --git a/bitmessage_icons.qrc b/src/bitmessage_icons.qrc similarity index 100% rename from bitmessage_icons.qrc rename to src/bitmessage_icons.qrc diff --git a/bitmessage_icons_rc.py b/src/bitmessage_icons_rc.py similarity index 100% rename from bitmessage_icons_rc.py rename to src/bitmessage_icons_rc.py diff --git a/bitmessagemain.py b/src/bitmessagemain.py similarity index 100% rename from bitmessagemain.py rename to src/bitmessagemain.py diff --git a/bitmessageui.py b/src/bitmessageui.py similarity index 100% rename from bitmessageui.py rename to src/bitmessageui.py diff --git a/bitmessageui.ui b/src/bitmessageui.ui similarity index 100% rename from bitmessageui.ui rename to src/bitmessageui.ui diff --git a/defaultKnownNodes.py b/src/defaultKnownNodes.py similarity index 100% rename from defaultKnownNodes.py rename to src/defaultKnownNodes.py diff --git a/help.py b/src/help.py similarity index 100% rename from help.py rename to src/help.py diff --git a/help.ui b/src/help.ui similarity index 100% rename from help.ui rename to src/help.ui diff --git a/highlevelcrypto.py b/src/highlevelcrypto.py similarity index 100% rename from highlevelcrypto.py rename to src/highlevelcrypto.py diff --git a/iconglossary.py b/src/iconglossary.py similarity index 100% rename from iconglossary.py rename to src/iconglossary.py diff --git a/iconglossary.ui b/src/iconglossary.ui similarity index 100% rename from iconglossary.ui rename to src/iconglossary.ui diff --git a/images/addressbook.png b/src/images/addressbook.png similarity index 100% rename from images/addressbook.png rename to src/images/addressbook.png diff --git a/images/blacklist.png b/src/images/blacklist.png similarity index 100% rename from images/blacklist.png rename to src/images/blacklist.png diff --git a/images/can-icon-16px.png b/src/images/can-icon-16px.png similarity index 100% rename from images/can-icon-16px.png rename to src/images/can-icon-16px.png diff --git a/images/can-icon-24px.png b/src/images/can-icon-24px.png similarity index 100% rename from images/can-icon-24px.png rename to src/images/can-icon-24px.png diff --git a/images/can-icon.ico b/src/images/can-icon.ico similarity index 100% rename from images/can-icon.ico rename to src/images/can-icon.ico diff --git a/images/greenicon.png b/src/images/greenicon.png similarity index 100% rename from images/greenicon.png rename to src/images/greenicon.png diff --git a/images/identities.png b/src/images/identities.png similarity index 100% rename from images/identities.png rename to src/images/identities.png diff --git a/images/inbox.png b/src/images/inbox.png similarity index 100% rename from images/inbox.png rename to src/images/inbox.png diff --git a/images/networkstatus.png b/src/images/networkstatus.png similarity index 100% rename from images/networkstatus.png rename to src/images/networkstatus.png diff --git a/images/redicon.png b/src/images/redicon.png similarity index 100% rename from images/redicon.png rename to src/images/redicon.png diff --git a/images/send.png b/src/images/send.png similarity index 100% rename from images/send.png rename to src/images/send.png diff --git a/images/sent.png b/src/images/sent.png similarity index 100% rename from images/sent.png rename to src/images/sent.png diff --git a/images/subscriptions.png b/src/images/subscriptions.png similarity index 100% rename from images/subscriptions.png rename to src/images/subscriptions.png diff --git a/images/yellowicon.png b/src/images/yellowicon.png similarity index 100% rename from images/yellowicon.png rename to src/images/yellowicon.png diff --git a/messages.dat reader.py b/src/messages.dat reader.py similarity index 100% rename from messages.dat reader.py rename to src/messages.dat reader.py diff --git a/newaddressdialog.py b/src/newaddressdialog.py similarity index 100% rename from newaddressdialog.py rename to src/newaddressdialog.py diff --git a/newaddressdialog.ui b/src/newaddressdialog.ui similarity index 100% rename from newaddressdialog.ui rename to src/newaddressdialog.ui diff --git a/newsubscriptiondialog.py b/src/newsubscriptiondialog.py similarity index 100% rename from newsubscriptiondialog.py rename to src/newsubscriptiondialog.py diff --git a/newsubscriptiondialog.ui b/src/newsubscriptiondialog.ui similarity index 100% rename from newsubscriptiondialog.ui rename to src/newsubscriptiondialog.ui diff --git a/pyelliptic/LICENSE b/src/pyelliptic/LICENSE similarity index 100% rename from pyelliptic/LICENSE rename to src/pyelliptic/LICENSE diff --git a/pyelliptic/README.md b/src/pyelliptic/README.md similarity index 100% rename from pyelliptic/README.md rename to src/pyelliptic/README.md diff --git a/pyelliptic/__init__.py b/src/pyelliptic/__init__.py similarity index 100% rename from pyelliptic/__init__.py rename to src/pyelliptic/__init__.py diff --git a/pyelliptic/arithmetic.py b/src/pyelliptic/arithmetic.py similarity index 100% rename from pyelliptic/arithmetic.py rename to src/pyelliptic/arithmetic.py diff --git a/pyelliptic/cipher.py b/src/pyelliptic/cipher.py similarity index 100% rename from pyelliptic/cipher.py rename to src/pyelliptic/cipher.py diff --git a/pyelliptic/ecc.py b/src/pyelliptic/ecc.py similarity index 100% rename from pyelliptic/ecc.py rename to src/pyelliptic/ecc.py diff --git a/pyelliptic/hash.py b/src/pyelliptic/hash.py similarity index 100% rename from pyelliptic/hash.py rename to src/pyelliptic/hash.py diff --git a/pyelliptic/openssl.py b/src/pyelliptic/openssl.py similarity index 100% rename from pyelliptic/openssl.py rename to src/pyelliptic/openssl.py diff --git a/regenerateaddresses.py b/src/regenerateaddresses.py similarity index 100% rename from regenerateaddresses.py rename to src/regenerateaddresses.py diff --git a/regenerateaddresses.ui b/src/regenerateaddresses.ui similarity index 100% rename from regenerateaddresses.ui rename to src/regenerateaddresses.ui diff --git a/settings.py b/src/settings.py similarity index 100% rename from settings.py rename to src/settings.py diff --git a/settings.ui b/src/settings.ui similarity index 100% rename from settings.ui rename to src/settings.ui diff --git a/socks/BUGS b/src/socks/BUGS similarity index 100% rename from socks/BUGS rename to src/socks/BUGS diff --git a/socks/LICENSE b/src/socks/LICENSE similarity index 100% rename from socks/LICENSE rename to src/socks/LICENSE diff --git a/socks/README b/src/socks/README similarity index 100% rename from socks/README rename to src/socks/README diff --git a/socks/__init__.py b/src/socks/__init__.py similarity index 100% rename from socks/__init__.py rename to src/socks/__init__.py diff --git a/specialaddressbehavior.py b/src/specialaddressbehavior.py similarity index 100% rename from specialaddressbehavior.py rename to src/specialaddressbehavior.py diff --git a/specialaddressbehavior.ui b/src/specialaddressbehavior.ui similarity index 100% rename from specialaddressbehavior.ui rename to src/specialaddressbehavior.ui