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

[Philip Muškovac]

build with qimageblitz again.

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-22 17:23:26 +0000
+++ debian/changelog	2010-12-23 00:49:52 +0000
@@ -1,8 +1,12 @@
-kdebindings (4:4.5.90-0ubuntu1~ppa1) natty; urgency=low
+kdebindings (4:4.5.90-0ubuntu1) natty; urgency=low
 
+  [ Jonathan Riddell ]
   * New upstream RC release
 
- -- Jonathan Riddell <[e-mail]>  Wed, 22 Dec 2010 16:21:42 +0000
+  [ Philip Muskovac ]
+  * Add build-dep on libqimageblitz-dev again
+
+ -- Philip Muskovac <[e-mail]>  Thu, 23 Dec 2010 01:06:35 +0100
 
 kdebindings (4:4.5.85-0ubuntu2) natty; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-12-09 10:54:09 +0000
+++ debian/control	2010-12-23 00:49:52 +0000
@@ -14,7 +14,7 @@
  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),
- libgdbm-dev,
+ libgdbm-dev, libqimageblitz-dev,
  libqwt5-qt4-dev, libqtwebkit-dev
 Uploaders: Torsten Marek <[e-mail]>, Sune Vuorela <[e-mail]>, David Palacio <[e-mail]>, Modestas Vainius <[e-mail]>, Michael Meskes <[e-mail]>
 Standards-Version: 3.8.4
@@ -310,18 +310,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
@@ -1090,15 +1090,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-12-07 00:00:42 +0000
+++ debian/libkimono-cil-dev.install	2010-12-23 00:49:52 +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-12-07 00:00:42 +0000
+++ debian/libqimageblitz0.0-cil.install	2010-12-23 00:49:52 +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/libsmokekde-dev.install'
--- debian/libsmokekde-dev.install	2010-12-07 00:00:42 +0000
+++ debian/libsmokekde-dev.install	2010-12-23 00:49:52 +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