Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

1 files changed, 12 insertions, 15 deletions

diff --git a/kde/kdebase-workspace/.footprint.i686 b/kde/kdebase-workspace/.footprint.i686
index 1b5f94980..59f50eb36 100644
--- a/kde/kdebase-workspace/.footprint.i686
+++ b/kde/kdebase-workspace/.footprint.i686
@@ -9,6 +9,10 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 drwxr-xr-x	root/root	etc/kde/
 -rw-r--r--	root/root	etc/kde/kdmrc
 -rw-r--r--	root/root	etc/ksysguarddrc
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/kde
+-rw-r--r--	root/root	etc/pam.d/kde-np
+-rw-r--r--	root/root	etc/pam.d/kscreensaver
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/genkdmconf
@@ -179,11 +183,11 @@ drwxr-xr-x	root/root	usr/include/taskmanager/
 -rw-r--r--	root/root	usr/include/taskmanager/taskmanager_export.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cmake/
-drwxr-xr-x	root/root	usr/lib/cmake/KDE4Workspace-4.6.00/
--rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.00/KDE4WorkspaceConfig.cmake
--rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.00/KDE4WorkspaceConfigVersion.cmake
--rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.00/KDE4WorkspaceLibraryTargets-release.cmake
--rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.00/KDE4WorkspaceLibraryTargets.cmake
+drwxr-xr-x	root/root	usr/lib/cmake/KDE4Workspace-4.6.1/
+-rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.1/KDE4WorkspaceConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.1/KDE4WorkspaceConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.1/KDE4WorkspaceLibraryTargets-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/KDE4Workspace-4.6.1/KDE4WorkspaceLibraryTargets.cmake
 drwxr-xr-x	root/root	usr/lib/kconf_update_bin/
 -rwxr-xr-x	root/root	usr/lib/kconf_update_bin/krdb_clearlibrarypath
 -rwxr-xr-x	root/root	usr/lib/kconf_update_bin/kwin_update_default_rules
@@ -245,7 +249,6 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_standard_actions.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_style.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_usb.so
--rwxr-xr-x	root/root	usr/lib/kde4/kcm_view1394.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_workspaceoptions.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_xinerama.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kded_freespacenotifier.so
@@ -307,6 +310,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/libexec/
 -rwxr-xr-x	root/root	usr/lib/kde4/libexec/kwin_opengl_test
 -rwxr-xr-x	root/root	usr/lib/kde4/libexec/kwin_rules_dialog
 -rwxr-xr-x	root/root	usr/lib/kde4/libexec/test_kcm_xinerama
+-rwxr-xr-x	root/root	usr/lib/kde4/plasma-geolocation-gps.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma-geolocation-ip.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_animator_default.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_activitybar.so
@@ -409,7 +413,6 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/styles/
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_fakenet.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_lirc.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_modemmanager04.so
--rwxr-xr-x	root/root	usr/lib/kde4/solid_networkmanager07.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_wicd.so
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so -> libkdecorations.so.4
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so.4 -> libkdecorations.so.4.6.0
@@ -579,14 +582,12 @@ drwxr-xr-x	root/root	usr/share/apps/kcmsolidactions/
 -rw-r--r--	root/root	usr/share/apps/kcmsolidactions/solid-action-template.desktop
 drwxr-xr-x	root/root	usr/share/apps/kcmusb/
 -rw-r--r--	root/root	usr/share/apps/kcmusb/usb.ids
-drwxr-xr-x	root/root	usr/share/apps/kcmview1394/
--rw-r--r--	root/root	usr/share/apps/kcmview1394/oui.db
 drwxr-xr-x	root/root	usr/share/apps/kconf_update/
 -rwxr-xr-x	root/root	usr/share/apps/kconf_update/convertShortcuts.pl
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kaccel.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kcmdisplayrc.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/klipper-kconfigxt.upd
--rw-r--r--	root/root	usr/share/apps/kconf_update/krdb.upd
+-rw-r--r--	root/root	usr/share/apps/kconf_update/krdb_libpathwipe.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/ksmserver.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/ksmserver_shortcuts.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kwin.upd
@@ -2171,7 +2172,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
@@ -2179,7 +2179,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kfontview.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kwin.png
--rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/
@@ -2193,7 +2192,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/
@@ -2245,7 +2243,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/kcmlaunch.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcmsmserver.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kcmusb.desktop
--rw-r--r--	root/root	usr/share/kde4/services/kcmview1394.desktop
 drwxr-xr-x	root/root	usr/share/kde4/services/kded/
 -rw-r--r--	root/root	usr/share/kde4/services/kded/freespacenotifier.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kded/kephal.desktop
@@ -2425,6 +2422,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/kwin/
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-engine-akonadi.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-engine-metadata.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-engine-searchlaunch.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/plasma-geolocation-gps.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-geolocation-ip.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/plasma-layout-org.kde.plasma-desktop.findWidgets.desktop
@@ -2526,7 +2524,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/solidbackends/
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_lirc.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_modemmanager04.desktop
--rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_wicd.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/standard_actions.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/style.desktop