KDE Bindings

Merge lp:~yofel/kdebindings/4.5.85 into lp:~kubuntu-packagers/kubuntu-packaging/kdebindings

  1. 4.5.85
  2. Merge into kdebindings
Proposed by Philip Muškovac
Status: Merged
Merged at revision: 142
Proposed branch: lp:~yofel/kdebindings/4.5.85
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdebindings
Diff against target: 392 lines (+117/-101)
13 files modified
debian/changelog (+22/-0)
debian/control (+76/-28)
debian/libkimono-cil-dev.install (+1/-1)
debian/libqimageblitz0.0-cil.install (+3/-3)
debian/libqt4-ruby1.8.examples (+2/-2)
debian/libqtdeclarative-ruby1.8.install (+2/-0)
debian/libsmokekde-dev.install (+2/-2)
debian/libsmokeqt3support4-3.install (+1/-0)
debian/libsmokeqt4-dev.install (+6/-0)
debian/libsmokeqtdeclarative4-3.install (+1/-0)
debian/libsmokeqthelp4-3.install (+1/-0)
debian/patches/kubuntu_05_fix_pykde4_typedefs.diff (+0/-64)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~yofel/kdebindings/4.5.85
Reviewer Review Type Date Requested Status
Kubuntu Members Pending
Review via email: mp+42895@code.launchpad.net

Description of the change

4.5.85 release

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1kdebindings (4:4.5.85-0ubuntu1) natty; urgency=low
2
3 * New upstream beta release
4 * Disable libqwt-ruby1.8 and qwt files in libqt4-ruby1.8.examples
5 * Add libqtdeclarative-ruby1.8, libsmokeqt3support4-3,
6 libsmokeqtdeclarative4-3 and libsmokeqthelp4-3
7
8 -- Philip Muskovac <yofel@gmx.net> Tue, 07 Dec 2010 00:10:46 +0100
9
10kdebindings (4:4.5.80-0ubuntu2) natty; urgency=low
11
12 * Rebuild to add support for python 2.7.
13
14 -- Matthias Klose <doko@ubuntu.com> Fri, 03 Dec 2010 00:02:08 +0000
15
16kdebindings (4:4.5.80-0ubuntu1) natty; urgency=low
17
18 * New upstream release
19 * Remove build-dep on libqimageblitz-dev, causes smoke to segfault
20
21 -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 01 Dec 2010 11:14:38 +0000
22
1kdebindings (4:4.5.3-0ubuntu2) natty; urgency=low23kdebindings (4:4.5.3-0ubuntu2) natty; urgency=low
224
3 * Rebuild for new SIP ABI25 * Rebuild for new SIP ABI
426
=== 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 @@
6Build-Depends: kde-sc-dev-latest (>= 4:4.5.3),6Build-Depends: kde-sc-dev-latest (>= 4:4.5.3),
7 debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.9.2),7 debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.9.2),
8 kdelibs5-dev (>= 4:4.5.2-0ubuntu1), libqt4-opengl-dev (>= 4:4.7.0~beta2), libphonon-dev (>= 4:4.7.0really4.4.2),8 kdelibs5-dev (>= 4:4.5.2-0ubuntu1), libqt4-opengl-dev (>= 4:4.7.0~beta2), libphonon-dev (>= 4:4.7.0really4.4.2),
9 libsoprano-dev (>= 2.3.0), libqimageblitz-dev,9 libsoprano-dev (>= 2.3.0),
10 python, python-all-dev, python-sip-dev (>= 4.11.2), python-qt4 (>=4.8.1), python-qt4-dev (>=4.7.7),10 python, python-all-dev, python-sip-dev (>= 4.11.2), python-qt4 (>=4.8.1), python-qt4-dev (>=4.7.7),
11 ruby1.8-dev, ruby1.8, python-support (>= 0.6),11 ruby1.8-dev, ruby1.8, python-support (>= 0.6),
12 mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],12 mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
13 cli-common-dev (>= 0.5.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],13 cli-common-dev (>= 0.5.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
14 monodoc-base [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],14 monodoc-base [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
15 okular-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), libakonadi-dev (>= 1.3.85), libattica-dev, shared-desktop-ontologies,15 okular-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), libakonadi-dev (>= 1.3.85), libattica-dev, shared-desktop-ontologies,
16 libqscintilla2-dev (>= 2.4.5), 16 libqscintilla2-dev (>= 2.4.5),
17 libqwt5-qt4-dev, libqtwebkit-dev17 libqwt5-qt4-dev, libqtwebkit-dev
18Uploaders: Torsten Marek <shlomme@debian.org>, Sune Vuorela <sune@debian.org>, David Palacio <dpalacio@uninorte.edu.co>, Modestas Vainius <modax@debian.org>, Michael Meskes <meskes@debian.org>18Uploaders: Torsten Marek <shlomme@debian.org>, Sune Vuorela <sune@debian.org>, David Palacio <dpalacio@uninorte.edu.co>, Modestas Vainius <modax@debian.org>, Michael Meskes <meskes@debian.org>
19Standards-Version: 3.8.419Standards-Version: 3.8.4
@@ -46,6 +46,19 @@
46 .46 .
47 This is part of the KDE Bindings module.47 This is part of the KDE Bindings module.
4848
49Package: libsmokeqt3support4-3
50Section: libs
51Depends: ${shlibs:Depends}, ${misc:Depends}
52Architecture: any
53Description: Qt Qt3Support Smoke library
54 Smoke libraries are part of the bindings used for Qt and KDE. This package
55 contains Qt Qt3Support Smoke.
56 .
57 Smoke provides infrastructure which is used for creating bindings for
58 multiple languages such as Ruby, C# and PHP.
59 .
60 This is part of the KDE Bindings module.
61
49Package: libsmokeqtcore4-362Package: libsmokeqtcore4-3
50Section: libs63Section: libs
51Depends: ${shlibs:Depends}, ${misc:Depends}64Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -60,6 +73,19 @@
60 .73 .
61 This is part of the KDE Bindings module.74 This is part of the KDE Bindings module.
6275
76Package: libsmokeqtdeclarative4-3
77Section: libs
78Depends: ${shlibs:Depends}, ${misc:Depends}
79Architecture: any
80Description: Qt Declarative Smoke library
81 Smoke libraries are part of the bindings used for Qt and KDE. This package
82 contains Qt Declarative Smoke.
83 .
84 Smoke provides infrastructure which is used for creating bindings for
85 multiple languages such as Ruby, C# and PHP.
86 .
87 This is part of the KDE Bindings module.
88
63Package: libsmokeqtgui4-389Package: libsmokeqtgui4-3
64Section: libs90Section: libs
65Depends: ${shlibs:Depends}, ${misc:Depends}91Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -88,6 +114,19 @@
88 .114 .
89 This is part of the KDE Bindings module.115 This is part of the KDE Bindings module.
90116
117Package: libsmokeqthelp4-3
118Section: libs
119Depends: ${shlibs:Depends}, ${misc:Depends}
120Architecture: any
121Description: Qt Help Smoke library
122 Smoke libraries are part of the bindings used for Qt and KDE. This package
123 contains Qt Help Smoke.
124 .
125 Smoke provides infrastructure which is used for creating bindings for
126 multiple languages such as Ruby, C# and PHP.
127 .
128 This is part of the KDE Bindings module.
129
91#Package: libsmokeqtmultimedia4-3130#Package: libsmokeqtmultimedia4-3
92#Section: libs131#Section: libs
93#Depends: ${shlibs:Depends}, ${misc:Depends}132#Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -270,18 +309,18 @@
270 .309 .
271 This is part of the KDE Bindings module.310 This is part of the KDE Bindings module.
272311
273Package: libsmokeqimageblitz3312#Package: libsmokeqimageblitz3
274Section: libs313#Section: libs
275Depends: ${shlibs:Depends}, ${misc:Depends}314#Depends: ${shlibs:Depends}, ${misc:Depends}
276Architecture: any315#Architecture: any
277Description: QImageBlitz Smoke libraries316#Description: QImageBlitz Smoke libraries
278 Smoke libraries are part of the bindings used for Qt and KDE. This package317# Smoke libraries are part of the bindings used for Qt and KDE. This package
279 contains QImageBlitz Smoke.318# contains QImageBlitz Smoke.
280 .319# .
281 Smoke provides infrastructure which is used for creating bindings for320# Smoke provides infrastructure which is used for creating bindings for
282 multiple languages such as Ruby, C# and PHP.321# multiple languages such as Ruby, C# and PHP.
283 .322# .
284 This is part of the KDE Bindings module.323# This is part of the KDE Bindings module.
285324
286Package: libsmokekdecore4-3325Package: libsmokekdecore4-3
287Section: libs326Section: libs
@@ -677,15 +716,24 @@
677 .716 .
678 This is part of the KDE Bindings module.717 This is part of the KDE Bindings module.
679718
680Package: libqwt-ruby1.8719Package: libqtdeclarative-ruby1.8
681Section: ruby720Section: ruby
682Depends: ${shlibs:Depends}, ${misc:Depends}721Depends: ${shlibs:Depends}, ${misc:Depends}
683Architecture: i386 amd64 ia64 powerpc sparc722Architecture: any
684Description: Qwt bindings for Ruby 1.8723Description: QtDeclarative bindings for Ruby 1.8
685 This package installs the Qwt bindings for Ruby 1.8724 This package installs the QtDeclarative bindings for Ruby 1.8
686 .725 .
687 This is part of the KDE Bindings module.726 This is part of the KDE Bindings module.
688727
728#Package: libqwt-ruby1.8
729#Section: ruby
730#Depends: ${shlibs:Depends}, ${misc:Depends}
731#Architecture: i386 amd64 ia64 powerpc sparc
732#Description: Qwt bindings for Ruby 1.8
733# This package installs the Qwt bindings for Ruby 1.8
734# .
735# This is part of the KDE Bindings module.
736
689Package: libkde4-ruby1.8737Package: libkde4-ruby1.8
690Section: ruby738Section: ruby
691Depends: libqt4-ruby1.8, ${shlibs:Depends}, ${misc:Depends}739Depends: libqt4-ruby1.8, ${shlibs:Depends}, ${misc:Depends}
@@ -884,7 +932,7 @@
884Package: libkimono-cil-dev932Package: libkimono-cil-dev
885Section: libdevel933Section: libdevel
886Replaces: 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)934Replaces: 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)
887Depends: 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}935Depends: 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})
888Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia936Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
889Description: development files for Qt CLI bindings937Description: development files for Qt CLI bindings
890 This package contains the development files (pc files) for Qt CLI bindings938 This package contains the development files (pc files) for Qt CLI bindings
@@ -1041,15 +1089,15 @@
1041 .1089 .
1042 This is part of the KDE Bindings module.1090 This is part of the KDE Bindings module.
10431091
1044Package: libqimageblitz0.0-cil1092#Package: libqimageblitz0.0-cil
1045Section: cli-mono1093#Section: cli-mono
1046Depends: libqyoto4.5-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}1094#Depends: libqyoto4.5-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}
1047Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia1095#Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
1048Description: CLI bindings for QImageBlitz1096#Description: CLI bindings for QImageBlitz
1049 This package provides the QImageBlitz assembly, that allows1097# This package provides the QImageBlitz assembly, that allows
1050 CLI-based software to use the QImageBlitz library.1098# CLI-based software to use the QImageBlitz library.
1051 .1099# .
1052 This is part of the KDE Bindings module.1100# This is part of the KDE Bindings module.
10531101
1054Package: krossruby1102Package: krossruby
1055Section: ruby1103Section: ruby
10561104
=== 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 @@
4debian/csharp/ktexteditor-sharp.pc usr/lib/pkgconfig/4debian/csharp/ktexteditor-sharp.pc usr/lib/pkgconfig/
5debian/csharp/nepomuk-sharp.pc usr/lib/pkgconfig/5debian/csharp/nepomuk-sharp.pc usr/lib/pkgconfig/
6debian/csharp/plasma-sharp.pc usr/lib/pkgconfig/6debian/csharp/plasma-sharp.pc usr/lib/pkgconfig/
7debian/csharp/qimageblitz-sharp.pc usr/lib/pkgconfig/7#debian/csharp/qimageblitz-sharp.pc usr/lib/pkgconfig/
8debian/csharp/soprano-sharp.pc usr/lib/pkgconfig/8debian/csharp/soprano-sharp.pc usr/lib/pkgconfig/
99
=== 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 @@
1debian/csharp/qimageblitz.dll.config usr/lib/cli/qimageblitz-0.0/1#debian/csharp/qimageblitz.dll.config usr/lib/cli/qimageblitz-0.0/
2usr/lib/libqimageblitz-sharp.so usr/lib/cli/qimageblitz-0.0/2#usr/lib/libqimageblitz-sharp.so usr/lib/cli/qimageblitz-0.0/
3usr/lib/mono/gac/qimageblitz/*/qimageblitz.dll usr/lib/cli/qimageblitz-0.0/3#usr/lib/mono/gac/qimageblitz/*/qimageblitz.dll usr/lib/cli/qimageblitz-0.0/
44
=== 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 @@
1./ruby/qwt/examples/clock1#./ruby/qwt/examples/clock
2./ruby/qwt/examples/clock/analog_clock.rb2#./ruby/qwt/examples/clock/analog_clock.rb
3./ruby/qtruby/examples/desktop3./ruby/qtruby/examples/desktop
4./ruby/qtruby/examples/desktop/systray4./ruby/qtruby/examples/desktop/systray
5./ruby/qtruby/examples/desktop/systray/main.rb5./ruby/qtruby/examples/desktop/systray/main.rb
66
=== 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 @@
1usr/lib/ruby/1.8/*/qtdeclarative.so
2usr/lib/ruby/1.8/qtdeclarative/qtdeclarative.rb
03
=== 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 @@
14./usr/include/smoke/nepomukquery_smoke.h14./usr/include/smoke/nepomukquery_smoke.h
15./usr/include/smoke/okular_smoke.h15./usr/include/smoke/okular_smoke.h
16./usr/include/smoke/plasma_smoke.h16./usr/include/smoke/plasma_smoke.h
17./usr/include/smoke/qimageblitz_smoke.h17#./usr/include/smoke/qimageblitz_smoke.h
18./usr/lib/libsmokeakonadi.so18./usr/lib/libsmokeakonadi.so
19./usr/lib/libsmokeattica.so19./usr/lib/libsmokeattica.so
20./usr/lib/libsmokebase.so20./usr/lib/libsmokebase.so
@@ -31,6 +31,6 @@
31./usr/lib/libsmokenepomukquery.so31./usr/lib/libsmokenepomukquery.so
32./usr/lib/libsmokeokular.so32./usr/lib/libsmokeokular.so
33./usr/lib/libsmokeplasma.so33./usr/lib/libsmokeplasma.so
34./usr/lib/libsmokeqimageblitz.so34#./usr/lib/libsmokeqimageblitz.so
35./usr/lib/libsmokesolid.so35./usr/lib/libsmokesolid.so
36./usr/lib/libsmokekutils.so36./usr/lib/libsmokekutils.so
3737
=== 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 @@
1usr/lib/libsmokeqt3support.so.3*
02
=== 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 @@
2usr/include/smoke/phonon_smoke.h2usr/include/smoke/phonon_smoke.h
3usr/include/smoke/qsci_smoke.h3usr/include/smoke/qsci_smoke.h
4#usr/include/smoke/qt_smoke.h4#usr/include/smoke/qt_smoke.h
5usr/include/smoke/qt3support_smoke.h
5usr/include/smoke/qtcore_smoke.h6usr/include/smoke/qtcore_smoke.h
6usr/include/smoke/qtdbus_smoke.h7usr/include/smoke/qtdbus_smoke.h
8usr/include/smoke/qtdeclarative_smoke.h
7usr/include/smoke/qtgui_smoke.h9usr/include/smoke/qtgui_smoke.h
10usr/include/smoke/qthelp_smoke.h
8#usr/include/smoke/qtmultimedia_smoke.h11#usr/include/smoke/qtmultimedia_smoke.h
9usr/include/smoke/qtnetwork_smoke.h12usr/include/smoke/qtnetwork_smoke.h
10usr/include/smoke/qtopengl_smoke.h13usr/include/smoke/qtopengl_smoke.h
@@ -20,9 +23,12 @@
20usr/lib/libsmokephonon.so23usr/lib/libsmokephonon.so
21usr/lib/libsmokeqsci.so24usr/lib/libsmokeqsci.so
22#usr/lib/libsmokeqt.so25#usr/lib/libsmokeqt.so
26usr/lib/libsmokeqt3support.so
23usr/lib/libsmokeqtcore.so27usr/lib/libsmokeqtcore.so
24usr/lib/libsmokeqtdbus.so28usr/lib/libsmokeqtdbus.so
29usr/lib/libsmokeqtdeclarative.so
25usr/lib/libsmokeqtgui.so30usr/lib/libsmokeqtgui.so
31usr/lib/libsmokeqthelp.so
26#usr/lib/libsmokeqtmultimedia.so32#usr/lib/libsmokeqtmultimedia.so
27usr/lib/libsmokeqtnetwork.so33usr/lib/libsmokeqtnetwork.so
28usr/lib/libsmokeqtopengl.so34usr/lib/libsmokeqtopengl.so
2935
=== 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 @@
1usr/lib/libsmokeqtdeclarative.so.3*
02
=== 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 @@
1usr/lib/libsmokeqthelp.so.3*
02
=== 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 @@
1--- kdebindings-4.5.2+svn/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:28:36 1170601
2+++ kdebindings-4.5.2+svn/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:31:50 1170602
3@@ -733,61 +733,6 @@
4 };
5
6
7-%MappedType QList<uint>
8-{
9-%TypeHeaderCode
10-#include <qlist.h>
11-%End
12-
13-%ConvertFromTypeCode
14- // Create the list.
15- PyObject *l;
16-
17- if ((l = PyList_New(sipCpp->size())) == NULL)
18- return NULL;
19-
20- // Set the list elements.
21- for (int i = 0; i < sipCpp->size(); ++i) {
22- PyObject *pobj;
23-
24-#if PY_MAJOR_VERSION >= 3
25- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
26-#else
27- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
28-#endif
29- Py_DECREF(l);
30-
31- return NULL;
32- }
33-
34- PyList_SET_ITEM(l, i, pobj);
35- }
36-
37- return l;
38-%End
39-
40-%ConvertToTypeCode
41- // Check the type if that is all that is required.
42- if (sipIsErr == NULL)
43- return PyList_Check(sipPy);
44-
45- QList<uint> *ql = new QList<uint>;
46-
47- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
48-#if PY_MAJOR_VERSION >= 3
49- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
50-#else
51- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
52-#endif
53- }
54-
55- *sipCppPtr = ql;
56-
57- return sipGetState(sipTransferObj);
58-%End
59-};
60-
61-
62 template <TYPE*>
63 %MappedType QStack<TYPE*>
64 {
650
=== 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 @@
1212_pythonpluginfactory_use_versioned_python_lib.diff1212_pythonpluginfactory_use_versioned_python_lib.diff
13version_cppparser_library.diff13version_cppparser_library.diff
14optional_install_sip_files.diff14optional_install_sip_files.diff
15kubuntu_05_fix_pykde4_typedefs.diff

Subscribers

People subscribed via source and target branches