diff -Nru httraqt-1.4.6/debian/changelog httraqt-1.4.7/debian/changelog --- httraqt-1.4.6/debian/changelog 2015-09-07 16:39:13.000000000 +0000 +++ httraqt-1.4.7/debian/changelog 2015-12-06 11:39:24.000000000 +0000 @@ -1,3 +1,10 @@ +httraqt (1.4.7-1) unstable; urgency=medium + + * [ebd5cc4] Imported Upstream version 1.4.7 + * [7fb1de2] Ignore quilt dir + + -- Anton Gladky Sun, 06 Dec 2015 12:39:24 +0100 + httraqt (1.4.6-2) unstable; urgency=medium * [3c3588e] Take build date from d/changelog. Towards reproducibility. diff -Nru httraqt-1.4.6/README httraqt-1.4.7/README --- httraqt-1.4.6/README 2015-09-06 11:34:12.000000000 +0000 +++ httraqt-1.4.7/README 2015-11-13 18:26:33.000000000 +0000 @@ -19,6 +19,7 @@ Version history +1.4.7, Ticket 34, rulez seperated by newline insteed of space 1.4.6, Hotfix for Qt5 compiling 1.4.5, Icons as files, #32 overworked code, #33 multiple urls are fixed 1.4.4, Icons for Dialogs are fixed, size column is fixed in progress diff -Nru httraqt-1.4.6/sources/options/OptionsDialog.cpp httraqt-1.4.7/sources/options/OptionsDialog.cpp --- httraqt-1.4.6/sources/options/OptionsDialog.cpp 2015-06-25 20:31:46.000000000 +0000 +++ httraqt-1.4.7/sources/options/OptionsDialog.cpp 2015-11-13 17:38:42.000000000 +0000 @@ -210,7 +210,7 @@ } case TEXTEDIT: { // this one only for rulez->scanList - (*ivec).value = ((QTextEdit*)(*ivec).wg)->toPlainText(); + (*ivec).value = (((QTextEdit*)(*ivec).wg)->toPlainText()).replace("\n"," ").simplified(); break; } diff -Nru httraqt-1.4.6/sources/options/optionsrulez.cpp httraqt-1.4.7/sources/options/optionsrulez.cpp --- httraqt-1.4.6/sources/options/optionsrulez.cpp 2015-06-25 20:32:51.000000000 +0000 +++ httraqt-1.4.7/sources/options/optionsrulez.cpp 2015-11-13 17:43:03.000000000 +0000 @@ -103,7 +103,7 @@ { QString st; disconnect(rulezForm::scanList, SIGNAL(textChanged()), this, SLOT(setScanRulezToGUI())); - st = rulezForm::scanList->toPlainText(); + st = rulezForm::scanList->toPlainText().replace("\n"," "); // set the widgets for (int i = 0; i < 4; i++) { @@ -116,7 +116,7 @@ void optionsRulez::detectTypeInc(const QString &st, int i) { - QString editString = scanList->toPlainText(); +// QString editString = scanList->toPlainText(); QStringList lst = ext[i].split(" "); for (QStringList::Iterator j = lst.begin(); j != lst.end(); j++) { @@ -154,6 +154,7 @@ for (QStringList::Iterator i = lst.begin(); i != lst.end(); i++) { if (editString.contains(*i) == true) { editString.remove(((*i) + " ")); + editString.remove(((*i) + "\n")); } } } @@ -168,7 +169,7 @@ QString act; QString le = rulezForm::lineEdit356->text(); - if (le == "") { + if (le == "" && action != 10) { return; } @@ -231,10 +232,12 @@ if (editor.contains("+" + act + " ") == true) { editor.remove("+" + act + " "); + editor.remove("+" + act + "\n"); } if (editor.contains("-" + act + " ") == true) { editor.remove("-" + act + " "); + editor.remove("-" + act + "\n"); } if (incl) { diff -Nru httraqt-1.4.6/sources/version.h httraqt-1.4.7/sources/version.h --- httraqt-1.4.6/sources/version.h 2015-09-06 11:28:15.000000000 +0000 +++ httraqt-1.4.7/sources/version.h 2015-11-13 17:59:14.000000000 +0000 @@ -1,8 +1,8 @@ #ifndef HTTVERSION_H #define HTTVERSION_H -#define HTTQTVERSION "1.4.5" -#define PROGRAM_DATE "06 Sep 2015" +#define HTTQTVERSION "1.4.6" +#define PROGRAM_DATE "13 Nov 2015" #define USE_QT_VERSION 4