citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Resolve minor merge conflict

Browse Source
This commit is contained in:
Jonathan Warren 2014-12-25 19:26:31 -05:00
commit 6c4ec3f3fe
8 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -3,12 +3,10 @@ VERSION=0.4.4
RELEASE=1 RELEASE=1
ARCH_TYPE=`uname -m` ARCH_TYPE=`uname -m`
PREFIX?=/usr/local PREFIX?=/usr/local
LIBDIR=lib
all: all:
debug: debug:
sourcedeb:
tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs --exclude 'debian'
gzip -f9n ../${APP}_${VERSION}.orig.tar
source: source:
tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs
gzip -f9n ../${APP}_${VERSION}.orig.tar gzip -f9n ../${APP}_${VERSION}.orig.tar
@ -31,15 +29,18 @@ install:
mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps
install -m 644 desktop/${APP}.desktop ${DESTDIR}${PREFIX}/share/applications/${APP}.desktop install -m 644 desktop/${APP}.desktop ${DESTDIR}${PREFIX}/share/applications/${APP}.desktop
install -m 644 desktop/icon24.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${APP}.png install -m 644 desktop/icon24.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${APP}.png
install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP} cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}
echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP} echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}
echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP} echo "if [ -d ${PREFIX}/share/${APP} ]; then" >> ${DESTDIR}${PREFIX}/bin/${APP}
echo ' cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP} echo " cd ${PREFIX}/share/${APP}" >> ${DESTDIR}${PREFIX}/bin/${APP}
echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP} echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo ' cd ${DESTDIR}/usr/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP} echo " cd /usr/share/pybitmessage" >> ${DESTDIR}${PREFIX}/bin/${APP}
echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP} echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo 'if [ -d /opt/openssl-compat-bitcoin/lib ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo ' LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP} echo ' LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo ' exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
chmod +x ${DESTDIR}${PREFIX}/bin/${APP} chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
uninstall: uninstall:
rm -f ${PREFIX}/share/man/man1/${APP}.1.gz rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
@ -54,3 +55,7 @@ clean:
rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc
rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz
rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz
sourcedeb:
tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs --exclude 'debian'
gzip -f9n ../${APP}_${VERSION}.orig.tar

6
arch.sh
View File

@ -24,14 +24,14 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
make clean make clean
rm -f archpackage/*.gz rm -f archpackage/*.gz
# Having the root directory called name-version seems essential # having the root directory called name-version seems essential
mv ../${APP} ../${APP}-${VERSION} mv ../${APP} ../${APP}-${VERSION}
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
# Rename the root directory without the version number # rename the root directory without the version number
mv ../${APP}-${VERSION} ../${APP} mv ../${APP}-${VERSION} ../${APP}
# Calculate the MD5 checksum # calculate the MD5 checksum
CHECKSM=$(md5sum ${SOURCE}) CHECKSM=$(md5sum ${SOURCE})
sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD

2
archpackage/PKGBUILD
View File

@ -19,7 +19,7 @@ install=
changelog= changelog=
source=($pkgname-$pkgver.tar.gz) source=($pkgname-$pkgver.tar.gz)
noextract=() noextract=()
md5sums=(0ee9bcb11dc606788fde94c7857e8720) md5sums=()
build() { build() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr ./configure --prefix=/usr

2
debian.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.4 PREV_VERSION=0.4.2
VERSION=0.4.4 VERSION=0.4.4
RELEASE=1 RELEASE=1
ARCH_TYPE=all ARCH_TYPE=all

30
debian/changelog vendored
View File

@ -1,3 +1,33 @@
pybitmessage (0.4.4-1) utopic; urgency=low
* Added ability to limit network transfer rate
* Updated to Protocol Version 3
* Removed use of memoryview so that we can support python 2.7.3
* Make use of l10n for localizations
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Sun, 2 November 2014 12:55:00 +0100
pybitmessage (0.4.3-1) saucy; urgency=low
* Support pyelliptic's updated HMAC algorithm. We'll remove support for the old method after an upgrade period.
* Improved version check
* Refactored decodeBase58 function
* Ignore duplicate messages
* Added bytes received/sent counts and rate on the network information tab
* Fix unicode handling in 'View HTML code as formatted text'
* Refactor handling of packet headers
* Use pointMult function instead of arithmetic.privtopub since it is faster
* Fixed issue where client wasn't waiting for a verack before continuing on with the conversation
* Fixed CPU hogging by implementing tab-based refresh improvements
* Added curses interface
* Added support for IPv6
* Added a 'trustedpeer' option to keys.dat
* Limit maximum object size to 20 MB
* Support email-like > quote characters and reply-below-quote
* Added Japanese and Dutch language files; updated Norwegian and Russian languages files
-- Bob Mottram (4096 bits) <bob@robotics.uk.to> Thu, 6 March 2014 20:23:00 +0100
pybitmessage (0.4.2-1) saucy; urgency=low pybitmessage (0.4.2-1) saucy; urgency=low
* Exclude debian directory from orig.tar.gz * Exclude debian directory from orig.tar.gz

4
ebuild.sh
View File

@ -21,13 +21,13 @@ 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/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
# Create the source code in the SOURCES directory # create the source code in the SOURCES directory
make clean make clean
mkdir -p ~/ebuild mkdir -p ~/ebuild
rm -f ${SOURCE} rm -f ${SOURCE}
mv ../${APP} ../${APP}-${VERSION} mv ../${APP} ../${APP}-${VERSION}
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
# Rename the root directory without the version number # rename the root directory without the version number
mv ../${APP}-${VERSION} ../${APP} mv ../${APP}-${VERSION} ../${APP}

12
rpm.sh
View File

@ -24,25 +24,25 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
sudo yum groupinstall "Development Tools" sudo yum groupinstall "Development Tools"
sudo yum install rpmdevtools sudo yum install rpmdevtools
# Setup the rpmbuild directory tree # setup the rpmbuild directory tree
rpmdev-setuptree rpmdev-setuptree
# Create the source code in the SOURCES directory # create the source code in the SOURCES directory
make clean make clean
mkdir -p ~/rpmbuild/SOURCES mkdir -p ~/rpmbuild/SOURCES
rm -f ${SOURCE} rm -f ${SOURCE}
# Having the root directory called name-version seems essential # having the root directory called name-version seems essential
mv ../${APP} ../${APP}-${VERSION} mv ../${APP} ../${APP}-${VERSION}
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
# Rename the root directory without the version number # rename the root directory without the version number
mv ../${APP}-${VERSION} ../${APP} mv ../${APP}-${VERSION} ../${APP}
# Copy the spec file into the SPECS directory # copy the spec file into the SPECS directory
cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS
# Build # build
cd ~/rpmbuild/SPECS cd ~/rpmbuild/SPECS
rpmbuild -ba ${APP}.spec rpmbuild -ba ${APP}.spec
cd ${CURRDIR} cd ${CURRDIR}

24
rpmpackage/pybitmessage.spec
View File

@ -69,6 +69,30 @@ make install -B DESTDIR=%{buildroot} PREFIX=/usr
%attr(644,root,root) /usr/share/icons/hicolor/24x24/apps/%{name}.png %attr(644,root,root) /usr/share/icons/hicolor/24x24/apps/%{name}.png
%changelog %changelog
* Sun Nov 2 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.4.4-1
- Added ability to limit network transfer rate
- Updated to Protocol Version 3
- Removed use of memoryview so that we can support python 2.7.3
- Make use of l10n for localizations
* Thu Mar 6 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.4.3-1
- Support pyelliptic's updated HMAC algorithm. We'll remove support for the old method after an upgrade period.
- Improved version check
- Refactored decodeBase58 function
- Ignore duplicate messages
- Added bytes received/sent counts and rate on the network information tab
- Fix unicode handling in 'View HTML code as formatted text'
- Refactor handling of packet headers
- Use pointMult function instead of arithmetic.privtopub since it is faster
- Fixed issue where client wasn't waiting for a verack before continuing on with the conversation
- Fixed CPU hogging by implementing tab-based refresh improvements
- Added curses interface
- Added support for IPv6
- Added a 'trustedpeer' option to keys.dat
- Limit maximum object size to 20 MB
- Support email-like > quote characters and reply-below-quote
- Added Japanese and Dutch language files; updated Norwegian and Russian languages files
* Thu Mar 6 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.4.2-1 * Thu Mar 6 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> - 0.4.2-1
- Exclude debian directory from orig.tar.gz - Exclude debian directory from orig.tar.gz
- Added Norwegian, Chinese, and Arabic translations - Added Norwegian, Chinese, and Arabic translations