diff -pruN 4:4.6.3-2/CMakeLists.txt 4:4.6.3-2ubuntu2/CMakeLists.txt
--- 4:4.6.3-2/CMakeLists.txt	2011-06-07 16:50:43.000000000 +0100
+++ 4:4.6.3-2ubuntu2/CMakeLists.txt	2011-06-07 16:40:27.000000000 +0100
@@ -97,9 +97,10 @@ if( EIGEN2_FOUND )
 endif( EIGEN2_FOUND )
 
 macro_optional_add_subdirectory(kalzium)
-if (EIGEN2_FOUND AND NOT WIN32)
+macro_optional_find_package(OpenGL)
+if (OPENGL_FOUND AND EIGEN2_FOUND AND NOT WIN32)
   macro_optional_add_subdirectory(step)
-endif (EIGEN2_FOUND AND NOT WIN32)
+endif (OPENGL_FOUND AND EIGEN2_FOUND AND NOT WIN32)
 macro_optional_add_subdirectory(doc)
 
 include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff -pruN 4:4.6.3-2/debian/changelog 4:4.6.3-2ubuntu2/debian/changelog
--- 4:4.6.3-2/debian/changelog	2011-06-05 13:43:23.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/changelog	2011-06-07 12:36:24.000000000 +0100
@@ -1,3 +1,38 @@
+kdeedu (4:4.6.3-2ubuntu2) oneiric; urgency=low
+
+  * Re-add and refresh kubuntu_opengl.diff, accidentally dropped in
+    the last upload.
+  * Switch kdeedu to arch-any and drop step from dependencies on armel.
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Tue, 07 Jun 2011 13:27:51 +0200
+
+kdeedu (4:4.6.3-2ubuntu1) oneiric; urgency=low
+
+  [ Rohan Garg ]
+  * Merge from debian, remaining changes,
+      - Drop from build-deps: r-base-core (in universe)
+      - Keep in build-deps: libgmm-dev, libsbigudrv-dev, libindi-dev,
+        libx11-dev
+      - kdeedu doesn't depend on kiten and blinken
+      - cantor-backend-sage doesn't recommend sagemath
+      - kstars doesn't suggest indi
+      - kstars recommends xplanet
+      - Drop python marble bindings since they don't build right now
+        + Drop python-sip-dev, python-support, python-dev, python-qt4,
+          python-kde4, python-qt4-dev, python-kde4-dev from build depends
+      - Don't build cantor-backend-r as we don't have the right build-depends
+      - Parley recommends python-kde4, krossruby and libkde4-ruby
+      - Add a dummy package for kalgebra-mobile
+      - Add kalzium.install.armel which doesn't include compound viewer
+      - Don't build step for ARM
+      - Keep kalgebra-common
+      - Keep dependency on OpenBabel (is only temporarily removed in Debian)
+
+  [ Philip Muškovac ]
+  * Update Vcs- links as the branch is owned by kubuntu-packagers now
+
+ -- Rohan Garg <rohangarg@kubuntu.org>  Mon, 06 Jun 2011 19:29:58 +0200
+
 kdeedu (4:4.6.3-2) unstable; urgency=low
 
   [ Pino Toscano ]
@@ -79,6 +114,271 @@ kdeedu (4:4.6.2-1) experimental; urgency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 27 Apr 2011 12:23:40 +0300
 
+kdeedu (4:4.6.2-0ubuntu2) natty; urgency=low
+
+  [ Tarun Kumar Mall ]
+  * New upstream release
+
+  [ Jonathan Riddell ]
+  * Don't build opengl compontents on ARM
+  * Add kubuntu_01_opengl.diff to stop building step which requires opengl
+  * Build step on non-arm arches only
+  * Add kalzium.install.armel which doesn't include compound viewer
+  * Add build-dep on libx11-dev
+
+ -- Tarun Kumar Mall <c2tarun@gmail.com>  Mon, 04 Apr 2011 18:12:13 +0000
+
+kdeedu (4:4.6.1a-0ubuntu2) natty; urgency=low
+
+  * Split kalgebra-mobile and kalgebra-common packages. (LP: #683439)
+
+ -- Tarun Kumar Mall <c2tarun@gmail.com>  Wed, 16 Mar 2011 11:20:06 +0000
+
+kdeedu (4:4.6.1a-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Thu, 03 Mar 2011 16:50:17 +0100
+
+kdeedu (4:4.6.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * marble-data and marble-plugins conflict libmarblewidget10
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 01 Feb 2011 19:15:44 +0000
+
+kdeedu (4:4.6.0-0ubuntu2) natty; urgency=low
+
+  [ Jonathan Riddell ]
+  * Update kde-sc-dev-latest version
+
+  [ Scott Kitterman ]
+  * Drop obsolete build-depends on sip4
+  * Drop unneeded build-depends on python-sip4
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 26 Jan 2011 20:54:41 -0500
+
+kdeedu (4:4.6.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+  * Remove cdbs version from build-depends for easier backporting
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Jan 2011 13:01:24 +0000
+
+kdeedu (4:4.5.95-0ubuntu1) natty; urgency=low
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+  [ Benedict Stein ]
+  * debian/control: add python-kde4 as recommends for parley (LP:#698056)
+
+  [ Harald Sitter ]
+  * Also recommend krossruby and libkde4-ruby as plugins can be anything and
+    Parley currently does not handle missing frameworks (at all)
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Thu, 06 Jan 2011 18:23:11 +0100
+
+kdeedu (4:4.5.90-0ubuntu1) natty; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 22 Dec 2010 16:22:08 +0000
+
+kdeedu (4:4.5.85-0ubuntu2) natty; urgency=low
+
+  * Fix double/qreal issue in rocs/src/Core/Data.h to fix FTBFS on armel
+    - Fix thanks to Harald Sitter (and already committed upstream)
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 13 Dec 2010 15:26:52 -0500
+
+kdeedu (4:4.5.85-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 07 Dec 2010 13:27:15 +0000
+
+kdeedu (4:4.5.80-0ubuntu1) natty; urgency=low
+
+  * New upstream beta release
+  * Remove kstars_unswap_fields_in_wizard.diff now upstream
+  * Don't use -DEXPERIMENTAL_PYTHON_BINDINGS currently broken
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 24 Nov 2010 13:48:35 +0000
+
+kdeedu (4:4.5.3-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+  * Add DEB_DH_SCOUR_ARGS := -Xflag, scour does not like these svg files
+  * Build-dep on cdbs 0.4.89ubuntu4 required for the above
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Nov 2010 16:12:30 +0000
+
+kdeedu (4:4.5.2-0ubuntu2) natty; urgency=low
+
+  * Bump python-kde4 build-dep to 4:4.5.2+svn1188326-0ubuntu1
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Fri, 22 Oct 2010 22:52:49 +0200
+
+kdeedu (4:4.5.2-0ubuntu1) natty; urgency=low
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+  [ Felix Geyer ]
+  * Merge with Debian git, remaining changes:
+    - Drop from build-deps: openbabel, r-base-core (are in universe)
+    - Keep in build-deps: libgmm-dev, libsbigudrv-dev, python-kde4-dev,
+      python-qt4-dev, sip4, libindi-dev
+    - kdeedu doesn't depend on kiten and blinken
+    - cantor-backend-sage doesn't recommend sagemath
+    - kstars doesn't suggest indi
+    - kstars recommends xplanet
+    - Keep python marble bindings and set -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE
+      in debian/rules
+    - Don't build cantor-backend-r as we don't have the right build-depends
+    - Add kubuntu_01_arm_needs_qreal.diff
+  * Drop librocslib4 and librocslib-dev packages and move the libs to rocs.
+  * Move GpsdPositionProviderPlugin.so from marble to marble-plugins.
+  * Move python-marble to section python.
+
+  [ Alessandro Ghersi ]
+  * Build against kdelibs5-dev 4.5.2-0ubuntu1 for libkutils4 transition
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Wed, 20 Oct 2010 19:23:41 +0200
+
+kdeedu (4:4.5.1-0r2) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  [ José Manuel Santamaría Lema ]
+  * Refreshed 02_no_install_rpath_use_link_path.diff patch.
+  * Update installed files.
+  * Add build depends libavogadro-dev and libglew1.5-dev.
+
+  [ George Kiagiadakis ]
+  * Change my email address in uploaders.
+  * Update symbols files.
+  * Update lintian overrides.
+  * Bump build dependency on kdelibs5-dev to version 4:4.5.
+  * Add libxrender-dev to build dependencies.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 02 Sep 2010 21:17:18 +0300
+
+kdeedu (4:4.5.1-0ubuntu2) maverick; urgency=low
+
+  * Restore debian/patches/kubuntu_01_arm_needs_qreal.diff lost during the
+    update to the new upstream release in order to fix FTBFS on armel
+  * Update symbols (debian/libmarblewidget10.symbols) for 4.5.1
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 05 Sep 2010 01:57:30 -0400
+
+kdeedu (4:4.5.1-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+    - Bump build-depends
+    - Update libmarblewidget10.install
+    - Update python-marble.install
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Tue, 31 Aug 2010 01:06:47 +0200
+
+kdeedu (4:4.5.0b-0ubuntu1) maverick; urgency=low
+
+  * New tar from upstream
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 04 Aug 2010 23:20:05 +0100
+
+kdeedu (4:4.5.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+    - Bump kde-sc-dev-latest to 4.5.0
+
+ -- Rohan Garg <rohangarg@ubuntu.com>  Fri, 30 Jul 2010 22:59:48 +0530
+
+kdeedu (4:4.4.92-0ubuntu2) maverick; urgency=low
+
+  * Build with kde4libs 4.4.92-0ubuntu3 for qtwebkit transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Jul 2010 09:38:36 +0100
+
+kdeedu (4:4.4.92-0ubuntu1) maverick; urgency=low
+
+  [ Alessandro Ghersi ]
+  * New upstream rc release
+    - Bump kde-sc-dev-latest to 4.4.92
+
+  [ Jonathan Riddell ]
+  * Build with libgmm-dev instead of libgmm++-dev, that's the version
+    in main
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Fri, 09 Jul 2010 04:23:24 +0200
+
+kdeedu (4:4.4.90-0ubuntu1) maverick; urgency=low
+
+  * New upstream rc release
+    - Bump kde-sc-dev-latest to 4.4.90
+    - Update install files
+    - Add ${misc:Depends} to python-marble and kstars dependencies
+    - Add python-dev, python-sip, python-qt4, python-kde4 to build-deps
+      to build python-marble
+    - Use dh_pysupport -p$(cdbs_curpkg) in rules for python-marble
+    - Update not-installed file
+    - Remove TODO.source no longer need
+    - Remove README.source
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Thu, 24 Jun 2010 01:14:40 +0200
+
+kdeedu (4:4.4.85-0ubuntu4) maverick; urgency=low
+
+  * Build-dep on libindi >= 0.6.1-0ubuntu2 for pkg-config fix
+  * Add libgps-dev build-depends
+  * Update symbol files
+  * Re-enable python-marble
+  * Use dh_sip and dh_pysupport for python-marble
+  * add python-sip-dev, python-support build-depends
+  * Swap libgmm-dev build-dep for libgmm++-dev
+  * Add build-dep on libavogadro-dev
+  * Add build-dep on xplanet and kstars recommends xplanet
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 11 Jun 2010 12:17:03 +0100
+
+kdeedu (4:4.4.85-0ubuntu3) maverick; urgency=low
+
+  * Remove usr/lib/libcompoundviewer.so.4 and libcompoundviewer.so.4.5.0 from
+    debian/kalzium.install to fix FTBFS
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 11 Jun 2010 00:11:03 -0400
+
+kdeedu (4:4.4.85-0ubuntu2) maverick; urgency=low
+
+  * libmarblewidget10 conflicts/replaces on libmarblewidget4
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Wed, 09 Jun 2010 20:26:20 +0200
+
+kdeedu (4:4.4.85-0ubuntu1) maverick; urgency=low
+
+  * New upstream beta release:
+    - Bump kde-sc-dev-latest build-dep version to 4.4.85
+    - Rename libmarblewidget4 to libmarblewidget10
+    - Rename libmarblewidget4.install to libmarblewidget10.install
+      - Change lib version to 0.10.0 and bump lib soversion to 10
+    - Rename libmarblewidget4.symbols to libmarblewidget10.symbols
+    - libmarble-dev depends on libmarblewidget10
+    - Update install files
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Tue, 08 Jun 2010 03:46:44 +0200
+
+kdeedu (4:4.4.80-0ubuntu1) maverick; urgency=low
+
+  * New upstream beta release:
+    - Bump kde-sc-dev-latest build-dep version to 4.4.80
+    - Update various .install files
+    - Add build-depends on libxrender-dev and libglew1.5-dev
+    - Add new librocslib4 and librocslib-dev binary packages
+  * Switch to source format 3.0 (quilt)
+    - Bump debhelper build-depend version to 7.3.16 or greater
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Tue, 25 May 2010 11:29:28 -0400
+
 kdeedu (4:4.4.5-2) unstable; urgency=low
 
   [ Modestas Vainius ]
@@ -132,6 +432,27 @@ kdeedu (4:4.4.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 01 Jun 2010 01:15:15 +0300
 
+kdeedu (4:4.4.3-1ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+      - Build against liboost-python1.42-dev
+      - remove indi from kdeedu (external package)
+      - Drop from build-deps libgps-dev, xplanet (are in Universe)
+      - Keep in build-deps libgmm-dev, libsbigudrv-dev, python-kde4-dev,
+        python-qt4-dev, sip4, libindi-dev
+      - Kdeedu not depend on kiten, blinken (in universe), indi
+        (kstars conflict)
+      - kturtle description - change to be more reflective of pseudo-logo
+        language
+      - Keep python marble bindings, we should try to build python-marble
+        in KDE 4.4 packaging and keep -DEXPERIMENTAL_PYTHON_BINDINGS=FALSE in
+        rules for switching easily to TRUE when we want try to build it
+      - keep docs path in usr/share/doc/kde/HTML
+      - cantor-backend-sage not recommends sagemath
+      - Don't build cantor-backend-r we don't have the right build-depends
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Thu, 20 May 2010 05:54:23 +0200
+
 kdeedu (4:4.4.3-1) unstable; urgency=low
 
   * New upstream release.
@@ -146,6 +467,13 @@ kdeedu (4:4.4.3-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 01 May 2010 23:37:52 +0300
 
+kdeedu (4:4.4.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Bump build-depends
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 04 May 2010 12:14:33 +0100
+
 kdeedu (4:4.4.2-1) experimental; urgency=low
 
   * New upstream release:
@@ -212,6 +540,146 @@ kdeedu (4:4.4.2-1) experimental; urgency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 05 Apr 2010 23:15:28 +0300
 
+kdeedu (4:4.4.2-0ubuntu2) lucid; urgency=low
+
+  * Add kubuntu_02_fix_cantor_part_destination.diff (LP: #554865)
+    - Update cantor.install
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Sun, 04 Apr 2010 01:23:54 +0200
+
+kdeedu (4:4.4.2-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Bump build-depends
+    - Update cantor.install
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Mon, 29 Mar 2010 01:12:11 +0200
+
+kdeedu (4:4.4.1-0ubuntu3) lucid; urgency=low
+
+  * debian/control: fixing typo in rocs description (LP: #538212)
+
+ -- Richard A. Johnson <nixternal@ubuntu.com>  Sun, 28 Mar 2010 13:10:09 -0500
+
+kdeedu (4:4.4.1-0ubuntu2) lucid; urgency=low
+
+  * Build-dep on libreadline-dev not libreadline5-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Mar 2010 13:43:50 +0000
+
+kdeedu (4:4.4.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Bump build dep versions
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Sun, 28 Feb 2010 05:22:21 +0100
+
+kdeedu (4:4.4.0-0ubuntu1) lucid; urgency=low
+
+  [ Alessandro Ghersi ]
+  * New upstream release
+    - Bump build dep versions
+
+  [ Jonathan Thomas ]
+  * Update kross dependency for parley to reflect the new package name, krosspython
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Fri, 05 Feb 2010 00:14:28 +0100
+
+kdeedu (4:4.3.98-0ubuntu1) lucid; urgency=low
+
+  [ Christian Mangold ]
+  * New upstream release candidate
+    - Bump build dep versions
+
+  [ Alessandro Ghersi ]
+  * Bump Qt to 4.6.1
+
+ -- Christian Mangold <neversfelde@ubuntu.com>  Tue, 02 Feb 2010 01:50:39 +0100
+
+kdeedu (4:4.3.95-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Bump build-deps
+    - Update marble-data.install
+    - Update cantor.install
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Wed, 20 Jan 2010 18:33:49 +0100
+
+kdeedu (4:4.3.90-0ubuntu1) lucid; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jan 2010 13:36:24 +0000
+
+kdeedu (4:4.3.85-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Bump build-deps
+    - Drop cancel_docs.diff no longer need
+    - Add libattica-dev to build-deps
+    - Update install files to readd docs
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Sat, 19 Dec 2009 21:52:54 +0100
+
+kdeedu (4:4.3.80-0ubuntu3) lucid; urgency=low
+
+  * Removing r-base-core from deps because it is in universe. This needs to be
+    in main!
+
+ -- Richard A. Johnson <nixternal@ubuntu.com>  Tue, 15 Dec 2009 11:17:38 -0600
+
+kdeedu (4:4.3.80-0ubuntu2) lucid; urgency=low
+
+  * Fixed previous TODO
+    - Add new packages - see list-missing output in bzr
+  * control: Added 2 new binary packages, cantor and rocs
+    - cantor: added libspectre-dev and r-base-core to Build-Depends
+      time.
+    - rocs: added info in control file, no new deps
+    - Added cantor and rocs to kdeedu depends
+  * cantor.install: Added new package and all files
+  * rocs.install: Added new package and all files
+  * marble-data.install: Added new weather data images
+  * kalzium.install: Added 3 new plasma widgets
+    - concentrationCalculator
+    - gasCalculator
+    - nuclearCalculator
+  * not-installed: all work under "Devel symlinks without devel headers"
+    section:
+    - Added ./usr/lib/libanalitza.so
+    - Moved ./usr/lib/libanalitzagui.so up for aesthetic purposes
+    - Added ./usr/lib/libcantorlibs.so
+  * Added kubuntu_02_fix_cantor_r_backend_kio_ftbfs.diff - adds KDE4 REQUIRED
+    KIO to backends/R/rserver/CMakeLists.txt file. Stops cantor from FTBFS due
+    to undefined reference to KIO::NetAccess::del in rserver.cpp. Contacted
+    upstream providing them information on this.
+
+ -- Richard A. Johnson <nixternal@ubuntu.com>  Tue, 15 Dec 2009 00:05:42 -0600
+
+kdeedu (4:4.3.80-0ubuntu1) lucid; urgency=low
+
+  [ Mackenzie Morgan ]
+  * New upstream release (4.4 beta 1)
+  * Removed 00_kfreebsd.diff and kubuntu_03_fix_kstars_buffer_overrun.diff 
+    as already upstream
+  * cancel_docs.diff:
+    - Don't build docs this time since it hangs the build
+  * Commented out docs from debian/*.install files due to above
+
+  [ Scott Kitterman ]
+  * Remove usr/share/kde4/apps/parley/parleypracticeui.rc from
+    parley-data.install (dropped upstream)
+  * Bump .so version from 4.3.0 to 4.4.0 for libanalitza.so,
+    libcompoundviewer.so, libSatLib.so, libkdeeduui.so,
+    libkeduvocdocument.so, libscience.so, libkiten.so, and
+    libmarblewidget.so
+  * Add usr/liblibanalitzagui.so.4/4.4.0 to kalgebra.install
+  * Tighten up Qt build-depends (> 4.6.0)
+
+  * TODO: Add new packages - see list-missing output in bzr
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 08 Dec 2009 05:32:00 +0000
+
 kdeedu (4:4.3.4-1) unstable; urgency=low
 
   * New upstream release.
@@ -245,6 +713,73 @@ kdeedu (4:4.3.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 09 Dec 2009 00:24:06 +0200
 
+kdeedu (4:4.3.3-0ubuntu3) lucid; urgency=low
+
+  * Add missing epoch to Qt build-depends version
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 25 Nov 2009 13:47:00 +0000
+
+kdeedu (4:4.3.3-0ubuntu2) lucid; urgency=low
+
+  * Rebuild against Qt 4.6 rc 1, which is binary incompatible with 4.6
+    beta
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 24 Nov 2009 08:59:53 +0000
+
+kdeedu (4:4.3.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+  * Merge with Debian testing remaining changes:
+    - debian/control:
+      - Build against liboost-python1.38-dev
+      - remove indi from kdeedu (external package)
+      - Drop from build-deps libgps-dev, xplanet (are in Universe)
+      - Keep in build-deps libgmm-dev, libsbigudrv-dev, python-kde4-dev,
+        python-qt4-dev, sip4, libindi-dev
+      - Keep our Conflict/Replace on -kde4 packages
+      - Kdeedu not depend on kiten, blinken (in universe), indi
+        (kstars conflict)
+      - kturtle description - change to be more reflective of pseudo-logo
+        language
+      - Keep python marble bindings, we should try to build python-marble
+        in KDE 4.4 packaging and keep -DEXPERIMENTAL_PYTHON_BINDINGS=FALSE in
+        rules for switching easily to TRUE when we want try to build it
+    - debian/step.install:
+      - step.desktop go in usr/share/applications/kde4/step.desktop
+      - keep docs path in usr/share/doc/kde/HTML
+    - Add kubuntu_01_marble_desktop_tryexec.diff:
+      - Adds TryExec statement to marble.desktop as libmarble4 depends
+        on marble-data containing the .desktop but not the binary.
+
+  [Michal Zajac]
+   * Parley now recommends libkrosspython0 (closes LP: #484802)
+   * Added few lines to parley-data.install to prevent
+     wiktionary_sound.{py,desktop} from installing since it does not work.
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Thu, 12 Nov 2009 03:44:27 +0100
+
+kdeedu (4:4.3.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Lisandro Damián Nicanor Pérez Meyer:
+
+  * Changes to build and ship Marble's Qt Designer's plugin.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Switch from libreadline5-dev to libreadline-dev.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 07 Oct 2009 21:22:48 +0200
+
+kdeedu (4:4.3.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add kubuntu_03_fix_kstars_buffer_overrun.diff from upstream to fix the
+    overrun in satlib. Can be removed in KDE 4.4, if not earlier. Fixes
+    LP: #456904 (B.K.O. #202212)
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Thu, 22 Oct 2009 14:33:59 -0400
+
 kdeedu (4:4.3.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -259,6 +794,13 @@ kdeedu (4:4.3.2-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 07 Oct 2009 21:22:48 +0200
 
+kdeedu (4:4.3.2-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+    - Bump buil-deps
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Sat, 03 Oct 2009 18:35:43 +0200
+
 kdeedu (4:4.3.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -268,6 +810,13 @@ kdeedu (4:4.3.1-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 06 Sep 2009 16:48:24 +0200
 
+kdeedu (4:4.3.1-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * Bump version of KDE build-deps to 4.3.1
+
+ -- Christian Mangold <neversfelde@ubuntu.com>  Sat, 29 Aug 2009 11:35:30 +0200
+
 kdeedu (4:4.3.0-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
@@ -285,6 +834,29 @@ kdeedu (4:4.3.0-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 04 Aug 2009 09:06:45 +0200
 
+kdeedu (4:4.3.0-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * Bump version of kdelibs5-dev build-dep to 4.3.0
+  * Change libboost-python1.35-dev build-dep to libboost-python1.38-dev
+  * Move /usr/share/icons/oxygen/22x22/actions/pointer.png from step.install 
+    to not-installed, because of file conflict with oxygen-icons
+
+ -- Christian Mangold <neversfelde@ubuntu.com>  Fri, 31 Jul 2009 00:34:16 +0200
+
+kdeedu (4:4.2.98-0ubuntu2) karmic; urgency=low
+
+  * Rebuild with new pkg-kde-tools to build translation templates
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 29 Jul 2009 18:11:58 +0100
+
+kdeedu (4:4.2.98-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * debian/control: Bump Build-Depends versions
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Wed, 22 Jul 2009 14:20:09 +0000
+
 kdeedu (4:4.2.96-1) experimental; urgency=low
 
   * New upstream
@@ -297,6 +869,44 @@ kdeedu (4:4.2.96-1) experimental; urgenc
 
  -- Sune Vuorela <debian@pusling.com>  Sat, 11 Jul 2009 22:26:30 +0200
 
+kdeedu (4:4.2.96-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+    - Bump Build-Depends versions
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Fri, 10 Jul 2009 14:04:47 +0200
+
+kdeedu (4:4.2.95-0ubuntu1) karmic; urgency=low
+
+  * New upstream release:
+    - debian/control: Bump Build-Depends versions
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Fri, 26 Jun 2009 19:03:14 +0000
+
+kdeedu (4:4.2.90-0ubuntu1) karmic; urgency=low
+
+  * New upstream release:
+    - update KDE versions to 4.2.90 (KDE 4.3 beta 2)
+  * debian/control:
+    - bump standards version to 3.8.1, no change
+  * Update various .install files:
+    - kalzium.install
+
+ -- Steve Stalcup <vorian@ubuntu.com>  Fri, 05 Jun 2009 20:20:48 -0400
+
+kdeedu (4:4.2.85-0ubuntu2) karmic; urgency=low
+
+  * Update build-deps: libqt4-phonon-dev, pkg-kde-tools 
+
+ -- Roderick B. Greening <roderick.greening@gmail.com>  Thu, 21 May 2009 15:19:33 -0230
+
+kdeedu (4:4.2.85-0ubuntu1) karmic; urgency=low
+
+  * New upstream beta release
+  * Set EXPERIMENTAL_PYTHON_BINDINGS=FALSE, currently broken
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 15 May 2009 09:10:45 +0000
+
 kdeedu (4:4.2.4-1) unstable; urgency=low
 
   * New upstreams.
@@ -313,6 +923,42 @@ kdeedu (4:4.2.4-1) unstable; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 06 Apr 2009 23:37:08 +0200
 
+kdeedu (4:4.2.2-1ubuntu2) karmic; urgency=low
+
+  * Remove unused build-dependency on eigen
+  * Add kubuntu_02_qt_phonon.diff to compile with Qt's Phonon
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 11 May 2009 09:07:33 +0000
+
+kdeedu (4:4.2.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian Unstable
+  
+  +++ Changes by Richard A. Johnson
+  
+  * Merge debian/changelog
+
+  +++ Changes by Jonathan Thomas
+
+  * Merge everything else, remaining changes:
+    - Conflict/Replace on -kde4 packages
+    - Build-Depends: cdbs (>= 0.4.52ubuntu7), libgmm-dev,
+      libqalculate-dev, libsbigudrv-dev
+    - kdeedu not depend on kiten, blinken (in universe), indi (kstars conflict).
+    - kturtle description - change to be more reflective of pseudo-logo language
+    - remove indi from kdeedu (external package)
+    - Drop openbabel, libgsl0-dev and libgps-dev build-deps (they are in universe)
+    - Keep python marble bindings
+  * Update KUBUNTU-DEBIAN-DIFFERENCES
+
+  +++ Changes by Josh Stewart
+
+  * debian/control:
+    - Add libindi-dev to build-depends
+    - Update kstars depends, replaced indi with libindi0 (LP: #359517)
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Thu, 07 May 2009 22:04:43 -0400
+
 kdeedu (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release:
@@ -321,6 +967,16 @@ kdeedu (4:4.2.2-1) unstable; urgency=low
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 06 Apr 2009 01:59:06 +0200
 
+kdeedu (4:4.2.2-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release
+  * debian/rules: Bump libs version of kalgebra
+  * debian/control:
+    - Bump build-depends and depends on kdelibs5-dev
+    - Add build-depends on libgsl0-dev
+
+ -- Andreas Wenning <awen@awen.dk>  Sun, 29 Mar 2009 13:27:41 +0200
+
 kdeedu (4:4.2.1-1) experimental; urgency=low
 
   * New upstream release.
@@ -342,6 +998,22 @@ kdeedu (4:4.2.1-1) experimental; urgency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 15 Mar 2009 11:22:08 +0100
 
+kdeedu (4:4.2.1-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Update -dev depends and build-depends to (>= 4:4.2.1).
+    - Update build-depends on libphonon-dev to 4.3.1
+    - Correct typo in libkiten4 description.
+  * debian/rules:
+    - Update kalgebra version.
+  * Remove patch kubuntu_02_python_marble.diff - applied upstream
+  * debian/python-marble.install:
+    - Update to reflect new default python version being python2.6
+  * Rename plasmoid-worldclock.install to plasma-widget-worldclock.install
+
+ -- Andreas Wenning <awen@awen.dk>  Sat, 28 Feb 2009 21:50:21 +0100
+
 kdeedu (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.
@@ -393,48 +1065,297 @@ kdeedu (4:4.2.0-1) experimental; urgency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 26 Jan 2009 23:18:12 +0200
 
-kdeedu (4:4.1.4-1) experimental; urgency=low
+kdeedu (4:4.2.0-0ubuntu7) jaunty; urgency=low
 
-  * New upstream release
+  [ Jonathan Thomas ]
+  * Bump conflictsversion/add a replace on kanagram (<< 4:4.1.80) to accomodate 
+    upgrades from intrepid-updates (LP: #332625)
 
- -- Sune Vuorela <debian@pusling.com>  Sat, 10 Jan 2009 01:05:49 +0100
+ -- Scott Kitterman <scott@kitterman.com>  Thu, 26 Feb 2009 18:49:39 -0500
 
-kdeedu (4:4.1.3-1) experimental; urgency=low
+kdeedu (4:4.2.0-0ubuntu6) jaunty; urgency=low
 
-  * New upstream release
+  * Add missing build-dep on sip4
 
- -- Sune Vuorela <debian@pusling.com>  Sat, 01 Nov 2008 14:57:08 +0100
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Feb 2009 11:09:54 +0000
 
-kdeedu (4:4.1.2-1) experimental; urgency=low
+kdeedu (4:4.2.0-0ubuntu5) jaunty; urgency=low
 
-  * New upstream release.
-  * Update not-installed.
+  * Add misssing build-dep on python-kde4-dev and python-qt4-dev
 
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 01 Oct 2008 01:50:20 +0200
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Feb 2009 09:58:29 +0000
 
-kdeedu (4:4.1.1-1) experimental; urgency=low
+kdeedu (4:4.2.0-0ubuntu4) jaunty; urgency=low
 
-  * New upstream release.
+  [ Jonathan Riddell ]
+  * Package Marble Python bindings
+   - Set -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE
+   - Add debian/patches/kubuntu_01_python_marble.diff
+   - Add python-marble.install and debian/control entry
+  * Rename plasmoid-worldclock to plasma-widget-worldclock
 
- -- Sune Vuorela <debian@pusling.com>  Mon, 01 Sep 2008 00:18:33 +0200
+  [ Andreas Wenning ]
+  * Add kubuntu_01_marble_desktop_tryexec.diff:
+    - Adds TryExec statement to marble.desktop as libbarble4 depends
+      on marble-data containing the .desktop but not the binary.
+  * Add quilt to build depends in debian/control
 
-kdeedu (4:4.1.0-1) experimental; urgency=low
+ -- Andreas Wenning <awen@awen.dk>  Fri, 30 Jan 2009 19:59:28 +0100
 
-  * New usptream release.
-  * Add build depend on libfacile-ocaml-dev and libgps-dev. Replace
-    libopenbabel-dev with openbabel.
-  * Updated installed files.
+kdeedu (4:4.2.0-0ubuntu3) jaunty; urgency=low
+
+  * libmarble4 replaces old marble
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 29 Jan 2009 15:21:15 +0000
+
+kdeedu (4:4.2.0-0ubuntu2) jaunty; urgency=low
+
+  * Fix Marble packages (LP: #322278)
+    - Move Marble plugins to libmarble4 package as they are required
+      for proper operation of Marble Widget.
+  * Build-Depend on libboost-python1.35-dev as unversioned package
+    have moved to universe
+
+ -- Luka Renko <lure@ubuntu.com>  Wed, 28 Jan 2009 19:19:02 +0100
+
+kdeedu (4:4.2.0-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release:
+    - Bump build-depend version on kdelibs5-dev to (>= 4:4.2.0)
+    - Update debian/rules for 4.2.0
+    - *.install : docs have moved from kde4/ to kde/
+
+ -- Jordan Mantha <laserjock@ubuntu.com>  Thu, 22 Jan 2009 15:42:14 -0800
+
+kdeedu (4:4.1.96-0ubuntu2) jaunty; urgency=low
+
+  * Rebuild against new libplasma-dev
+
+ -- Steve Stalcup <vorian@ubuntu.com>  Thu, 15 Jan 2009 02:23:59 -0500
+
+kdeedu (4:4.1.96-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release:
+    - Bump build-depend version on kdelibs5-dev to (>= 4:4.1.96)
+    - Update debian/rules for 4.1.96
+    - Update various debian/.install files
+  * Make libmarble4 depend on marble-data. Currently libmarble4 depends on
+    marble-data, or else it will crash programs if -data isn't present.
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Thu, 08 Jan 2009 18:24:46 -0500
+
+kdeedu (4:4.1.85-0ubuntu1) jaunty; urgency=low
+
+  [ Harald Sitter ]
+  * Change Vcs-Browser to Launchpad and replace Vcs-Svn with Vcs-Bzr
+
+  [ Guillaume Martres ]
+  * New upstream beta release
+  * debian/control:
+    - Added binary package plasmoid-worldclock
+    - Bumped kdelibs5-dev and libplasma-dev build-dep version to (>= 4:4.1.85)
+  * Added debian/plasmoid-worldclock.install
+  * Updated debian/libmarble4.install
+  * debian/kalgebra.install:
+    - Removed usr/lib/libcompoundviewer.so.4.2.0 since it's already installed
+      by kalzium.install and kalgebra doesn't link against it
+  * Update kalgebra version in debian/rules
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Fri, 12 Dec 2008 20:43:57 +0100
+
+kdeedu (4:4.1.80-0ubuntu1) jaunty; urgency=low
+
+  [ Richard Birnie ]
+  * New upstream release
+
+  [ Harald Sitter ]
+  * Documentation:
+    + kpercentage removed upstream
+    + Drop openbabel and libgps-dev build-deps (they are in universe)
+    + Comment out the indi binaries in kstars.install (indi 0.6 not yet in
+      Jaunty)
+  * Removed kpercentage.install and reference in debian/control
+  * Add final newline to libkdeedu-dev.install
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Thu, 27 Nov 2008 13:39:18 +0100
+
+kdeedu (4:4.1.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Sat, 10 Jan 2009 01:05:49 +0100
+
+kdeedu (4:4.1.3-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian
+  * Ubuntu changes:
+    - merge changelog with Debian changelog
+    - MD5SUM differs on source
+    - use kde4.mk (not local cdbs)
+    - control:
+      - Conflict/Replace on -kde4 packages
+      - Build-Depends: cdbs (>= 0.4.52ubuntu7), libgmm-dev, 
+        libqalculate-dev, libsbigudrv-dev
+      - Bump standards version 3.8.0
+      - kdeedu not depend on kiten, blinken (both in universe), 
+        or indi (kstars depends indi (>= 5:0.5))
+      - Add depend on step
+      - kturtle description - change to be more reflective of pseudo-logo language
+      - remove indi from kdeedu (external package)
+      - add package step
+    - kalzium.install - include avogadro-kalzium, compoundviewer, designer plugin
+    - kstars.install - remove indi files (part of external package)
+      usr/bin/indiserver, usr/lib/libsbigudrv.so*
+    - remove 97_fix_target_link_libraries.diff (unneeded)
+  * Debian changes:
+    - control:
+      - Build-Depends: cmake (>= 2.6), libphonon-dev (>= 4:4.2),
+        openbabel, libgps-dev
+      - libkdeedu-dev - depends kdelibs5-dev (>= 4:4.0.82)
+      - libkiten-dev - depends kdelibs5-dev (>= 4:4.0.82)
+      - libmarble-dev - depends kdelibs5-dev (>= 4:4.0.82)
+    - kig.install - sort files
+    - marble-data.install - re-order files
+
+ -- Roderick B. Greening <roderick.greening@gmail.com>  Wed, 12 Nov 2008 03:15:29 -0330
+
+kdeedu (4:4.1.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <debian@pusling.com>  Sat, 01 Nov 2008 14:57:08 +0100
+
+kdeedu (4:4.1.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update not-installed.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 01 Oct 2008 01:50:20 +0200
+
+kdeedu (4:4.1.2-0ubuntu3) intrepid; urgency=low
+
+  * Add step conflicts and replaces step-kde4 (LP: #289052)
+
+ -- Terence Simpson <tsimpson@ubuntu.com>  Sun, 26 Oct 2008 01:11:50 +0100
+
+kdeedu (4:4.1.2-0ubuntu2) intrepid; urgency=low
+
+  * debian/control:
+    - Added Build-Depends on libfacile-ocaml-dev, which was recently promoted
+      to main, to enable the equation solver of Kalzium
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Wed, 08 Oct 2008 13:22:23 +0200
+
+kdeedu (4:4.1.2-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release
+    updated kalzium.install and step.install
+
+ -- Steve Stalcup <vorian@ubuntu.com>  Thu, 25 Sep 2008 21:28:58 -0400
+
+kdeedu (4:4.1.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sune Vuorela <debian@pusling.com>  Mon, 01 Sep 2008 00:18:33 +0200
+
+kdeedu (4:4.1.1-0ubuntu1) intrepid; urgency=low
+
+  [ Guillaume Martres ]
+  * New upstream release
+  * debian/rules:
+    - removed THIS_SHOULD_GO_TO_UNSTABLE not needed with latest cdbs
+  * debian/control:
+    - ensure cdbs version is (>= 0.4.52ubuntu7), kdelibs5-dev is (>= 4:4.1.1) and
+      libplasma-dev is (>= 4:4.1.1)
+  * debian/not-installed:
+    - add indiserver
+
+  [ Harald Sitter ]
+  * Remove old debian/cdbs/
+  * Build against kdelibs 4:4.1.1+really4.1.1
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Tue, 02 Sep 2008 03:35:39 +0200
+
+kdeedu (4:4.1.0-1) experimental; urgency=low
+
+  * New usptream release.
+  * Add build depend on libfacile-ocaml-dev and libgps-dev. Replace
+    libopenbabel-dev with openbabel.
+  * Updated installed files.
   * Update 97_fix_target_link_libraries.diff removing links that are not
     longer needed.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 27 Jul 2008 11:15:45 +0200
 
+kdeedu (4:4.1.0-0ubuntu5) intrepid; urgency=low
+
+  * Change kturtle description, the language is not Logo
+  * Add build-dep on libopenbabel-dev, now in main
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Aug 2008 19:40:41 +0100
+
+kdeedu (4:4.1.0-0ubuntu4) intrepid; urgency=low
+
+  * Add kdeedu dependency on step
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Aug 2008 13:08:55 +0100
+
+kdeedu (4:4.1.0-0ubuntu3) intrepid; urgency=low
+
+  * Remove kdeedu dependency on blinken and kiten, they're in universe
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Aug 2008 11:20:31 +0100
+
+kdeedu (4:4.1.0-0ubuntu2) intrepid; urgency=low
+
+  [ Jonathan Riddell ]
+  * switch to kde4.mk from cdbs
+
+  [ Steve Stalcup ]
+  * update kalzium.install to prevent build failure
+  * update kstars.install to remove conflicting binary of indi
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 01 Aug 2008 15:29:38 +0000
+
+kdeedu (4:4.1.0-0ubuntu1) intrepid; urgency=low
+
+  * New upstream relase
+  * debian/kalzium-data.install:
+    - removed usr/share/kde4/apps/desktoptheme/default/widgets/chalkboard.svg,
+      usr/share/kde4/services/plasma-dataengine-kalzium.desktop and
+      usr/share/kde4/services/plasma_didyouknow.desktop, they don't exist anymore.
+  * debian/kalzium.install:
+    - removed usr/lib/kde4/plasma_applet_didyouknow.so and
+      usr/lib/kde4/plasma_engine_kalzium.so, they don't exist anymore.
+    - added files in usr/lib/avogadro-kalzium/, libraries in usr/lib and
+      usr/lib/kde4/plugins/designer/kalziumuiwidgets.so
+  * debian/not-installed:
+    - removed step documentation files, step is now installed
+    - removed extra license file, doesn't exist anymore
+  * debian/control:
+    - bumped build-deps kdelibs5-dev to (>= 4:4.1.0), libphonon-dev
+      to (>= 4:4.2.0-0ubuntu1) and libplasma-dev to (>= 4:4.1.0)
+      for KDE 4.1.0 release.
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Thu, 24 Jul 2008 17:34:04 +0200
+
 kdeedu (4:4.0.98-1) experimental; urgency=low
 
   * New upstream release, Release Candidate 1.
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 15 Jul 2008 01:25:12 +0200
 
+kdeedu (4:4.0.98-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release candidate
+  * Bump Standards-Version to 3.8.0
+  * Change to hardcoded version for kstars' indi dependency (LP: #247744)
+  * Remove kstars' Recommends on indi
+  * Remove kubuntu_01_marble_fix.diff
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 12 Jul 2008 16:00:31 +0200
+
 kdeedu (4:4.0.84-1) experimental; urgency=low
 
   * New upstream snapshot
@@ -442,6 +1363,19 @@ kdeedu (4:4.0.84-1) experimental; urgenc
 
  -- Sune Vuorela <debian@pusling.com>  Sun, 29 Jun 2008 16:07:39 +0200
 
+kdeedu (4:4.0.83-0ubuntu2) intrepid; urgency=low
+
+  * Add patch kubuntu_01_marble_fix.diff from upstream, fixes marble starting
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jun 2008 12:48:44 +0000
+
+kdeedu (4:4.0.83-0ubuntu1) intrepid; urgency=low
+
+  * New upstream beta release
+  * Change step to arch: any (not all)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 19 Jun 2008 11:45:15 +0000
+
 kdeedu (4:4.0.82+svn819867-1) experimental; urgency=low
 
   * New upstream snapshot.
@@ -451,6 +1385,26 @@ kdeedu (4:4.0.82+svn819867-1) experiment
 
  -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 16 Jun 2008 08:53:40 +0200
 
+kdeedu (4:4.0.80-1ubuntu3) intrepid; urgency=low
+
+  * Do not build indi, it has a separate tar
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jun 2008 09:50:39 +0000
+
+kdeedu (4:4.0.80-1ubuntu2) intrepid; urgency=low
+
+  * Remove build-depends on openbabel, it did not pass main review
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 17 Jun 2008 13:34:02 +0000
+
+kdeedu (4:4.0.80-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian
+  * Add conflicts on -kde4 packages
+  * Add build-deps on libgmm-dev, libqalculate-dev, libsbigudrv-dev
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 May 2008 10:11:40 +0100
+
 kdeedu (4:4.0.80-1) experimental; urgency=low
 
   * New upstream snapshot.
@@ -467,6 +1421,12 @@ kdeedu (4:4.0.74-1) experimental; urgenc
 
  -- Fathi Boudra <fabo@debian.org>  Tue, 20 May 2008 00:41:00 +0200
 
+kdeedu (4:4.0.73-0ubuntu1) intrepid; urgency=low
+
+  * New upstream development release, merge with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 May 2008 13:17:37 +0100
+
 kdeedu (4:4.0.72-1) experimental; urgency=low
 
   * New upstream snapshot.
@@ -650,3 +1610,792 @@ kdeedu (4:3.95.0-1) experimental; urgenc
   * Write copyright file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 04 Nov 2007 21:12:12 +0100
+
+kdeedu (4:3.90.1-1) alioth; urgency=low
+
+  * Initial release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 24 May 2007 04:15:11 +0200
+
+kdeedu (4:3.5.9-0ubuntu2) hardy; urgency=low
+
+  * Fix overwrite, kalzium-data conflicts/replaces old kalzium
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Mar 2008 20:41:48 +0000
+
+kdeedu (4:3.5.9-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 14 Feb 2008 12:27:06 +0000
+
+kdeedu (4:3.5.8-1ubuntu2) hardy; urgency=low
+
+  * Run buildprep before upload
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Nov 2007 10:45:18 +0000
+
+kdeedu (4:3.5.8-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining change:
+   - No omcal build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:43 +0000
+
+kdeedu (4:3.5.8-1) unstable; urgency=low
+
+  * New upstream release.
+    + Patches: remove 11_kig+boost_autoconf_check, merged upstream.
+    + Update *.install files.
+  * Update section in Debian menu files.
+  
+  * Implement use of uploaders.mk and update uploaders.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 16 Oct 2007 16:19:11 +0200
+
+kdeedu (4:3.5.8-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 09 Oct 2007 11:41:25 +0100
+
+kdeedu (4:3.5.7-1ubuntu2) gutsy; urgency=low
+
+  * Rebuild for boost 1.34.0 -> 1.34.1 transistion.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 13 Sep 2007 11:06:00 +1000
+
+kdeedu (4:3.5.7-1ubuntu1) gutsy; urgency=low
+
+  * New Upstream Version
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * Removed kubuntu_02_python2.5.diff - fixed upstream
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 23 May 2007 12:49:14 +1000
+
+kdeedu (4:3.5.7-1) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * New upstream version.
+    - fix issues with accented chars in ktouch. (Closes: #360985)
+    - kwordquiz desktop file is now installed the right place. 
+    - patch upstream build system regarding boost. It doesn't find the debian
+      boost version. Thanks to Daniel Schepler for doing the nice checks in
+      debian/rules to catch this.
+
+  +++ Changes by Daniel Schepler:
+
+  * debian/control: Add kgeography to the kdeedu metapackage.
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 16 May 2007 12:29:33 +0200
+
+kdeedu (4:3.5.6-3ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 30 Apr 2007 20:32:54 +0100
+
+kdeedu (4:3.5.6-3) unstable; urgency=low
+
+  +++ Changes by Daniel Schepler:
+
+  * debian/control: Add kgeography to the kdeedu metapackage.
+
+ -- Daniel Schepler <schepler@debian.org>  Tue, 24 Apr 2007 22:37:43 -0400
+
+kdeedu (4:3.5.6-2) unstable; urgency=low
+
+  * Upload to unstable after Etch release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 18 Apr 2007 17:06:10 +0100
+
+kdeedu (4:3.5.6-1) experimental; urgency=low
+
+  * New upstream version.
+    - fixes typo in Hercules constellation in kstars. (Closes: #395849)
+  * Make kdeedu-dbg depend on kdelibs-dbg to get useful backtraces when
+    debugging.
+
+  +++ Changes by Sune Vuorela:
+  * Update kfreebsd install files. (Closes: 399235)
+  * Remove patch 12_fr_keyboard (applied upstream).
+  * Enable more keyboardlayouts in ktouch. (Closes: #398735)
+  * Don't relibtoolize on-the-fly, but use buildprep instead.
+    - adapt build depends accordingly.
+  * Okay. Yann Dirson wins. Let us try to ship the kig python
+    script api docs (Closes: #394517). Needs to build-dep on doxygen.
+    This should really be moved to its own binary-indep package soonish.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 20 Jan 2007 16:55:45 +0100
+
+kdeedu (4:3.5.6-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+  * Remove 12_fr_keyboard.diff
+  * Add kubuntu_02_python2.5.diff for python 2.5 detection
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:30 +0000
+
+kdeedu (4:3.5.5-1ubuntu3) feisty; urgency=low
+
+  * Rebuild for python2.5.
+  * Teach kig about python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 00:57:51 +0000
+
+kdeedu (4:3.5.5-1ubuntu2) feisty; urgency=low
+
+  * Up the replaces on indi of kstars to fix https://launchpad.net/bugs/78964
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 Jan 2007 12:49:44 +0000
+
+kdeedu (4:3.5.5-1ubuntu1) feisty; urgency=low
+
+  * Merge with Debian
+  * Compile with --enable-gcc-hidden-visibility
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Nov 2006 20:14:40 +0000
+
+kdeedu (4:3.5.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove obsolete Recommends: kcontrol, along with the accompanying
+    blurb in the package description, which is no longer needed because
+    of the Depends: ttf-sjfonts.
+
+ -- Daniel Schepler <schepler@debian.org>  Sun,  8 Oct 2006 14:26:21 +0200
+
+kdeedu (4:3.5.4-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r577498).
+
+  +++ Changes by Christopher Martin:
+
+  * Packaging sync with the rest of the team KDE packages. Update
+    package descriptions, sync debian-qt-kde.mk and other CDBS
+    stuff (should help building on slow architectures).
+
+  * Rather than having packages recommend kdeedu-data, just depend
+    on it.
+
+  * Apply the still-relevant kstars/indi part of the kFreeBSD build
+    patch (libtool is now updated automatically). (Closes: #326619)
+
+  * Strengthen kiten's Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+    to a Depends. (Closes: #372112)
+
+  * Fix kvoctrain description typo. (Closes: #364193)
+
+  * Patch the ktouch French keyboard. (Closes: #347850)
+
+  * Split INDI out of kstars, into a new 'indi' package, which kstars
+    depends on. (Closes: #267999, #365098)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 26 Aug 2006 17:07:38 -0400
+
+kdeedu (4:3.5.4-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes detection of autoconf 2.60.  Closes: #379817.
+  * Bump Standards-Version to 3.7.2 (no changes required).
+
+ -- Daniel Schepler <schepler@debian.org>  Sat, 29 Jul 2006 13:21:27 -0400
+
+kdeedu (4:3.5.5-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
+
+kdeedu (4:3.5.4-0ubuntu4) edgy; urgency=low
+
+  * Rebuild with latest cdbs to add gettext domain to .desktop files for
+    langpacks-desktopfiles-kde, no source changes
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Sep 2006 22:53:10 +0000
+
+kdeedu (4:3.5.4-0ubuntu3) edgy; urgency=low
+
+  * Add kalzium-data Replaces: kalzium (<< 4:3.5.4)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  1 Aug 2006 15:15:09 +0000
+
+kdeedu (4:3.5.4-0ubuntu2) edgy; urgency=low
+
+  * Remove 30_libtool.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 30 Jul 2006 16:15:24 +0100
+
+kdeedu (4:3.5.4-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Jul 2006 10:12:18 +0000
+
+kdeedu (4:3.5.3-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 03 Jul 2006 19:57:21 +0100
+
+kdeedu (4:3.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add blinken to kdeedu dependencies.
+  * Remove copy of steve.ttf from blinken, and instead depend on
+    the new ttf-sjfonts package.  Closes: #344377.
+  * Do the same for khangman: remove the copies of Domestic_Manners.ttf
+    and Dustismo_Roman.ttf, and instead depend on ttf-dustin.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 29 Mar 2006 21:31:41 +0200
+
+kdeedu (4:3.5.2-0ubuntu9) dapper; urgency=low
+
+  * debian/rules:
+    - added dh_iconcache.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 18 May 2006 15:16:34 +0200
+
+kdeedu (4:3.5.2-0ubuntu8) dapper; urgency=low
+
+  * Add EXTRACTATTR to .pot generation rule
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 18:31:07 +0300
+
+kdeedu (4:3.5.2-0ubuntu7) dapper; urgency=low
+
+  * Add build-dep on gawk so that kstars.pot gets generated
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  9 May 2006 17:42:58 +0300
+
+kdeedu (4:3.5.2-0ubuntu6) dapper; urgency=low
+
+  * Remove html docs in kanagram, they are in kdeedu-doc-html.
+  * Move kgeography html docs to kdeedu-doc-html. 
+
+ -- Frode M. Doeving <frode@lnix.net>  Tue,  2 May 2006 18:41:09 +0200
+
+kdeedu (4:3.5.2-0ubuntu5) dapper; urgency=low
+
+  * Make kgeorgraphy Replaces kgeography-data, closes Malone #42192
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  1 May 2006 17:20:59 +0100
+
+kdeedu (4:3.5.2-0ubuntu4) dapper; urgency=low
+
+  * Remove references in debian/kdeedu-doc-html* to KMessedwords,
+    now Kanagram, Closes Malone #30732
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 16:25:37 +0100
+
+kdeedu (4:3.5.2-0ubuntu3) dapper; urgency=low
+
+  * Updated debian/rules to install docs for the correct list of packages
+
+ -- Frode M. Doeving <frode@lnix.net>  Wed, 26 Apr 2006 19:11:21 +0200
+
+kdeedu (4:3.5.2-0ubuntu2) dapper; urgency=low
+
+  * Edit debian/rules to mark .po files as UTF-8
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Apr 2006 19:11:11 +0100
+
+kdeedu (4:3.5.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Mar 2006 12:06:28 +0000
+
+kdeedu (4:3.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjust dependencies on *-data to be binNMU-safe.
+    Closes: #348644, #348687, #348690, #348692.
+  * New patch 10_lib_link.diff: Link libkvoctrain.so against -lkio to
+    resolve as many undefined symbols as possible.  Unfortunately, that
+    library still needs a couple symbols from the kvoctrain binary itself.
+  * Remove obsolete kmessedwords doc-base file.  Closes: #350297.
+
+ -- Daniel Schepler <schepler@debian.org>  Thu,  2 Feb 2006 09:49:13 +0100
+
+kdeedu (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdeedu (4:3.5.0-4) unstable; urgency=low
+
+  * New package: kdeedu-dbg, to make debugging symbols available.
+  * Include uuencoded tar file of binary files changed on branch.
+  * Rebuild against boost 1.33.1.
+
+ -- Daniel Schepler <schepler@debian.org>  Tue, 17 Jan 2006 09:44:35 +0100
+
+kdeedu (4:3.5.0-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * No longer build with g++-3.4 on any architecture, since g++-4.0
+    should be fixed.
+  * Update to SVN branches/KDE/3.5, up to revision 496050.
+  * Tighten versioning of Build-Depends on kdelibs4-dev.  Closes: #344765.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon,  9 Jan 2006 22:39:22 +0100
+
+kdeedu (4:3.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+ -- Daniel Schepler <schepler@debian.org>  Tue, 20 Dec 2005 10:47:44 +0100
+
+kdeedu (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+  * Rename package kmessedwords to kanagram.
+  * Rename libkdeedu1 to libkdeedu3 due to SONAME change of libkdeeduui.
+  * New packages: blinken, kgeography, kgeography-data.
+  * New split-off data package: kalzium-data.
+  * Regenerate all Debian menu icons, since several of the upstream icons
+    were improved.
+
+ -- Daniel Schepler <schepler@debian.org>  Wed, 14 Dec 2005 00:31:49 +0100
+
+kdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * rebuild for new libboost 
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 Jan 2006 15:31:57 +0100
+
+kdeedu (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 12:27:39 +0000
+
+kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 19:43:59 +0000
+
+kdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * kmessedwords replaced with kanagram
+  * libkdeedu1 becomes libkdeedu3
+  * New packages kgeography, blinken
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 13 Nov 2005 20:53:20 +0000
+
+kdeedu (4:3.4.3-2) unstable; urgency=low
+
+  * New maintainer: I'll be the primary maintainer although I'm listing
+    the Debian QT/KDE group as the official maintainer.  Thanks to
+    Ben Burton for maintaining the package up until now.
+  * Switch to CDBS.
+  * Update Build-Depends to ensure getting c2a-transitioned versions of
+    kdelibs and boost-python.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon,  5 Dec 2005 21:25:51 +0100
+
+kdeedu (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed Maintainer to Debian Qt/KDE Maintainers
+  * Acknowledge NMU (Closes: #334986). 
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  3 Dec 2005 16:17:55 +0100
+
+kdeedu (4:3.4.2-2.1) unstable; urgency=low
+
+  * NMU
+  * Use gcc-3.4 to build in arm, m68k and hppa, closes: #334986
+
+ -- Isaac Clerencia <isaac@debian.org>  Fri, 21 Oct 2005 13:14:31 +0200
+
+kdeedu (4:3.4.2-2) unstable; urgency=low
+
+  * Built against libfam-dev, not libgamin-dev.
+
+ -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
+
+kdeedu (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * First g++-4 upload to sid.
+  * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
+    Note that the libkdeedu1 and libkiten1 package names do not need to change.
+  * Fixed tempfile handling in langen2kvtml, which is shipped in the kvoctrain
+    package.  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050815-1.txt
+    References: CAN-2005-2101
+  * Don't use libsuff=64 on amd64/ppc64 (closes: #301796).
+  * Added the new script keduca-shrinker, thanks to Mathieu Roy for providing
+    it (closes: #305980).
+  * Updated FSF address in the copyright file.
+  * Bumped standards-version to 3.6.2.1 (no changes required).
+  * KTouch now allows manual level change regardless of whether automatic
+    level changing is enabled (closes: #129491).
+  * Line numbers fixed in KTurtle error messages (closes: #293582).
+
+ -- Ben Burton <bab@debian.org>  Thu,  1 Sep 2005 09:04:24 +1000
+
+kdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Do not try to install missing man pages
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  9 Oct 2005 13:12:42 +0100
+
+kdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa etc
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  7 Oct 2005 18:35:59 +0000
+
+kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
+
+  * SECURITY UPDATE: fix insecure temporary file creation
+  * The script uses known filenames in /tmp which allow an
+    local attacker to overwrite files writeable by the
+    user (manually) invoking the conversion script.  A local
+    file can overwrite files and possibly elevate privileges.
+  * Add kubuntu_01_langen2kvtml_temp_file_vulnerability.diff
+  * References:
+    CAN-2005-2101
+    http://www.kde.org/info/security/advisory-20050815-1.txt
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 13 Aug 2005 12:35:52 +0000
+
+kdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * last rebuild didnt work it seems...
+    rebuild for new boost again to make kig installable in edubuntu
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon,  8 Aug 2005 12:08:34 +0200
+
+kdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Rebuild for new boost upload.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed,  3 Aug 2005 23:24:48 +0200
+
+kdeedu (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 26 Jul 2005 16:24:24 +0000
+
+kdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed,  1 Jun 2005 00:32:27 +0000
+
+kdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release.
+  * Sync with Debian.
+
+ -- Jonathan Riddell <jr@jriddell.org>  Sat, 28 May 2005 19:08:44 +0000
+
+kdeedu (4:3.4.0-0pre2) unstable; urgency=low
+
+  * Merge in recent packaging changes from the 3.3 branch.
+  * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
+    for the time being.
+
+ -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
+
+kdeedu (4:3.4.0-0pre1) unstable; urgency=low
+
+  * New major upstream release.
+  * New binary packages libkiten1 and libkiten-dev.
+  * Removed obsolete kderemove tags from menu items.
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
+
+kdeedu (4:3.3.2-3) unstable; urgency=low
+
+  * Included the full GFDL text in debian/copyright, since all of the docbook
+    documentation is under this license.
+  * Fixed the "umbruckan" typos in the German kturtle data (closes: #285146).
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 10:15:48 +1100
+
+kdeedu (4:3.3.2-2) unstable; urgency=high
+
+  * Fixed buffer overflows in fliccd, one of the INDI drivers shipped with
+    kstars (closes: #295499).  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050215-1.txt
+    References: CAN-2005-0011
+  * Patched the sources directly (i.e., the patch shows up in the usual
+    debian diff but not as an extra file in debian/patches), since this is
+    a non-debian-specific problem that is already fixed in upstream CVS.
+
+ -- Ben Burton <bab@debian.org>  Thu, 17 Feb 2005 07:53:09 +1100
+
+kdeedu (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * The moon images are now licensed under the GPL (closes: #266404).
+  * Built against boost 1.32.0.
+  * Re-enabled boost.python scripting on arm, since it now seems to be
+    compiling with boost 1.32.0.
+  * Added a test in debian/rules to make the build fail if the boost libraries
+    are not built.
+
+ -- Ben Burton <bab@debian.org>  Sun, 16 Jan 2005 20:45:11 +1100
+
+kdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Add directory /usr/share/doc/kde/HTML/en/flashkard to kdeedu-doc-html
+    to prevent .dhelp problem.
+
+ -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 18:35:25 +0000
+
+kdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * New upstream release
+  * cleanup debian/patches dir
+
+ -- Andreas Mueller <amu@ubuntu.com>  Wed,  9 Mar 2005 18:09:17 +0000
+
+kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
+
+  * SECURITY UPDATE: Buffer overflow in fliccd of kdeedu/kstars/indi
+  * added 01-kstars-indi-fliccd-overflows.diff which fixes buffer overflows
+  * References:
+    CAN-2005-0011
+    http://www.kde.org/info/security/advisory-20050215-1.txt
+
+ -- Jonathan Riddell <jr@jriddell.org>  Thu, 17 Feb 2005 02:44:19 +0000
+
+kdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+
+ -- Andreas Mueller <amu@canonical.com>  Sun, 16 Jan 2005 03:38:05 +0100
+
+kdeedu (4:3.3.1-3) unstable; urgency=medium
+
+  * Sigh.  Patched kstars platform tests for m68k.  This _really_ is
+    every arch dealt with.
+
+ -- Ben Burton <bab@debian.org>  Fri, 12 Nov 2004 07:39:04 +1100
+
+kdeedu (4:3.3.1-2) unstable; urgency=medium
+
+  * Patched platform tests in kstars to include mips and mipsel.
+
+ -- Ben Burton <bab@debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
+
+kdeedu (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Platform tests in kstars code now expanded to include s390 and powerpc
+    (closes: #278341).
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * KTurtle no longer crashes on configure (closes: #278234).
+  * Patched KTurtle so that the default language is in fact one of the
+    supported KTurtle languages and not a different dialect.  This fixes
+    the broken examples directory as well as KTurtle refusing to run any
+    commands.
+  * Cosmetic updates to some manpages.
+
+ -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 08:35:18 +1000
+
+kdeedu (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * New binary packages klatin, kturtle and kwordquiz.
+  * Package flashkard is no longer shipped with kdeedu.
+  * There is no longer a need to pull data out of the upstream tarball,
+    since upstream no longer ships with the (non-free) Messier images.
+  * Made libkdeedu-dev depend on kdelibs4-dev.
+  * KStars now shows borders between constellations (closes: #241930) and
+    supports full-screen mode (closes: #219649).
+  * KTouch now waits for a keypress before starting and also provides a
+    pause button (closes: #129523).
+  * A little more documentation is now installed for libkdeedu-dev.
+
+ -- Ben Burton <bab@debian.org>  Sat, 16 Oct 2004 15:32:36 +1000
+
+kdeedu (4:3.2.3-2) unstable; urgency=low
+
+  * Disable kig scripting on arm while boost.python remains broken on
+    that architecture.
+
+ -- Ben Burton <bab@debian.org>  Sat, 17 Jul 2004 11:19:00 +1000
+
+kdeedu (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Added manpages for KStars INDI server and device drivers.
+  * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+    just www-browser.
+  * Added debian/clean-sources to simplify removal of non-DFSG-free material.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
+
+kdeedu (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Built against Boost.Python 1.31.0, which in turn is built against
+    Python 2.3 (closes: #243079, #245135).
+
+ -- Ben Burton <bab@debian.org>  Thu, 22 Apr 2004 18:15:48 +1000
+
+kdeedu (4:3.2.1-2) unstable; urgency=low
+
+  * Don't use Conflicts/Replaces where we should just use Replaces.
+
+ -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
+
+kdeedu (4:3.2.1-1) unstable; urgency=low
+
+  * First KDE 3.2 upload to sid.
+
+ -- Ben Burton <bab@debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
+
+kdeedu (4:3.2.0.1-1) experimental; urgency=low
+
+  * First KDE 3.2 upload to experimental.
+  * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
+    version change since some binary files have been updated).
+  * Split kstars into kstars / kstars-data.
+  * Split klettres into klettres / klettres-data.
+  * Using versioned dependencies for the kdeedu metapackage.
+
+ -- Ben Burton <bab@debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdeedu (4:3.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
+  * New binary packages kbruch and kig.
+
+ -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdeedu (4:3.1.5-2) unstable; urgency=low
+
+  * Building with -mieee on alpha to avoid kstars SIGFPE (closes: #226966).
+
+ -- Ben Burton <bab@debian.org>  Tue, 20 Jan 2004 09:52:13 +1100
+
+kdeedu (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
+
+kdeedu (4:3.1.4-3) unstable; urgency=low
+
+  * Kiten recommends Japanese fonts (closes: #216440).
+  * Kiten depends on edict and kanjidic instead of supplying its own
+    copies (closes: #217196).
+
+ -- Ben Burton <bab@debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
+
+kdeedu (4:3.1.4-2) unstable; urgency=low
+
+  * New pull from BRANCH; includes bugfixes for kstars.
+  * Fixed Saskatchewan time zones (closes: #206642).
+  * Fixed incomplete sentences in tips of the day (closes: #196943).
+
+ -- Ben Burton <bab@debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
+
+kdeedu (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Using the new debian_branch for kstars, which now uses the Hipparcos
+    catalog and for which all non-DFSG-free images have been either removed or
+    replaced.  The copyright file has been updated accordingly, including
+    license information for both the catalog and images.  Thanks very much to
+    Jason Harris for his hard work on this (closes: #198499).
+  * KVocTrain no longer segfaults with inline editing (closes: #196211).
+  * Split debian menu titles into title/longtitle (closes: #196666).
+  * Changed several debian menu sections to Apps/Education.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 11:29:44 +1000
+
+kdeedu (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Libtool updated (closes: #194479).
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Have kstars suggest konqueror since it offers the user online resources
+    (closes: #192734).
+  * Man page overhaul.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdeedu (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
+
+kdeedu (4:3.1.0-3) unstable; urgency=low
+
+  * Uses full paths in doc-base files instead of symlinks (closes: #180332).
+
+ -- Ben Burton <bab@debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
+
+kdeedu (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian (closes: #119019).
+  * Rolled the epoch to aid upgrades from the unofficial repository on
+    ftp.kde.org.. *sigh*
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
+
+kdeedu (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab@debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdeedu (3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built with g++-3.2.
+  * Build-depends on automake1.7.
+
+ -- Ben Burton <benb@acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
+
+kdeedu (3.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to Chris Cheney's style of debian/rules.
+  * Build-depends on automake1.6.
+
+ -- Ben Burton <benb@acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
+
+kdeedu (3.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on automake1.5.
+
+ -- Ben Burton <benb@acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
+
+kdeedu (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdeedu (3.0.1-1) unstable; urgency=low
+
+  * Initial Debian release (closes: Bug#119019).
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 May 2002 18:44:16 +1000
+
diff -pruN 4:4.6.3-2/debian/control 4:4.6.3-2ubuntu2/debian/control
--- 4:4.6.3-2/debian/control	2011-06-05 13:42:16.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/control	2011-06-07 12:36:24.000000000 +0100
@@ -1,7 +1,8 @@
 Source: kdeedu
 Section: kde
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Daniel Schepler <schepler@debian.org>, Sune Vuorela <sune@debian.org>,
  Fathi Boudra <fabo@debian.org>, Armin Berres <armin+debian@space-based.de>,
  Modestas Vainius <modax@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>,
@@ -10,30 +11,33 @@ Build-Depends: kde-sc-dev-latest (>= 4:4
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  dpkg-dev (>= 1.15.5), kdelibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.3.0),
  libboost-python-dev, libcfitsio3-dev (>= 3.040),
- libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev,
+ libglu1-mesa-dev [!armel], libgs-dev, libnova-dev, libqt4-opengl-dev [!armel],
  libreadline-dev, libxslt-dev, ocaml, zlib1g-dev,
- libfacile-ocaml-dev, pkg-config, libgps-dev (>= 2.90),
+ libfacile-ocaml-dev, libopenbabel-dev, pkg-config, libgps-dev (>= 2.90),
  xplanet, libeigen2-dev (>> 2.0.3), libgsl0-dev, libqalculate-dev, libglib2.0-dev,
- libspectre-dev, libattica-dev, r-base-core, libglew1.5-dev,
- libxrender-dev, libqtwebkit-dev
-Build-Conflicts: libopenbabel-dev
+ libspectre-dev, libattica-dev, libavogadro-dev [!armel], libglew1.5-dev [!armel],
+ libxrender-dev, libqtwebkit-dev,
+ libgmm-dev, libsbigudrv-dev,
+ libindi-dev (>= 0.6.1-0ubuntu2), libx11-dev
 Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeedu.git
-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdeedu.git
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kdeedu/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kdeedu/ubuntu
+XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeedu.git
+XS-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdeedu.git
 
 Package: kdeedu
-Architecture: all
-Depends: ${misc:Depends}, blinken (>= ${source:Version}),
+Architecture: any
+Depends: ${misc:Depends},
  kalgebra (>= ${source:Version}), kalzium (>= ${source:Version}),
  kanagram (>= ${source:Version}), kbruch (>= ${source:Version}),
  kgeography (>= ${source:Version}), khangman (>= ${source:Version}),
- kig (>= ${source:Version}), kiten (>= ${source:Version}),
+ kig (>= ${source:Version}),
  klettres (>= ${source:Version}), kmplot (>= ${source:Version}),
  kstars (>= ${source:Version}), ktouch (>= ${source:Version}), 
  kturtle (>= ${source:Version}), kwordquiz (>= ${source:Version}), 
  marble (>= ${source:Version}), parley (>= ${source:Version}),
- step (>= ${source:Version}), cantor (>= ${source:Version}),
+ step (>= ${source:Version}) [!armel], cantor (>= ${source:Version}),
  rocs (>= ${source:Version})
 Description: educational applications from the official KDE release
  KDE is produced by an international technology team that creates free and open
@@ -68,7 +72,7 @@ Architecture: any
 Section: math
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: cantor-backend-kalgebra
-Suggests: cantor-backend-maxima, cantor-backend-r, cantor-backend-sage,
+Suggests: cantor-backend-maxima, cantor-backend-sage,
  cantor-backend-octave
 Description: interface for mathematical applications
  Cantor is an application to allow you to you use your favorite mathematical
@@ -80,7 +84,6 @@ Description: interface for mathematical 
  external packages):
   * KAlgebra (cantor-backend-kalgebra)
   * Maxima Computer Algebra System (cantor-backend-maxima)
-  * R Project for Statistical Computing (cantor-backend-r)
   * Sage Mathematics Software (cantor-backend-sage)
   * Octave (cantor-backend-octave)
  .
@@ -131,27 +134,10 @@ Description: Octave backend for Cantor
  .
  This package is part of the KDE education module.
 
-Package: cantor-backend-r
-Architecture: any
-Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core
-Suggests: r-base-html
-Description: R backend for Cantor
- Cantor is an application to allow you to you use your favorite mathematical
- applications from within an elegant KDE-integrated worksheet interface. It
- provides dialogs to assist with common tasks and allows you to share your
- worksheets with others.
- .
- This package provides the backend for using the R Project for Statistical
- Computing (http://www.r-project.org) in Cantor.
- .
- This package is part of the KDE education module.
-
 Package: cantor-backend-sage
 Architecture: any
 Section: math
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: sagemath
 Description: Sage backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant KDE-integrated worksheet interface. It
@@ -166,23 +152,48 @@ Description: Sage backend for Cantor
 Package: kalgebra
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra-common (= ${binary:Version})
 Description: algebraic graphing calculator for KDE
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language.
  .
  This package is part of the KDE education module.
 
+Package: kalgebra-mobile
+Depends: kalgebramobile, ${misc:Depends}
+Architecture: all
+Section: math
+Description: transitional dummy package for kalgebra-mobile
+ This is a transitional package for kalgebra-mobile, and can be safely removed
+ after the installation is complete.
+ .
+ This package is part of the KDE education module
+
 Package: kalgebramobile
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: kalgebra (<< 4:4.6.1a-0ubuntu2), kalgebra-mobile (<< 4.6.3-1ubuntu1)
+Replaces: kalgebra (<< 4:4.6.1a-0ubuntu2), kalgebra-mobile (<< 4.6.3-1ubuntu1)
+Depends: ${shlibs:Depends}, ${misc:Depends},  kalgebra-common (= ${binary:Version})
 Description: algebraic graphing calculator for KDE
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language.
  .
  This package is part of the KDE education module.
 
+Package: kalgebra-common
+Architecture: any
+Section: math
+Breaks: kalgebra (<< 4:4.6.1a-0ubuntu2)
+Replaces: kalgebra (<< 4:4.6.1a-0ubuntu2)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: contains files common for kalgebra and kalgebra-mobile
+ KAlgebra is a algebraic graphing calculator with support for 3D graphing and
+ MathML markup language and it contains files needed for both full and mobile
+ versions.
+ .
+ This package is part of the KDE education module.
+
 Package: kalzium
 Architecture: any
 Section: science
@@ -345,6 +356,7 @@ Architecture: any
 Section: science
 Depends: ${shlibs:Depends}, ${misc:Depends}, kstars-data (>= ${source:Version})
 Suggests: konqueror, khelpcenter4, indi
+Recommends: xplanet
 Description: desktop planetarium for KDE
  KStars is a desktop planetarium for KDE, depicting an accurate graphical
  simulation of the night sky, from any location on Earth, at any date and time.
@@ -519,8 +531,8 @@ Package: marble-plugins
 Architecture: any
 Section: misc
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libmarble4
-Breaks: libmarble4
+Replaces: libmarble4, marble (<< 4:4.5.2-0ubuntu1)
+Breaks: libmarble4, marble (<< 4:4.5.2-0ubuntu1)
 Description: plugins for Marble
  This package contains various plugins for the Marble desktop globe. The Marble
  globe widget library may not be of much use if this package is not installed.
@@ -552,7 +564,7 @@ Package: parley
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl,
  parley-data (>= ${source:Version}), kdeedu-kvtml-data (= ${source:Version})
-Recommends: krosspython
+Recommends: krosspython, python-kde4, krossruby, libkde4-ruby
 Suggests: khelpcenter4
 Description: vocabulary trainer for KDE
  Parley is a utility to help train vocabulary when learning a foreign language.
@@ -584,7 +596,7 @@ Description: graph theory IDE
  This package is part of the KDE education module.
 
 Package: step
-Architecture: any
+Architecture: amd64 i386 powerpc
 Section: science
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: interactive physical simulator for KDE
diff -pruN 4:4.6.3-2/debian/kalgebra-common.install 4:4.6.3-2ubuntu2/debian/kalgebra-common.install
--- 4:4.6.3-2/debian/kalgebra-common.install	1970-01-01 01:00:00.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/kalgebra-common.install	2011-06-07 12:36:24.000000000 +0100
@@ -0,0 +1,23 @@
+usr/bin/calgebra
+usr/lib/kde4/plasma_applet_kalgebra.so
+usr/lib/libanalitza.so.4
+usr/lib/libanalitza.so.4.6.0
+usr/lib/libanalitzagui.so.4
+usr/lib/libanalitzagui.so.4.6.0
+usr/share/doc/kde/HTML/en/kalgebra/
+usr/share/icons/hicolor/128x128/apps/kalgebra.png
+usr/share/icons/hicolor/16x16/apps/kalgebra.png
+usr/share/icons/hicolor/32x32/apps/kalgebra.png
+usr/share/icons/hicolor/48x48/apps/kalgebra.png
+usr/share/icons/hicolor/64x64/apps/kalgebra.png
+usr/share/kde4/apps/katepart/syntax/kalgebra.xml
+usr/share/kde4/services/kalgebraplasmoid.desktop
+usr/share/kde4/apps/kalgebra/scripts/tables/tables.js
+usr/share/kde4/apps/kalgebra/scripts/plot2d/plot2d.js
+usr/share/kde4/apps/kalgebra/scripts/console/console.js
+usr/share/kde4/apps/kalgebra/scripts/variables/variables.js
+usr/share/kde4/servicetypes/kalgebrascript.desktop
+usr/share/kde4/apps/kalgebra/scripts/tables/kalgebratables.desktop
+usr/share/kde4/apps/kalgebra/scripts/plot2d/kalgebraplot2d.desktop
+usr/share/kde4/apps/kalgebra/scripts/console/kalgebraconsole.desktop
+usr/share/kde4/apps/kalgebra/scripts/variables/kalgebravariables.desktop
diff -pruN 4:4.6.3-2/debian/kalgebra.install 4:4.6.3-2ubuntu2/debian/kalgebra.install
--- 4:4.6.3-2/debian/kalgebra.install	2011-04-06 20:52:03.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/kalgebra.install	2011-06-07 12:36:24.000000000 +0100
@@ -1,16 +1,2 @@
-usr/bin/calgebra
 usr/bin/kalgebra
-usr/lib/kde4/plasma_applet_kalgebra.so
-usr/lib/libanalitza.so.4
-usr/lib/libanalitza.so.4.6.0
-usr/lib/libanalitzagui.so.4
-usr/lib/libanalitzagui.so.4.6.0
 usr/share/applications/kde4/kalgebra.desktop
-usr/share/doc/kde/HTML/en/kalgebra/
-usr/share/icons/hicolor/128x128/apps/kalgebra.png
-usr/share/icons/hicolor/16x16/apps/kalgebra.png
-usr/share/icons/hicolor/32x32/apps/kalgebra.png
-usr/share/icons/hicolor/48x48/apps/kalgebra.png
-usr/share/icons/hicolor/64x64/apps/kalgebra.png
-usr/share/kde4/apps/katepart/syntax/kalgebra.xml
-usr/share/kde4/services/kalgebraplasmoid.desktop
diff -pruN 4:4.6.3-2/debian/kalgebramobile.install 4:4.6.3-2ubuntu2/debian/kalgebramobile.install
--- 4:4.6.3-2/debian/kalgebramobile.install	2011-04-06 20:52:03.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/kalgebramobile.install	2011-06-07 12:36:24.000000000 +0100
@@ -1,11 +1,2 @@
 usr/bin/kalgebramobile
 usr/share/applications/kde4/kalgebramobile.desktop
-usr/share/kde4/apps/kalgebra/scripts/console/console.js
-usr/share/kde4/apps/kalgebra/scripts/console/kalgebraconsole.desktop
-usr/share/kde4/apps/kalgebra/scripts/plot2d/kalgebraplot2d.desktop
-usr/share/kde4/apps/kalgebra/scripts/plot2d/plot2d.js
-usr/share/kde4/apps/kalgebra/scripts/tables/kalgebratables.desktop
-usr/share/kde4/apps/kalgebra/scripts/tables/tables.js
-usr/share/kde4/apps/kalgebra/scripts/variables/kalgebravariables.desktop
-usr/share/kde4/apps/kalgebra/scripts/variables/variables.js
-usr/share/kde4/servicetypes/kalgebrascript.desktop
diff -pruN 4:4.6.3-2/debian/kalzium.install 4:4.6.3-2ubuntu2/debian/kalzium.install
--- 4:4.6.3-2/debian/kalzium.install	2011-06-05 13:41:51.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/kalzium.install	2011-06-07 12:36:24.000000000 +0100
@@ -5,6 +5,8 @@ usr/lib/kde4/nuclearCalculator.so
 usr/lib/kde4/plasma_applet_didyouknow.so
 usr/lib/kde4/plasma_applet_molmassCalculator.so
 usr/lib/kde4/plasma_engine_kalzium.so
+usr/lib/libcompoundviewer.so.4
+usr/lib/libcompoundviewer.so.4.6.0
 usr/share/applications/kde4/kalzium.desktop
 usr/share/kde4/services/concentrationCalculator.desktop
 usr/share/kde4/services/gasCalculator.desktop
diff -pruN 4:4.6.3-2/debian/kalzium.install.armel 4:4.6.3-2ubuntu2/debian/kalzium.install.armel
--- 4:4.6.3-2/debian/kalzium.install.armel	1970-01-01 01:00:00.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/kalzium.install.armel	2011-06-07 12:36:24.000000000 +0100
@@ -0,0 +1,14 @@
+usr/bin/kalzium
+usr/lib/kde4/concentrationCalculator.so
+usr/lib/kde4/gasCalculator.so
+usr/lib/kde4/nuclearCalculator.so
+usr/lib/kde4/plasma_applet_didyouknow.so
+usr/lib/kde4/plasma_applet_molmassCalculator.so
+usr/lib/kde4/plasma_engine_kalzium.so
+usr/share/applications/kde4/kalzium.desktop
+usr/share/kde4/services/concentrationCalculator.desktop
+usr/share/kde4/services/gasCalculator.desktop
+usr/share/kde4/services/nuclearCalculator.desktop
+usr/share/kde4/services/plasma-dataengine-kalzium.desktop
+usr/share/kde4/services/plasma_didyouknow.desktop
+usr/share/kde4/services/plasma-applet-Molmasscalculator.desktop
diff -pruN 4:4.6.3-2/debian/KUBUNTU-DEBIAN-DIFFERENCES 4:4.6.3-2ubuntu2/debian/KUBUNTU-DEBIAN-DIFFERENCES
--- 4:4.6.3-2/debian/KUBUNTU-DEBIAN-DIFFERENCES	1970-01-01 01:00:00.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/KUBUNTU-DEBIAN-DIFFERENCES	2011-06-07 12:36:24.000000000 +0100
@@ -0,0 +1,15 @@
+    - Drop from build-deps: openbabel, r-base-core (are in universe)
+    - Keep in build-deps: libgmm-dev, libsbigudrv-dev, libindi-dev, libx11-dev
+    - kdeedu doesn't depend on kiten and blinken
+    - cantor-backend-sage doesn't recommend sagemath
+    - kstars doesn't suggest indi
+    - kstars recommends xplanet
+    - Drop python marble bindings since they don't build right now
+      + Drop python-sip-dev, python-support, python-dev, python-qt4, python-kde4, 
+        python-qt4-dev, python-kde4-dev from build depends
+    - Don't build cantor-backend-r as we don't have the right build-depends
+    - Parley recommends python-kde4, krossruby and libkde4-ruby
+    - Add a dummy package for kalgebra-mobile
+    - Add kalzium.install.armel which doesn't include compound viewer
+    - Don't build step for ARM
+    - Switch kdeedu to arch-any and drop step from dependencies on armel.
diff -pruN 4:4.6.3-2/debian/not-installed 4:4.6.3-2ubuntu2/debian/not-installed
--- 4:4.6.3-2/debian/not-installed	2011-03-29 22:21:18.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/not-installed	2011-06-07 12:36:24.000000000 +0100
@@ -2,6 +2,11 @@
 ./usr/lib/libhtmesh.a
 # extra license file
 ./usr/share/kde4/apps/marble/data/LICENSE.txt
+# already in package indi
+./usr/bin/indiserver
+./usr/lib/libsbigudrv.so
+./usr/lib/libsbigudrv.so.1
+./usr/lib/libsbigudrv.so.1.0.0
 
 # Devel symlinks without devel headers
 ./usr/lib/libcompoundviewer.so
@@ -32,6 +37,7 @@
 ./usr/include/rocs/Data.h
 ./usr/include/rocs/DataType.h
 ./usr/include/rocs/DynamicPropertiesList.h
+./usr/include/rocs/edge.h
 ./usr/include/rocs/FilePluginInterface.h
 ./usr/include/rocs/NodeItem.h
 ./usr/include/rocs/OrientedEdgeItem.h
@@ -39,7 +45,10 @@
 ./usr/include/rocs/Pointer.h
 ./usr/include/rocs/ToolsPluginInterface.h
 ./usr/include/rocs/graphDocument.h
+./usr/include/rocs/graphGroups.h
+./usr/include/rocs/graph.h
 ./usr/include/rocs/krossBackend.h
+./usr/include/rocs/node.h
 ./usr/include/rocs/qtScriptBackend.h
 ./usr/include/rocs/rocs_typedefs.h
 ./usr/include/rocs/rocslib_export.h
diff -pruN 4:4.6.3-2/debian/patches/kubuntu_opengl.diff 4:4.6.3-2ubuntu2/debian/patches/kubuntu_opengl.diff
--- 4:4.6.3-2/debian/patches/kubuntu_opengl.diff	1970-01-01 01:00:00.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/patches/kubuntu_opengl.diff	2011-06-07 12:36:24.000000000 +0100
@@ -0,0 +1,17 @@
+Index: kdeedu-4.6.1a/CMakeLists.txt
+===================================================================
+--- kdeedu-4.6.1a.orig/CMakeLists.txt	2011-03-28 18:08:15.731238274 +0100
++++ kdeedu-4.6.1a/CMakeLists.txt	2011-03-28 18:08:23.751238271 +0100
+@@ -97,9 +97,10 @@
+ endif( EIGEN2_FOUND )
+ 
+ macro_optional_add_subdirectory(kalzium)
+-if (EIGEN2_FOUND AND NOT WIN32)
++macro_optional_find_package(OpenGL)
++if (OPENGL_FOUND AND EIGEN2_FOUND AND NOT WIN32)
+   macro_optional_add_subdirectory(step)
+-endif (EIGEN2_FOUND AND NOT WIN32)
++endif (OPENGL_FOUND AND EIGEN2_FOUND AND NOT WIN32)
+ macro_optional_add_subdirectory(doc)
+ 
+ include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff -pruN 4:4.6.3-2/debian/patches/series 4:4.6.3-2ubuntu2/debian/patches/series
--- 4:4.6.3-2/debian/patches/series	2011-05-26 00:12:26.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/patches/series	2011-06-07 12:36:24.000000000 +0100
@@ -1,3 +1,4 @@
 step_needs_-lcln.diff
 no_install_rpath_use_link_path.diff
 enable_debianabimanager.diff
+kubuntu_opengl.diff
diff -pruN 4:4.6.3-2/debian/rules 4:4.6.3-2ubuntu2/debian/rules
--- 4:4.6.3-2/debian/rules	2011-05-26 19:59:24.000000000 +0100
+++ 4:4.6.3-2ubuntu2/debian/rules	2011-06-07 12:36:24.000000000 +0100
@@ -7,10 +7,15 @@ include /usr/share/pkg-kde-tools/qt-kde-
 marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
 marble_plugin_path = /usr/lib/kde4/plugins/marble/$(marble_soversion)
 
+ifeq ($(DEB_HOST_ARCH),armel)
+conf_args += -DWITH_OpenGL=OFF
+endif
+
 override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
         -DKDEEDU_KTOUCH_BUILD_WITH_PHONON=ON \
-        -DMARBLE_PLUGIN_PATH=$(marble_plugin_path)
+        -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \
+        $(conf_args)
 
 .PHONY: override_dh_auto_test
 
diff -pruN 4:4.6.3-2/.pc/applied-patches 4:4.6.3-2ubuntu2/.pc/applied-patches
--- 4:4.6.3-2/.pc/applied-patches	2011-06-07 16:50:43.000000000 +0100
+++ 4:4.6.3-2ubuntu2/.pc/applied-patches	2011-06-07 16:40:27.000000000 +0100
@@ -1,3 +1,4 @@
 step_needs_-lcln.diff
 no_install_rpath_use_link_path.diff
 enable_debianabimanager.diff
+kubuntu_opengl.diff
diff -pruN 4:4.6.3-2/.pc/kubuntu_opengl.diff/CMakeLists.txt 4:4.6.3-2ubuntu2/.pc/kubuntu_opengl.diff/CMakeLists.txt
--- 4:4.6.3-2/.pc/kubuntu_opengl.diff/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
+++ 4:4.6.3-2ubuntu2/.pc/kubuntu_opengl.diff/CMakeLists.txt	2011-06-07 16:40:27.000000000 +0100
@@ -0,0 +1,107 @@
+project(kdeedu)
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+# search packages used by KDE
+find_package(KDE4 4.3.80 REQUIRED)
+if(WIN32)
+  find_package(KDEWIN32 REQUIRED)
+  # detect oxygen icon dir at configure time based on KDEDIRS - there may be different package installation locations
+  execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE _dir ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+  file(TO_CMAKE_PATH "${_dir}" __dir)
+  find_path(KDE4_ICON_DIR oxygen PATHS
+      ${__dir}
+  )
+  message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
+else(WIN32)
+    set (KDE4_ICON_DIR  ${CMAKE_INSTALL_PREFIX}/share/icons)
+endif(WIN32)
+
+#### Python support ####
+set(PythonSupport_FOUND FALSE)
+
+macro_log_feature(EXPERIMENTAL_PYTHON_BINDINGS "Experimental Python binding support for the Marble library" "Experimental Python binding support for the Marble library"
+  "http://techbase.kde.org/Development/Languages/Python" FALSE ""
+  "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.")
+
+if(EXPERIMENTAL_PYTHON_BINDINGS)
+    macro_optional_find_package(PythonLibrary)
+
+    macro_optional_find_package(SIP)
+    if(SIP_FOUND AND SIP_VERSION STRLESS "040701")
+        message(STATUS "The version of SIP found is too old. 4.7.1 or later is needed.")
+        set(SIP_FOUND)
+    endif(SIP_FOUND AND SIP_VERSION STRLESS "040701")
+
+    include(SIPMacros)
+
+    macro_optional_find_package(PyQt4)
+    if(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
+        message(STATUS "The version of PyQt found is too old. 4.4.0 or later is required.")
+        set(PYQT4_FOUND)
+    endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
+    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by marble python plugins to run. " "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
+
+#    macro_optional_find_package(PyKDE4)
+#    if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+#      set(PythonSupport_FOUND TRUE)
+#    endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+
+    if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND)
+      set(PythonSupport_FOUND TRUE)
+    endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND)
+
+    macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support"
+      "http://techbase.kde.org/Development/Languages/Python" FALSE ""
+      "Needed for Python bindings to the marble widget.")
+endif(EXPERIMENTAL_PYTHON_BINDINGS)
+
+#### End Python support ####
+
+include(KDE4Defaults)
+include(MacroLibrary)
+include(MacroOptionalAddSubdirectory)
+include(MacroBoolTo01)
+
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories (${QDBUS_INCLUDE_DIRS}  ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+add_subdirectory(cmake)
+add_subdirectory(data)
+add_subdirectory(libkdeedu)
+macro_optional_add_subdirectory(blinken)
+macro_optional_add_subdirectory(kanagram)
+macro_optional_add_subdirectory(kbruch)
+macro_optional_add_subdirectory(kgeography)
+macro_optional_add_subdirectory(khangman)
+macro_optional_add_subdirectory(kig)
+macro_optional_add_subdirectory(kiten)
+macro_optional_add_subdirectory(klettres)
+macro_optional_add_subdirectory(kmplot)
+macro_optional_add_subdirectory(ktouch)
+macro_optional_add_subdirectory(kturtle)
+macro_optional_add_subdirectory(parley)
+macro_optional_add_subdirectory(kwordquiz)
+macro_optional_add_subdirectory(marble)
+macro_optional_add_subdirectory(kalgebra)
+macro_optional_add_subdirectory(cantor)
+if(NOT MSVC)
+  # boost 1.44 / std::isspace() problem
+  macro_optional_add_subdirectory(rocs)
+endif(NOT MSVC)
+
+macro_optional_find_package(Eigen2 2.0.3)
+macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "2.0.3" "Required to build Step and KStars.")
+if( EIGEN2_FOUND )
+   macro_optional_add_subdirectory(kstars)
+endif( EIGEN2_FOUND )
+
+macro_optional_add_subdirectory(kalzium)
+if (EIGEN2_FOUND AND NOT WIN32)
+  macro_optional_add_subdirectory(step)
+endif (EIGEN2_FOUND AND NOT WIN32)
+macro_optional_add_subdirectory(doc)
+
+include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
+
+macro_display_feature_log()
