rev 12854 - in branches/kde4.2/packages/kdebindings/debian: . csharp patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Dec 5 20:22:06 UTC 2008 

Author: modax-guest
Date: 2008-12-05 20:22:06 +0000 (Fri, 05 Dec 2008)
New Revision: 12854

Added:
   branches/kde4.2/packages/kdebindings/debian/csharp/khtml-dll.dll.config
   branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk-dll.dll.config
   branches/kde4.2/packages/kdebindings/debian/csharp/plasma-dll.dll.config
   branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install
   branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.installcligac
   branches/kde4.2/packages/kdebindings/debian/patches/06_build_smokephonon.diff
   branches/kde4.2/packages/kdebindings/debian/patches/07_fix_kpythonpluginfactory_build.diff
   branches/kde4.2/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
   branches/kde4.2/packages/kdebindings/debian/plasma-scriptengine-kimono.install
Removed:
   branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config
   branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config
Modified:
   branches/kde4.2/packages/kdebindings/debian/changelog
   branches/kde4.2/packages/kdebindings/debian/control
   branches/kde4.2/packages/kdebindings/debian/libkde4-ruby1.8.install
   branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.installcligac
   branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.examples
   branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.install
   branches/kde4.2/packages/kdebindings/debian/libqt4-ruby1.8.install
   branches/kde4.2/packages/kdebindings/debian/libsmokeqt4-2.install
   branches/kde4.2/packages/kdebindings/debian/not-installed
   branches/kde4.2/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
   branches/kde4.2/packages/kdebindings/debian/patches/series
   branches/kde4.2/packages/kdebindings/debian/python-kde4-doc.install
   branches/kde4.2/packages/kdebindings/debian/python-kde4.install
   branches/kde4.2/packages/kdebindings/debian/rules
Log:
dirty kdebindings snapshot

Modified: branches/kde4.2/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/changelog	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/changelog	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1,4 +1,4 @@
-kdebindings (4:4.1.82+svn892615-0r1) UNRELEASED; urgency=low
+kdebindings (4:4.1.82+svn892999-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -16,9 +16,34 @@
   * Build depend on monodoc to build kio_monodoc.
   * Bump SIP build dependencies to >= 4.7.8.
   * Bump python-qt4 dependencies to 4.4.4.
+  * Pass -DCMAKE_USE_RELATIVE_PATHS=ON to cmake.
+  * Make python-kde4 depend on python-qt4 (>= 4.4.4) and python-sip4 (>= 4.7.8)
+    (the versions it was built against).
+  
+  !! DISCLAIMER !! Changes below are sort of "not really sure what I was doing".
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 12:57:11 +0200
+  * Build depend on monodoc (TODO: useless?).
+  * Add patches:
+    - 06_build_smokephonon.diff - much smoke stuff needs phononsmoke, but that
+      one was disabled because it didn't build. Reenable it and hack around its
+      brokenness which probably results into useless smokephonon, but working
+      builds of other smoke stuff.
+    - 07_fix_kpythonpluginfactory_build.diff - include Python.h first as Qt
+      includes steals "slots" keyword.
+    - 08_csharp_plasma_examples.diff - do not build a few csharp plasma
+      examples. They fail.
+  * Add libplasma2.0-cil package for plasma-dll.dll based on libnepomuk2.2-cil.
+  * Add new plasma-scriptengine-kimono package for Kimono plasma script engine.
+  * Install /usr/lib/kde4/kimonopluginfactory.so to libkimono4.1-cil.
+  * For some reason csharp khtml.dll, nepomuk.dll got renamed to khtml-dll.dll
+    and nepomuk-dll.dll. Do the renaming but this is probably wrong.
+  * Install a more few files to python-kde4 like python plugin factory.
+  * Ruby nepomuk bindings disappeared.
+  * Some modification to install files. A few disappeared.
+  * TODO: there are files missing. Check.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 22:07:24 +0200
+
 kdebindings (4:4.1.3-2) experimental; urgency=low
 
   [ Vincent Fourmond ]

Modified: branches/kde4.2/packages/kdebindings/debian/control
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/control	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/control	2008-12-05 20:22:06 UTC (rev 12854)
@@ -171,7 +171,8 @@
 Section: python
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
+ python-qt4 (>= 4.4.4), python-sip4 (>= 4.7.8)
 Description: Python bindings for the KDE 4 libraries
  This package contains PyKDE, the Python bindings for the KDE 4
  libraries, that allow you to write KDE programs using Python instead of
@@ -249,6 +250,16 @@
  .
  This is part of KDE Bindings module
 
+Package: plasma-scriptengine-kimono
+Section: kde
+Depends: libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
+Description: Kimono Plasma script engine
+ This package provides the script engine for Plasma which allows
+ to write Plasma applets in CLI languagues.
+ .
+ This is part of KDE Bindings module
+ 
 Package: libkhtml2.0-cil
 Section: libs
 Depends: libqyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
@@ -269,6 +280,17 @@
  .
  This is part of KDE Bindings module
 
+Package: libplasma2.0-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
+Description: kde4 bindings for CLI, Plasma-edition
+ This package provides the plasma assembly that allows 
+ CLI based software to use the Plasma library
+ .
+ This is part of KDE Bindings module
+
+
 Package: libqtscript2.2-cil
 Section: libs
 Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}

Added: branches/kde4.2/packages/kdebindings/debian/csharp/khtml-dll.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/khtml-dll.dll.config	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/khtml-dll.dll.config	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,3 @@
+<configuration>
+<dllmap dll="libkhtml-sharp" target="/usr/lib/cli/kdebindings-2.0/libkhtml-sharp.so" />
+</configuration>

Deleted: branches/kde4.2/packages/kdebindings/debian/csharp/khtml.dll.config

Added: branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk-dll.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk-dll.dll.config	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk-dll.dll.config	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,3 @@
+<configuration>
+<dllmap dll="libnepomuk-sharp" target="/usr/lib/cli/kdebindings-2.2/libnepomuk-sharp.so" />
+</configuration>

Deleted: branches/kde4.2/packages/kdebindings/debian/csharp/nepomuk.dll.config

Added: branches/kde4.2/packages/kdebindings/debian/csharp/plasma-dll.dll.config
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/csharp/plasma-dll.dll.config	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/csharp/plasma-dll.dll.config	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,3 @@
+<configuration>
+<dllmap dll="libplasma-sharp" target="/usr/lib/cli/kdebindings-2.0/libplasma-sharp.so" />
+</configuration>

Modified: branches/kde4.2/packages/kdebindings/debian/libkde4-ruby1.8.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libkde4-ruby1.8.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libkde4-ruby1.8.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -2,13 +2,13 @@
 usr/lib/ruby/1.8/khtml/khtml.rb
 usr/lib/ruby/1.8/ktexteditor/ktexteditor.rb
 usr/lib/ruby/1.8/solid/solid.rb
-usr/lib/ruby/1.8/nepomuk/nepomuk.rb
+#usr/lib/ruby/1.8/nepomuk/nepomuk.rb
 usr/lib/ruby/1.8/soprano/soprano.rb
 usr/lib/ruby/1.8/*/khtml.so
 usr/lib/ruby/1.8/*/korundum4.so
 usr/lib/ruby/1.8/*/ktexteditor.so
 usr/lib/ruby/1.8/*/solid.so
-usr/lib/ruby/1.8/*/nepomuk.so
+#usr/lib/ruby/1.8/*/nepomuk.so
 usr/lib/ruby/1.8/*/soprano.so
 
 usr/lib/kde4/krossruby.so

Modified: branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.installcligac
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.installcligac	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libkhtml2.0-cil.installcligac	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1 +1 @@
-/usr/lib/cli/kdebindings-2.0/khtml.dll
+/usr/lib/cli/kdebindings-2.0/khtml-dll.dll

Added: branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libkimono4.1-cil.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1 @@
+usr/lib/kde4/kimonopluginfactory.so

Modified: branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.examples
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.examples	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.examples	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1,20 +1,15 @@
 ./ruby/plasma/examples/CMakeLists.txt
-./ruby/plasma/examples/applets
 ./ruby/plasma/examples/applets/CMakeLists.txt
-./ruby/plasma/examples/applets/tiger/contents/code
-./ruby/plasma/examples/applets/tiger/contents/code/main.rb
-./ruby/plasma/examples/applets/tiger/metadata.desktop
-./ruby/plasma/examples/applets/plasma_applet_ruby_webapplet/contents
-./ruby/plasma/examples/applets/plasma_applet_ruby_webapplet/contents/code
-./ruby/plasma/examples/applets/plasma_applet_ruby_webapplet/contents/code/main.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_webapplet/metadata.desktop
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/ui/calendar.ui
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/ui/timezonesConfig.ui
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/ui/analog_clock_config.ui
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/code/main.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/code/clockapplet.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/code/calendar.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/code/timezones_config.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/contents/code/analog_clock_config.rb
-./ruby/plasma/examples/applets/plasma_applet_ruby_clock/metadata.desktop
-
+./ruby/plasma/examples/applets/analog-clock/CMakeLists.txt
+./ruby/plasma/examples/applets/analog-clock/clockConfig.ui
+./ruby/plasma/examples/applets/analog-clock/plasma-applet-ruby-analogclock.desktop
+./ruby/plasma/examples/applets/analog-clock/clockapplet.rb
+./ruby/plasma/examples/applets/analog-clock/analog_clock_config.ui
+./ruby/plasma/examples/applets/analog-clock/timezonesConfig.ui
+./ruby/plasma/examples/applets/analog-clock/clock.rb
+./ruby/plasma/examples/applets/analog-clock/calendar.ui
+./ruby/plasma/examples/applets/digital-clock/CMakeLists.txt
+./ruby/plasma/examples/applets/digital-clock/digital_clock_config.ui
+./ruby/plasma/examples/applets/digital-clock/clock.rb
+./ruby/plasma/examples/applets/digital-clock/calendar.ui
+./ruby/plasma/examples/applets/digital-clock/plasma-ruby-digital-clock-default.desktop

Modified: branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libplasma-ruby1.8.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1,8 +1,2 @@
 /usr/lib/ruby/1.8/*/plasma_applet.so
-/usr/share/kde4/apps/plasma_scriptengine_ruby/package_ruboid.rb
-/usr/share/kde4/apps/plasma_scriptengine_ruby/applet.rb
-/usr/share/kde4/apps/plasma_scriptengine_ruby/data_engine.rb
-/usr/share/kde4/services/plasma-scriptengine-ruby-package.desktop
-/usr/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
-/usr/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
 /usr/lib/ruby/1.8/KDE/plasma.rb

Added: branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.installcligac
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.installcligac	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/libplasma2.0-cil.installcligac	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1 @@
+/usr/lib/cli/kdebindings-2.0/plasma-dll.dll

Modified: branches/kde4.2/packages/kdebindings/debian/libqt4-ruby1.8.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libqt4-ruby1.8.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libqt4-ruby1.8.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -8,11 +8,13 @@
 usr/lib/ruby/1.8/qtuitools/qtuitools.rb
 usr/lib/ruby/1.8/qtwebkit/qtwebkit.rb
 usr/lib/ruby/1.8/qtscript/qtscript.rb
+usr/lib/ruby/1.8/qttest/qttest.rb
 usr/lib/ruby/1.8/*/phonon.so
 usr/lib/ruby/1.8/*/qtruby4.so
 usr/lib/ruby/1.8/*/qtuitools.so
 usr/lib/ruby/1.8/*/qtwebkit.so
 usr/lib/ruby/1.8/*/qtscript.so
+usr/lib/ruby/1.8/*/qttest.so
 
 usr/bin/rbqtapi
 usr/bin/rbrcc

Modified: branches/kde4.2/packages/kdebindings/debian/libsmokeqt4-2.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/libsmokeqt4-2.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/libsmokeqt4-2.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -4,6 +4,8 @@
 usr/lib/libsmokeqt.so.2.0.0
 usr/lib/libsmokeqtscript.so.2
 usr/lib/libsmokeqtscript.so.2.0.0
+usr/lib/libsmokeqttest.so.2
+usr/lib/libsmokeqttest.so.2.0.0
 usr/lib/libsmokeqtuitools.so.2
 usr/lib/libsmokeqtuitools.so.2.0.0
 usr/lib/libsmokeqtwebkit.so.2

Modified: branches/kde4.2/packages/kdebindings/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/not-installed	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/not-installed	2008-12-05 20:22:06 UTC (rev 12854)
@@ -50,6 +50,7 @@
 ./usr/lib/libsmokeplasma.so
 ./usr/lib/libsmokeqtscript.so
 ./usr/lib/libsmokeqt.so
+./usr/lib/libsmokeqttest.so
 ./usr/lib/libsmokeqtuitools.so
 ./usr/lib/libsmokeqtwebkit.so
 ./usr/lib/libsmokesolid.so


Property changes on: branches/kde4.2/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
___________________________________________________________________
Name: svn:executable
   - *

Added: branches/kde4.2/packages/kdebindings/debian/patches/06_build_smokephonon.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/06_build_smokephonon.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,60 @@
+This patch is HACK to make kdebindings build. The resulting
+PhononSmoke is useless probably.
+--- a/smoke/CMakeLists.txt
++++ b/smoke/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ OPTION(ENABLE_QTSCRIPT_SMOKE "build QtScriptSmoke" ON)
+ OPTION(ENABLE_QTUITOOLS_SMOKE "build QtUiToolsSmoke" ON)
+ OPTION(ENABLE_QTTEST_SMOKE "build QtTestSmoke" ON)
+-OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" OFF)
++OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" ON)
+ 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")

Added: branches/kde4.2/packages/kdebindings/debian/patches/07_fix_kpythonpluginfactory_build.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/07_fix_kpythonpluginfactory_build.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/patches/07_fix_kpythonpluginfactory_build.diff	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,18 @@
+--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
++++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+@@ -18,6 +18,7 @@
+    Boston, MA 02111-1307, USA.
+ */
+ 
++#include <Python.h>
+ #include <QtCore/QCoreApplication>
+ #include <QFileInfo>
+ #include <QDir>
+@@ -25,7 +26,6 @@
+ #include <klibloader.h>
+ #include <kstandarddirs.h>
+ #include <kcmodule.h>
+-#include <Python.h>
+ #include <kcomponentdata.h>
+ #include <kdebug.h>
+ 

Added: branches/kde4.2/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,8 @@
+--- a/csharp/plasma/examples/applets/CMakeLists.txt
++++ b/csharp/plasma/examples/applets/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-add_subdirectory( tiger )
++#add_subdirectory( tiger )
+ add_subdirectory( plasmaclock )
+-add_subdirectory( analog-clock )
++#add_subdirectory( analog-clock )

Modified: branches/kde4.2/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/series	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/patches/series	2008-12-05 20:22:06 UTC (rev 12854)
@@ -3,4 +3,7 @@
 03_csharp_dont_use_qyotoshared_directly.diff
 04_fix_ruby_requires.diff
 05_rbqtapi_ruby1.8.diff
+06_build_smokephonon.diff
+07_fix_kpythonpluginfactory_build.diff
+08_csharp_plasma_examples.diff
 #99_enable_okular_plasma.diff

Added: branches/kde4.2/packages/kdebindings/debian/plasma-scriptengine-kimono.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/plasma-scriptengine-kimono.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/plasma-scriptengine-kimono.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -0,0 +1,3 @@
+usr/share/kde4/apps/plasma_scriptengine_kimono/PlasmaScriptengineKimono.dll
+usr/share/kde4/services/plasma-scriptengine-kimono-applet.desktop
+usr/share/kde4/services/plasma-scriptengine-kimono-dataengine.desktop

Modified: branches/kde4.2/packages/kdebindings/debian/python-kde4-doc.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/python-kde4-doc.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/python-kde4-doc.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1,2 +1,2 @@
-usr/share/doc/kde4/HTML/en/pykde4/
+#usr/share/doc/kde4/HTML/en/pykde4/
 usr/share/kde4/apps/pykde4/examples

Modified: branches/kde4.2/packages/kdebindings/debian/python-kde4.install
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/python-kde4.install	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/python-kde4.install	2008-12-05 20:22:06 UTC (rev 12854)
@@ -1,3 +1,4 @@
+usr/lib/kde4/kpythonpluginfactory.so
 usr/lib/python2.*/site-packages/PyKDE4/*.so
 usr/lib/python2.*/site-packages/PyKDE4/__init__.py
 usr/lib/python2.*/site-packages/PyKDE4/pykdeconfig.py
@@ -2 +3,2 @@
 usr/lib/kde4/krosspython.so
+usr/share/kde4/apps/pykde4/kde4.py

Modified: branches/kde4.2/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/rules	2008-12-05 20:19:01 UTC (rev 12853)
+++ branches/kde4.2/packages/kdebindings/debian/rules	2008-12-05 20:22:06 UTC (rev 12854)
@@ -28,6 +28,7 @@
 cmake_flags := \
 	-DCMAKE_SKIP_RPATH=true				\
 	-DCMAKE_BUILD_TYPE=Debian			\
+	-DCMAKE_USE_RELATIVE_PATHS=ON			\
 	-DCMAKE_INSTALL_PREFIX=/usr			\
 	-DCMAKE_VERBOSE_MAKEFILE=ON			\
 							\
@@ -52,9 +53,9 @@
 cmake_flags += \
 	-DENABLE_PYKDE4=OFF\
 	-DENABLE_SOPRANO_SMOKE=ON \
-    -DENABLE_NEPOMUK_SMOKE=ON \
-    -DENABLE_NEPOMUK_RUBY=ON \
-    -DENABLE_PHONON_RUBY=ON \
+	-DENABLE_NEPOMUK_SMOKE=ON \
+	-DENABLE_NEPOMUK_RUBY=ON \
+	-DENABLE_PHONON_RUBY=ON \
 	-DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
 	-DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH) \
 	$(MONOFLAGS)
@@ -136,16 +137,16 @@
 	$(MAKE) -C $(objdir) install DESTDIR=$(CURDIR)/debian/tmp
 
 install: $(MONOTARGET) install-generic
-	rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
+#	rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
 	install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
 	    debian/python-kde4-dev/usr/bin/pykdeuic4
 
 monospecific: install-generic install-pre 
 	#khtml
 	install -d debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0
-	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/khtml.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
+	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/khtml-dll.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
 	install -D -m 644 $(DEST_USR_LIB)/libkhtml-sharp.so debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
-	install -D -m 644 $(CURDIR)/debian/csharp/khtml.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
+	install -D -m 644 $(CURDIR)/debian/csharp/khtml-dll.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
 	#qyoto
 	install -d debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4
 	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qt-dotnet.dll debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
@@ -158,9 +159,14 @@
 	install -D -m 644 $(CURDIR)/debian/csharp/kde-dotnet.dll.config debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
 	#nepomuk
 	install -d debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
-	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/nepomuk.dll debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/nepomuk-dll.dll debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
 	install -D -m 644 $(DEST_USR_LIB)/libnepomuk-sharp.so debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
-	install -D -m 644 $(CURDIR)/debian/csharp/nepomuk.dll.config debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+	install -D -m 644 $(CURDIR)/debian/csharp/nepomuk-dll.dll.config debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+	# plasma
+	install -d debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
+	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/plasma-dll.dll debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
+	install -D -m 644 $(DEST_USR_LIB)/libplasma-sharp.so debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
+	install -D -m 644 $(CURDIR)/debian/csharp/plasma-dll.dll.config debian/libplasma2.0-cil/usr/lib/cli/kdebindings-2.0
 	#qtscript
 	install -d debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
 	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtscript.dll debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2

More information about the pkg-kde-commits mailing list