[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-6-30-g9954e2e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit af93a73d21690a72ff430642a2eabf692d901f5e
Merge: 38f32a8f72dbaa987a91611686adfa65cbb5e83b 2e5456682d81678170e002245419bf3f3334b356
Author: Modestas Vainius <modax at debian.org>
Date:   Tue May 10 01:54:50 2011 +0300

    Merge branch 'kde4.4'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                                 |   33 +++++++++++++++++++++-
 debian/control                                   |   13 --------
 debian/libsmokeqtmultimedia4-3.install           |    1 -
 debian/libsmokeqtmultimedia4-3.lintian-overrides |    1 -
 debian/patches/series                            |    1 +
 debian/patches/smokegen_phonon.diff              |   18 ++++++++++++
 debian/rules                                     |    5 ++-
 7 files changed, 54 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index df740b2,67feaa9..548289d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,29 +1,70 @@@
- kdebindings (4:4.6.2-0r0) UNRELEASED; urgency=low
++kdebindings (4:4.6.3-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +
 +  [ Sune Vuorela ]
 +  * Make kio-monodoc depend on monodoc-manual.
 +  
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
 +  * Bump build dependencies on KDE SC libs to 4:4.6.
 +  * Bump build dependency on libakonadi-dev to 1.5.0.
 +  * Bump build dependency on python-sip-dev to 4.12.0.
 +  * Bump build dependencies on python-qt4 to 4.8.
 +  * Bump build dependency on libqt4-opengl-dev to 4.7.1.
 +  * Bump build dependency on libphonon-dev to 4:4.6.0really4.4.4.
 +  * Update installed files.
 +  * Add build dependencies:
 +    - libqtwebkit-dev
 +    - libqtassistantclient-dev
 +  * Remove libsmokeqtmultimedia4-3 for now.
 +  * Remove libsmokeqt4-3 package.
 +  * Refresh patches:
 +    - Unfuzzy some of them.
 +    - Delete backport_r1150375.diff.
 +    - Delete backport_r1170602.diff.
 +    - Delete backport_r1184022.diff.
 +    - Delete backport_r1211266.diff.
 +  * Bump S-V to 3.9.1; add Breaks next to Replaces where needed.
 +
 +  [ Pino Toscano ]
 +  * Few touches to the packages descriptions.
 +    - ... including the spelling of "Common Intermediate Language".
 +      (Closes: #617329)
 +
++  [ Modestas Vainius ]
++  * Drop add_qtwebkit_includedir.diff patch, merged upstream.
++  * Adapt smokegen_phonon.diff to upstream changes.
++  * No longer set -DENABLE_QTMULTIMEDIA_SMOKE=OFF, not needed anymore.
++
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Aug 2010 22:43:03 +0200
 +
+ kdebindings (4:4.4.5-6) unstable; urgency=low
+ 
+   [ Pino Toscano ]
+   * Backport upstream fixes (merged in smokegen_phonon.diff) to make
+     smokephonon compile with Phonon >= 4.5.0. (Closes: #625707)
+ 
+   [ Modestas Vainius ]
+   * Do not hardcode python versions in debian/rules. Use pyversions instead.
+     This should make kdebindings fully binNMUable for python transitions.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 May 2011 01:03:07 +0300
+ 
+ kdebindings (4:4.4.5-5) unstable; urgency=high
+ 
+   * Saluting Canterbury Distribution
+ 
+   [ Didier Raboud ]
+   * Drop libsmokeqtmultimedia4-3 (Closes: #620219).
+     - Urgency high for Qt4.7 transition.
+   * Add libqtwebkit-dev B-D (Closes: #618215)
+ 
+   [ Sune Vuorela ]
+   * Add qtwebkit includes to python build
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Mar 2011 14:31:18 +0200
+ 
  kdebindings (4:4.4.5-4) unstable; urgency=low
  
    [ Pino Toscano ]
diff --cc debian/patches/series
index d45b9a9,ef6b9ab..50a3dad
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -12,4 -12,10 +12,5 @@@ fix_segfault_in_generator_on_armel.dif
  12_pythonpluginfactory_use_versioned_python_lib.diff
  version_cppparser_library.diff
  optional_install_sip_files.diff
 -backport_r1150375.diff
 -backport_r1170602.diff
 -backport_r1184022.diff
  backport_r1209688.diff
 -backport_r1211266.diff
 -add_qtwebkit_includedir.diff
+ smokegen_phonon.diff
diff --cc debian/patches/smokegen_phonon.diff
index 0000000,8d6a1cf..d575329
mode 000000,100644..100644
--- a/debian/patches/smokegen_phonon.diff
+++ b/debian/patches/smokegen_phonon.diff
@@@ -1,0 -1,17 +1,18 @@@
+ Author: Pino Toscano <pino at kde.org>
+ Description: Fix compilation with newer Phonon.
+  This includes two patches committed upstream, slightly adapted to support old
+  smokegen (which does not define __SMOKEGEN_RUN__ when running).
+ Forwarded: not-needed
+ Origin: vendor
+ Last-Update: 2011-05-09
+ 
 ---- a/smoke/phonon/phonon_includes.h
 -+++ b/smoke/phonon/phonon_includes.h
 -@@ -1,4 +1,6 @@
 - #define PHONON_EXPORT
 -+#define PHONON_DEPRECATED
 -+#define PHONON_EXPORT_DEPRECATED
++--- a/smoke/qt/phonon/phonon_includes.h
+++++ b/smoke/qt/phonon/phonon_includes.h
++@@ -1,6 +1,7 @@
++ #ifdef __SMOKEGEN_RUN__
++ #  define PHONON_EXPORT
++ #  define PHONON_DEPRECATED
+++#  define PHONON_EXPORT_DEPRECATED
++ #endif
+  
+  #include <phonon/abstractaudiooutput.h>
 - #include <phonon/abstractmediastream.h>

-- 
KDE Bindings module packaging