Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2012-07-15 12:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla (Old) and /work/SRC/openSUSE:Factory/.qscintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qscintilla/python-qscintilla.changes 2012-02-16 10:09:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python-qscintilla.changes 2012-07-15 12:05:41.000000000 +0200 @@ -2 +2,16 @@ -Sun Feb 5 00:37:41 UTC 2012 - ter...@gmail.com +Thu Jul 5 09:43:26 UTC 2012 - dmuel...@suse.com + +- link .changes files for python/3-qscintilla to qscintilla.changes +- update to 2.6.2: + * Added support for Qt v5. + * QsciLexer::wordCharacters() is now part of the public API. + * Bug fixes. + +------------------------------------------------------------------- +Mon Feb 27 09:44:14 CET 2012 - dmuel...@suse.de + +- update to 2.6.1: + - Mainly a bugfix release + +------------------------------------------------------------------- +Sun Feb 5 00:35:40 UTC 2012 - ter...@gmail.com @@ -7,0 +23 @@ +- remove Qt3 support (it does not compile with current Qt3 packages) @@ -10 +26 @@ -Mon Aug 29 18:41:49 UTC 2011 - ter...@gmail.com +Wed Nov 23 06:35:52 UTC 2011 - ter...@gmail.com @@ -12 +28 @@ -- move sip files into separate package to avoid python 2/3 conflicts +- build QScintilla plugin for QT4 Designer @@ -15 +31 @@ -Mon Aug 15 01:42:37 UTC 2011 - ter...@gmail.com +Mon Aug 15 01:40:43 UTC 2011 - ter...@gmail.com --- /work/SRC/openSUSE:Factory/qscintilla/python3-qscintilla.changes 2012-02-16 10:09:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python3-qscintilla.changes 2012-07-15 12:05:41.000000000 +0200 @@ -2 +2 @@ -Sun Feb 5 00:38:16 UTC 2012 - ter...@gmail.com +Thu Jul 5 09:43:26 UTC 2012 - dmuel...@suse.com @@ -4,4 +4,5 @@ -- update to 2.6: - - based on Scintilla v2.29. - - improved support for rebinding keys to commands - - native key bindings under OS/X. +- link .changes files for python/3-qscintilla to qscintilla.changes +- update to 2.6.2: + * Added support for Qt v5. + * QsciLexer::wordCharacters() is now part of the public API. + * Bug fixes. @@ -10 +11 @@ -Tue Nov 22 23:50:59 UTC 2011 - cgiboude...@gmx.com +Mon Feb 27 09:44:14 CET 2012 - dmuel...@suse.de @@ -12 +13,2 @@ -- Define python3_sitearch for opensuse < 12.1 +- update to 2.6.1: + - Mainly a bugfix release @@ -15 +17 @@ -Tue Sep 13 13:52:03 UTC 2011 - co...@suse.com +Sun Feb 5 00:35:40 UTC 2012 - ter...@gmail.com @@ -17 +19,5 @@ -- do not require packages not installed +- update to 2.6: + - based on Scintilla v2.29. + - improved support for rebinding keys to commands + - native key bindings under OS/X. +- remove Qt3 support (it does not compile with current Qt3 packages) @@ -20 +26 @@ -Mon Aug 29 18:42:23 UTC 2011 - ter...@gmail.com +Wed Nov 23 06:35:52 UTC 2011 - ter...@gmail.com @@ -22 +28 @@ -- move sip files into separate package to avoid python 2/3 conflicts +- build QScintilla plugin for QT4 Designer @@ -25 +31 @@ -Mon Aug 15 01:42:37 UTC 2011 - ter...@gmail.com +Mon Aug 15 01:40:43 UTC 2011 - ter...@gmail.com @@ -28 +33,0 @@ - @@ -32,32 +37 @@ -* Mon Aug 8 2011 ter...@gmail.com - -- more python3 changes - -------------------------------------------------------------------- -Sun Oct 17 2010 h...@urpla.net - -- python 3 adjustments - -------------------------------------------------------------------- -Tue Sep 21 2010 h...@urpla.net - -- update to 2.4.5 release: - * Fixed a bug in QsciLexerVerilog that meant that the Keyword style was being - completely ignored. - * QsciStyle now auto-allocates style numbers from 63 rather than STYLE_MAX - because Scintilla only initially creates enough storage for that number of - styles. - * Fixed a regression, and the original bug, in QsciScintilla::clearAnnotations(). - * Implemented QsciLexerHTML::autoCompletionFillups() to change the fillups to - "/>". - * The QsciScintillaBase.SendScintilla() Python overloads will now accept unicode - strings that can be encoded to UTF-8. - * The entries in user and auto-completion lists should now support UTF-8. - * Reverted the addition of the /Encoding/ annotations to SendScintilla() as it is - (probably) not the right solution. - * With Python v3, the QsciScintillaBase.SendScintilla() overloads that take - char * arguments now require them to be bytes objects and no longer allow them - to be str objects. - -------------------------------------------------------------------- -Fri Jul 30 2010 h...@urpla.net +Wed Sep 1 10:51:33 CEST 2010 - dmuel...@suse.de @@ -65,13 +39,5 @@ -- update to 2.4.4 release: - * Pop-lists now get removed when the main widget loses focus. - * Changed SCN_MODIFIED to deal with text being NULL. - * The SCN_MODIFIED signal now tries to make sure that the text passed is valid. - * QsciScintilla::markerDefine() now allows existing markers to be redefined if an - explicit marker number is given. - * Fixed the drag and drop behaviour so that a move automatically turns into a - copy when the mouse leaves the widget. - * Fixed build problems against Qt v3. - * Added QsciScintillaBase::fromMimeData(). - * Renamed QsciScintillaBase::createMimeData() to toMimeData(). - * Added QsciScintillaBase::canInsertFromMimeData(). - * Added QsciScintillaBase::createMimeData(). +- update to 2.4.5: + - A bug fix release. + - Added the canInsertFromMimeData(), fromMimeData() and toMimeData() methods + to QsciScintillaBase. + - QsciScintilla::markerDefine() now allows existing markers to be redefined. --- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2012-03-07 13:58:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes 2012-07-15 12:05:41.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 5 09:43:26 UTC 2012 - dmuel...@suse.com + +- link .changes files for python/3-qscintilla to qscintilla.changes +- update to 2.6.2: + * Added support for Qt v5. + * QsciLexer::wordCharacters() is now part of the public API. + * Bug fixes. + +------------------------------------------------------------------- Old: ---- QScintilla-gpl-2.6.1.tar.gz New: ---- QScintilla-gpl-2.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.OTNW9A/_old 2012-07-15 12:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.OTNW9A/_new 2012-07-15 12:05:42.000000000 +0200 @@ -28,11 +28,12 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.6.1 +Version: 2.6.2 Release: 0 %define scintilla_version %version Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz -Requires: python-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python-qt4`) +%requires_ge python-qt4 +%requires_ge python-sip %py_requires %description ++++++ python3-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.OTNW9A/_old 2012-07-15 12:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.OTNW9A/_new 2012-07-15 12:05:42.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.6.1 +Version: 2.6.2 Release: 0 %define scintilla_version %version Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz @@ -38,8 +38,8 @@ %if 0%{?suse_version} > 1140 BuildRequires: python3-base %endif -Requires: python3-sip -Requires: libqt4-x11 +%requires_ge python3-sip +%requires_ge libqt4-x11 %global python3_sitearch %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True))" 2>/dev/null || echo PYTHON-NOT-FOUND) ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.OTNW9A/_old 2012-07-15 12:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.OTNW9A/_new 2012-07-15 12:05:42.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.6.1 +Version: 2.6.2 Release: 0 %define scintilla_version %version Source: http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz @@ -92,7 +92,7 @@ %patch %build -pushd Qt4 +pushd Qt4Qt5 qmake make %{?jobs:-j %jobs} popd @@ -102,7 +102,7 @@ popd %install -pushd Qt4 +pushd Qt4Qt5 make INSTALL_ROOT=$RPM_BUILD_ROOT install popd pushd designer-Qt4 ++++++ QScintilla-gpl-2.6.1.tar.gz -> QScintilla-gpl-2.6.2.tar.gz ++++++ ++++ 235119 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.OTNW9A/_old 2012-07-15 12:05:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OTNW9A/_new 2012-07-15 12:05:43.000000000 +0200 @@ -2,3 +2,4 @@ # This script is called automatically during autobuild checkin. ln -f qscintilla.changes python-qscintilla.changes +ln -f qscintilla.changes python3-qscintilla.changes ++++++ qscintilla.diff ++++++ --- /var/tmp/diff_new_pack.OTNW9A/_old 2012-07-15 12:05:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OTNW9A/_new 2012-07-15 12:05:43.000000000 +0200 @@ -31,6 +31,6 @@ INSTALLS += target -LIBS += -lqscintilla2 -+LIBS += -L../Qt4 -lqscintilla2 -+INCLUDEPATH += ../Qt4 ++LIBS += -L../Qt4Qt5 -lqscintilla2 ++INCLUDEPATH += ../Qt4Qt5 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org