Hello community,
here is the log from the commit of package kdeedu4
checked in at Sun Jun 22 07:16:07 CEST 2008.
--------
--- KDE/kdeedu4/kdeedu4.changes 2008-05-29 09:17:39.000000000 +0200
+++ kdeedu4/kdeedu4.changes 2008-06-10 14:25:57.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jun 10 14:25:57 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.82
+
+-------------------------------------------------------------------
+Mon Jun 9 23:03:47 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.81
+
+-------------------------------------------------------------------
kdeedu4-noarch.changes: same change
Old:
----
4_0_BRANCH.diff
kdeedu-4.0.4.tar.bz2
New:
----
4_1_BRANCH.diff
kdeedu-4.0.82.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeedu4-noarch.spec ++++++
--- /var/tmp/diff_new_pack.i13002/_old 2008-06-22 06:14:26.000000000 +0200
+++ /var/tmp/diff_new_pack.i13002/_new 2008-06-22 06:14:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4-noarch (Version 4.0.4)
+# spec file for package kdeedu4-noarch (Version 4.0.82)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,10 +20,11 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
Url: http://edu.kde.org
-Version: 4.0.4
-Release: 12
+Version: 4.0.82
+Release: 1
Source0: kdeedu-%version.tar.bz2
Source1: _upstream
+Patch0: 4_1_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
BuildArch: noarch
@@ -40,6 +41,7 @@
%prep
%setup -q -n kdeedu-%version
+%patch
%build
%cmake_kde4 -d build
@@ -80,7 +82,7 @@
%files -n kde4-marble-data
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/marble
%_kde_share_dir/apps/marble/data
@@ -103,15 +105,19 @@
%files -n kde4-kstars-data -f filelists/kstars
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/kstars
%endif
%files
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%changelog
+* Tue Jun 10 2008 dmueller@suse.de
+- update to 4.0.82
+* Tue Jun 10 2008 dmueller@suse.de
+- update to 4.0.81
* Thu May 29 2008 dmueller@suse.de
- make sure that the right version of kde4-marble-data is installed
(kde#162254)
++++++ kdeedu4.spec ++++++
--- /var/tmp/diff_new_pack.i13002/_old 2008-06-22 06:14:26.000000000 +0200
+++ /var/tmp/diff_new_pack.i13002/_new 2008-06-22 06:14:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4 (Version 4.0.4)
+# spec file for package kdeedu4 (Version 4.0.82)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
Name: kdeedu4
-BuildRequires: boost-devel freeglut-devel libeigen libkde4-devel ocaml
+BuildRequires: boost-devel freeglut-devel kdebase4-workspace-devel libeigen ocaml
BuildRequires: libopenbabel-devel ocaml-facile readline-devel
%if 0
#arch %ix86
@@ -24,12 +24,11 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
Url: http://edu.kde.org
-Version: 4.0.4
-Release: 12
-%define rversion 4.0.4
-Source0: kdeedu-%rversion.tar.bz2
+Version: 4.0.82
+Release: 1
+Source0: kdeedu-%version.tar.bz2
Source1: _upstream
-Patch0: 4_0_BRANCH.diff
+Patch0: 4_1_BRANCH.diff
Patch1: marble-designer-plugin.diff
Patch2: desktop-files.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,7 +66,7 @@
The KDE Team
%prep
-%setup -q -n kdeedu-%rversion
+%setup -q -n kdeedu-%version
%patch
%patch1
%patch2
@@ -79,12 +78,14 @@
%install
cd build
%makeinstall
+%if 0
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/parley.svgz $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/128x128/apps/parley.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/16x16/apps/parley.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/32x32/apps/parley.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/48x48/apps/parley.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/64x64/apps/parley.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
+%endif
%create_subdir_filelist -d libkdeedu -v libkdeedu.devel
%create_subdir_filelist -d marble -v marble.devel
%create_subdir_filelist -d blinken
@@ -107,11 +108,12 @@
cd ..
sed -ri s,.*libsbigudrv.so.*,, filelists/kstars
sed -ri s,.*/usr/share/kde4/apps/marble/data.*,, filelists/marble
+%if 0
sed -ri s,.*/usr/share/icons/oxygen/.*/apps/parley.*,, filelists/parley
+%endif
%create_exclude_filelist
%suse_update_desktop_file khangman Education Languages
%suse_update_desktop_file kiten Education Languages
- %suse_update_desktop_file radselect Education Languages
%suse_update_desktop_file klettres Education Languages
%suse_update_desktop_file parley Education Languages
%suse_update_desktop_file kwordquiz Education Languages
@@ -164,7 +166,7 @@
%files -n libkdeedu4 -f filelists/libkdeedu
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n libkdeedu4-devel
License: GPL v2 or later
@@ -184,8 +186,9 @@
%files -n libkdeedu4-devel -f filelists/libkdeedu.devel
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/include/libkdeedu
+/usr/share/kde4/apps/cmake/modules/FindKDEEdu.cmake
%package -n kde4-blinken
License: GPL v2 or later
@@ -208,7 +211,7 @@
%files -n kde4-blinken -f filelists/blinken
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-marble
License: GPL v2 or later
@@ -232,7 +235,7 @@
%files -n kde4-marble -f filelists/marble
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/marble_part
%package -n kde4-marble-devel
@@ -252,8 +255,9 @@
%files -n kde4-marble-devel -f filelists/marble.devel
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/include/marble
+/usr/share/kde4/apps/cmake/modules/FindMarbleWidget.cmake
%package -n kde4-kalzium
License: GPL v2 or later
@@ -278,10 +282,7 @@
%files -n kde4-kalzium -f filelists/kalzium
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
-%dir /usr/%_lib/avogadro-kalzium
-%dir /usr/%_lib/avogadro-kalzium/engines
-%dir /usr/%_lib/avogadro-kalzium/tools
+%doc COPYING COPYING.DOC README
%package -n kde4-kanagram
License: GPL v2 or later
@@ -305,7 +306,7 @@
%files -n kde4-kanagram -f filelists/kanagram
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%config %_kde_config_dir/kanagram.knsrc
%dir /usr/share/kde4/apps/kvtml
%dir /usr/share/kde4/apps/kvtml/en
@@ -331,7 +332,7 @@
%files -n kde4-kbruch -f filelists/kbruch
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kalgebra
License: GPL v2 or later
@@ -354,7 +355,7 @@
%files -n kde4-kalgebra -f filelists/kalgebra
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kgeography
License: GPL v2 or later
@@ -377,7 +378,7 @@
%files -n kde4-kgeography -f filelists/kgeography
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-khangman
License: GPL v2 or later
@@ -401,7 +402,7 @@
%files -n kde4-khangman -f filelists/khangman
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/kvtml
%dir /usr/share/kde4/apps/kvtml/en
@@ -429,7 +430,7 @@
%files -n kde4-kig -f filelists/kig
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kiten
License: GPL v2 or later
@@ -452,7 +453,7 @@
%files -n kde4-kiten -f filelists/kiten
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir /usr/include/libkiten
%dir /usr/share/kde4/apps/kitenradselect
@@ -477,7 +478,7 @@
%files -n kde4-klettres -f filelists/klettres
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%config %_kde_config_dir/klettres.knsrc
%package -n kde4-kmplot
@@ -501,7 +502,7 @@
%files -n kde4-kmplot -f filelists/kmplot
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kpercentage
License: GPL v2 or later
@@ -524,7 +525,7 @@
%files -n kde4-kpercentage -f filelists/kpercentage
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kstars
License: GPL v2 or later
@@ -548,7 +549,7 @@
%files -n kde4-kstars -f filelists/kstars
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-ktouch
License: GPL v2 or later
@@ -571,7 +572,7 @@
%files -n kde4-ktouch -f filelists/ktouch
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-kturtle
License: GPL v2 or later
@@ -594,7 +595,7 @@
%files -n kde4-kturtle -f filelists/kturtle
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%package -n kde4-parley
License: GPL v2 or later
@@ -618,8 +619,10 @@
%files -n kde4-parley -f filelists/parley
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
+%if 0
/usr/share/icons/hicolor/*/apps/parley.*
+%endif
%package -n kde4-kwordquiz
License: GPL v2 or later
@@ -643,15 +646,20 @@
%files -n kde4-kwordquiz -f filelists/kwordquiz
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%config %_kde_config_dir/kwordquiz.knsrc
%files -f filelists/exclude
%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
+%doc COPYING COPYING.DOC README
%dir %_kde_share_dir/apps/libkdeedu
+%doc %lang(en) /usr/share/doc/kde/HTML/en/step
%changelog
+* Tue Jun 10 2008 dmueller@suse.de
+- update to 4.0.82
+* Tue Jun 10 2008 dmueller@suse.de
+- update to 4.0.81
* Thu May 29 2008 dmueller@suse.de
- make sure that the right version of kde4-marble-data is installed
(kde#162254)
++++++ 4_0_BRANCH.diff -> 4_1_BRANCH.diff ++++++
--- KDE/kdeedu4/4_0_BRANCH.diff 2008-05-02 11:09:23.000000000 +0200
+++ kdeedu4/4_1_BRANCH.diff 2008-06-10 15:37:49.000000000 +0200
@@ -1,44 +1,7 @@
-package: kdeedu-4.0.4.tar.bz2
+package: kdeedu-4.0.82.tar.bz2
kdemod: kdeedu
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 803050
-+svn di between //tags/KDE/4.0.4/kdeedu and //branches/KDE/4.0/kdeedu
---- parley/src/practice/MCQueryDlg.cpp
-+++ parley/src/practice/MCQueryDlg.cpp
-@@ -37,7 +37,7 @@
- #include <QRadioButton>
- #include <QButtonGroup>
- #include <QPushButton>
--#include <QKeyEvent>
-+#include <QShortcut>
-
- MCQueryDlg::MCQueryDlg(KEduVocDocument *doc, QWidget *parent) : PracticeDialog(i18n("Multiple Choice"), doc, parent)
- {
-@@ -86,6 +86,17 @@
- mw->know_it->setVisible(Prefs::skipKnownEnabled());
- mw->imageGraphicsView->setVisible(false);
-
-+ QShortcut *shortcut1 = new QShortcut(QKeySequence(Qt::Key_1), this);
-+ connect(shortcut1, SIGNAL(activated()), mw->choiceRadioButton1, SLOT(animateClick()));
-+ QShortcut *shortcut2 = new QShortcut(QKeySequence(Qt::Key_2), this);
-+ connect(shortcut2, SIGNAL(activated()), mw->choiceRadioButton2, SLOT(animateClick()));
-+ QShortcut *shortcut3 = new QShortcut(QKeySequence(Qt::Key_3), this);
-+ connect(shortcut3, SIGNAL(activated()), mw->choiceRadioButton3, SLOT(animateClick()));
-+ QShortcut *shortcut4 = new QShortcut(QKeySequence(Qt::Key_4), this);
-+ connect(shortcut4, SIGNAL(activated()), mw->choiceRadioButton4, SLOT(animateClick()));
-+ QShortcut *shortcut5 = new QShortcut(QKeySequence(Qt::Key_5), this);
-+ connect(shortcut5, SIGNAL(activated()), mw->choiceRadioButton5, SLOT(animateClick()));
-+
- m_choiceRadioButtons << mw->choiceRadioButton1
- << mw->choiceRadioButton2
- << mw->choiceRadioButton3
-
-Property changes on: .
-___________________________________________________________________
-Deleted: svn:mergeinfo
-Added: svn:externals
- +
-
-
++current HEAD:
++svn di between //trunk/KDE/kdeedu@819047 and //trunk/KDE/kdeedu
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.i13002/_old 2008-06-22 06:14:26.000000000 +0200
+++ /var/tmp/diff_new_pack.i13002/_new 2008-06-22 06:14:26.000000000 +0200
@@ -1,19 +1,9 @@
---- ./kiten/radselect/radselect.desktop 2007/05/10 14:59:58 1.1
-+++ ./kiten/radselect/radselect.desktop 2007/05/10 15:00:03
-@@ -3,7 +3,6 @@
- Name=radselect
- Name[x-test]=xxradselectxx
- Exec=kitenradselect %i -caption "%c"
--Icon=radselect
- Type=Application
- DocPath=radselect/radselect.html
- Comment=A helper program for kiten
--- marble/src/marble.desktop 2007/07/10 10:38:39 1.1
+++ marble/src/marble.desktop 2007/07/10 10:38:51
@@ -9,3 +9,3 @@
Icon=marble
Terminal=false
--Categories=Qt;KDE;Education;Utility;X-KDE-More;Science;
+-Categories=Qt;KDE;Education;Science;
+Categories=Qt;KDE;Education;Science;Astronomy;
--- kiten/app/kiten.desktop 2007/09/01 10:56:40 1.1
+++ kiten/app/kiten.desktop 2007/09/01 10:56:45
++++++ kdeedu-4.0.4.tar.bz2 -> kdeedu-4.0.82.tar.bz2 ++++++
KDE/kdeedu4/kdeedu-4.0.4.tar.bz2 kdeedu4/kdeedu-4.0.82.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org