Merge lp:~benste/kdeedu/bugfix-lp-698056 into lp:~kubuntu-packagers/kubuntu-packaging/kdeedu

[benste]

new attempt, fixing the simple dependency issue, and using the kubuntu changelog style :-)

[Harald Sitter (apachelogger)]

As supsected in the bug report the change was not all that right, in fact Parley's scripting thingy uses kross which can be either krosspython or krossruby, the package now recommends both. Additionally the default scripts use pykde rather than pyqt, fixed that too.

Anyhow, there is cool things to be learned from this:
Since Parley still works without the python magic, depends is not the appropriate relation, but recommends is. The reason for this is that someone might want to install without the python packages and could still use Parley quite normal (well, except for the error), however for the average user recommends will just like depends install the packages and thus provide a good user experience :)
Recommends is a weaker relationship than depends, and for optional scripting capabilities usually recommends is what ought to be used (depends on the particular case at hand of course).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-05 15:38:20 +0000
+++ debian/changelog	2011-01-06 16:18:11 +0000
@@ -1,3 +1,9 @@
+kdeedu (4:4.5.95-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+  * debian/control: add python-qt4 dependency for parley (LP:#698056)
+
+ -- Benedict Stein <[e-mail]>  Thu, 06 Jan 2011 15:53:30 +0100
+
 kdeedu (4:4.5.95-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-12-23 13:47:24 +0000
+++ debian/control	2011-01-06 16:18:11 +0000
@@ -522,7 +522,7 @@
 
 Package: parley
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl, python-qt4,
  parley-data (>= ${source:Version}), kdeedu-kvtml-data (= ${source:Version})
 Replaces: parley-data (<< 4:4.1.86)
 Breaks: parley-data (<< 4:4.1.86)