diff -Nru /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/debian/changelog /tmp/TZIeusYfug/kubuntu-default-settings-6.10/debian/changelog --- /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/debian/changelog 2006-10-23 12:36:01.000000000 +0200 +++ /tmp/TZIeusYfug/kubuntu-default-settings-6.10/debian/changelog 2006-12-08 20:37:53.000000000 +0100 @@ -1,3 +1,10 @@ +kubuntu-default-settings (1:6.10-61.1) edgy; urgency=low + + * Do not hide directories on / as this has just confused users. + Remove /.hidden symbolic link. LP #75017 + + -- Luka Renko Fri, 8 Dec 2006 19:35:23 +0100 + kubuntu-default-settings (1:6.10-61) edgy; urgency=low * ./cursors/default/index.theme, diff -Nru /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/debian/kubuntu-default-settings.postinst /tmp/TZIeusYfug/kubuntu-default-settings-6.10/debian/kubuntu-default-settings.postinst --- /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/debian/kubuntu-default-settings.postinst 2006-10-11 16:15:54.000000000 +0200 +++ /tmp/TZIeusYfug/kubuntu-default-settings-6.10/debian/kubuntu-default-settings.postinst 2006-12-08 21:47:48.000000000 +0100 @@ -23,11 +23,14 @@ foomatic-cleanupdrivers fi + # remove /.hidden symlink introduced in edgy release + if [ -s /.hidden ]; then + if [ "`readlink /.hidden`" = "/etc/kubuntu-default-settings/hidden-root" ]; then + rm /.hidden + fi + fi + # create links for .hidden files, don't bail out if s.th. goes wrong. - if [ ! -e /.hidden ]; then - ln -s /etc/kubuntu-default-settings/hidden-root /.hidden || \ - echo "Could not create symlink /.hidden, skipping." - fi if [ -d /media ]; then if [ ! -e /media/.hidden ]; then ln -s /etc/kubuntu-default-settings/hidden-media /media/.hidden || \ diff -Nru /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/Makefile /tmp/TZIeusYfug/kubuntu-default-settings-6.10/Makefile --- /tmp/bE55qNoNBp/kubuntu-default-settings-6.10/Makefile 2006-10-11 16:15:46.000000000 +0200 +++ /tmp/TZIeusYfug/kubuntu-default-settings-6.10/Makefile 2006-12-08 20:34:53.000000000 +0100 @@ -160,5 +160,4 @@ ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool" mkdir -p "$(DESTDIR)/etc/kubuntu-default-settings" - install -m644 kde-hidden/hidden-root "$(DESTDIR)/etc/kubuntu-default-settings/" install -m644 kde-hidden/hidden-media "$(DESTDIR)/etc/kubuntu-default-settings/"