[SCM] tora Debian packaging branch, master, updated. upstream/2.1.1-26-g54936b6

Michael Meskes meskes at alioth.debian.org
Tue Mar 30 14:08:53 UTC 2010


The following commit has been merged in the master branch:
commit 1e14c30787a4888b90a532c31615a301c1e896c0
Merge: cc2431ee355067fde6c1f8f0aeb1fb2fab59cf36 47bd180a5429cf0c58c1410e7e2ac9e70373aefc
Author: Michael Meskes <meskes at debian.org>
Date:   Tue Mar 30 13:13:11 2010 +0200

    Merge commit 'upstream/2.1.2'
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt                                     |   42 +-
 ChangeLog                                          |  412 +-
 Makefile.in                                        |   36 +-
 NEWS                                               |    5 +
 README.LAYOUT                                      |    2 +
 README.RELEASE                                     |   12 +-
 README.WINDOWS                                     |   24 +-
 aclocal.m4                                         | 6650 +---------
 cmake/modules/FindDB2.cmake                        |   69 +
 cmake/modules/FindOracle.cmake                     |  124 +-
 cmake/modules/OCIVersion.c                         |   18 +
 cmake/modules/PCHSupport_26.cmake                  |  331 +
 config.h.in                                        |    4 +
 config/config.guess                                |  196 +-
 config/config.sub                                  |   43 +-
 config/ltmain.sh                                   | 8440 ++++++-----
 config/m4/libtool.m4                               | 7360 +++++++++
 config/m4/ltoptions.m4                             |  368 +
 config/m4/ltsugar.m4                               |  123 +
 config/m4/ltversion.m4                             |   23 +
 config/m4/lt~obsolete.m4                           |   92 +
 config/texinfo.tex                                 |   26 +-
 configure                                          |15701 ++++++++------------
 configure.ac                                       |    2 +-
 debian/changelog                                   |    7 +
 doc/Makefile.in                                    |   25 +-
 doc/help/Explain-plan.html                         |   53 -
 doc/help/Getting-bind-parameters.html              |   54 -
 doc/help/Index_002dlist.html                       |   72 +-
 doc/help/Makefile                                  |   79 +-
 doc/help/Makefile.am                               |    2 +-
 doc/help/Makefile.in                               |   23 +-
 doc/help/Memo-editor.html                          |   43 -
 doc/help/Object-description.html                   |   44 -
 doc/help/SGA-Statement.html                        |   44 -
 .../What-privileges-do-you-need-to-run-TOra.html   |   44 -
 doc/help/additionalhelp.html                       |   21 +-
 doc/help/additionalhelp.texi                       |   13 +-
 doc/help/alert.html                                |    8 +-
 doc/help/alert.texi                                |    2 +-
 doc/help/analyze.html                              |   43 +-
 doc/help/analyze.texi                              |   40 +-
 doc/help/api.html                                  |   14 +-
 doc/help/browser.html                              |   95 +-
 doc/help/browser.texi                              |  114 +-
 doc/help/charts.html                               |    8 +-
 doc/help/charts.texi                               |   22 +-
 doc/help/common.html                               |   18 +-
 doc/help/common.texi                               |   69 +-
 doc/help/current.html                              |    8 +-
 doc/help/current.texi                              |    2 +-
 doc/help/database.html                             |   95 +-
 doc/help/database.texi                             |   99 +-
 doc/help/debugger.html                             |   18 +-
 doc/help/debugger.texi                             |   49 +-
 doc/help/editor.html                               |   87 +
 doc/help/editor.texi                               |   67 +
 doc/help/editors.html                              |   12 +-
 doc/help/explainplan.html                          |   53 +
 doc/help/explainplan.texi                          |   15 +
 doc/help/extendingtora.html                        |    8 +-
 doc/help/externalapi.html                          |    6 +-
 doc/help/fonts.html                                |   71 -
 doc/help/fonts.texi                                |   44 -
 doc/help/gettingbindparameters.html                |   53 +
 doc/help/gettingbindparameters.texi                |   18 +
 doc/help/globalsettings.html                       |   10 +-
 doc/help/help.html                                 |    6 +-
 doc/help/help.texi                                 |    2 +-
 doc/help/history.html                              |    6 +-
 doc/help/images/additionalhelp.png                 |  Bin 15123 -> 42827 bytes
 doc/help/images/addwatch.png                       |  Bin 4371 -> 21922 bytes
 doc/help/images/analyze.png                        |  Bin 40758 -> 62560 bytes
 doc/help/images/browser.png                        |  Bin 44432 -> 109182 bytes
 doc/help/images/browserfilter.png                  |  Bin 12779 -> 40334 bytes
 doc/help/images/changewatch.png                    |  Bin 4257 -> 20817 bytes
 doc/help/images/charts.png                         |  Bin 47606 -> 29345 bytes
 doc/help/images/chartsetup.png                     |  Bin 5386 -> 49136 bytes
 doc/help/images/contentfilter.png                  |  Bin 29084 -> 72887 bytes
 doc/help/images/current.png                        |  Bin 16703 -> 20043 bytes
 doc/help/images/database.png                       |  Bin 24017 -> 73185 bytes
 doc/help/images/debugger.png                       |  Bin 18323 -> 109856 bytes
 doc/help/images/difference.png                     |  Bin 13413 -> 47308 bytes
 doc/help/images/editmenu.png                       |  Bin 8005 -> 33135 bytes
 doc/help/images/editor.png                         |  Bin 0 -> 86513 bytes
 doc/help/images/editor_syntax.png                  |  Bin 0 -> 86788 bytes
 doc/help/images/filemenu.png                       |  Bin 6852 -> 26692 bytes
 doc/help/images/getparam.png                       |  Bin 5995 -> 25053 bytes
 doc/help/images/help.png                           |  Bin 41834 -> 76330 bytes
 doc/help/images/helpmenu.png                       |  Bin 2324 -> 8617 bytes
 doc/help/images/invalid.png                        |  Bin 13476 -> 44217 bytes
 doc/help/images/lists.png                          |  Bin 6974 -> 60224 bytes
 doc/help/images/memo.png                           |  Bin 9967 -> 30707 bytes
 doc/help/images/mysql.png                          |  Bin 0 -> 42038 bytes
 doc/help/images/newconnection.png                  |  Bin 37206 -> 51104 bytes
 doc/help/images/oracle.png                         |  Bin 17751 -> 54382 bytes
 doc/help/images/output.png                         |  Bin 2773 -> 13235 bytes
 doc/help/images/preferences.png                    |  Bin 43821 -> 105258 bytes
 doc/help/images/priviledges.png                    |  Bin 4941 -> 22115 bytes
 doc/help/images/quota.png                          |  Bin 5072 -> 21848 bytes
 doc/help/images/resize.png                         |  Bin 8446 -> 33269 bytes
 doc/help/images/rollback.png                       |  Bin 28579 -> 88262 bytes
 doc/help/images/rollbacksetup.png                  |  Bin 15472 -> 47562 bytes
 doc/help/images/script.png                         |  Bin 49774 -> 108237 bytes
 doc/help/images/searchreplace.png                  |  Bin 5824 -> 31424 bytes
 doc/help/images/security.png                       |  Bin 27371 -> 47808 bytes
 doc/help/images/session.png                        |  Bin 65326 -> 100689 bytes
 doc/help/images/sgastatement.png                   |  Bin 5471 -> 26512 bytes
 doc/help/images/sgatrace.png                       |  Bin 23480 -> 69587 bytes
 doc/help/images/sqledit.png                        |  Bin 42086 -> 156725 bytes
 doc/help/images/storage.png                        |  Bin 38810 -> 84941 bytes
 doc/help/images/tools.png                          |  Bin 20355 -> 77209 bytes
 doc/help/images/toolsmenu.png                      |  Bin 10229 -> 37616 bytes
 doc/help/images/tuning.png                         |  Bin 47786 -> 100155 bytes
 doc/help/images/visualize.png                      |  Bin 8106 -> 18397 bytes
 doc/help/images/windowsmenu.png                    |  Bin 5314 -> 25093 bytes
 doc/help/images/worksheet.png                      |  Bin 26756 -> 38214 bytes
 doc/help/images/worksheetsetup.png                 |  Bin 23178 -> 66217 bytes
 doc/help/images/workspace.png                      |  Bin 123543 -> 231168 bytes
 doc/help/index.html                                |   34 +-
 doc/help/invalid.html                              |   26 +-
 doc/help/invalid.texi                              |   25 +-
 doc/help/lists.html                                |   10 +-
 doc/help/lists.texi                                |    4 +-
 doc/help/make-pdf.sh                               |    6 +
 doc/help/memoeditor.html                           |   43 +
 doc/help/memoeditor.texi                           |    7 +
 doc/help/newconnection.html                        |   18 +-
 doc/help/newconnection.texi                        |   19 +-
 doc/help/objectdescription.html                    |   44 +
 doc/help/objectdescription.texi                    |    6 +
 doc/help/output.html                               |   18 +-
 doc/help/output.texi                               |   14 +-
 doc/help/plsqleditor.html                          |   24 +-
 doc/help/plsqleditor.texi                          |   24 +-
 doc/help/preferences.html                          |   16 +-
 doc/help/preferences.texi                          |   10 +-
 doc/help/rollback.html                             |   34 +-
 doc/help/rollback.texi                             |   42 +-
 doc/help/script.html                               |   43 +-
 doc/help/script.texi                               |   44 +-
 doc/help/searchreplace.html                        |   10 +-
 doc/help/searchreplace.texi                        |    4 +-
 doc/help/security.html                             |   41 +-
 doc/help/security.texi                             |   43 +-
 doc/help/session.html                              |   43 +-
 doc/help/session.texi                              |   47 +-
 doc/help/sgastatement.html                         |   45 +
 doc/help/sgastatement.texi                         |    9 +
 doc/help/sqledit.html                              |   10 +-
 doc/help/sqledit.texi                              |    2 +-
 doc/help/storage.html                              |   39 +-
 doc/help/storage.texi                              |   58 +-
 doc/help/template.html                             |    8 +-
 doc/help/template.texi                             |    6 +-
 doc/help/toc.html                                  |    4 +-
 doc/help/tools.html                                |    8 +-
 doc/help/toolsetting.html                          |   12 +-
 doc/help/toolsetting.texi                          |    6 +-
 doc/help/tora.info                                 |  Bin 142460 -> 147627 bytes
 doc/help/tora.texi                                 |   12 +-
 doc/help/tora/Explain-plan.html                    |   53 -
 doc/help/tora/Getting-bind-parameters.html         |   53 -
 doc/help/tora/Index_002dlist.html                  |   76 -
 doc/help/tora/Memo-editor.html                     |   43 -
 doc/help/tora/Object-description.html              |   44 -
 doc/help/tora/SGA-Statement.html                   |   44 -
 .../What-privileges-do-you-need-to-run-TOra.html   |   44 -
 doc/help/tora/additionalhelp.html                  |   59 -
 doc/help/tora/alert.html                           |   63 -
 doc/help/tora/analyze.html                         |   74 -
 doc/help/tora/api.html                             |  248 -
 doc/help/tora/browser.html                         |  276 -
 doc/help/tora/charts.html                          |   66 -
 doc/help/tora/common.html                          |   49 -
 doc/help/tora/current.html                         |   49 -
 doc/help/tora/database.html                        |   78 -
 doc/help/tora/debugger.html                        |  148 -
 doc/help/tora/editors.html                         |   99 -
 doc/help/tora/extendingtora.html                   |   46 -
 doc/help/tora/externalapi.html                     |   50 -
 doc/help/tora/fonts.html                           |   71 -
 doc/help/tora/globalsettings.html                  |   63 -
 doc/help/tora/help.html                            |   57 -
 doc/help/tora/history.html                         |   65 -
 doc/help/tora/index.html                           |  113 -
 doc/help/tora/invalid.html                         |   47 -
 doc/help/tora/lists.html                           |   78 -
 doc/help/tora/newconnection.html                   |   62 -
 doc/help/tora/output.html                          |   56 -
 doc/help/tora/plsqleditor.html                     |   83 -
 doc/help/tora/preferences.html                     |   63 -
 doc/help/tora/rollback.html                        |   84 -
 doc/help/tora/script.html                          |  102 -
 doc/help/tora/searchreplace.html                   |   59 -
 doc/help/tora/security.html                        |   94 -
 doc/help/tora/session.html                         |   76 -
 doc/help/tora/sqledit.html                         |   65 -
 doc/help/tora/storage.html                         |   66 -
 doc/help/tora/template.html                        |   92 -
 doc/help/tora/tools.html                           |   64 -
 doc/help/tora/toolsetting.html                     |   49 -
 doc/help/tora/trace.html                           |   62 -
 doc/help/tora/tuning.html                          |   75 -
 doc/help/tora/unittest.html                        |   75 -
 doc/help/tora/window.html                          |  195 -
 doc/help/tora/worksheet.html                       |  170 -
 doc/help/tora/workspace.html                       |   64 -
 doc/help/tora_documentation.pdf                    |  Bin 0 -> 3257262 bytes
 doc/help/trace.html                                |   10 +-
 doc/help/trace.texi                                |    4 +-
 doc/help/tuning.html                               |   44 +-
 doc/help/tuning.texi                               |   64 +-
 doc/help/unittest.html                             |    8 +-
 doc/help/whatprivileges.html                       |   45 +
 doc/help/whatprivileges.texi                       |    7 +
 doc/help/window.html                               |   54 +-
 doc/help/window.texi                               |  130 +-
 doc/help/worksheet.html                            |  148 +-
 doc/help/worksheet.texi                            |  183 +-
 doc/help/workspace.html                            |    9 +-
 doc/help/workspace.texi                            |    3 +-
 rpm/tora.spec                                      |    7 +-
 rpm/tora.spec.in                                   |    1 +
 src/CMakeLists.txt                                 |   57 +-
 src/Makefile.am                                    |   12 +-
 src/Makefile.in                                    |   78 +-
 src/connectioncolorsdialogui.ui                    |  131 +
 src/docklets/toviewconnections.cpp                 |    1 +
 src/help/Explain-plan.html                         |   53 -
 src/help/Getting-bind-parameters.html              |   54 -
 src/help/Index_002dlist.html                       |   72 +-
 src/help/Memo-editor.html                          |   43 -
 src/help/Object-description.html                   |   44 -
 src/help/SGA-Statement.html                        |   44 -
 .../What-privileges-do-you-need-to-run-TOra.html   |   44 -
 src/help/additionalhelp.html                       |   21 +-
 src/help/alert.html                                |    8 +-
 src/help/analyze.html                              |   43 +-
 src/help/api.html                                  |   14 +-
 src/help/browser.html                              |   95 +-
 src/help/charts.html                               |    8 +-
 src/help/common.html                               |   18 +-
 src/help/current.html                              |    8 +-
 src/help/database.html                             |   95 +-
 src/help/debugger.html                             |   18 +-
 src/help/editor.html                               |   87 +
 src/help/editors.html                              |   12 +-
 src/help/explainplan.html                          |   53 +
 src/help/extendingtora.html                        |    8 +-
 src/help/externalapi.html                          |    6 +-
 src/help/fonts.html                                |   71 -
 src/help/gettingbindparameters.html                |   53 +
 src/help/globalsettings.html                       |   10 +-
 src/help/help.html                                 |    6 +-
 src/help/history.html                              |    6 +-
 src/help/images/additionalhelp.png                 |  Bin 15123 -> 42827 bytes
 src/help/images/addwatch.png                       |  Bin 4371 -> 21922 bytes
 src/help/images/analyze.png                        |  Bin 40758 -> 62560 bytes
 src/help/images/browser.png                        |  Bin 44432 -> 109182 bytes
 src/help/images/browserfilter.png                  |  Bin 12779 -> 40334 bytes
 src/help/images/changewatch.png                    |  Bin 4257 -> 20817 bytes
 src/help/images/charts.png                         |  Bin 47606 -> 29345 bytes
 src/help/images/chartsetup.png                     |  Bin 5386 -> 49136 bytes
 src/help/images/contentfilter.png                  |  Bin 29084 -> 72887 bytes
 src/help/images/current.png                        |  Bin 16703 -> 20043 bytes
 src/help/images/database.png                       |  Bin 24017 -> 73185 bytes
 src/help/images/debugger.png                       |  Bin 18323 -> 109856 bytes
 src/help/images/difference.png                     |  Bin 13413 -> 47308 bytes
 src/help/images/editmenu.png                       |  Bin 8005 -> 33135 bytes
 src/help/images/editor.png                         |  Bin 0 -> 86513 bytes
 src/help/images/editor_syntax.png                  |  Bin 0 -> 86788 bytes
 src/help/images/filemenu.png                       |  Bin 6852 -> 26692 bytes
 src/help/images/getparam.png                       |  Bin 5995 -> 25053 bytes
 src/help/images/help.png                           |  Bin 41834 -> 76330 bytes
 src/help/images/helpmenu.png                       |  Bin 2324 -> 8617 bytes
 src/help/images/invalid.png                        |  Bin 13476 -> 44217 bytes
 src/help/images/lists.png                          |  Bin 6974 -> 60224 bytes
 src/help/images/memo.png                           |  Bin 9967 -> 30707 bytes
 src/help/images/mysql.png                          |  Bin 0 -> 42038 bytes
 src/help/images/newconnection.png                  |  Bin 37206 -> 51104 bytes
 src/help/images/oracle.png                         |  Bin 17751 -> 54382 bytes
 src/help/images/output.png                         |  Bin 2773 -> 13235 bytes
 src/help/images/preferences.png                    |  Bin 43821 -> 105258 bytes
 src/help/images/priviledges.png                    |  Bin 4941 -> 22115 bytes
 src/help/images/quota.png                          |  Bin 5072 -> 21848 bytes
 src/help/images/resize.png                         |  Bin 8446 -> 33269 bytes
 src/help/images/rollback.png                       |  Bin 28579 -> 88262 bytes
 src/help/images/rollbacksetup.png                  |  Bin 15472 -> 47562 bytes
 src/help/images/script.png                         |  Bin 49774 -> 108237 bytes
 src/help/images/searchreplace.png                  |  Bin 5824 -> 31424 bytes
 src/help/images/security.png                       |  Bin 27371 -> 47808 bytes
 src/help/images/session.png                        |  Bin 65326 -> 100689 bytes
 src/help/images/sgastatement.png                   |  Bin 5471 -> 26512 bytes
 src/help/images/sgatrace.png                       |  Bin 23480 -> 69587 bytes
 src/help/images/sqledit.png                        |  Bin 42086 -> 156725 bytes
 src/help/images/storage.png                        |  Bin 38810 -> 84941 bytes
 src/help/images/tools.png                          |  Bin 20355 -> 77209 bytes
 src/help/images/toolsmenu.png                      |  Bin 10229 -> 37616 bytes
 src/help/images/tuning.png                         |  Bin 47786 -> 100155 bytes
 src/help/images/visualize.png                      |  Bin 8106 -> 18397 bytes
 src/help/images/windowsmenu.png                    |  Bin 5314 -> 25093 bytes
 src/help/images/worksheet.png                      |  Bin 26756 -> 38214 bytes
 src/help/images/worksheetsetup.png                 |  Bin 23178 -> 66217 bytes
 src/help/images/workspace.png                      |  Bin 123543 -> 231168 bytes
 src/help/index.html                                |   34 +-
 src/help/invalid.html                              |   26 +-
 src/help/lists.html                                |   10 +-
 src/help/memoeditor.html                           |   43 +
 src/help/newconnection.html                        |   18 +-
 src/help/objectdescription.html                    |   44 +
 src/help/output.html                               |   18 +-
 src/help/plsqleditor.html                          |   24 +-
 src/help/preferences.html                          |   16 +-
 src/help/rollback.html                             |   34 +-
 src/help/script.html                               |   43 +-
 src/help/searchreplace.html                        |   10 +-
 src/help/security.html                             |   41 +-
 src/help/session.html                              |   43 +-
 src/help/sgastatement.html                         |   45 +
 src/help/sqledit.html                              |   10 +-
 src/help/storage.html                              |   39 +-
 src/help/template.html                             |    8 +-
 src/help/toc.html                                  |    4 +-
 src/help/tools.html                                |    8 +-
 src/help/toolsetting.html                          |   12 +-
 src/help/trace.html                                |   10 +-
 src/help/tuning.html                               |   44 +-
 src/help/unittest.html                             |    8 +-
 src/help/whatprivileges.html                       |   45 +
 src/help/window.html                               |   54 +-
 src/help/worksheet.html                            |  148 +-
 src/help/workspace.html                            |    9 +-
 src/icons/checkcode.xpm                            |   23 +
 src/migratetool/tora3.cpp                          |    1 +
 src/qscintilla2/CMakeLists.txt                     |   48 +-
 src/qscintilla2/ChangeLog                          |  199 +
 src/qscintilla2/Qt4/ListBoxQt.cpp                  |    7 +-
 src/qscintilla2/Qt4/ListBoxQt.h                    |    7 +-
 src/qscintilla2/Qt4/PlatQt.cpp                     |   49 +-
 src/qscintilla2/Qt4/Qsci/qsciabstractapis.h        |    7 +-
 src/qscintilla2/Qt4/Qsci/qsciapis.h                |    7 +-
 src/qscintilla2/Qt4/Qsci/qscicommand.h             |    9 +-
 src/qscintilla2/Qt4/Qsci/qscicommandset.h          |    7 +-
 src/qscintilla2/Qt4/Qsci/qscidocument.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qsciglobal.h              |   11 +-
 src/qscintilla2/Qt4/Qsci/qscilexer.h               |   67 +-
 src/qscintilla2/Qt4/Qsci/qscilexerbash.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerbatch.h          |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexercmake.h          |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexercpp.h            |   20 +-
 src/qscintilla2/Qt4/Qsci/qscilexercsharp.h         |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexercss.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexercustom.h         |  121 +
 src/qscintilla2/Qt4/Qsci/qscilexerd.h              |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerdiff.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerfortran.h        |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h      |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerhtml.h           |   33 +-
 src/qscintilla2/Qt4/Qsci/qscilexeridl.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerjava.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerjavascript.h     |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerlua.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexermakefile.h       |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerpascal.h         |   70 +-
 src/qscintilla2/Qt4/Qsci/qscilexerperl.h           |   31 +-
 src/qscintilla2/Qt4/Qsci/qscilexerpostscript.h     |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerpov.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerproperties.h     |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerpython.h         |   49 +-
 src/qscintilla2/Qt4/Qsci/qscilexerruby.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerspice.h          |  124 +
 src/qscintilla2/Qt4/Qsci/qscilexersql.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexertcl.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexertex.h            |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerverilog.h        |  241 +
 src/qscintilla2/Qt4/Qsci/qscilexervhdl.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscilexerxml.h            |   38 +-
 src/qscintilla2/Qt4/Qsci/qscilexeryaml.h           |    7 +-
 src/qscintilla2/Qt4/Qsci/qscimacro.h               |   11 +-
 src/qscintilla2/Qt4/Qsci/qsciprinter.h             |    7 +-
 src/qscintilla2/Qt4/Qsci/qsciscintilla.h           |  132 +-
 src/qscintilla2/Qt4/Qsci/qsciscintillabase.h       |  156 +-
 src/qscintilla2/Qt4/Qsci/qscistyle.h               |  201 +
 src/qscintilla2/Qt4/Qsci/qscistyledtext.h          |   75 +
 src/qscintilla2/Qt4/SciClasses.cpp                 |   16 +-
 src/qscintilla2/Qt4/SciClasses.h                   |    7 +-
 src/qscintilla2/Qt4/ScintillaQt.cpp                |   19 +-
 src/qscintilla2/Qt4/ScintillaQt.h                  |    7 +-
 src/qscintilla2/Qt4/qsciabstractapis.cpp           |    7 +-
 src/qscintilla2/Qt4/qsciapis.cpp                   |   30 +-
 src/qscintilla2/Qt4/qscicommand.cpp                |    7 +-
 src/qscintilla2/Qt4/qscicommandset.cpp             |    7 +-
 src/qscintilla2/Qt4/qscidocument.cpp               |   18 +-
 src/qscintilla2/Qt4/qscilexer.cpp                  |   46 +-
 src/qscintilla2/Qt4/qscilexerbash.cpp              |    7 +-
 src/qscintilla2/Qt4/qscilexerbatch.cpp             |    7 +-
 src/qscintilla2/Qt4/qscilexercmake.cpp             |    7 +-
 src/qscintilla2/Qt4/qscilexercpp.cpp               |   43 +-
 src/qscintilla2/Qt4/qscilexercsharp.cpp            |    7 +-
 src/qscintilla2/Qt4/qscilexercss.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexercustom.cpp            |  115 +
 src/qscintilla2/Qt4/qscilexerd.cpp                 |    7 +-
 src/qscintilla2/Qt4/qscilexerdiff.cpp              |    7 +-
 src/qscintilla2/Qt4/qscilexerfortran.cpp           |    7 +-
 src/qscintilla2/Qt4/qscilexerfortran77.cpp         |    7 +-
 src/qscintilla2/Qt4/qscilexerhtml.cpp              |   62 +-
 src/qscintilla2/Qt4/qscilexeridl.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexerjava.cpp              |    7 +-
 src/qscintilla2/Qt4/qscilexerjavascript.cpp        |    7 +-
 src/qscintilla2/Qt4/qscilexerlua.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexermakefile.cpp          |    7 +-
 src/qscintilla2/Qt4/qscilexerpascal.cpp            |  152 +-
 src/qscintilla2/Qt4/qscilexerperl.cpp              |   62 +-
 src/qscintilla2/Qt4/qscilexerpostscript.cpp        |    7 +-
 src/qscintilla2/Qt4/qscilexerpov.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexerproperties.cpp        |    7 +-
 src/qscintilla2/Qt4/qscilexerpython.cpp            |   88 +-
 src/qscintilla2/Qt4/qscilexerruby.cpp              |    7 +-
 src/qscintilla2/Qt4/qscilexerspice.cpp             |  202 +
 src/qscintilla2/Qt4/qscilexersql.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexertcl.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexertex.cpp               |    7 +-
 src/qscintilla2/Qt4/qscilexerverilog.cpp           |  435 +
 src/qscintilla2/Qt4/qscilexervhdl.cpp              |    7 +-
 src/qscintilla2/Qt4/qscilexerxml.cpp               |   63 +-
 src/qscintilla2/Qt4/qscilexeryaml.cpp              |    7 +-
 src/qscintilla2/Qt4/qscimacro.cpp                  |    7 +-
 src/qscintilla2/Qt4/qsciprinter.cpp                |    7 +-
 src/qscintilla2/Qt4/qsciscintilla.cpp              |  416 +-
 src/qscintilla2/Qt4/qsciscintillabase.cpp          |   11 +-
 src/qscintilla2/Qt4/qscistyle.cpp                  |  245 +
 src/qscintilla2/Qt4/qscistyledtext.cpp             |   47 +
 src/qscintilla2/include/Face.py                    |   39 +-
 src/qscintilla2/include/HFacer.py                  |   19 +-
 src/qscintilla2/include/SciLexer.h                 |   81 +-
 src/qscintilla2/include/Scintilla.h                |  135 +-
 src/qscintilla2/include/Scintilla.iface            |  190 +-
 src/qscintilla2/include/ScintillaWidget.h          |    6 +-
 src/qscintilla2/src/CellBuffer.cpp                 |  360 +-
 src/qscintilla2/src/CellBuffer.h                   |   75 +-
 src/qscintilla2/src/Document.cpp                   |  198 +-
 src/qscintilla2/src/Document.h                     |   73 +-
 src/qscintilla2/src/Editor.cpp                     |  371 +-
 src/qscintilla2/src/Editor.h                       |    5 +
 src/qscintilla2/src/Indicator.cpp                  |    2 +-
 src/qscintilla2/src/Indicator.h                    |    3 +-
 src/qscintilla2/src/KeyWords.cpp                   |    7 +
 src/qscintilla2/src/LexAU3.cpp                     |    3 +-
 src/qscintilla2/src/LexBash.cpp                    |    4 +
 src/qscintilla2/src/LexCOBOL.cpp                   |  368 +
 src/qscintilla2/src/LexCPP.cpp                     |   32 +
 src/qscintilla2/src/LexD.cpp                       |    3 +
 src/qscintilla2/src/LexFortran.cpp                 |    4 +-
 src/qscintilla2/src/LexGen.py                      |   83 +-
 src/qscintilla2/src/LexHTML.cpp                    |   49 +-
 src/qscintilla2/src/LexInno.cpp                    |   50 +-
 src/qscintilla2/src/LexNimrod.cpp                  |  430 +
 src/qscintilla2/src/LexOthers.cpp                  |   41 +-
 src/qscintilla2/src/LexPascal.cpp                  |  699 +-
 src/qscintilla2/src/LexPerl.cpp                    |   14 +-
 src/qscintilla2/src/LexPowerPro.cpp                |  600 +
 src/qscintilla2/src/LexProgress.cpp                |   47 +-
 src/qscintilla2/src/LexPython.cpp                  |  141 +-
 src/qscintilla2/src/LexRuby.cpp                    |    4 +-
 src/qscintilla2/src/LexSML.cpp                     |  222 +
 src/qscintilla2/src/LexSQL.cpp                     |    3 +
 src/qscintilla2/src/LexSorcus.cpp                  |  205 +
 src/qscintilla2/src/LexTACL.cpp                    |  397 +
 src/qscintilla2/src/LexTADS3.cpp                   |    2 +-
 src/qscintilla2/src/LexTAL.cpp                     |  396 +
 src/qscintilla2/src/LexTeX.cpp                     |    7 +-
 src/qscintilla2/src/LexVerilog.cpp                 |    6 +-
 src/qscintilla2/src/LexYAML.cpp                    |    2 +-
 src/qscintilla2/src/PerLine.cpp                    |  464 +
 src/qscintilla2/src/PerLine.h                      |  116 +
 src/qscintilla2/src/PositionCache.cpp              |    4 +-
 src/qscintilla2/src/RESearch.cpp                   |    5 +-
 src/qscintilla2/src/SciTE.properties               |    4 +-
 src/qscintilla2/src/ScintillaBase.cpp              |    7 +
 src/qscintilla2/src/SplitVector.h                  |    2 +-
 src/qscintilla2/src/UniConversion.cpp              |    2 +-
 src/qscintilla2/src/ViewStyle.cpp                  |   19 +-
 src/qscintilla2/src/ViewStyle.h                    |    6 +
 src/toabout.cpp                                    |    4 +-
 src/tobackground.cpp                               |   42 +-
 src/tobackgroundlabel.cpp                          |   42 +-
 src/tobackuptool.cpp                               |   40 +
 src/tobrowser.cpp                                  |  332 +-
 src/tobrowser.h                                    |   42 +-
 src/tobrowsertable.cpp                             |  393 +-
 src/tobrowsertable.h                               |   37 +-
 src/tobrowsertableui.ui                            |  511 +-
 src/tobrowsertablewidget.cpp                       |    3 +-
 src/tobrowserviewwidget.cpp                        |   39 +-
 src/tobrowserviewwidget.h                          |   28 +-
 src/toconf.h                                       |    6 +
 src/toconfiguration.cpp                            |  139 +-
 src/toconfiguration.h                              |   19 +
 src/toconnection.cpp                               |  165 +-
 src/toconnection.h                                 |   75 +-
 src/toconnectionmodel.cpp                          |   33 +-
 src/toconnectionpool.cpp                           |   35 +-
 src/toconnectionpool.h                             |    1 +
 src/todatabasesettingui.ui                         |  267 +-
 src/todatatype.cpp                                 |   88 +-
 src/todatatype.h                                   |    3 +
 src/todebug.cpp                                    |  941 +-
 src/todebug.h                                      |   60 +-
 src/todefaultkeywords.h                            |    2 +
 src/todescribe.h                                   |    2 +-
 src/toeditextensions.cpp                           |   32 +
 src/toeditextensions.h                             |    3 +
 src/toextract.cpp                                  |   44 +-
 src/toextract.h                                    |   27 +
 src/toglobalsetting.cpp                            |   69 +
 src/toglobalsetting.h                              |   19 +
 src/toglobalsettingui.ui                           |  554 +-
 src/tohighlightedtext.cpp                          |  118 +-
 src/tohighlightedtext.h                            |   21 +-
 src/toinvalid.cpp                                  |   31 +-
 src/tolinechart.h                                  |    2 +-
 src/tolistviewformattersql.cpp                     |   42 +-
 src/tologger.h                                     |   60 +
 src/tomain.cpp                                     |    4 +-
 src/tomarkedtext.cpp                               |    6 +
 src/tonewconnection.cpp                            |   35 +-
 src/tonewconnection.h                              |    7 +-
 src/tonewconnectionui.ui                           |  295 +-
 src/tonoblockquery.cpp                             |    4 +-
 src/tonoblockquery.h                               |    6 +-
 src/tooracleconnection.cpp                         |   36 +-
 src/tooracleextract.cpp                            |  402 +-
 src/tooracleextract.h                              |  356 +
 src/tooracletable.cpp                              |  425 +
 src/toplsqleditor.cpp                              |  212 +-
 src/toplsqleditor.h                                |   32 +-
 src/toplsqltext.cpp                                |  404 +-
 src/toplsqltext.h                                  |  201 +-
 src/topreferencesui.ui                             |  156 +-
 src/toprofiler.cpp                                 |    2 +-
 src/tora.qrc                                       |   19 +-
 src/toreport.cpp                                   |    4 +-
 src/toresultextract.cpp                            |    1 +
 src/toresulttableview.cpp                          |    3 +-
 src/toresulttableviewedit.cpp                      |   51 +-
 src/toscript.cpp                                   |   95 +-
 src/tosession.cpp                                  |   40 +-
 src/tosql.cpp                                      |    6 +-
 src/tosqlparse.cpp                                 |  528 +-
 src/tosqlparse.h                                   |   46 +-
 src/tosyntaxsetup.cpp                              |   11 +
 src/tosyntaxsetupui.ui                             |  663 +-
 src/totableselect.cpp                              |   40 +
 src/tothread.cpp                                   |   19 +
 src/tothread.h                                     |   31 +-
 src/totimer.cpp                                    |   43 +-
 src/totool.cpp                                     |   45 +-
 src/toworksheet.cpp                                |   80 +-
 src/toworksheet.h                                  |   11 +-
 src/ts_log/critical_section.h                      |  252 +
 src/ts_log/decorator.h                             |  263 +
 src/ts_log/message_handler_log.h                   |  216 +
 src/ts_log/thread_safe_log.h                       |  596 +
 src/ts_log/ts_log_utils.h                          |   17 +
 src/utils.cpp                                      |  102 +-
 src/utils.h                                        |   29 +-
 test/Makefile.in                                   |   25 +-
 test/configuration/Makefile.in                     |   21 +-
 utils/Makefile.in                                  |   25 +-
 utils/chex/Makefile.in                             |   21 +-
 571 files changed, 38894 insertions(+), 30924 deletions(-)

diff --cc debian/changelog
index cff7203,a5bd740..bffeb27
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,15 @@@
+ tora (2.1.2-1) unstable; urgency=low
+ 
 -  * Improved: Add editor option for uppler/lowercase object names
 -  * Improved: Db extract/compare tool now remembers widgets states
 -  * New: Filesystem completer for target line edit
 -  * Improved: Compatibility with sql+
 -  * New: Color/pixmap identifier for connection
 -  * Improved: Schema browser improvements
 -  * New: Ability to add external static check
 -  * New: Save package specification and body to one file
 -  * New: Initial support for creating/modifying tables
 -  * Bugfixes
++  * Added debug package. (Closes: #560064)
++  * New Upstream version 2.1.2
++
++ -- Michael Meskes <meskes at debian.org>  Tue, 30 Mar 2010 13:14:16 +0200
+ 
  tora (2.1.1-1) unstable; urgency=low
  
 -  * New upstream version
 +  * New upstream version.
  
 - -- Nathan Neulinger <nneul at neulinger.org> Tue, 13 Oct 2009 13:44:40 -0600
 + -- Michael Meskes <meskes at debian.org>  Thu, 19 Nov 2009 15:18:19 +0100
  
  tora (2.1.0-1) unstable; urgency=low
  

-- 
tora Debian packaging 



More information about the pkg-kde-commits mailing list