Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit kdebase4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 09 Aug 2007 16:31:55 +0200
  • Message-id: <20070809143155.7CB5D67832C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdebase4
checked in at Thu Aug 9 16:31:55 CEST 2007.

--------
--- KDE/kdebase4/kdebase4.changes       2007-07-28 22:58:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes      2007-08-09 09:57:47.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug  9 09:57:10 CEST 2007 - stbinner@xxxxxxx
+
+- update to 3.92.0.svn697325
+- fix file conflicts
+
+-------------------------------------------------------------------
kdebase4-wallpapers.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.y23522/_old  2007-08-09 16:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.y23522/_new  2007-08-09 16:31:16.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package kdebase4 (Version 3.92.0)
+# spec file for package kdebase4 (Version 3.92.0.svn697325)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,7 +20,7 @@
 Group:          System/GUI/KDE
 Summary:        The KDE Workspace Components
 Url:            http://www.kde.org/
-Version:        3.92.0
+Version:        3.92.0.svn697325
 Release:        1
 Source0:        kdebase.tar.bz2
 Source1:        _upstream
@@ -63,7 +63,7 @@
     The KDE Team <kde@xxxxxxx>
 
 %prep
-%setup -q -n kdebase-3.92.0
+%setup -q -n kdebase
 %patch
 %patch1
 %patch2
@@ -437,7 +437,6 @@
 /usr/%_lib/kde4/kcm_kwinoptions.so
 /usr/%_lib/kde4/kcm_kwinrules.so
 /usr/%_lib/kde4/kwin3_b2.so
-/usr/%_lib/kde4/kwin3_default.so
 /usr/%_lib/kde4/kwin3_keramik.so
 /usr/%_lib/kde4/kwin3_laptop.so
 /usr/%_lib/kde4/kwin3_modernsys.so
@@ -446,7 +445,6 @@
 /usr/%_lib/kde4/kwin3_redmond.so
 /usr/%_lib/kde4/kwin3_web.so
 /usr/%_lib/kde4/kwin_b2_config.so
-/usr/%_lib/kde4/kwin_default_config.so
 /usr/%_lib/kde4/kwin_keramik_config.so
 /usr/%_lib/kde4/kwin_modernsys_config.so
 /usr/%_lib/kde4/kwin_plastik_config.so
@@ -454,14 +452,16 @@
 /usr/%_lib/kde4/kcm_kwin4_effect_builtins.so
 /usr/%_lib/kde4/kcm_kwineffects.so
 /usr/%_lib/kde4/kwin3_oxy.so
+/usr/%_lib/kde4/kwin3_kde2.so
+/usr/%_lib/kde4/kwin_kde2_config.so
 /usr/%_lib/libkdeinit4_kwin_rules_dialog.so
 /usr/%_lib/libkdeinit4_kwin.so
 
-%_kde_share_dir/apps/kconf_update/*.upd
+%_kde_share_dir/apps/kconf_update/kwin3_plugin.pl
 
-%_kde_share_dir/apps/kconf_update/*.sh
+%_kde_share_dir/apps/kconf_update/kwin_focus1.sh
 
-%_kde_share_dir/apps/kconf_update/*.pl
+%_kde_share_dir/apps/kconf_update/kwin_focus2.sh
 
 %_kde_share_dir/apps/kwin
 
@@ -488,6 +488,22 @@
 %_kde_share_dir/services/kwinoptions.desktop
 
 %_kde_share_dir/services/kwinrules.desktop
+
+%_kde_share_dir/apps/kconf_update/kwin.upd
+
+%_kde_share_dir/apps/kconf_update/kwin3_plugin.upd
+
+%_kde_share_dir/apps/kconf_update/kwin_focus1.upd
+
+%_kde_share_dir/apps/kconf_update/kwin_focus2.upd
+
+%_kde_share_dir/apps/kconf_update/kwin_fsp_workarounds_1.upd
+
+%_kde_share_dir/apps/kconf_update/kwiniconify.upd
+
+%_kde_share_dir/apps/kconf_update/kwinsticky.upd
+
+%_kde_share_dir/apps/kconf_update/kwinupdatewindowsettings.upd
 %package devel
 Requires:       libkdepimlibs4-devel kdebase4 = %version
 Summary:        The KDE Base Components: Build Environment
@@ -1017,7 +1033,7 @@
 /usr/share/desktop-directories/kde-settings-system.directory
 /usr/share/desktop-directories/kde-settings-webbrowsing.directory
 /usr/share/desktop-directories/kde-education.directory
-/usr/share/icons/crystalsvg/*/actions/abentry.*
+/usr/share/icons/oxygen/*/actions/abentry.*
 /usr/share/icons/crystalsvg/*/actions/knewstuff.*
 /usr/share/icons/crystalsvg/*/apps/energy.*
 /usr/share/icons/crystalsvg/*/apps/hwinfo.*
@@ -1251,6 +1267,8 @@
 #%_kde_share_dir/services/plasma-applet-ciavc.desktop
 #%_kde_share_dir/services/plasma-engine-ciavc.desktop
 
+%_kde_share_dir/services/plasma-applet-url.desktop
+
 %_kde_share_dir/services/plasma-clock-default.desktop
 
 %_kde_share_dir/services/plasma-engine-time.desktop
@@ -1331,7 +1349,6 @@
 /usr/%_lib/kde4/kwin4_effect_builtins.so
 /usr/%_lib/kde4/kwin4_effect_tests.so
 #/usr/%_lib/kde4/kxkb_panelapplet.so
-/usr/%_lib/kde4/launcher_panelapplet.so
 /usr/%_lib/kde4/libexec/test_kcm_xinerama
 /usr/%_lib/kde4/libkfontviewpart.so
 /usr/%_lib/kde4/libkhtmlkttsdplugin.so
@@ -1507,6 +1524,7 @@
 
 %_kde_share_dir/config.kcfg/kcm_useraccount.kcfg
 #%_kde_share_dir/config.kcfg/kcm_useraccount_pass.kcfg
+/usr/share/dbus-1/interfaces/org.kde.krunner.App.xml
 
 %_kde_share_dir/config.kcfg/kickerSettings.kcfg
 
@@ -1514,8 +1532,6 @@
 
 %_kde_share_dir/config.kcfg/kscreensaversettings.kcfg
 
-%_kde_share_dir/config.kcfg/launcherapplet.kcfg
-
 %_kde_share_dir/config.kcfg/taskbar.kcfg
 %config %_kde_config_dir/konqsidebartng.rc
 /usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
@@ -1660,6 +1676,10 @@
 /usr/share/icons/oxygen/*/apps/kfontview.*
 /usr/share/icons/oxygen/*/mimetypes/fonts-package.*
 /usr/share/icons/oxygen/*/actions/view-process-system.*
+/usr/share/icons/oxygen/*/actions/view-process-all-tree.*
+/usr/share/icons/oxygen/*/actions/view-process-all.*
+/usr/share/icons/oxygen/*/actions/view-process-own.*
+/usr/share/icons/oxygen/*/actions/view-process-users.*
 
 %_kde_share_dir/services/accessibility.desktop
 
@@ -1834,7 +1854,32 @@
 %_kde_share_dir/servicetypes/uasprovider.desktop
 /usr/share/sounds/pop.wav
 
+%_kde_share_dir/apps/kconf_update/convertShortcuts.pl
+
+%_kde_share_dir/apps/kconf_update/kfmclient_3_2_update.sh
+
+%_kde_share_dir/apps/kconf_update/kicker-3.1-properSizeSetting.pl
+
+%_kde_share_dir/apps/kconf_update/kicker-3.5-kconfigXTize.pl
+
+%_kde_share_dir/apps/kconf_update/kicker-3.5-taskbarEnums.pl
+
+%_kde_share_dir/apps/kconf_update/klipper-1-2.pl
+
+%_kde_share_dir/apps/kconf_update/klipper-kde31.sh
+
+%_kde_share_dir/apps/kconf_update/move_favicons.sh
+
+%_kde_share_dir/apps/kconf_update/move_konqsidebartng_entries.sh
+
+%_kde_share_dir/apps/kconf_update/move_session_config.sh
+
+%_kde_share_dir/apps/kconf_update/pluginlibFix.pl
+
 %changelog
+* Thu Aug 09 2007 - stbinner@xxxxxxx
+- update to 3.92.0.svn697325
+- fix file conflicts
 * Sat Jul 28 2007 - stbinner@xxxxxxx
 - update to KDE 4.0 Beta 1
 * Thu Jul 19 2007 - stbinner@xxxxxxx

++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.y23522/_old  2007-08-09 16:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.y23522/_new  2007-08-09 16:31:16.000000000 +0200
@@ -21,7 +21,7 @@
 Summary:        KDE 4 Wallpapers
 Url:            http://www.kde.org/
 Version:        3.92.0
-Release:        1
+Release:        10
 Source0:        kdebase.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -37,7 +37,7 @@
     The KDE Team <kde@xxxxxxx>
 
 %prep
-%setup -q -n kdebase-3.92.0
+%setup -q -n kdebase
 
 %build
   %cmake_kde4 -d build
@@ -58,6 +58,9 @@
 /usr/share/wallpapers
 
 %changelog
+* Thu Aug 09 2007 - stbinner@xxxxxxx
+- update to 3.92.0.svn697325
+- fix file conflicts
 * Sat Jul 28 2007 - stbinner@xxxxxxx
 - update to KDE 4.0 Beta 1
 * Thu Jul 19 2007 - stbinner@xxxxxxx

++++++ dotkde4.diff ++++++
--- /var/tmp/diff_new_pack.y23522/_old  2007-08-09 16:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.y23522/_new  2007-08-09 16:31:16.000000000 +0200
@@ -1,7 +1,5 @@
-Index: workspace/startkde
-===================================================================
---- workspace/startkde (revision 646264)
-+++ workspace/startkde (working copy)
+--- workspace/startkde.cmake   2007/08/07 17:24:08     1.1
++++ workspace/startkde.cmake   2007/08/07 17:24:13
 @@ -55,7 +55,7 @@
  # The user's personal KDE directory is usually ~/.kde, but this setting
  # may be overridden by setting KDEHOME.

++++++ kdebase.tar.bz2 ++++++
KDE/kdebase4/kdebase.tar.bz2 /mounts/work_src_done/STABLE/kdebase4/kdebase.tar.bz2 differ: byte 11, line 1





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread