rev 12929 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-13 09:03:18 +0000 (Sat, 13 Dec 2008)
New Revision: 12929

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdebase-workspace/debian/not-installed
   branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
Log:
New snapshot. Do not depend on bindings at build time

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-13 04:11:56 UTC (rev 12928)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-13 09:03:18 UTC (rev 12929)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.1.85+svn895745-0r1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.1.85+svn896300-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -47,8 +47,13 @@
 
   * Allow kwrited to install with setgid utmp.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Dec 2008 04:23:47 +0200
+  +++ Changes by David Palacio:
 
+  * 23_do_not_depend_on_bindings.diff: do no depend on python-kde4 at build
+    time (circular build dependency).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Dec 2008 10:48:26 +0200
+
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-13 04:11:56 UTC (rev 12928)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-13 09:03:18 UTC (rev 12929)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
  kdelibs5-dev (>= 4:4.1.82+svn894637), libplasma-dev (>= 4:4.1.82+svn894637),
  kdepimlibs5-dev (>= 4:4.1.82+svn894631), libboost-dev,
- python-support (>= 0.6),
+ python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev (>= 0.7.0~),
  libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,

Modified: branches/kde4.2/packages/kdebase-workspace/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/not-installed	2008-12-13 04:11:56 UTC (rev 12928)
+++ branches/kde4.2/packages/kdebase-workspace/debian/not-installed	2008-12-13 09:03:18 UTC (rev 12929)
@@ -7,7 +7,6 @@
 ./usr/share/kde4/apps/plasma_scriptengine_python/pyappletscript.pyc
 ./usr/share/kde4/apps/plasma_scriptengine_python/pydataengine.pyc
 ./usr/share/kde4/apps/plasma_scriptengine_python/plasma_importer.pyc
-./usr/lib/libkhotkeysprivate.so
 ./usr/lib/python2.5/site-packages/PyKDE4/plasmascript.pyc
 
 # Gets renamed by python-support

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2008-12-13 04:11:56 UTC (rev 12928)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/23_do_not_depend_on_bindings.diff	2008-12-13 09:03:18 UTC (rev 12929)
@@ -1,13 +1,14 @@
-Index: b/CMakeLists.txt
-===================================================================
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,7 +46,7 @@
+@@ -46,9 +46,9 @@
  
  macro_optional_find_package(PyKDE4)
  set(PythonSupport_FOUND FALSE)
 -if(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
 +if(PYTHONLIBRARY_FOUND)
    set(PythonSupport_FOUND TRUE)
- endif(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+-endif(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
++endif(PYTHONLIBRARY_FOUND)
  
+ macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support" "http://techbase.kde.org/Development/Languages/Python" FALSE "" "Needed to build plasma scriptengine for Python")
+ #### End Python support ####