[Pkg-kde-commits] rev 587 - branches/kde-3.4.0/packages/kdebase/debian
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 03 Mar 2005 05:08:30 +0100
Author: chrsmrtn-guest
Date: 2005-03-03 05:08:29 +0100 (Thu, 03 Mar 2005)
New Revision: 587
Modified:
branches/kde-3.4.0/packages/kdebase/debian/kcontrol.preinst
branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.preinst
branches/kde-3.4.0/packages/kdebase/debian/kdesktop.preinst
branches/kde-3.4.0/packages/kdebase/debian/kdm.preinst
branches/kde-3.4.0/packages/kdebase/debian/kicker.preinst
branches/kde-3.4.0/packages/kdebase/debian/konqueror.prerm
branches/kde-3.4.0/packages/kdebase/debian/konsole.preinst
branches/kde-3.4.0/packages/kdebase/debian/ksmserver.preinst
Log:
Maintainer script cleanups. Nothing substantive.
Modified: branches/kde-3.4.0/packages/kdebase/debian/kcontrol.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kcontrol.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/kcontrol.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,44 +1,24 @@
-#! /bin/sh
-# preinst script for kcontrol
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/kde3/kuriikwsfilterrc
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian testing (Sarge) files
- rm /etc/kde3/kuriikwsfilterrc > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,69 +1,49 @@
-#! /bin/sh
-# preinst script for kdebase-data
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/kde3/debian/d-adventure.desktop
+ rm -f /etc/kde3/debian/d-arcade.desktop
+ rm -f /etc/kde3/debian/d-board.desktop
+ rm -f /etc/kde3/debian/d-card.desktop
+ rm -f /etc/kde3/debian/d-databases.desktop
+ rm -f /etc/kde3/debian/d-debian.desktop
+ rm -f /etc/kde3/debian/d-emulators.desktop
+ rm -f /etc/kde3/debian/d-hamradio.desktop
+ rm -f /etc/kde3/debian/d-help.desktop
+ rm -f /etc/kde3/debian/d-lock.desktop
+ rm -f /etc/kde3/debian/d-math.desktop
+ rm -f /etc/kde3/debian/d-modules.desktop
+ rm -f /etc/kde3/debian/d-puzzles.desktop
+ rm -f /etc/kde3/debian/d-root-window.desktop
+ rm -f /etc/kde3/debian/d-save.desktop
+ rm -f /etc/kde3/debian/d-screen.desktop
+ rm -f /etc/kde3/debian/d-shells.desktop
+ rm -f /etc/kde3/debian/d-sports.desktop
+ rm -f /etc/kde3/debian/d-strategy.desktop
+ rm -f /etc/kde3/debian/d-technical.desktop
+ rm -f /etc/kde3/debian/d-tetris-like.desktop
+ rm -f /etc/kde3/debian/d-text.desktop
+ rm -f /etc/kde3/debian/d-toys.desktop
+ rm -f /etc/kde3/debian/d-viewers.desktop
+ rm -f /etc/kde3/debian/d-window-managers.desktop
+ rm -f /etc/kde3/debian/d-xshells.desktop
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian testing (Sarge) files
- rm /etc/kde3/debian/d-adventure.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-arcade.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-board.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-card.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-databases.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-debian.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-emulators.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-hamradio.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-help.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-lock.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-math.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-modules.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-puzzles.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-root-window.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-save.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-screen.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-shells.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-sports.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-strategy.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-technical.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-tetris-like.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-text.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-toys.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-viewers.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-window-managers.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/d-xshells.desktop > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/kdesktop.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdesktop.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdesktop.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,45 +1,25 @@
-#! /bin/sh
-# preinst script for kdesktop
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/kde3/debian/debian.desktop
+ rm -f /etc/kde3/debian/debian.html
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian testing (Sarge) files
- rm /etc/kde3/debian/debian.desktop > /dev/null 2>&1 || true
- rm /etc/kde3/debian/debian.html > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,51 +1,29 @@
-#! /bin/sh
-# preinst script for kdm
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/kde3/debian/kdm-update-menu.sh
+ rm -f /etc/kde3/debian/kdm.options
+ rm -f /etc/kde3/kdm/pixmaps/XFree86bw.xpm
+ rm -f /etc/kde3/kdm/pixmaps/XFree86.xpm
+ rm -f /etc/kde3/kdm/Xresources
+ rm -f /etc/menu-methods/kdm
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian 3.0 (Woody) files
- rm /etc/menu-methods/kdm > /dev/null 2>&1 || true
- # Debian testing (Sarge) files
- rm /etc/kde3/debian/kdm-update-menu.sh > /dev/null 2>&1 || true
- rm /etc/kde3/debian/kdm.options > /dev/null 2>&1 || true
- rm /etc/kde3/kdm/pixmaps/XFree86bw.xpm > /dev/null 2>&1 || true
- rm /etc/kde3/kdm/pixmaps/XFree86.xpm > /dev/null 2>&1 || true
- rm /etc/kde3/kdm/Xresources > /dev/null 2>&1 || true
- rm /etc/menu-methods/kdm > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/kicker.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kicker.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/kicker.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,47 +1,26 @@
-#! /bin/sh
-# preinst script for kicker
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/menu-methods/kdebase
+ rm -f /etc/kde3/debian/kde-update-menu.sh
+ rm -f /etc/menu-methods/kicker
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian 3.0 (Woody) files
- rm /etc/menu-methods/kdebase > /dev/null 2>&1 || true
- # Debian testing (Sarge) files
- rm /etc/kde3/debian/kde-update-menu.sh > /dev/null 2>&1 || true
- rm /etc/menu-methods/kicker > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/konqueror.prerm
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/konqueror.prerm 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/konqueror.prerm 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,22 +1,5 @@
-#! /bin/sh
-# prerm script for konqueror
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
case "$1" in
remove)
/usr/sbin/update-alternatives --remove x-www-browser /usr/bin/konqueror
@@ -34,11 +17,6 @@
;;
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/konsole.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/konsole.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/konsole.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,44 +1,24 @@
-#! /bin/sh
-# preinst script for konsole
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
+case "$1" in
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+ upgrade)
+ rm -f /etc/kde3/konsolerc
+ ;;
-
-case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian testing (Sarge) files
- rm /etc/kde3/konsolerc > /dev/null 2>&1 || true
- fi
+ install)
;;
abort-upgrade)
-
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-
Modified: branches/kde-3.4.0/packages/kdebase/debian/ksmserver.preinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/ksmserver.preinst 2005-03-03 04:08:01 UTC (rev 586)
+++ branches/kde-3.4.0/packages/kdebase/debian/ksmserver.preinst 2005-03-03 04:08:29 UTC (rev 587)
@@ -1,55 +1,27 @@
-#! /bin/sh
-# preinst script for ksmserver
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
case "$1" in
- install|upgrade)
- if [ "$1" = "upgrade" ]
- then
- # Debian 3.0 (Woody) files
- rm /etc/gdm/Sessions/KDE > /dev/null 2>&1 || true
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
- # Debian testing (Sarge) files
- rm /etc/gdm/Sessions/KDE > /dev/null 2>&1 || true
- rm /etc/kde3/debian/startkde > /dev/null 2>&1 || true
- /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde3
- fi
- if [ "$1" = "install" ]
- then
- # Work around bug where x-session-manager is set to manual
- update-alternatives --auto x-session-manager
- fi
+ upgrade)
+ rm -f /etc/gdm/Sessions/KDE
+ rm -f /etc/kde3/debian/startkde
+ /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
+ /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde3
;;
- abort-upgrade)
+ install)
+ ;;
+ abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
+
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
exit 0
-
-