diff -Nru kubuntu-active-default-settings-12.04.0ubuntu1/debian/changelog kubuntu-active-default-settings-12.04.0ubuntu2/debian/changelog --- kubuntu-active-default-settings-12.04.0ubuntu1/debian/changelog 2012-03-05 11:24:58.000000000 +0000 +++ kubuntu-active-default-settings-12.04.0ubuntu2/debian/changelog 2012-03-21 14:53:36.000000000 +0000 @@ -1,3 +1,11 @@ +kubuntu-active-default-settings (12.04.0ubuntu2) precise; urgency=low + + * Remove share/config/kdeglobals as plasma-active-default-settings already + provides it. + * Add /usr/share/plasma-active-default-settings/ to KDEDIRS + + -- Rodrigo Belem Sat, 17 Mar 2012 16:38:09 -0400 + kubuntu-active-default-settings (12.04.0ubuntu1) precise; urgency=low [ Rodrigo Belem ] diff -Nru kubuntu-active-default-settings-12.04.0ubuntu1/etc/X11/Xsession.d/51kubuntu-active kubuntu-active-default-settings-12.04.0ubuntu2/etc/X11/Xsession.d/51kubuntu-active --- kubuntu-active-default-settings-12.04.0ubuntu1/etc/X11/Xsession.d/51kubuntu-active 2012-03-03 00:46:40.000000000 +0000 +++ kubuntu-active-default-settings-12.04.0ubuntu2/etc/X11/Xsession.d/51kubuntu-active 2012-03-17 20:37:17.000000000 +0000 @@ -1,5 +1,5 @@ if [ -z "$KDEDIRS" ]; then - export KDEDIRS=/usr/share/kubuntu-active-default-settings/:/usr/share/kubuntu-default-settings/kde4-profile/default/ + export KDEDIRS=/usr/share/kubuntu-active-default-settings/:/usr/share/plasma-active-default-settings/:/usr/share/kubuntu-default-settings/kde4-profile/default/ else - export KDEDIRS=/usr/share/kubuntu-active-default-settings/:$KDEDIRS + export KDEDIRS=/usr/share/kubuntu-active-default-settings/:/usr/share/plasma-active-default-settings/:$KDEDIRS fi diff -Nru kubuntu-active-default-settings-12.04.0ubuntu1/share/config/kdeglobals kubuntu-active-default-settings-12.04.0ubuntu2/share/config/kdeglobals --- kubuntu-active-default-settings-12.04.0ubuntu1/share/config/kdeglobals 2012-03-05 11:23:45.000000000 +0000 +++ kubuntu-active-default-settings-12.04.0ubuntu2/share/config/kdeglobals 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[General] -BrowserApplication=!active-webbrowser