[Pkg-bitcoin-commits] [bitcointrader] 01/01: New upstream release [1.07.99.7]
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Tue Sep 2 01:31:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository bitcointrader.
commit b8f1666 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Tue Sep 2 01:28:18 2014
New upstream release [1.07.99.7]
---
debian/changelog | 2 +-
debian/patches/post-release.patch | 298 --------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 300 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f28ea35..eb7ad6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bitcointrader (1.07.99b5+repack-1) UNRELEASED; urgency=low
+bitcointrader (1.07.99.7+repack-1) UNRELEASED; urgency=low
* Initial release (Closes: #759014).
diff --git a/debian/patches/post-release.patch b/debian/patches/post-release.patch
deleted file mode 100644
index bd8a1d0..0000000
--- a/debian/patches/post-release.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-Last-Update: 2014-09-02
-Forwarded: not-needed
-Origin: upstream
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: post-release fixes
-
---- a/src/QtBitcoinTrader_Mobility.pro
-+++ b/src/QtBitcoinTrader_Mobility.pro
-@@ -1,35 +1,29 @@
--#
--# Basic stuff
--#
- TEMPLATE = app
- LANGUAGE = C++
- TARGET = QtBitcoinTrader
- DEPENDPATH += .
--QT += network
- INCLUDEPATH += .
- INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
--INCLUDEPATH += /usr/include/QtMultimediaKit
--INCLUDEPATH += /usr/include/QtMobility
--MOBILITY = multimedia
-
--win32 {
--LIBS += -lcrypt32 -llibeay32 -lssleay32 -luser32 -lgdi32 -ladvapi32
--}
--!win32 {
--LIBS += -lcrypto -lz -lQtMultimediaKit
--}
-+QT += network script
-+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets multimedia
-+
-+ win32 { LIBS += -lcrypt32 -leay32 -lssleay32 -luser32 -lgdi32 -ladvapi32 -lz}
-+!win32 { LIBS += -lcrypto -lz }
-
--CONFIG += qt warn_off release mobility
-+CONFIG += qt warn_off release
-+
-+mac{
-+LIBS += -framework CoreFoundation
-+LIBS += -framework ApplicationServices
-+}
-
- #
- # Headers
- #
--
- HEADERS += aboutdialog.h \
- addrulegroup.h \
-- addrulewindow.h \
-- audioplayer.h \
- currencyinfo.h \
- currencypairitem.h \
- datafolderchusedialog.h \
- debugviewer.h \
-@@ -39,9 +33,8 @@
- exchange_bitfinex.h \
- exchange_bitstamp.h \
- exchange_btcchina.h \
- exchange_btce.h \
-- exchange_cryptsy.h \
- feecalculator.h \
- historyitem.h \
- historymodel.h \
- julyaes256.h \
-@@ -60,9 +53,8 @@
- orderstablecancelbutton.h \
- passworddialog.h \
- percentpicker.h \
- qtbitcointrader.h \
-- ruleholder.h \
- rulesmodel.h \
- rulewidget.h \
- thisfeatureunderdevelopment.h \
- tradesitem.h \
-@@ -70,11 +62,25 @@
- translationdialog.h \
- translationline.h \
- updaterdialog.h \
- apptheme.h \
-- logobutton.h
-+ logobutton.h \
-+ networkmenu.h \
-+ julybuttonmenu.h \
-+ scriptwidget.h \
-+ scriptobject.h \
-+ addscriptwindow.h \
-+ julylockfile.h \
-+ exchange_gocio.h \
-+ featuredexchangesdialog.h \
-+ allexchangesdialog.h \
-+ allexchangesmodel.h \
-+ exchangebutton.h \
-+ addruledialog.h \
-+ rulescriptparser.h \
-+ ruleholder.h
-+
- FORMS += addrulegroup.ui \
-- addrulewindow.ui \
- datafolderchusedialog.ui \
- debugviewer.ui \
- feecalculator.ui \
- newpassworddialog.ui \
-@@ -85,13 +91,19 @@
- thisfeatureunderdevelopment.ui \
- translationabout.ui \
- translationdialog.ui \
- updaterdialog.ui \
-- logobutton.ui
-+ logobutton.ui \
-+ networkmenu.ui \
-+ scriptwidget.ui \
-+ addscriptwindow.ui \
-+ featuredexchangesdialog.ui \
-+ allexchangesdialog.ui \
-+ exchangebutton.ui \
-+ addruledialog.ui
-+
- SOURCES += aboutdialog.cpp \
- addrulegroup.cpp \
-- addrulewindow.cpp \
-- audioplayer.cpp \
- currencypairitem.cpp \
- datafolderchusedialog.cpp \
- debugviewer.cpp \
- depthitem.cpp \
-@@ -100,9 +112,8 @@
- exchange_bitfinex.cpp \
- exchange_bitstamp.cpp \
- exchange_btcchina.cpp \
- exchange_btce.cpp \
-- exchange_cryptsy.cpp \
- feecalculator.cpp \
- historyitem.cpp \
- historymodel.cpp \
- julyaes256.cpp \
-@@ -121,9 +132,8 @@
- orderstablecancelbutton.cpp \
- passworddialog.cpp \
- percentpicker.cpp \
- qtbitcointrader.cpp \
-- ruleholder.cpp \
- rulesmodel.cpp \
- rulewidget.cpp \
- thisfeatureunderdevelopment.cpp \
- tradesitem.cpp \
-@@ -131,9 +141,23 @@
- translationdialog.cpp \
- translationline.cpp \
- updaterdialog.cpp \
- apptheme.cpp \
-- logobutton.cpp
-+ logobutton.cpp \
-+ networkmenu.cpp \
-+ julybuttonmenu.cpp \
-+ scriptwidget.cpp \
-+ scriptobject.cpp \
-+ addscriptwindow.cpp \
-+ julylockfile.cpp \
-+ exchange_gocio.cpp \
-+ featuredexchangesdialog.cpp \
-+ allexchangesdialog.cpp \
-+ allexchangesmodel.cpp \
-+ exchangebutton.cpp \
-+ addruledialog.cpp \
-+ rulescriptparser.cpp \
-+ ruleholder.cpp
- #
- # Resources
- #
- RESOURCES += QtResource.qrc
-@@ -173,5 +197,5 @@
- win32 {
- RC_FILE = WinResource.rc
- }
-
--macx:ICON = $${PWD}/QtBitcoinTrader.icns
-\ No newline at end of file
-+macx:ICON = $${PWD}/QtBitcoinTrader.icns
---- a/src/julyhttp.cpp
-+++ b/src/julyhttp.cpp
-@@ -64,10 +64,11 @@
- httpHeader.append("User-Agent: "+baseValues.customUserAgent+"\r\n");
- else
- httpHeader.append("User-Agent: Qt Bitcoin Trader v"+baseValues.appVerStr+"\r\n");
- httpHeader.append("Host: "+hostName+"\r\n");
-+ httpHeader.append("Accept: */*\r\n");
- if(baseValues.gzipEnabled)httpHeader.append("Accept-Encoding: gzip\r\n");
-- httpHeader.append("Content-Type: "+contentType+"\r\n");
-+ contentTypeLine="Content-Type: "+contentType+"\r\n";
- if(keepAlive)httpHeader.append("Connection: keep-alive\r\n");
- else httpHeader.append("Connection: close\r\n");
- apiDownState=false;
- apiDownCounter=0;
-@@ -208,15 +209,23 @@
- readingHeader=true;
- contentLength=0;
- }
-
-+ bool lineReaded=false;
- while(readingHeader)
- {
- bool endFound=false;
-- QByteArray currentLine;
-- while(!endFound&&canReadLine())
-- {
-- currentLine=readLine();
-+ QByteArray currentLine;
-+ while(!endFound&&canReadLine())
-+ {
-+ lineReaded=true;
-+ if(outBuffer.size())
-+ {
-+ currentLine=outBuffer+readLine();
-+ outBuffer.clear();
-+ }
-+ else currentLine=readLine();
-+ if(outBuffer.size()){currentLine.prepend(outBuffer);outBuffer.clear();}
- if(currentLine=="\r\n"||
- currentLine=="\n"||
- currentLine.isEmpty())endFound=true;
- else
-@@ -269,10 +278,16 @@
- contentGzipped=true;
- }
- }
- if(!endFound)
-- {
-- retryRequest();
-+ {
-+ if(!lineReaded)
-+ {
-+ if(outBuffer.size()>30000)outBuffer.clear();
-+ outBuffer.append(readAll());
-+ return;
-+ }
-+ retryRequest();
- return;
- }
- readingHeader=false;
- }
-@@ -387,9 +402,9 @@
- {
- if(contentGzipped)uncompress(&buffer);
- bool apiMaybeDown=buffer[0]=='<';
- setApiDown(apiMaybeDown);
-- if(debugLevel&&buffer.isEmpty())logThread->writeLog("Response is EMPTY",2);
-+ if(debugLevel&&buffer.isEmpty())logThread->writeLog("Response is EMPTY",2);
- emit dataReceived(buffer,requestList.first().reqType);
- }
- waitingReplay=false;
- readingHeader=true;
-@@ -483,8 +498,9 @@
- QByteArray *data=new QByteArray(method+httpHeader+cookieLine);
- if(!restSignLine.isEmpty())data->append(restKeyLine+restSignLine);
- if(!postData.isEmpty())
- {
-+ data->append(contentTypeLine);
- data->append("Content-Length: "+QByteArray::number(postData.size())+"\r\n\r\n");
- data->append(postData);
- }
- else data->append("\r\n");
-@@ -542,8 +558,9 @@
- QByteArray *data=new QByteArray(method+httpHeader+cookieLine);
- if(!restSignLine.isEmpty())data->append(restKeyLine+restSignLine);
- if(!postData.isEmpty())
- {
-+ data->append(contentTypeLine);
- data->append("Content-Length: "+QByteArray::number(postData.size())+"\r\n\r\n");
- data->append(postData);
- }
- else data->append("\r\n");
---- a/src/julyhttp.h
-+++ b/src/julyhttp.h
-@@ -64,8 +64,10 @@
- JulyHttp(const QString &hostName, const QByteArray &restKeyLine, QObject *parent, const bool &secure=true, const bool &keepAlive=true, const QByteArray &contentType="application/x-www-form-urlencoded");
- ~JulyHttp();
-
- private:
-+ QByteArray outBuffer;
-+ QByteArray contentTypeLine;
- int noReconnectCount;
- void addSpeedSize(qint64);
- QMap<QByteArray,QByteArray> cookiesMap;
- void saveCookies();
---- a/src/qtbitcointrader.cpp
-+++ b/src/qtbitcointrader.cpp
-@@ -1150,9 +1150,9 @@
- pVoice->Speak(NULL,SPF_PURGEBEFORESPEAK,0);
- pVoice->Speak(text.utf16(), SPF_ASYNC, NULL);
- }
- #else
-- startApplication("say",text);
-+ startApplication("say",text.split(' '));
- #endif
- #endif
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 542f2b5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-post-release.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcointrader.git
More information about the Pkg-bitcoin-commits
mailing list