[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.4-1-8-g65edfa5

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 65edfa5001cefc4fae25afa4e7c0564c556d1e33
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jul 8 00:19:23 2011 +0300

    Switch plasma-scriptengine-python to dh_python2.
    
    Follow python-kde4 4:4.6.80 and switch plasma-scriptengine-python from
    python-support to dh_python2. Otherwise, python fails to find
    PyKDE4.plasmascript. (Closes: #633000)
---
 debian/changelog |    5 +++++
 debian/control   |    5 +++--
 debian/rules     |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed6b1e5..d7f6b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ kdebase-workspace (4:4.6.5-0r1) UNRELEASED; urgency=low
   * Drop kdebase-workspace-dbg and -dev lintian overrides files, no longer
     needed.
 
+  [ Modestas Vainius ]
+  * Follow python-kde4 4:4.6.80 and switch plasma-scriptengine-python from
+    python-support to dh_python2. Otherwise, python fails to find
+    PyKDE4.plasmascript. (Closes: #633000)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jul 2011 08:12:18 +0200
 
 kdebase-workspace (4:4.6.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5e5227d..9ce4cec 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.5),
  libfontconfig-dev,
  libggadget-1.0-dev (>= 0.11.2), libggadget-qt-1.0-dev (>= 0.11.2),
  libglu1-mesa-dev, libqt4-opengl-dev,
- python-support (>= 0.6), python-dev,
+ python-dev (>= 2.6.6-3~),
  shared-desktop-ontologies,
  libpam0g-dev,
  libnm-util-dev (>= 0.7) [linux-any],
@@ -34,6 +34,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.5),
  libdmtx-dev,
  libqtwebkit-dev
 Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdebase-workspace.git
@@ -192,7 +193,7 @@ Description: Ruby script engine for Plasma
 
 Package: plasma-scriptengine-python
 Architecture: all
-Depends: ${python:Depends}, python-kde4 (>= 4:4.2.0), ${misc:Depends},
+Depends: ${python:Depends}, python-kde4 (>= 4:4.6.80), ${misc:Depends},
  python-qt4-dbus
 Description: Python script engine for Plasma
  This package provides the Python script engine for Plasma. You have to install
diff --git a/debian/rules b/debian/rules
index 688968f..9315e3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-dh = --with=python-support
+dh = --with=python2
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_addsubst_allLibraries = kdebase-workspace-dev

-- 
KDE Base Workspace module packaging