diff --git a/COPYING b/COPYING index dfa169ea9d..4fe0f2b0f8 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -Copyright (c) 2012-2015 Jonathan Warren -Copyright (c) 2013-2015 The Bitmessage Developers +Copyright (c) 2012-2016 Jonathan Warren +Copyright (c) 2013-2016 The Bitmessage Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/LICENSE b/LICENSE index 56ac8e3a42..d2afc3c44d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2014 Jonathan Warren -Copyright (c) 2013-2014 The Bitmessage Developers +Copyright (c) 2012-2016 Jonathan Warren +Copyright (c) 2013-2016 The Bitmessage Developers 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 diff --git a/Makefile b/Makefile index 3078ee945c..f3d478be89 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ APP=pybitmessage -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 ARCH_TYPE=`uname -m` PREFIX?=/usr/local diff --git a/arch.sh b/arch.sh index 96d2e8d879..16fd90f53f 100755 --- a/arch.sh +++ b/arch.sh @@ -2,7 +2,7 @@ APP=pybitmessage PREV_VERSION=0.4.4 -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 ARCH_TYPE=any CURRDIR=`pwd` diff --git a/archpackage/PKGBUILD b/archpackage/PKGBUILD index 5c2c78eb84..fdb5845f35 100644 --- a/archpackage/PKGBUILD +++ b/archpackage/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Bob Mottram (4096 bits) pkgname=pybitmessage -pkgver=0.4.4 +pkgver=0.5.6 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." arch=('any') diff --git a/debian.sh b/debian.sh index 3a4edbe517..6b77d31348 100755 --- a/debian.sh +++ b/debian.sh @@ -2,10 +2,12 @@ APP=pybitmessage PREV_VERSION=0.4.2 -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 ARCH_TYPE=all DIR=${APP}-${VERSION} +CURDIR=`pwd` +SHORTDIR=`basename ${CURDIR}` if [ $ARCH_TYPE == "x86_64" ]; then ARCH_TYPE="amd64" @@ -30,17 +32,21 @@ make clean make # Change the parent directory name to Debian format -mv ../${APP} ../${DIR} +# Intelligently detects current dir name and changes accordingly +mv ../${SHORTDIR} ../${DIR} # Create a source archive make sourcedeb # Build the package -dpkg-buildpackage -F +dpkg-buildpackage -F -us -uc # Sign files -gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb -gpg -ba ../${APP}_${VERSION}.orig.tar.gz +# This does not work if you don't have a private signing key +# To change it back, uncomment the next two lines. +#gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb +#gpg -ba ../${APP}_${VERSION}.orig.tar.gz # Restore the parent directory name -mv ../${DIR} ../${APP} +# Restores back to the parent dir name that was established with the SHORTDIR and CURDIR vars +mv ../${DIR} ../${SHORTDIR} diff --git a/debian/copyright b/debian/copyright index 55863ba1b9..b341b873ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: Source: Files: * -Copyright: Copyright 2014 Bob Mottram (4096 bits) +Copyright: Copyright 2016 Bob Mottram (4096 bits) License: MIT Files: debian/* -Copyright: Copyright 2014 Bob Mottram (4096 bits) +Copyright: Copyright 2016 Bob Mottram (4096 bits) License: MIT License: MIT diff --git a/ebuild.sh b/ebuild.sh deleted file mode 100755 index 11a6f5beb8..0000000000 --- a/ebuild.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -APP=pybitmessage -PREV_VERSION=0.4.4 -VERSION=0.4.4 -RELEASE=1 -SOURCEDIR=. -ARCH_TYPE=`uname -m` -CURRDIR=`pwd` -SOURCE=~/ebuild/${APP}-${VERSION}.tar.gz - - -# Update version numbers automatically - so you don't have to -sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' Makefile debian.sh rpm.sh arch.sh puppy.sh slack.sh -sed -i 's/Version: '${PREV_VERSION}'/Version: '${VERSION}'/g' rpmpackage/${APP}.spec -sed -i 's/Release: '${RELEASE}'/Release: '${RELEASE}'/g' rpmpackage/${APP}.spec -sed -i 's/pkgrel='${RELEASE}'/pkgrel='${RELEASE}'/g' archpackage/PKGBUILD -sed -i 's/pkgver='${PREV_VERSION}'/pkgver='${VERSION}'/g' archpackage/PKGBUILD -sed -i "s/-${PREV_VERSION}-/-${VERSION}-/g" puppypackage/*.specs -sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs -sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh -sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links - -# create the source code in the SOURCES directory -make clean -mkdir -p ~/ebuild -rm -f ${SOURCE} -mv ../${APP} ../${APP}-${VERSION} -tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs - -# rename the root directory without the version number -mv ../${APP}-${VERSION} ../${APP} - diff --git a/puppy.sh b/puppy.sh index 4883273458..7037bfcda7 100755 --- a/puppy.sh +++ b/puppy.sh @@ -2,7 +2,7 @@ APP=pybitmessage PREV_VERSION=0.4.4 -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 BUILDDIR=~/petbuild CURRDIR=`pwd` diff --git a/rpm.sh b/rpm.sh index 52fb046550..e06eab7ecb 100755 --- a/rpm.sh +++ b/rpm.sh @@ -2,7 +2,7 @@ APP=pybitmessage PREV_VERSION=0.4.4 -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 SOURCEDIR=. ARCH_TYPE=`uname -m` diff --git a/rpmpackage/pybitmessage.spec b/rpmpackage/pybitmessage.spec index 258636f8c8..6371b738eb 100644 --- a/rpmpackage/pybitmessage.spec +++ b/rpmpackage/pybitmessage.spec @@ -1,5 +1,5 @@ Name: pybitmessage -Version: 0.4.4 +Version: 0.5.6 Release: 1%{?dist} Summary: Send encrypted messages License: MIT diff --git a/slack.sh b/slack.sh index c19ff95468..866b42ee0e 100755 --- a/slack.sh +++ b/slack.sh @@ -2,7 +2,7 @@ APP=pybitmessage PREV_VERSION=0.4.4 -VERSION=0.4.4 +VERSION=0.5.6 RELEASE=1 ARCH_TYPE=`uname -m` BUILDDIR=~/slackbuild diff --git a/src/api.py b/src/api.py index 7c355941b1..14f5345fa9 100644 --- a/src/api.py +++ b/src/api.py @@ -1,5 +1,5 @@ -# Copyright (c) 2012-2014 Jonathan Warren -# Copyright (c) 2012-2014 The Bitmessage developers +# Copyright (c) 2012-2016 Jonathan Warren +# Copyright (c) 2012-2016 The Bitmessage developers comment= """ This is not what you run to run the Bitmessage API. Instead, enable the API diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 2767e465c7..37da15fc7f 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.7 -# Copyright (c) 2012 Jonathan Warren -# Copyright (c) 2012 The Bitmessage developers +# Copyright (c) 2012-2016 Jonathan Warren +# Copyright (c) 2012-2016 The Bitmessage developers # Distributed under the MIT/X11 software license. See the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bitmessageqt/about.py b/src/bitmessageqt/about.py index d268753284..7ddec7a0af 100644 --- a/src/bitmessageqt/about.py +++ b/src/bitmessageqt/about.py @@ -66,7 +66,7 @@ def retranslateUi(self, aboutDialog): aboutDialog.setWindowTitle(_translate("aboutDialog", "About", None)) self.label.setText(_translate("aboutDialog", "PyBitmessage", None)) self.labelVersion.setText(_translate("aboutDialog", "version ?", None)) - self.label_2.setText(_translate("aboutDialog", "

Copyright © 2012-2014 Jonathan Warren
Copyright © 2013-2014 The Bitmessage Developers

", None)) + self.label_2.setText(_translate("aboutDialog", "

Copyright © 2012-2016 Jonathan Warren
Copyright © 2013-2016 The Bitmessage Developers

", None)) self.label_3.setText(_translate("aboutDialog", "

Distributed under the MIT/X11 software license; see http://www.opensource.org/licenses/mit-license.php

", None)) self.label_5.setText(_translate("aboutDialog", "This is Beta software.", None)) diff --git a/src/bitmessageqt/about.ui b/src/bitmessageqt/about.ui index 3deab41bc8..2ee905c073 100644 --- a/src/bitmessageqt/about.ui +++ b/src/bitmessageqt/about.ui @@ -74,7 +74,7 @@ - <html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> Qt::AlignCenter diff --git a/src/translations/bitmessage_ar.ts b/src/translations/bitmessage_ar.ts index 195db5162b..6c1bfc5aff 100644 --- a/src/translations/bitmessage_ar.ts +++ b/src/translations/bitmessage_ar.ts @@ -1184,8 +1184,8 @@ The 'Random Number' option is selected by default but deterministic ad - Copyright © 2013 Jonathan Warren - حقوق الحفظ © 2013 Warren Jonathan + Copyright © 2013-2016 Jonathan Warren + حقوق الحفظ © 2013-2016 Warren Jonathan diff --git a/src/translations/bitmessage_cs.ts b/src/translations/bitmessage_cs.ts index 438e590735..dd6dd3a46b 100755 --- a/src/translations/bitmessage_cs.ts +++ b/src/translations/bitmessage_cs.ts @@ -1213,13 +1213,13 @@ Možnost "Náhodné číslo" je nastavena jako výchozí, deterministi - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 Vývojáři Bitmessage</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 Vývojáři Bitmessage</p></body></html> - <html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html> - <html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 Vývojáři Bitmessage</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 Vývojáři Bitmessage</p></body></html> diff --git a/src/translations/bitmessage_de.ts b/src/translations/bitmessage_de.ts index 3e0a2546e8..6ea075d49f 100644 --- a/src/translations/bitmessage_de.ts +++ b/src/translations/bitmessage_de.ts @@ -1218,8 +1218,8 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei - Copyright © 2013 Jonathan Warren - Copyright © 2013 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren @@ -1233,7 +1233,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_en_pirate.ts b/src/translations/bitmessage_en_pirate.ts index 0233089727..236472dd10 100644 --- a/src/translations/bitmessage_en_pirate.ts +++ b/src/translations/bitmessage_en_pirate.ts @@ -1164,7 +1164,7 @@ T' 'Random Number' option be selected by default but deterministi - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_eo.ts b/src/translations/bitmessage_eo.ts index 8fac557f9f..be1288c274 100644 --- a/src/translations/bitmessage_eo.ts +++ b/src/translations/bitmessage_eo.ts @@ -1206,8 +1206,8 @@ The 'Random Number' option is selected by default but deterministic ad - Copyright © 2013 Jonathan Warren - Kopirajto © 2013 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren + Kopirajto © 2013-2016 Jonathan Warren @@ -1221,7 +1221,7 @@ The 'Random Number' option is selected by default but deterministic ad - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_fr.ts b/src/translations/bitmessage_fr.ts index a54833030f..1e868c4068 100644 --- a/src/translations/bitmessage_fr.ts +++ b/src/translations/bitmessage_fr.ts @@ -1278,8 +1278,8 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais - Copyright © 2013 Jonathan Warren - Copyright © 2013 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren @@ -1293,7 +1293,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts index 08061f61d1..0f2eb79a40 100644 --- a/src/translations/bitmessage_ja.ts +++ b/src/translations/bitmessage_ja.ts @@ -1058,7 +1058,7 @@ The 'Random Number' option is selected by default but deterministic ad - Copyright © 2013 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren diff --git a/src/translations/bitmessage_nl.ts b/src/translations/bitmessage_nl.ts index 46969c0d7f..b56f0a71af 100644 --- a/src/translations/bitmessage_nl.ts +++ b/src/translations/bitmessage_nl.ts @@ -1164,7 +1164,7 @@ The 'Random Number' option is selected by default but deterministic ad - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_no.ts b/src/translations/bitmessage_no.ts index 0b12acfb57..41105c44bd 100644 --- a/src/translations/bitmessage_no.ts +++ b/src/translations/bitmessage_no.ts @@ -1296,8 +1296,8 @@ The 'Random Number' option is selected by default but deterministic ad - Copyright © 2013 Jonathan Warren - Kopirett © 2013 Jonathan Warren + Copyright © 2013-2016 Jonathan Warren + Kopirett © 2013-2016 Jonathan Warren @@ -1311,8 +1311,8 @@ The 'Random Number' option is selected by default but deterministic ad - <html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html> - <html><head/><body><p>Kopirett © 2012-2014 Jonathan Warren<br/>Kopirett © 2013-2014 Bitmessage-utviklerne</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Kopirett © 2012-2016 Jonathan Warren<br/>Kopirett © 2013-2016 Bitmessage-utviklerne</p></body></html> diff --git a/src/translations/bitmessage_ru.ts b/src/translations/bitmessage_ru.ts index 04ef8ab4ff..85b3ff2d94 100644 --- a/src/translations/bitmessage_ru.ts +++ b/src/translations/bitmessage_ru.ts @@ -1242,8 +1242,8 @@ The 'Random Number' option is selected by default but deterministic ad - Copyright © 2013 Jonathan Warren - Копирайт © 2013 Джонатан Уоррен + Copyright © 2013-2016 Jonathan Warren + Копирайт © 2013-2016 Джонатан Уоррен @@ -1257,7 +1257,7 @@ The 'Random Number' option is selected by default but deterministic ad - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> diff --git a/src/translations/bitmessage_zh_cn.ts b/src/translations/bitmessage_zh_cn.ts index 0b580e656a..09d553d0f0 100644 --- a/src/translations/bitmessage_zh_cn.ts +++ b/src/translations/bitmessage_zh_cn.ts @@ -1243,8 +1243,8 @@ The 'Random Number' option is selected by default but deterministic ad - <html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html> - <html><head/><body><p>版权所有 © 2012-2013 Jonathan Warren<br/>版权所有 © 2013 比特信开发者</p></body></html> + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 The Bitmessage Developers</p></body></html> + <html><head/><body><p>版权所有 © 2012-2016 Jonathan Warren<br/>版权所有 © 2013-2016 比特信开发者</p></body></html>