[SCM] tora Debian packaging branch, master, updated. upstream/2.1.0-18-g1edaf2d

Michael Meskes meskes at alioth.debian.org
Thu Nov 19 14:48:32 UTC 2009


The following commit has been merged in the master branch:
commit 1edaf2d1ef0051d90cf7e50d4a7cc51125771442
Merge: dad7f28d09d759f75ab0a7133149ba5a75b1129b 376a9af5fda23a367773ba2bc0674ce990306f2a
Author: Michael Meskes <meskes at debian.org>
Date:   Thu Nov 19 15:05:47 2009 +0100

    Merge commit 'upstream/2.1.1'

 CMakeLists.txt                                     |  153 +-
 Makefile.am                                        |    3 +-
 Makefile.in                                        |    3 +-
 README.BINARIES                                    |    5 +-
 README.CMAKE                                       |   11 +-
 README.OSX                                         |    3 +-
 README.RELEASE                                     |   13 +-
 README.WINDOWS                                     |   33 +-
 cmake/modules/FindOracle.cmake                     |   17 +-
 configure                                          |   20 +-
 configure.ac                                       |    2 +-
 debian/changelog                                   |    6 +
 doc/help/Makefile                                  |   26 +-
 osx_tools/CompleteBundle.cmake.in                  |   71 +
 osx_tools/CreateBundle.sh.in                       |   46 +
 osx_tools/Info.plist.in                            |   41 +
 osx_tools/dmg/background-page001.png               |  Bin 0 -> 501829 bytes
 osx_tools/dmg/background.sla                       |  105 +
 osx_tools/dmg/readme.html                          |  777 ++
 osx_tools/dmg/tora.dmgCanvas                       |  Bin 0 -> 605029 bytes
 osx_tools/qt.conf.in                               |    3 +
 rpm/tora.spec                                      |   13 +-
 rpm/tora.spec.in                                   |   11 +-
 src/CMakeLists.txt                                 |  126 +-
 src/Makefile.am                                    |    4 +-
 src/Makefile.in                                    |    4 +-
 src/qscintilla2/CMakeLists.txt                     |  251 +
 src/qscintilla2/ChangeLog                          | 1713 +++++
 src/qscintilla2/Qt4/ListBoxQt.cpp                  |  326 +
 src/qscintilla2/Qt4/ListBoxQt.h                    |   82 +
 src/qscintilla2/Qt4/PlatQt.cpp                     |  986 +++
 src/qscintilla2/Qt4/Qsci/qsciabstractapis.h        |  115 +
 src/qscintilla2/Qt4/Qsci/qsciapis.h                |  237 +
 src/qscintilla2/Qt4/Qsci/qscicommand.h             |  119 +
 src/qscintilla2/Qt4/Qsci/qscicommandset.h          |  103 +
 src/qscintilla2/Qt4/Qsci/qscidocument.h            |   84 +
 src/qscintilla2/Qt4/Qsci/qsciglobal.h              |   71 +
 src/qscintilla2/Qt4/Qsci/qscilexer.h               |  346 +
 src/qscintilla2/Qt4/Qsci/qscilexerbash.h           |  201 +
 src/qscintilla2/Qt4/Qsci/qscilexerbatch.h          |  138 +
 src/qscintilla2/Qt4/Qsci/qscilexercmake.h          |  183 +
 src/qscintilla2/Qt4/Qsci/qscilexercpp.h            |  288 +
 src/qscintilla2/Qt4/Qsci/qscilexercsharp.h         |  100 +
 src/qscintilla2/Qt4/Qsci/qscilexercss.h            |  230 +
 src/qscintilla2/Qt4/Qsci/qscilexerd.h              |  247 +
 src/qscintilla2/Qt4/Qsci/qscilexerdiff.h           |  118 +
 src/qscintilla2/Qt4/Qsci/qscilexerfortran.h        |   82 +
 src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h      |  191 +
 src/qscintilla2/Qt4/Qsci/qscilexerhtml.h           |  500 ++
 src/qscintilla2/Qt4/Qsci/qscilexeridl.h            |   87 +
 src/qscintilla2/Qt4/Qsci/qscilexerjava.h           |   78 +
 src/qscintilla2/Qt4/Qsci/qscilexerjavascript.h     |  104 +
 src/qscintilla2/Qt4/Qsci/qscilexerlua.h            |  198 +
 src/qscintilla2/Qt4/Qsci/qscilexermakefile.h       |  128 +
 src/qscintilla2/Qt4/Qsci/qscilexerpascal.h         |  215 +
 src/qscintilla2/Qt4/Qsci/qscilexerperl.h           |  258 +
 src/qscintilla2/Qt4/Qsci/qscilexerpostscript.h     |  227 +
 src/qscintilla2/Qt4/Qsci/qscilexerpov.h            |  226 +
 src/qscintilla2/Qt4/Qsci/qscilexerproperties.h     |  157 +
 src/qscintilla2/Qt4/Qsci/qscilexerpython.h         |  261 +
 src/qscintilla2/Qt4/Qsci/qscilexerruby.h           |  218 +
 src/qscintilla2/Qt4/Qsci/qscilexersql.h            |  233 +
 src/qscintilla2/Qt4/Qsci/qscilexertcl.h            |  213 +
 src/qscintilla2/Qt4/Qsci/qscilexertex.h            |  115 +
 src/qscintilla2/Qt4/Qsci/qscilexervhdl.h           |  241 +
 src/qscintilla2/Qt4/Qsci/qscilexerxml.h            |   98 +
 src/qscintilla2/Qt4/Qsci/qscilexeryaml.h           |  170 +
 src/qscintilla2/Qt4/Qsci/qscimacro.h               |  122 +
 src/qscintilla2/Qt4/Qsci/qsciprinter.h             |  123 +
 src/qscintilla2/Qt4/Qsci/qsciscintilla.h           | 1572 ++++
 src/qscintilla2/Qt4/Qsci/qsciscintillabase.h       | 2650 +++++++
 src/qscintilla2/Qt4/SciClasses.cpp                 |  206 +
 src/qscintilla2/Qt4/SciClasses.h                   |  124 +
 src/qscintilla2/Qt4/ScintillaQt.cpp                |  578 ++
 src/qscintilla2/Qt4/ScintillaQt.h                  |  130 +
 src/qscintilla2/Qt4/qsciabstractapis.cpp           |   66 +
 src/qscintilla2/Qt4/qsciapis.cpp                   |  952 +++
 src/qscintilla2/Qt4/qscicommand.cpp                |  213 +
 src/qscintilla2/Qt4/qscicommandset.cpp             |  681 ++
 src/qscintilla2/Qt4/qscidocument.cpp               |  166 +
 src/qscintilla2/Qt4/qscilexer.cpp                  |  648 ++
 src/qscintilla2/Qt4/qscilexerbash.cpp              |  361 +
 src/qscintilla2/Qt4/qscilexerbatch.cpp             |  223 +
 src/qscintilla2/Qt4/qscilexercmake.cpp             |  318 +
 src/qscintilla2/Qt4/qscilexercpp.cpp               |  493 ++
 src/qscintilla2/Qt4/qscilexercsharp.cpp            |  131 +
 src/qscintilla2/Qt4/qscilexercss.cpp               |  385 +
 src/qscintilla2/Qt4/qscilexerd.cpp                 |  446 ++
 src/qscintilla2/Qt4/qscilexerdiff.cpp              |  142 +
 src/qscintilla2/Qt4/qscilexerfortran.cpp           |  124 +
 src/qscintilla2/Qt4/qscilexerfortran77.cpp         |  310 +
 src/qscintilla2/Qt4/qscilexerhtml.cpp              | 1116 +++
 src/qscintilla2/Qt4/qscilexeridl.cpp               |  115 +
 src/qscintilla2/Qt4/qscilexerjava.cpp              |   72 +
 src/qscintilla2/Qt4/qscilexerjavascript.cpp        |  133 +
 src/qscintilla2/Qt4/qscilexerlua.cpp               |  366 +
 src/qscintilla2/Qt4/qscilexermakefile.cpp          |  171 +
 src/qscintilla2/Qt4/qscilexerpascal.cpp            |  368 +
 src/qscintilla2/Qt4/qscilexerperl.cpp              |  507 ++
 src/qscintilla2/Qt4/qscilexerpostscript.cpp        |  459 ++
 src/qscintilla2/Qt4/qscilexerpov.cpp               |  475 ++
 src/qscintilla2/Qt4/qscilexerproperties.cpp        |  212 +
 src/qscintilla2/Qt4/qscilexerpython.cpp            |  404 ++
 src/qscintilla2/Qt4/qscilexerruby.cpp              |  391 +
 src/qscintilla2/Qt4/qscilexersql.cpp               |  439 ++
 src/qscintilla2/Qt4/qscilexertcl.cpp               |  456 ++
 src/qscintilla2/Qt4/qscilexertex.cpp               |  218 +
 src/qscintilla2/Qt4/qscilexervhdl.cpp              |  432 ++
 src/qscintilla2/Qt4/qscilexerxml.cpp               |  212 +
 src/qscintilla2/Qt4/qscilexeryaml.cpp              |  279 +
 src/qscintilla2/Qt4/qscimacro.cpp                  |  317 +
 src/qscintilla2/Qt4/qsciprinter.cpp                |  199 +
 src/qscintilla2/Qt4/qsciscintilla.cpp              | 3450 +++++++++
 src/qscintilla2/Qt4/qsciscintillabase.cpp          |  648 ++
 src/qscintilla2/include/Accessor.h                 |   79 +
 src/qscintilla2/include/Face.py                    |  107 +
 src/qscintilla2/include/HFacer.py                  |   76 +
 src/qscintilla2/include/KeyWords.h                 |   90 +
 src/qscintilla2/include/License.txt                |   20 +
 src/qscintilla2/include/Platform.h                 |  573 ++
 src/qscintilla2/include/PropSet.h                  |  104 +
 src/qscintilla2/include/SString.h                  |  289 +
 src/qscintilla2/include/SciLexer.h                 | 1278 ++++
 src/qscintilla2/include/Scintilla.h                |  848 +++
 src/qscintilla2/include/Scintilla.iface            | 3393 +++++++++
 src/qscintilla2/include/ScintillaWidget.h          |   59 +
 src/qscintilla2/include/WindowAccessor.h           |   66 +
 src/qscintilla2/src/AutoComplete.cpp               |  178 +
 src/qscintilla2/src/AutoComplete.h                 |   78 +
 src/qscintilla2/src/CallTip.cpp                    |  329 +
 src/qscintilla2/src/CallTip.h                      |   87 +
 src/qscintilla2/src/CellBuffer.cpp                 |  939 +++
 src/qscintilla2/src/CellBuffer.h                   |  242 +
 src/qscintilla2/src/CharClassify.cpp               |   43 +
 src/qscintilla2/src/CharClassify.h                 |   25 +
 src/qscintilla2/src/CharacterSet.h                 |   58 +
 src/qscintilla2/src/ContractionState.cpp           |  251 +
 src/qscintilla2/src/ContractionState.h             |   66 +
 src/qscintilla2/src/Decoration.cpp                 |  188 +
 src/qscintilla2/src/Decoration.h                   |   64 +
 src/qscintilla2/src/Document.cpp                   | 1664 +++++
 src/qscintilla2/src/Document.h                     |  333 +
 src/qscintilla2/src/DocumentAccessor.cpp           |  199 +
 src/qscintilla2/src/DocumentAccessor.h             |   76 +
 src/qscintilla2/src/Editor.cpp                     | 7603 ++++++++++++++++++++
 src/qscintilla2/src/Editor.h                       |  522 ++
 src/qscintilla2/src/ExternalLexer.cpp              |  263 +
 src/qscintilla2/src/ExternalLexer.h                |  110 +
 src/qscintilla2/src/Indicator.cpp                  |   81 +
 src/qscintilla2/src/Indicator.h                    |   31 +
 src/qscintilla2/src/KeyMap.cpp                     |  152 +
 src/qscintilla2/src/KeyMap.h                       |   51 +
 src/qscintilla2/src/KeyWords.cpp                   |  237 +
 src/qscintilla2/src/LexAPDL.cpp                    |  256 +
 src/qscintilla2/src/LexASY.cpp                     |  270 +
 src/qscintilla2/src/LexAU3.cpp                     |  906 +++
 src/qscintilla2/src/LexAVE.cpp                     |  228 +
 src/qscintilla2/src/LexAbaqus.cpp                  |  617 ++
 src/qscintilla2/src/LexAda.cpp                     |  524 ++
 src/qscintilla2/src/LexAsm.cpp                     |  180 +
 src/qscintilla2/src/LexAsn1.cpp                    |  185 +
 src/qscintilla2/src/LexBaan.cpp                    |  193 +
 src/qscintilla2/src/LexBash.cpp                    |  532 ++
 src/qscintilla2/src/LexBasic.cpp                   |  373 +
 src/qscintilla2/src/LexBullant.cpp                 |  228 +
 src/qscintilla2/src/LexCLW.cpp                     |  679 ++
 src/qscintilla2/src/LexCPP.cpp                     |  470 ++
 src/qscintilla2/src/LexCSS.cpp                     |  363 +
 src/qscintilla2/src/LexCaml.cpp                    |  403 ++
 src/qscintilla2/src/LexCmake.cpp                   |  456 ++
 src/qscintilla2/src/LexConf.cpp                    |  188 +
 src/qscintilla2/src/LexCrontab.cpp                 |  222 +
 src/qscintilla2/src/LexCsound.cpp                  |  210 +
 src/qscintilla2/src/LexD.cpp                       |  358 +
 src/qscintilla2/src/LexEScript.cpp                 |  273 +
 src/qscintilla2/src/LexEiffel.cpp                  |  238 +
 src/qscintilla2/src/LexErlang.cpp                  |  526 ++
 src/qscintilla2/src/LexFlagship.cpp                |  230 +
 src/qscintilla2/src/LexForth.cpp                   |  352 +
 src/qscintilla2/src/LexFortran.cpp                 |  466 ++
 src/qscintilla2/src/LexGAP.cpp                     |  263 +
 src/qscintilla2/src/LexGen.py                      |  237 +
 src/qscintilla2/src/LexGui4Cli.cpp                 |  313 +
 src/qscintilla2/src/LexHTML.cpp                    | 2184 ++++++
 src/qscintilla2/src/LexHaskell.cpp                 |  274 +
 src/qscintilla2/src/LexInno.cpp                    |  264 +
 src/qscintilla2/src/LexKix.cpp                     |  126 +
 src/qscintilla2/src/LexLisp.cpp                    |  279 +
 src/qscintilla2/src/LexLout.cpp                    |  212 +
 src/qscintilla2/src/LexLua.cpp                     |  358 +
 src/qscintilla2/src/LexMMIXAL.cpp                  |  186 +
 src/qscintilla2/src/LexMPT.cpp                     |  186 +
 src/qscintilla2/src/LexMSSQL.cpp                   |  363 +
 src/qscintilla2/src/LexMagik.cpp                   |  445 ++
 src/qscintilla2/src/LexMatlab.cpp                  |  236 +
 src/qscintilla2/src/LexMetapost.cpp                |  399 +
 src/qscintilla2/src/LexMySQL.cpp                   |  367 +
 src/qscintilla2/src/LexNsis.cpp                    |  654 ++
 src/qscintilla2/src/LexOpal.cpp                    |  522 ++
 src/qscintilla2/src/LexOthers.cpp                  | 1231 ++++
 src/qscintilla2/src/LexPB.cpp                      |  362 +
 src/qscintilla2/src/LexPLM.cpp                     |  198 +
 src/qscintilla2/src/LexPOV.cpp                     |  316 +
 src/qscintilla2/src/LexPS.cpp                      |  347 +
 src/qscintilla2/src/LexPascal.cpp                  |  373 +
 src/qscintilla2/src/LexPerl.cpp                    | 1295 ++++
 src/qscintilla2/src/LexPowerShell.cpp              |  175 +
 src/qscintilla2/src/LexProgress.cpp                |  276 +
 src/qscintilla2/src/LexPython.cpp                  |  461 ++
 src/qscintilla2/src/LexR.cpp                       |  213 +
 src/qscintilla2/src/LexRebol.cpp                   |  322 +
 src/qscintilla2/src/LexRuby.cpp                    | 1715 +++++
 src/qscintilla2/src/LexSQL.cpp                     |  346 +
 src/qscintilla2/src/LexScriptol.cpp                |  408 ++
 src/qscintilla2/src/LexSmalltalk.cpp               |  321 +
 src/qscintilla2/src/LexSpecman.cpp                 |  289 +
 src/qscintilla2/src/LexSpice.cpp                   |  225 +
 src/qscintilla2/src/LexTADS3.cpp                   |  904 +++
 src/qscintilla2/src/LexTCL.cpp                     |  366 +
 src/qscintilla2/src/LexTeX.cpp                     |  491 ++
 src/qscintilla2/src/LexVB.cpp                      |  282 +
 src/qscintilla2/src/LexVHDL.cpp                    |  477 ++
 src/qscintilla2/src/LexVerilog.cpp                 |  305 +
 src/qscintilla2/src/LexYAML.cpp                    |  314 +
 src/qscintilla2/src/License.txt                    |   20 +
 src/qscintilla2/src/LineMarker.cpp                 |  309 +
 src/qscintilla2/src/LineMarker.h                   |   62 +
 src/qscintilla2/src/Partitioning.h                 |  184 +
 src/qscintilla2/src/PositionCache.cpp              |  635 ++
 src/qscintilla2/src/PositionCache.h                |  166 +
 src/qscintilla2/src/PropSet.cpp                    |  755 ++
 src/qscintilla2/src/RESearch.cpp                   |  982 +++
 src/qscintilla2/src/RESearch.h                     |   75 +
 src/qscintilla2/src/RunStyles.cpp                  |  216 +
 src/qscintilla2/src/RunStyles.h                    |   46 +
 src/qscintilla2/src/SVector.h                      |  135 +
 src/qscintilla2/src/SciTE.properties               |    6 +
 src/qscintilla2/src/ScintillaBase.cpp              |  745 ++
 src/qscintilla2/src/ScintillaBase.h                |  101 +
 src/qscintilla2/src/SplitVector.h                  |  249 +
 src/qscintilla2/src/Style.cpp                      |  158 +
 src/qscintilla2/src/Style.h                        |   64 +
 src/qscintilla2/src/StyleContext.cpp               |   55 +
 src/qscintilla2/src/StyleContext.h                 |  179 +
 src/qscintilla2/src/UniConversion.cpp              |  119 +
 src/qscintilla2/src/UniConversion.h                |   12 +
 src/qscintilla2/src/ViewStyle.cpp                  |  359 +
 src/qscintilla2/src/ViewStyle.h                    |  124 +
 src/qscintilla2/src/WindowAccessor.cpp             |  191 +
 src/qscintilla2/src/XPM.cpp                        |  352 +
 src/qscintilla2/src/XPM.h                          |  102 +
 src/toalert.h                                      |    2 +-
 src/todebugtext.h                                  |    2 +-
 src/tomain.cpp                                     |    8 +-
 src/tomain.h                                       |    2 +-
 src/toqsqlconnection.cpp                           |   16 +-
 src/tora.rc                                        |    2 +
 src/toresultplan.cpp                               |    9 +-
 src/toresultview.h                                 |    2 +-
 src/torollback.cpp                                 |    2 +-
 src/torollback.h                                   |    2 +-
 src/tosqledit.cpp                                  |    2 +-
 src/tosyntaxsetup.cpp                              |    2 +-
 src/totemporary.h                                  |    2 +-
 src/towaitevents.cpp                               |    2 +-
 src/toworksheet.cpp                                |   11 +-
 src/utils.cpp                                      |    2 +-
 src/windows/dummyoci/Makefile                      |   10 +
 .../dummyoci/oci_nonstub.c}                        |    0
 src/windows/dummyoci/oci_stub.c                    |   45 +
 270 files changed, 91044 insertions(+), 175 deletions(-)

diff --cc debian/changelog
index e8ec500,e8ec500..cff7203
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,9 @@@
++tora (2.1.1-1) unstable; urgency=low
++
++  * New upstream version.
++
++ -- Michael Meskes <meskes at debian.org>  Thu, 19 Nov 2009 15:18:19 +0100
++
  tora (2.1.0-1) unstable; urgency=low
  
    * New upstream version, the rebuild closes: #540046.

-- 
tora Debian packaging 



More information about the pkg-kde-commits mailing list