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 :-)

[lp:~benste/kdeedu/bugfix-lp-698056]

122. By benste on 2011-01-06

removed changelog for , entry :-)

[Jonathan Riddell (jr)]

lovely thanks, merging

review: Approve

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-05 15:38:20 +0000
+++ debian/changelog	2011-01-06 16:07:37 +0000
@@ -1,3 +1,15 @@
+kdeedu (4:4.5.95-0ubuntu1~ppa3) maverick; urgency=low
+
+  * /debian/control added missing , for last commit in depend
+
+ -- Benedict Stein <[e-mail]>  Thu, 06 Jan 2011 17:01:10 +0100
+
+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:07:37 +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)