[SCM] tora Debian packaging branch, master, updated. upstream/2.1.2-29-gda2a819
Michael Meskes
meskes at alioth.debian.org
Mon Sep 27 09:11:31 UTC 2010
The following commit has been merged in the master branch:
commit 394f3741f9a303d84cdd206fee231b3def5cad06
Merge: 54936b6a35bf1e826a1e06ec5fd3a4dbea80e27d 620b51d2be6acc802b61aaef9277a6cb76c5dac1
Author: Michael Meskes <meskes at debian.org>
Date: Mon Sep 27 10:03:58 2010 +0200
Merge commit 'upstream/2.1.3'
CMakeLists.txt | 83 +-
ChangeLog | 55 +
INSTALL | 97 +-
Makefile.in | 5 +
NEWS | 3 +
README | 6 +
README.CMAKE | 5 +
README.RELEASE | 20 +-
README.WINDOWS | 4 +
aclocal.m4 | 5 +-
cmake/modules/FindOracle.cmake | 167 +-
cmake/modules/FindQScintilla.cmake | 23 +-
cmake/modules/FindTeradata.cmake | 52 +
cmake/modules/TeradataTest.c | 19 +
config.h.in | 11 +-
config/m4/teradata.m4 | 99 +
configure | 8906 +++++++-------------
configure.ac | 6 +-
debian/changelog | 6 +
doc/Makefile.in | 5 +
doc/help/Index_002dlist.html | 2 +-
doc/help/Makefile | 35 +-
doc/help/Makefile.in | 5 +
doc/help/additionalhelp.html | 2 +-
doc/help/alert.html | 6 +-
doc/help/alert.texi | 4 +-
doc/help/analyze.html | 4 +-
doc/help/analyze.texi | 2 +-
doc/help/api.html | 2 +-
doc/help/api/Doxyfile | 2 +-
doc/help/browser.html | 4 +-
doc/help/browser.texi | 2 +-
doc/help/charts.html | 2 +-
doc/help/common.html | 2 +-
doc/help/current.html | 2 +-
doc/help/database.html | 16 +-
doc/help/database.texi | 15 +
doc/help/debugger.html | 2 +-
doc/help/editor.html | 2 +-
doc/help/editors.html | 2 +-
doc/help/explainplan.html | 2 +-
doc/help/extendingtora.html | 2 +-
doc/help/externalapi.html | 2 +-
doc/help/gettingbindparameters.html | 2 +-
doc/help/globalsettings.html | 4 +-
doc/help/help.html | 2 +-
doc/help/history.html | 2 +-
doc/help/images/exporttofile.png | Bin 0 -> 37235 bytes
doc/help/images/mysql.png | Bin 42038 -> 60917 bytes
doc/help/index.html | 8 +-
doc/help/invalid.html | 4 +-
doc/help/invalid.texi | 4 +-
doc/help/lists.html | 22 +-
doc/help/lists.texi | 20 +
doc/help/memoeditor.html | 2 +-
doc/help/newconnection.html | 2 +-
doc/help/objectdescription.html | 2 +-
doc/help/output.html | 2 +-
doc/help/plsqleditor.html | 2 +-
doc/help/preferences.html | 2 +-
doc/help/preferences.texi | 2 +-
doc/help/rollback.html | 2 +-
doc/help/script.html | 2 +-
doc/help/searchreplace.html | 2 +-
doc/help/security.html | 2 +-
doc/help/session.html | 2 +-
doc/help/sgastatement.html | 2 +-
doc/help/sqledit.html | 4 +-
doc/help/sqledit.texi | 2 +-
doc/help/storage.html | 2 +-
doc/help/template.html | 2 +-
doc/help/tools.html | 2 +-
doc/help/toolsetting.html | 2 +-
doc/help/tora.info | Bin 147627 -> 150419 bytes
doc/help/tora.texi | 4 +-
doc/help/tora_documentation.pdf | Bin 3257262 -> 3332875 bytes
doc/help/trace.html | 2 +-
doc/help/tuning.html | 2 +-
doc/help/unittest.html | 2 +-
doc/help/whatprivileges.html | 2 +-
doc/help/window.html | 2 +-
doc/help/worksheet.html | 2 +-
doc/help/workspace.html | 2 +-
osx_tools/dmg/tora.dmgCanvas | Bin 605029 -> 605025 bytes
rpm/tora.desktop | 2 +-
rpm/tora.spec | 16 +-
rpm/tora.spec.in | 18 +-
src/CMakeLists.txt | 28 +-
src/Makefile.am | 13 +-
src/Makefile.in | 140 +-
src/help/Index_002dlist.html | 2 +-
src/help/additionalhelp.html | 2 +-
src/help/alert.html | 6 +-
src/help/analyze.html | 4 +-
src/help/api.html | 2 +-
src/help/browser.html | 4 +-
src/help/charts.html | 2 +-
src/help/common.html | 2 +-
src/help/current.html | 2 +-
src/help/database.html | 16 +-
src/help/debugger.html | 2 +-
src/help/editor.html | 2 +-
src/help/editors.html | 2 +-
src/help/explainplan.html | 2 +-
src/help/extendingtora.html | 2 +-
src/help/externalapi.html | 2 +-
src/help/gettingbindparameters.html | 2 +-
src/help/globalsettings.html | 4 +-
src/help/help.html | 2 +-
src/help/history.html | 2 +-
src/help/images/exporttofile.png | Bin 0 -> 37235 bytes
src/help/images/mysql.png | Bin 42038 -> 60917 bytes
src/help/index.html | 8 +-
src/help/invalid.html | 4 +-
src/help/lists.html | 22 +-
src/help/memoeditor.html | 2 +-
src/help/newconnection.html | 2 +-
src/help/objectdescription.html | 2 +-
src/help/output.html | 2 +-
src/help/plsqleditor.html | 2 +-
src/help/preferences.html | 2 +-
src/help/rollback.html | 2 +-
src/help/script.html | 2 +-
src/help/searchreplace.html | 2 +-
src/help/security.html | 2 +-
src/help/session.html | 2 +-
src/help/sgastatement.html | 2 +-
src/help/sqledit.html | 4 +-
src/help/storage.html | 2 +-
src/help/template.html | 2 +-
src/help/tools.html | 2 +-
src/help/toolsetting.html | 2 +-
src/help/trace.html | 2 +-
src/help/tuning.html | 2 +-
src/help/unittest.html | 2 +-
src/help/whatprivileges.html | 2 +-
src/help/window.html | 2 +-
src/help/worksheet.html | 2 +-
src/help/workspace.html | 2 +-
src/i18n/tora_fr.ts | 4 +-
src/i18n/tora_it.qm | Bin 151829 -> 151830 bytes
src/i18n/tora_it.ts | 4 +-
src/i18n/tora_se.qm | Bin 216985 -> 216987 bytes
src/i18n/tora_se.ts | 4 +-
src/icons/awrtool.xpm | 25 +
src/icons/xmlwrap.png | Bin 0 -> 1725 bytes
src/loki/include/loki/CachedFactory.h | 2 +-
src/otl/otlv4.h | 22 +
src/precompiled.h | 196 +
src/qscintilla2/Qt4/Qsci/qsciglobal.h | 4 +-
src/qscintilla2/Qt4/Qsci/qscilexerhtml.h | 3 +
src/qscintilla2/Qt4/Qsci/qsciscintilla.h | 35 +-
src/qscintilla2/Qt4/Qsci/qsciscintillabase.h | 26 +
src/qscintilla2/Qt4/ScintillaQt.cpp | 55 +-
src/qscintilla2/Qt4/qscilexerhtml.cpp | 9 +-
src/qscintilla2/Qt4/qscilexerverilog.cpp | 3 +
src/qscintilla2/Qt4/qsciscintilla.cpp | 19 +-
src/qscintilla2/Qt4/qsciscintillabase.cpp | 78 +-
src/qscintilla2/Qt4/qscistyle.cpp | 5 +-
src/templates/sqlfunctions.tpl | 4 +-
src/toabout.cpp | 4 +
src/toawr.cpp | 496 ++
src/{totemporary.h => toawr.h} | 53 +-
src/tobackuptool.cpp | 1 +
src/tobrowser.cpp | 235 +-
src/tobrowser.h | 5 +
src/tobrowserbasewidget.cpp | 40 +-
src/tobrowserbasewidget.h | 5 +-
src/tobrowsercodewidget.cpp | 21 +
...textview.cpp => tobrowserdirectorieswidget.cpp} | 57 +-
...blinkswidget.h => tobrowserdirectorieswidget.h} | 16 +-
src/tobrowserindexwidget.cpp | 11 +-
src/tobrowsertablewidget.cpp | 9 +-
src/tocodemodel.cpp | 51 +-
src/toconf.h | 2 +
src/toconfiguration.cpp | 13 +
src/toconfiguration.h | 2 +
src/toconnection.cpp | 69 +-
src/toconnection.h | 28 +-
src/todatabasesettingui.ui | 2 +-
src/todebug.cpp | 345 +-
src/todebug.h | 35 +-
src/todocklet.cpp | 1 +
src/tohighlightedtext.cpp | 53 +-
src/tohighlightedtext.h | 3 +-
src/tohtml.cpp | 2 +-
src/tolistviewformatter.h | 46 +-
src/tolistviewformattercsv.cpp | 2 +-
src/tolistviewformattersql.cpp | 46 +-
src/tologger.h | 103 +-
src/tomain.cpp | 61 +-
src/tomain.h | 10 +-
src/tomarkedtext.cpp | 91 +-
src/tomarkedtext.h | 32 +-
src/tomemoeditor.cpp | 7 +
src/tomodeleditor.cpp | 20 +-
src/tonewconnection.cpp | 28 +-
src/tonewconnection.h | 5 +-
src/tonewconnectionui.ui | 786 +-
src/tooracleconnection.cpp | 5 +-
src/toplsqleditor.cpp | 38 +-
src/toplsqleditor.h | 4 +
src/toplsqltext.cpp | 11 +-
src/toqsqlconnection.cpp | 21 +-
src/toqvalue.cpp | 58 +-
src/toqvalue.h | 25 +-
src/tora.qrc | 2 +
src/toresult.cpp | 2 +-
src/toresult.h | 2 +-
src/toresultcols.cpp | 75 +-
src/toresultcolscomment.cpp | 14 +
src/toresultcombo.cpp | 48 +-
src/toresultcombo.h | 14 +
src/toresultfield.cpp | 23 +-
src/toresultfield.h | 5 +
src/toresultmodel.cpp | 58 +-
src/toresultmodel.h | 11 +
src/toresultschema.cpp | 44 +-
src/toresultstorage.cpp | 157 +-
src/toresulttableview.cpp | 124 +-
src/toresulttableview.h | 39 +-
src/toresulttableviewedit.cpp | 21 +-
src/toresulttableviewedit.h | 10 +-
src/toresultview.cpp | 88 +-
src/torollback.cpp | 209 +-
src/torollback.h | 11 +-
src/tosql.h | 7 +-
src/tosqlparse.cpp | 19 +-
src/toteradataconnection.cpp | 1771 ++++
src/tothread.cpp | 4 +-
src/toworksheet.cpp | 95 +-
src/toworksheet.h | 3 +
src/ts_log/critical_section.h | 7 +-
src/ts_log/decorator.h | 2 +-
src/ts_log/thread_safe_log.h | 20 +-
src/ts_log/ts_log_utils.h | 8 +
src/utils.cpp | 42 +-
src/utils.h | 12 +-
.../installer/{tora.nsi => tora-teradata.nsi} | 11 +-
src/windows/installer/tora.nsi | 20 +
test/Makefile.in | 5 +
test/configuration/Makefile.in | 5 +
utils/Makefile.in | 5 +
utils/chex/Makefile.in | 5 +
244 files changed, 9030 insertions(+), 7611 deletions(-)
diff --cc debian/changelog
index 4be304f,4be304f..71c1b88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,9 @@@
++tora (2.1.3-1) unstable; urgency=low
++
++ * New Upstream version 2.1.3
++
++ -- Michael Meskes <meskes at debian.org> Mon, 27 Sep 2010 10:06:11 +0200
++
tora (2.1.2-1) unstable; urgency=low
* Added debug package. (Closes: #560064)
--
tora Debian packaging
More information about the pkg-kde-commits
mailing list