diff -u kdeedu-4.3.3/debian/copyright kdeedu-4.3.3/debian/copyright --- kdeedu-4.3.3/debian/copyright +++ kdeedu-4.3.3/debian/copyright @@ -52,7 +52,7 @@ Copyright: Unless something else is mentioned, copyright is -(C) 1996-2009, The K Desktop Environment project http://www.kde.org +(C) 1996-2008, The K Desktop Enviroment project http://www.kde.org License: diff -u kdeedu-4.3.3/debian/parley-data.lintian-overrides kdeedu-4.3.3/debian/parley-data.lintian-overrides --- kdeedu-4.3.3/debian/parley-data.lintian-overrides +++ kdeedu-4.3.3/debian/parley-data.lintian-overrides @@ -5 +5 @@ -parley-data: unusual-interpreter ./usr/share/kde4/apps/parley/plugins/wikitionary_sound.py #!kross + diff -u kdeedu-4.3.3/debian/step.install kdeedu-4.3.3/debian/step.install --- kdeedu-4.3.3/debian/step.install +++ kdeedu-4.3.3/debian/step.install @@ -1,6 +1,5 @@ usr/bin/step usr/share/applications/kde4/step.desktop -usr/share/doc/kde/HTML/en/step/ usr/share/icons/hicolor/128x128/apps/step.png usr/share/icons/hicolor/16x16/apps/step.png usr/share/icons/hicolor/22x22/apps/step.png @@ -68,0 +68 @@ +usr/share/doc/kde/HTML/en/step/ diff -u kdeedu-4.3.3/debian/rules kdeedu-4.3.3/debian/rules --- kdeedu-4.3.3/debian/rules +++ kdeedu-4.3.3/debian/rules @@ -10,3 +9,0 @@ -DEB_DH_SHLIBDEPS_ARGS_libmarble4 := -- -xkdebase-runtime -DEB_DH_SHLIBDEPS_ARGS_libkiten4 := -- -xkdebase-runtime -DEB_DH_SHLIBDEPS_ARGS_libkdeedu4 := -- -xkdebase-runtime diff -u kdeedu-4.3.3/debian/libmarble4.install kdeedu-4.3.3/debian/libmarble4.install --- kdeedu-4.3.3/debian/libmarble4.install +++ kdeedu-4.3.3/debian/libmarble4.install @@ -1,3 +1,3 @@ -usr/lib/kde4/plugins/marble/ usr/lib/libmarblewidget.so.4 usr/lib/libmarblewidget.so.4.3.0 +usr/lib/kde4/plugins/marble/ diff -u kdeedu-4.3.3/debian/kalzium.install kdeedu-4.3.3/debian/kalzium.install --- kdeedu-4.3.3/debian/kalzium.install +++ kdeedu-4.3.3/debian/kalzium.install @@ -2,39 +2,39 @@ +usr/lib/kde4/plasma_applet_didyouknow.so +usr/lib/kde4/plasma_engine_kalzium.so +usr/lib/libcompoundviewer.so.4 +usr/lib/libcompoundviewer.so.4.3.0 +usr/share/applications/kde4/kalzium.desktop +usr/share/kde4/services/plasma-dataengine-kalzium.desktop +usr/share/kde4/services/plasma_didyouknow.desktop +usr/lib/libavogadro-kalzium.so.0 +usr/lib/libavogadro-kalzium.so.0.9.3 +usr/lib/avogadro-kalzium/colors/libresiduecolor.so +usr/lib/avogadro-kalzium/colors/libindexcolor.so usr/lib/avogadro-kalzium/colors/libchargecolor.so usr/lib/avogadro-kalzium/colors/libdistancecolor.so -usr/lib/avogadro-kalzium/colors/libindexcolor.so -usr/lib/avogadro-kalzium/colors/libresiduecolor.so usr/lib/avogadro-kalzium/engines/libaxesengine.so -usr/lib/avogadro-kalzium/engines/libcartoonengine.so usr/lib/avogadro-kalzium/engines/libdipoleengine.so -usr/lib/avogadro-kalzium/engines/libforceengine.so -usr/lib/avogadro-kalzium/engines/libhbondengine.so -usr/lib/avogadro-kalzium/engines/liblabelengine.so -usr/lib/avogadro-kalzium/engines/liborbitalengine.so -usr/lib/avogadro-kalzium/engines/liboverlayengine.so -usr/lib/avogadro-kalzium/engines/libpolygonengine.so -usr/lib/avogadro-kalzium/engines/libribbonengine.so +usr/lib/avogadro-kalzium/engines/libcartoonengine.so +usr/lib/avogadro-kalzium/engines/libwireengine.so +usr/lib/avogadro-kalzium/engines/libsurfaceengine.so usr/lib/avogadro-kalzium/engines/libringengine.so -usr/lib/avogadro-kalzium/engines/libsimplewireengine.so usr/lib/avogadro-kalzium/engines/libsphereengine.so +usr/lib/avogadro-kalzium/engines/liblabelengine.so +usr/lib/avogadro-kalzium/engines/libribbonengine.so +usr/lib/avogadro-kalzium/engines/libhbondengine.so usr/lib/avogadro-kalzium/engines/libstickengine.so -usr/lib/avogadro-kalzium/engines/libsurfaceengine.so -usr/lib/avogadro-kalzium/engines/libwireengine.so +usr/lib/avogadro-kalzium/engines/libsimplewireengine.so +usr/lib/avogadro-kalzium/engines/liborbitalengine.so +usr/lib/avogadro-kalzium/engines/libpolygonengine.so +usr/lib/avogadro-kalzium/engines/libforceengine.so +usr/lib/avogadro-kalzium/engines/liboverlayengine.so +usr/lib/avogadro-kalzium/tools/libdrawtool.so usr/lib/avogadro-kalzium/tools/libaligntool.so usr/lib/avogadro-kalzium/tools/libautoopttool.so usr/lib/avogadro-kalzium/tools/libautorotatetool.so +usr/lib/avogadro-kalzium/tools/libnavigatetool.so usr/lib/avogadro-kalzium/tools/libbondcentrictool.so usr/lib/avogadro-kalzium/tools/libclickmeasuretool.so -usr/lib/avogadro-kalzium/tools/libdrawtool.so -usr/lib/avogadro-kalzium/tools/libmanipulatetool.so -usr/lib/avogadro-kalzium/tools/libnavigatetool.so usr/lib/avogadro-kalzium/tools/libselectrotatetool.so -usr/lib/kde4/plasma_applet_didyouknow.so -usr/lib/kde4/plasma_engine_kalzium.so +usr/lib/avogadro-kalzium/tools/libmanipulatetool.so usr/lib/kde4/plugins/designer/kalziumuiwidgets.so -usr/lib/libavogadro-kalzium.so.0 -usr/lib/libavogadro-kalzium.so.0.9.3 -usr/lib/libcompoundviewer.so.4 -usr/lib/libcompoundviewer.so.4.3.0 -usr/share/applications/kde4/kalzium.desktop -usr/share/kde4/services/plasma-dataengine-kalzium.desktop -usr/share/kde4/services/plasma_didyouknow.desktop diff -u kdeedu-4.3.3/debian/parley-data.install kdeedu-4.3.3/debian/parley-data.install --- kdeedu-4.3.3/debian/parley-data.install +++ kdeedu-4.3.3/debian/parley-data.install @@ -8,121 +8,7 @@ usr/share/icons/hicolor/scalable/apps/parley-simple.svgz usr/share/icons/hicolor/scalable/apps/parley.svgz usr/share/kde4/apps/desktoptheme/default/widgets/parley_plasma_card.svg -usr/share/kde4/apps/parley/plugins/mwclient -usr/share/kde4/apps/parley/plugins/mwclient/errors.py -usr/share/kde4/apps/parley/plugins/mwclient/page.py -usr/share/kde4/apps/parley/plugins/mwclient/ex.py -usr/share/kde4/apps/parley/plugins/mwclient/compatibility.py -usr/share/kde4/apps/parley/plugins/mwclient/client.py -usr/share/kde4/apps/parley/plugins/mwclient/__init__.py -usr/share/kde4/apps/parley/plugins/mwclient/README.txt -usr/share/kde4/apps/parley/plugins/mwclient/simplejson -usr/share/kde4/apps/parley/plugins/mwclient/simplejson/decoder.py -usr/share/kde4/apps/parley/plugins/mwclient/simplejson/scanner.py -usr/share/kde4/apps/parley/plugins/mwclient/simplejson/jsonfilter.py -usr/share/kde4/apps/parley/plugins/mwclient/simplejson/__init__.py -usr/share/kde4/apps/parley/plugins/mwclient/simplejson/encoder.py -usr/share/kde4/apps/parley/plugins/mwclient/listing.py -usr/share/kde4/apps/parley/plugins/mwclient/page_nowriteapi.py -usr/share/kde4/apps/parley/plugins/mwclient/http.py -usr/share/kde4/apps/parley/plugins/google_dictionary.py -usr/share/kde4/apps/parley/plugins/google_dictionary.desktop -usr/share/kde4/apps/parley/plugins/google_images.ui -usr/share/kde4/apps/parley/plugins/leo-dict.desktop -usr/share/kde4/apps/parley/plugins/example.py -usr/share/kde4/apps/parley/plugins/google_images.py -usr/share/kde4/apps/parley/plugins/example.desktop -usr/share/kde4/apps/parley/plugins/google_images.desktop -usr/share/kde4/apps/parley/plugins/leo-dict.py -usr/share/kde4/apps/parley/xslt -usr/share/kde4/apps/parley/xslt/flashcards.xsl -usr/share/kde4/apps/parley/xslt/table.xsl -usr/share/kde4/apps/parley/tips -usr/share/kde4/apps/parley/icons -usr/share/kde4/apps/parley/icons/oxygen -usr/share/kde4/apps/parley/icons/oxygen/48x48 -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/multiple-choice.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/lesson-add.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/edit-entry.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/advanced-setup.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/cards-block.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/set-language.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/list-add-card.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/edit-table-row.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/practice-setup.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/remove-duplicates.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/edit-clear.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/parley-no-text.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/list-remove-card.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/practice-start.png -usr/share/kde4/apps/parley/icons/oxygen/48x48/actions/lesson-remove.png -usr/share/kde4/apps/parley/icons/oxygen/32x32 -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/multiple-choice.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/lesson-add.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/edit-entry.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/advanced-setup.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/cards-block.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/set-language.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/list-add-card.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/edit-table-row.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/practice-setup.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/remove-duplicates.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/edit-clear.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/list-remove-card.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/practice-start.png -usr/share/kde4/apps/parley/icons/oxygen/32x32/actions/lesson-remove.png -usr/share/kde4/apps/parley/icons/oxygen/22x22 -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/multiple-choice.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/lesson-add.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/edit-entry.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/advanced-setup.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/cards-block.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/set-language.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/list-add-card.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/edit-table-row.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/practice-setup.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/remove-duplicates.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/edit-clear.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/list-remove-card.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/practice-start.png -usr/share/kde4/apps/parley/icons/oxygen/22x22/actions/lesson-remove.png -usr/share/kde4/apps/parley/icons/oxygen/scalable -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/remove-duplicates.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/lesson-add.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/list-remove-card.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/practice-setup.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/practice-start.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/cards-block.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/edit-entry.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/edit-clear.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/lesson-remove.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/list-add-card.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/edit-table-row.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/advanced-setup.svgz -usr/share/kde4/apps/parley/icons/oxygen/scalable/actions/set-language.svgz -usr/share/kde4/apps/parley/icons/oxygen/16x16 -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/multiple-choice.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/lesson-add.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/edit-entry.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/advanced-setup.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/cards-block.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/set-language.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/list-add-card.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/edit-table-row.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/practice-setup.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/remove-duplicates.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/edit-clear.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/list-remove-card.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/practice-start.png -usr/share/kde4/apps/parley/icons/oxygen/16x16/actions/lesson-remove.png -usr/share/kde4/apps/parley/editorui.rc -usr/share/kde4/apps/parley/parleyui.rc -usr/share/kde4/apps/parley/parleypracticeui.rc +usr/share/kde4/apps/parley/ usr/share/kde4/config.kcfg/documentsettings.kcfg usr/share/kde4/config.kcfg/languagesettings.kcfg usr/share/kde4/config.kcfg/parley.kcfg diff -u kdeedu-4.3.3/debian/kmplot.install kdeedu-4.3.3/debian/kmplot.install --- kdeedu-4.3.3/debian/kmplot.install +++ kdeedu-4.3.3/debian/kmplot.install @@ -15,0 +16,4 @@ +usr/share/dbus-1/interfaces/org.kde.kmplot.Parser.xml +usr/share/dbus-1/interfaces/org.kde.kmplot.View.xml +usr/share/dbus-1/interfaces/org.kde.kmplot.MainDlg.xml +usr/share/dbus-1/interfaces/org.kde.kmplot.KmPlot.xml diff -u kdeedu-4.3.3/debian/changelog kdeedu-4.3.3/debian/changelog --- kdeedu-4.3.3/debian/changelog +++ kdeedu-4.3.3/debian/changelog @@ -1,33 +1,9 @@ -kdeedu (4:4.3.3-0ubuntu2) karmic; urgency=low - - * Added libkrosspython0 as Recommends to Parley to fix errors with plugins - * Put wikitionary_sound.{py,desktop} to not-installed - - -- Michał Zając Tue, 17 Nov 2009 19:38:20 +0100 - -kdeedu (4:4.3.3-0ubuntu1) UNRELEASED; urgency=low +kdeedu (4:4.3.3-0ubuntu1~ppa2) karmic; 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 + - Bump buil-deps - -- Alessandro Ghersi Thu, 12 Nov 2009 03:44:27 +0100 + -- Alessandro Ghersi Sat, 31 Oct 2009 20:02:56 +0100 kdeedu (4:4.3.2-0ubuntu2) UNRELEASED; urgency=low @@ -44,15 +20,6 @@ -- Alessandro Ghersi Sat, 03 Oct 2009 18:35:43 +0200 -kdeedu (4:4.3.1-1) unstable; urgency=low - - * New upstream release. - * Bump KDE build dependencies to 4.3.1. - * Bump Standards-Version from 3.8.2 to 3.8.3 (no changes needed). - * Fix typo in libkiten4 description. - - -- Ana Beatriz Guerrero Lopez Sun, 06 Sep 2009 16:48:24 +0200 - kdeedu (4:4.3.1-0ubuntu1) karmic; urgency=low * New upstream release @@ -60,23 +27,6 @@ -- Christian Mangold Sat, 29 Aug 2009 11:35:30 +0200 -kdeedu (4:4.3.0-2) unstable; urgency=low - - +++ Changes by Modestas Vainius: - - * Do not ship step icons, they are shipped in oxygen-icon-theme. - * Add myself to uploaders. - - -- Debian Qt/KDE Maintainers Wed, 05 Aug 2009 13:39:37 +0300 - -kdeedu (4:4.3.0-1) unstable; urgency=low - - * New upstream release. - * Bump to Standards-Version: 3.8.2, no changes required. - * Bump build dependencies to >= 4.3.0. - - -- Ana Beatriz Guerrero Lopez Tue, 04 Aug 2009 09:06:45 +0200 - kdeedu (4:4.3.0-0ubuntu1) karmic; urgency=low * New upstream release @@ -100,18 +50,6 @@ -- Nathan Handler Wed, 22 Jul 2009 14:20:09 +0000 -kdeedu (4:4.2.96-1) experimental; urgency=low - - * New upstream - - step now uses eigen instead of gmm - - add gsl and qalculate build deps for step. - - also add glib build-dep to work around a bug in pkg-config - - kstars can now use xplanet, add to build-deps. - * Add patch to also build with -lcln when building step with qalculate - * No need to make libs pull in -runtime - - -- Sune Vuorela Sat, 11 Jul 2009 22:26:30 +0200 - kdeedu (4:4.2.96-0ubuntu1) karmic; urgency=low * New upstream release @@ -150,22 +88,6 @@ -- Jonathan Riddell Fri, 15 May 2009 09:10:45 +0000 -kdeedu (4:4.2.4-1) unstable; urgency=low - - * New upstreams. - - Step don't hang at 100% when using springs (Closes: 530030) - - Ktouch in german is now fixed in level 48 (Closes: 518854) - - +++ Changes by Sune Vuorela: - - * Fix up sections. - - ++++ Changes by Aurelien Jarno: - - * Add 00_kfreebsd to fix build on GNU/kFreeBSD. - - -- Debian Qt/KDE Maintainers Mon, 06 Apr 2009 23:37:08 +0200 - kdeedu (4:4.2.2-1ubuntu2) karmic; urgency=low * Remove unused build-dependency on eigen diff -u kdeedu-4.3.3/debian/control kdeedu-4.3.3/debian/control --- kdeedu-4.3.3/debian/control +++ kdeedu-4.3.3/debian/control @@ -3,16 +3,17 @@ Priority: optional Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Debian Qt/KDE Maintainers -Uploaders: Daniel Schepler , Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Armin Berres , Modestas Vainius -Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4), - kdelibs5-dev (>= 4:4.3.1), libphonon-dev (>= 4.6.0~beta1), +Uploaders: Daniel Schepler , Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Armin Berres , Matthew Rosewarne +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2), + kdelibs5-dev (>= 4:4.3.3), libqt4-phonon-dev (>= 4.5.1), libboost-python1.38-dev, libcfitsio3-dev (>= 3.040), libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev, libreadline5-dev, libusb-dev, libxslt-dev, ocaml, zlib1g-dev, libfacile-ocaml-dev, libopenbabel-dev, pkg-config, - libeigen2-dev (>> 2.0.3), libgsl0-dev, libqalculate-dev, libglib2.0-dev, - libgmm-dev, libsbigudrv-dev, python-kde4-dev, python-qt4-dev, sip4, libindi-dev -Standards-Version: 3.8.3 + libgmm-dev, libqalculate-dev, + libsbigudrv-dev, python-kde4-dev, python-qt4-dev, sip4, libgsl0-dev, + libindi-dev, libeigen2-dev (>= 2.0.3) +Standards-Version: 3.8.1 Homepage: http://edu.kde.org/ Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeedu/ubuntu Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/kdeedu/ubuntu @@ -24,10 +25,9 @@ kgeography (>= ${source:Version}), khangman (>= ${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}) + kstars (>= ${source:Version}), ktouch (>= ${source:Version}), + kturtle (>= ${source:Version}), kwordquiz (>= ${source:Version}), + marble (>= ${source:Version}), parley (>= ${source:Version}), step (>= ${source:Version}) Conflicts: kdeedu-kde4 Replaces: kdeedu-kde4 Description: educational applications from the official KDE 4 release @@ -43,7 +43,7 @@ Package: kdeedu-dbg Architecture: any -Section: debug +Section: libdevel Priority: extra Depends: kdebase-runtime-dbg Suggests: kdeedu (= ${source:Version}) @@ -55,8 +55,8 @@ Package: blinken Architecture: any -Depends: ${shlibs:Depends}, ttf-sjfonts Section: games +Depends: ${shlibs:Depends}, ttf-sjfonts Conflicts: blinken-kde4 Replaces: blinken-kde4 Suggests: khelpcenter4 @@ -111,8 +111,8 @@ Package: kanagram Architecture: any -Depends: ${shlibs:Depends}, kdeedu-kvtml-data Section: games +Depends: ${shlibs:Depends}, kdeedu-kvtml-data Conflicts: kanagram-kde4 Replaces: kanagram-kde4 Suggests: khelpcenter4 @@ -136,10 +136,10 @@ Package: kgeography Architecture: any +Section: kde Depends: ${shlibs:Depends}, kgeography-data (>= ${source:Version}) Conflicts: kgeography-kde4 Replaces: kgeography-kde4, kgeography-data (<< 4:4.1.86) -Section: games Suggests: khelpcenter4 Description: geography learning aid for KDE 4 KGeography is an aid for learning about world geography. You can use it to @@ -150,7 +150,7 @@ Package: kgeography-data Architecture: all -Section: games +Section: kde Conflicts: kgeography-data-kde4 Replaces: kgeography-data-kde4 Description: data files for KGeography @@ -379,7 +379,7 @@ Recommends: ttf-kochi-gothic | ttf-kochi-mincho Description: libraries for the Kiten Japanese reference and study aid This package contains shared libraries, language data, and resources used by - the Kiten Japanese reference and study aid. Portions of this library, + the the Kiten Japanese reference and study aid. Portions of this library, such as dictionary and character lookup widgets, may be useful for other applications. . @@ -401,6 +401,8 @@ #Architecture: any #Section: science #Depends: ${shlibs:Depends} +#Conflicts: indi-kde4 +#Replaces: indi-kde4 #Description: Instrument Neutral Distributed Interface for astronomical devices # Instrument Neutral Distributed Interface is a Distributed Control System # protocol to enable control, data acquisition and exchange among hardware @@ -412,7 +414,7 @@ Package: marble Architecture: any -Section: misc +Section: kde Depends: ${shlibs:Depends}, libmarble4 (= ${binary:Version}), marble-data (>= ${source:Version}) Conflicts: marble-kde4 @@ -427,7 +429,7 @@ Package: marble-data Architecture: all -Section: misc +Section: kde Conflicts: marble-data-kde4 Replaces: marble-data-kde4 Description: data files for Marble @@ -474,7 +476,6 @@ parley-data (>= ${source:Version}), kdeedu-kvtml-data (= ${source:Version}) Conflicts: parley-kde4 Replaces: parley-kde4, parley-data (<< 4:4.1.86) -Recommends: libkrosspython0 Suggests: khelpcenter4 Description: vocabulary trainer for KDE 4 Parley is a utility to help train vocabulary when learning a foreign language. @@ -495,7 +496,7 @@ Package: step Architecture: any -Section: science +Section: kde Conflicts: step-kde4 Replaces: step-kde4 Depends: ${shlibs:Depends} @@ -506,8 +507,6 @@ laws of physics. You can change every property of bodies/forces in your experiment (even during simulation) and see how this will change evolution of the experiment. - . - This package is part of the KDE 4 education module. Package: kdeedu-kvtml-data Architecture: all diff -u kdeedu-4.3.3/debian/KUBUNTU-DEBIAN-DIFFERENCES kdeedu-4.3.3/debian/KUBUNTU-DEBIAN-DIFFERENCES --- kdeedu-4.3.3/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ kdeedu-4.3.3/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,18 +1,8 @@ - - 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 + - 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 diff -u kdeedu-4.3.3/debian/not-installed kdeedu-4.3.3/debian/not-installed --- kdeedu-4.3.3/debian/not-installed +++ kdeedu-4.3.3/debian/not-installed @@ -23,6 +23,2 @@ -# Shipped in oxygen-icon-theme +# File conflict with oxygen-icons ./usr/share/icons/oxygen/22x22/actions/pointer.png - -#wikitionary_sound.py in Parley doesn't work -./usr/share/kde4/apps/parley/plugins/wiktionary_sound.desktop -./usr/share/kde4/apps/parley/plugins/wiktionary_sound.py diff -u kdeedu-4.3.3/debian/patches/series kdeedu-4.3.3/debian/patches/series --- kdeedu-4.3.3/debian/patches/series +++ kdeedu-4.3.3/debian/patches/series @@ -1,4 +1,3 @@ -step_needs_-lcln.diff -00_kfreebsd.diff kubuntu_01_marble_desktop_tryexec.diff +kubuntu_02_qt_phonon.diff kubuntu_03_fix_kstars_buffer_overrun.diff reverted: --- kdeedu-4.3.3/debian/patches/00_kfreebsd.diff +++ kdeedu-4.3.3.orig/debian/patches/00_kfreebsd.diff @@ -1,19 +0,0 @@ -Test on __linux__ is wrong as the behaviour does not depends on the kernel -but on the userland, that is GNU libc, tested by __GLIBC__. Test on -__FreeBSD__ and __NetBSD__ are correct though as they represent both the -kernel and the userland. - -The patch does not remove __linux__ in the patch to be as conservative as -possible. - ---- a/kstars/kstars/htmesh/SpatialGeneral.h -+++ b/kstars/kstars/htmesh/SpatialGeneral.h -@@ -80,7 +80,7 @@ typedef unsigned long long uint64; - - // emulate the standard bool type where not supported by compiler - --# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) -+# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GLIBC__) - # ifdef __unix__ - /* - * The following ifndef must ALWAYS be present since C++ may use reverted: --- kdeedu-4.3.3/debian/patches/step_needs_-lcln.diff +++ kdeedu-4.3.3.orig/debian/patches/step_needs_-lcln.diff @@ -1,11 +0,0 @@ ---- a/step/step/CMakeLists.txt -+++ b/step/step/CMakeLists.txt -@@ -48,7 +48,7 @@ if(STEP_WITH_QALCULATE) - add_definitions(-DSTEP_WITH_UNITSCALC) - add_definitions(${QALCULATE_CFLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- set(qalculate_LIBS ${QALCULATE_LIBRARIES}) -+ set(qalculate_LIBS ${QALCULATE_LIBRARIES} -lcln) - endif(STEP_WITH_QALCULATE) - - find_package(KDE4 REQUIRED) only in patch2: unchanged: --- kdeedu-4.3.3.orig/debian/plasmoid-worldclock.install +++ kdeedu-4.3.3/debian/plasmoid-worldclock.install @@ -0,0 +1,2 @@ +usr/lib/kde4/plasma_applet_worldclock.so +usr/share/kde4/services/plasma-applet-kworldclock.desktop only in patch2: unchanged: --- kdeedu-4.3.3.orig/debian/plasma-widget-worldclock.install +++ kdeedu-4.3.3/debian/plasma-widget-worldclock.install @@ -0,0 +1,2 @@ +usr/lib/kde4/plasma_applet_worldclock.so +usr/share/kde4/services/plasma-applet-kworldclock.desktop only in patch2: unchanged: --- kdeedu-4.3.3.orig/debian/patches/kubuntu_02_qt_phonon.diff +++ kdeedu-4.3.3/debian/patches/kubuntu_02_qt_phonon.diff @@ -0,0 +1,33 @@ +--- kdeedu/parley/src/practiceold/practicedialog.cpp 2008-10-09 09:47:15.000000000 +0000 ++++ kdeedu/parley/src/practiceold/practicedialog.cpp 2009-05-11 09:30:04.000000000 +0000 +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- kdeedu/parley/src/practiceold/showsolutiondialog.cpp~ 2008-07-22 00:03:55.000000000 +0000 ++++ kdeedu/parley/src/practiceold/showsolutiondialog.cpp 2009-05-11 09:34:26.000000000 +0000 +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + + ShowSolutionDialog::ShowSolutionDialog(TestEntry* entry, QWidget* parent) + :KDialog(parent) +--- kdeedu/parley/src/practice/prompt/soundprompt.h 2008-10-17 11:00:39.000000000 +0000 ++++ kdeedu/parley/src/practice/prompt/soundprompt.h 2009-05-15 10:24:47.000000000 +0000 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + +