Philip Muškovac has proposed merging lp:~yofel/kdebindings/4.5.85 into lp:~kubuntu-members/kdebindings/ubuntu.
Requested reviews: Kubuntu Members (kubuntu-members) 4.5.85 release -- https://code.launchpad.net/~yofel/kdebindings/4.5.85/+merge/42895 Your team Kubuntu Members is requested to review the proposed merge of lp:~yofel/kdebindings/4.5.85 into lp:~kubuntu-members/kdebindings/ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2010-11-16 14:55:16 +0000 +++ debian/changelog 2010-12-07 00:06:54 +0000 @@ -1,3 +1,25 @@ +kdebindings (4:4.5.85-0ubuntu1) natty; urgency=low + + * New upstream beta release + * Disable libqwt-ruby1.8 and qwt files in libqt4-ruby1.8.examples + * Add libqtdeclarative-ruby1.8, libsmokeqt3support4-3, + libsmokeqtdeclarative4-3 and libsmokeqthelp4-3 + + -- Philip Muskovac <[email protected]> Tue, 07 Dec 2010 00:10:46 +0100 + +kdebindings (4:4.5.80-0ubuntu2) natty; urgency=low + + * Rebuild to add support for python 2.7. + + -- Matthias Klose <[email protected]> Fri, 03 Dec 2010 00:02:08 +0000 + +kdebindings (4:4.5.80-0ubuntu1) natty; urgency=low + + * New upstream release + * Remove build-dep on libqimageblitz-dev, causes smoke to segfault + + -- Jonathan Riddell <[email protected]> Wed, 01 Dec 2010 11:14:38 +0000 + kdebindings (4:4.5.3-0ubuntu2) natty; urgency=low * Rebuild for new SIP ABI === modified file 'debian/control' --- debian/control 2010-11-16 14:55:16 +0000 +++ debian/control 2010-12-07 00:06:54 +0000 @@ -6,14 +6,14 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.5.3), debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.9.2), kdelibs5-dev (>= 4:4.5.2-0ubuntu1), libqt4-opengl-dev (>= 4:4.7.0~beta2), libphonon-dev (>= 4:4.7.0really4.4.2), - libsoprano-dev (>= 2.3.0), libqimageblitz-dev, + libsoprano-dev (>= 2.3.0), python, python-all-dev, python-sip-dev (>= 4.11.2), python-qt4 (>=4.8.1), python-qt4-dev (>=4.7.7), ruby1.8-dev, ruby1.8, python-support (>= 0.6), mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], cli-common-dev (>= 0.5.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], monodoc-base [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], okular-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), libakonadi-dev (>= 1.3.85), libattica-dev, shared-desktop-ontologies, - libqscintilla2-dev (>= 2.4.5), + libqscintilla2-dev (>= 2.4.5), libqwt5-qt4-dev, libqtwebkit-dev Uploaders: Torsten Marek <[email protected]>, Sune Vuorela <[email protected]>, David Palacio <[email protected]>, Modestas Vainius <[email protected]>, Michael Meskes <[email protected]> Standards-Version: 3.8.4 @@ -46,6 +46,19 @@ . This is part of the KDE Bindings module. +Package: libsmokeqt3support4-3 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: any +Description: Qt Qt3Support Smoke library + Smoke libraries are part of the bindings used for Qt and KDE. This package + contains Qt Qt3Support Smoke. + . + Smoke provides infrastructure which is used for creating bindings for + multiple languages such as Ruby, C# and PHP. + . + This is part of the KDE Bindings module. + Package: libsmokeqtcore4-3 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -60,6 +73,19 @@ . This is part of the KDE Bindings module. +Package: libsmokeqtdeclarative4-3 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: any +Description: Qt Declarative Smoke library + Smoke libraries are part of the bindings used for Qt and KDE. This package + contains Qt Declarative Smoke. + . + Smoke provides infrastructure which is used for creating bindings for + multiple languages such as Ruby, C# and PHP. + . + This is part of the KDE Bindings module. + Package: libsmokeqtgui4-3 Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -88,6 +114,19 @@ . This is part of the KDE Bindings module. +Package: libsmokeqthelp4-3 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: any +Description: Qt Help Smoke library + Smoke libraries are part of the bindings used for Qt and KDE. This package + contains Qt Help Smoke. + . + Smoke provides infrastructure which is used for creating bindings for + multiple languages such as Ruby, C# and PHP. + . + This is part of the KDE Bindings module. + #Package: libsmokeqtmultimedia4-3 #Section: libs #Depends: ${shlibs:Depends}, ${misc:Depends} @@ -270,18 +309,18 @@ . This is part of the KDE Bindings module. -Package: libsmokeqimageblitz3 -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Architecture: any -Description: QImageBlitz Smoke libraries - Smoke libraries are part of the bindings used for Qt and KDE. This package - contains QImageBlitz Smoke. - . - Smoke provides infrastructure which is used for creating bindings for - multiple languages such as Ruby, C# and PHP. - . - This is part of the KDE Bindings module. +#Package: libsmokeqimageblitz3 +#Section: libs +#Depends: ${shlibs:Depends}, ${misc:Depends} +#Architecture: any +#Description: QImageBlitz Smoke libraries +# Smoke libraries are part of the bindings used for Qt and KDE. This package +# contains QImageBlitz Smoke. +# . +# Smoke provides infrastructure which is used for creating bindings for +# multiple languages such as Ruby, C# and PHP. +# . +# This is part of the KDE Bindings module. Package: libsmokekdecore4-3 Section: libs @@ -677,15 +716,24 @@ . This is part of the KDE Bindings module. -Package: libqwt-ruby1.8 +Package: libqtdeclarative-ruby1.8 Section: ruby Depends: ${shlibs:Depends}, ${misc:Depends} -Architecture: i386 amd64 ia64 powerpc sparc -Description: Qwt bindings for Ruby 1.8 - This package installs the Qwt bindings for Ruby 1.8 +Architecture: any +Description: QtDeclarative bindings for Ruby 1.8 + This package installs the QtDeclarative bindings for Ruby 1.8 . This is part of the KDE Bindings module. +#Package: libqwt-ruby1.8 +#Section: ruby +#Depends: ${shlibs:Depends}, ${misc:Depends} +#Architecture: i386 amd64 ia64 powerpc sparc +#Description: Qwt bindings for Ruby 1.8 +# This package installs the Qwt bindings for Ruby 1.8 +# . +# This is part of the KDE Bindings module. + Package: libkde4-ruby1.8 Section: ruby Depends: libqt4-ruby1.8, ${shlibs:Depends}, ${misc:Depends} @@ -884,7 +932,7 @@ Package: libkimono-cil-dev Section: libdevel Replaces: libkimono4.1-cil (<< 4:4.4), libkhtml2.0-cil (<< 4:4.4), libakonadi2.2-cil (<< 4:4.4), libktexteditor4.1-cil (<< 4:4.4), libnepomuk2.2-cil (<< 4:4.4), libplasma2.0-cil (<< 4:4.4), libsoprano2.0-cil (<< 4:4.4), libqimageblitz0.0-cil (<< 4:4.4) -Depends: libqyoto-cil-dev (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), libkhtml2.0-cil (= ${binary:Version}), libakonadi2.2-cil (= ${binary:Version}), libktexteditor4.1-cil (= ${binary:Version}), libnepomuk2.2-cil (= ${binary:Version}), libplasma2.0-cil (= ${binary:Version}), libsoprano2.0-cil (= ${binary:Version}), libqimageblitz0.0-cil (= ${binary:Version}), ${misc:Depends} +Depends: libqyoto-cil-dev (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), libkhtml2.0-cil (= ${binary:Version}), libakonadi2.2-cil (= ${binary:Version}), libktexteditor4.1-cil (= ${binary:Version}), libnepomuk2.2-cil (= ${binary:Version}), libplasma2.0-cil (= ${binary:Version}), libsoprano2.0-cil (= ${binary:Version}) Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Description: development files for Qt CLI bindings This package contains the development files (pc files) for Qt CLI bindings @@ -1041,15 +1089,15 @@ . This is part of the KDE Bindings module. -Package: libqimageblitz0.0-cil -Section: cli-mono -Depends: libqyoto4.5-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends} -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia -Description: CLI bindings for QImageBlitz - This package provides the QImageBlitz assembly, that allows - CLI-based software to use the QImageBlitz library. - . - This is part of the KDE Bindings module. +#Package: libqimageblitz0.0-cil +#Section: cli-mono +#Depends: libqyoto4.5-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends} +#Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia +#Description: CLI bindings for QImageBlitz +# This package provides the QImageBlitz assembly, that allows +# CLI-based software to use the QImageBlitz library. +# . +# This is part of the KDE Bindings module. Package: krossruby Section: ruby === modified file 'debian/libkimono-cil-dev.install' --- debian/libkimono-cil-dev.install 2010-05-22 14:31:35 +0000 +++ debian/libkimono-cil-dev.install 2010-12-07 00:06:54 +0000 @@ -4,5 +4,5 @@ debian/csharp/ktexteditor-sharp.pc usr/lib/pkgconfig/ debian/csharp/nepomuk-sharp.pc usr/lib/pkgconfig/ debian/csharp/plasma-sharp.pc usr/lib/pkgconfig/ -debian/csharp/qimageblitz-sharp.pc usr/lib/pkgconfig/ +#debian/csharp/qimageblitz-sharp.pc usr/lib/pkgconfig/ debian/csharp/soprano-sharp.pc usr/lib/pkgconfig/ === modified file 'debian/libqimageblitz0.0-cil.install' --- debian/libqimageblitz0.0-cil.install 2010-05-22 14:31:35 +0000 +++ debian/libqimageblitz0.0-cil.install 2010-12-07 00:06:54 +0000 @@ -1,3 +1,3 @@ -debian/csharp/qimageblitz.dll.config usr/lib/cli/qimageblitz-0.0/ -usr/lib/libqimageblitz-sharp.so usr/lib/cli/qimageblitz-0.0/ -usr/lib/mono/gac/qimageblitz/*/qimageblitz.dll usr/lib/cli/qimageblitz-0.0/ +#debian/csharp/qimageblitz.dll.config usr/lib/cli/qimageblitz-0.0/ +#usr/lib/libqimageblitz-sharp.so usr/lib/cli/qimageblitz-0.0/ +#usr/lib/mono/gac/qimageblitz/*/qimageblitz.dll usr/lib/cli/qimageblitz-0.0/ === modified file 'debian/libqt4-ruby1.8.examples' --- debian/libqt4-ruby1.8.examples 2010-01-27 20:31:07 +0000 +++ debian/libqt4-ruby1.8.examples 2010-12-07 00:06:54 +0000 @@ -1,5 +1,5 @@ -./ruby/qwt/examples/clock -./ruby/qwt/examples/clock/analog_clock.rb +#./ruby/qwt/examples/clock +#./ruby/qwt/examples/clock/analog_clock.rb ./ruby/qtruby/examples/desktop ./ruby/qtruby/examples/desktop/systray ./ruby/qtruby/examples/desktop/systray/main.rb === added file 'debian/libqtdeclarative-ruby1.8.install' --- debian/libqtdeclarative-ruby1.8.install 1970-01-01 00:00:00 +0000 +++ debian/libqtdeclarative-ruby1.8.install 2010-12-07 00:06:54 +0000 @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/qtdeclarative.so +usr/lib/ruby/1.8/qtdeclarative/qtdeclarative.rb === modified file 'debian/libsmokekde-dev.install' --- debian/libsmokekde-dev.install 2010-07-28 11:12:10 +0000 +++ debian/libsmokekde-dev.install 2010-12-07 00:06:54 +0000 @@ -14,7 +14,7 @@ ./usr/include/smoke/nepomukquery_smoke.h ./usr/include/smoke/okular_smoke.h ./usr/include/smoke/plasma_smoke.h -./usr/include/smoke/qimageblitz_smoke.h +#./usr/include/smoke/qimageblitz_smoke.h ./usr/lib/libsmokeakonadi.so ./usr/lib/libsmokeattica.so ./usr/lib/libsmokebase.so @@ -31,6 +31,6 @@ ./usr/lib/libsmokenepomukquery.so ./usr/lib/libsmokeokular.so ./usr/lib/libsmokeplasma.so -./usr/lib/libsmokeqimageblitz.so +#./usr/lib/libsmokeqimageblitz.so ./usr/lib/libsmokesolid.so ./usr/lib/libsmokekutils.so === added file 'debian/libsmokeqt3support4-3.install' --- debian/libsmokeqt3support4-3.install 1970-01-01 00:00:00 +0000 +++ debian/libsmokeqt3support4-3.install 2010-12-07 00:06:54 +0000 @@ -0,0 +1,1 @@ +usr/lib/libsmokeqt3support.so.3* === modified file 'debian/libsmokeqt4-dev.install' --- debian/libsmokeqt4-dev.install 2010-07-28 11:12:10 +0000 +++ debian/libsmokeqt4-dev.install 2010-12-07 00:06:54 +0000 @@ -2,9 +2,12 @@ usr/include/smoke/phonon_smoke.h usr/include/smoke/qsci_smoke.h #usr/include/smoke/qt_smoke.h +usr/include/smoke/qt3support_smoke.h usr/include/smoke/qtcore_smoke.h usr/include/smoke/qtdbus_smoke.h +usr/include/smoke/qtdeclarative_smoke.h usr/include/smoke/qtgui_smoke.h +usr/include/smoke/qthelp_smoke.h #usr/include/smoke/qtmultimedia_smoke.h usr/include/smoke/qtnetwork_smoke.h usr/include/smoke/qtopengl_smoke.h @@ -20,9 +23,12 @@ usr/lib/libsmokephonon.so usr/lib/libsmokeqsci.so #usr/lib/libsmokeqt.so +usr/lib/libsmokeqt3support.so usr/lib/libsmokeqtcore.so usr/lib/libsmokeqtdbus.so +usr/lib/libsmokeqtdeclarative.so usr/lib/libsmokeqtgui.so +usr/lib/libsmokeqthelp.so #usr/lib/libsmokeqtmultimedia.so usr/lib/libsmokeqtnetwork.so usr/lib/libsmokeqtopengl.so === added file 'debian/libsmokeqtdeclarative4-3.install' --- debian/libsmokeqtdeclarative4-3.install 1970-01-01 00:00:00 +0000 +++ debian/libsmokeqtdeclarative4-3.install 2010-12-07 00:06:54 +0000 @@ -0,0 +1,1 @@ +usr/lib/libsmokeqtdeclarative.so.3* === added file 'debian/libsmokeqthelp4-3.install' --- debian/libsmokeqthelp4-3.install 1970-01-01 00:00:00 +0000 +++ debian/libsmokeqthelp4-3.install 2010-12-07 00:06:54 +0000 @@ -0,0 +1,1 @@ +usr/lib/libsmokeqthelp.so.3* === removed file 'debian/patches/kubuntu_05_fix_pykde4_typedefs.diff' --- debian/patches/kubuntu_05_fix_pykde4_typedefs.diff 2010-10-22 03:12:08 +0000 +++ debian/patches/kubuntu_05_fix_pykde4_typedefs.diff 1970-01-01 00:00:00 +0000 @@ -1,64 +0,0 @@ ---- kdebindings-4.5.2+svn/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:28:36 1170601 -+++ kdebindings-4.5.2+svn/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:31:50 1170602 -@@ -733,61 +733,6 @@ - }; - - --%MappedType QList<uint> --{ --%TypeHeaderCode --#include <qlist.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) { -- PyObject *pobj; -- --#if PY_MAJOR_VERSION >= 3 -- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { --#else -- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { --#endif -- Py_DECREF(l); -- -- return NULL; -- } -- -- PyList_SET_ITEM(l, i, pobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- return PyList_Check(sipPy); -- -- QList<uint> *ql = new QList<uint>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { --#if PY_MAJOR_VERSION >= 3 -- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); --#else -- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); --#endif -- } -- -- *sipCppPtr = ql; -- -- return sipGetState(sipTransferObj); --%End --}; -- -- - template <TYPE*> - %MappedType QStack<TYPE*> - { === modified file 'debian/patches/series' --- debian/patches/series 2010-10-22 03:12:08 +0000 +++ debian/patches/series 2010-12-07 00:06:54 +0000 @@ -12,4 +12,3 @@ 12_pythonpluginfactory_use_versioned_python_lib.diff version_cppparser_library.diff optional_install_sip_files.diff -kubuntu_05_fix_pykde4_typedefs.diff
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
