rev 14488 - in trunk/packages/kdebindings/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-04-23 14:04:23 +0000 (Thu, 23 Apr 2009)
New Revision: 14488

Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/control
   trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
Log:
* Update 06_build_smokephonon patch to build against Qt 4.5.1.
* Force build against Qt 4.5.1.


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2009-04-23 13:47:04 UTC (rev 14487)
+++ trunk/packages/kdebindings/debian/changelog	2009-04-23 14:04:23 UTC (rev 14488)
@@ -1,3 +1,12 @@
+kdebindings (4:4.2.2-3) unstable; urgency=low
+
+  +++ Changes by Fathi Boudra:
+
+  * Update 06_build_smokephonon patch to build against Qt 4.5.1.
+  * Force build against Qt 4.5.1.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 Apr 2009 16:00:46 +0200
+
 kdebindings (4:4.2.2-2) unstable; urgency=low
 
   +++ Changes by Michael Casadevall:
@@ -27,7 +36,7 @@
 kdebindings (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release.
-  
+
   +++ Changes by Vincent Fourmond:
 
   * Removing myself from Uploaders.

Modified: trunk/packages/kdebindings/debian/control
===================================================================
--- trunk/packages/kdebindings/debian/control	2009-04-23 13:47:04 UTC (rev 14487)
+++ trunk/packages/kdebindings/debian/control	2009-04-23 14:04:23 UTC (rev 14488)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: debhelper (>= 7), quilt,
- kdelibs5-dev (>= 4:4.2.2), libqt4-opengl-dev, libphonon-dev (>= 4:4.3.0),
+ kdelibs5-dev (>= 4:4.2.2), libqt4-opengl-dev (>= 4.5.1), libphonon-dev (>= 4:4.3.0),
  libsoprano-dev (>= 2.1.67-2~),
  python, python-all-dev, sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-qt4 (>= 4.4.4), python-qt4-dev (>= 4.4.4),
  ruby1.8-dev, ruby1.8, python-support (>= 0.6),

Modified: trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-04-23 13:47:04 UTC (rev 14487)
+++ trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-04-23 14:04:23 UTC (rev 14488)
@@ -11,50 +11,3 @@
  OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" ON)
  OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
  OPTION(ENABLE_KDE_SMOKE "build KDESmoke" ON)
---- a/smoke/phonon/CMakeLists.txt
-+++ b/smoke/phonon/CMakeLists.txt
-@@ -43,25 +43,25 @@
- 
- set(smokephonon_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- 	${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
--		${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
--                ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
-+#		${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
-+#                ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- )
- 
- IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")