[debian-edu-commits] debian-edu/ 01/01: Remove script tools/install-missing-taskpkgs (obsolete due to d-e/1.812), adjust Makefile and changelog.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch upgrade-tmp
in repository debian-edu-config.

commit 60678d5b88c7e7d61e5088d24879b57a61fd75e7
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Apr 27 12:44:09 2015 +0200

    Remove script tools/install-missing-taskpkgs (obsolete due to d-e/1.812), adjust Makefile and changelog.
---
 Makefile                                           |   1 -
 debian/changelog                                   |   5 -
 .../tools/install-missing-taskpkgs                 | 113 ---------------------
 3 files changed, 119 deletions(-)

diff --git a/Makefile b/Makefile
index be58218..d450756 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,6 @@ install: install-testsuite
 		share/debian-edu-config/tools/workaround-udev-bug-765577 \
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
-		share/debian-edu-config/tools/install-missing-taskpkgs \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
 		share/ltsp/init-ltsp.d/08-edu-hostname \
diff --git a/debian/changelog b/debian/changelog
index e90b390..c2fcead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,6 @@ debian-edu-config (1.818) UNRELEASED; urgency=medium
     - remove 'apt-get autoremove -y' from cf/cf.apt.
     - add param '--auto-remove' to all apt-get purge commands
       in cf/cf.ldapclient (Closes: #779646).
-  * share/d-e-c/tools: Add script 'install-missing-taskpkgs'; it does
-    what the name tells and is esp. useful after distribution upgrade
-    when packages from the task files are missing due to meta-packages
-    not allowing to define real Depends.
-    (Closes: #779644, #779647, #779648).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 10 Mar 2015 18:23:11 +0100
 
diff --git a/share/debian-edu-config/tools/install-missing-taskpkgs b/share/debian-edu-config/tools/install-missing-taskpkgs
deleted file mode 100755
index d2ef100..0000000
--- a/share/debian-edu-config/tools/install-missing-taskpkgs
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh -e
-#
-# Based upon testsuite/taskpkgs
-#
-# Make sure the correct profile packages are installed.
-# Once this is done, unwanted packages are removed including some of
-# the just installed ones if this script is called inside LTSP chroots.
-# Smarter way to get the right package subset would be nice.
-
-installed="$(dpkg --get-selections | awk '/\tinstall$/ {print $1}')"
-
-deb_installed() {
-    echo $installed | grep -qw $1
-}
-
-check_installed() {
-    deb=$1
-    if ! deb_installed "$deb" ; then
-         echo "$0: Package $deb is missing, installing it now."
-         apt-get -q -y install $deb
-    fi
-}
-
-check_installed_task() {
-    task=$1
-    found=false
-    for deb in $(tasksel --task-packages $task); do
-        found=true
-        if ! deb_installed "$deb" ; then
-             echo "$0: Package $deb is missing, installing it now."
-             apt-get -q -y install $deb
-        fi
-    done
-    if [ false = $found ] ; then
-            echo "error: $0: Task $task is empty, tasksel --task-packages $task returns nothing!"
-            retval=1
-    fi
-}
-
-if test -r /etc/debian-edu/config ; then
-    . /etc/debian-edu/config
-fi
-
-retval=0
-
-apt-get update
-
-check_installed education-common
-check_installed education-tasks
-
-for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
-    case $value in
-	Standalone)
-	    check_installed_task education-standalone
-	    ;;
-	Workstation)
-	    check_installed_task education-workstation
-	    ;;
-	Roaming-Workstation)
-	    check_installed_task education-roaming-workstation
-	    ;;
-	Thin-Client-Server|LTSP-server)
-	    check_installed_task education-thin-client-server
-	    ;;
-	Main-Server|Server)
-	    check_installed_task education-main-server
-	    ;;
-	Sugar)
-	    check_installed_task education-desktop-sugar
-	    ;;
-	Minimal)
-	    check_installed_task education-networked
-	    ;;
-	*)
-	    echo "error: $0: unknown profile '$profile'"
-	    ;;
-    esac
-done
-
-# Some packages are unwanted for the LTSP chroot
-# so remove them. Remove as well automatically installed packages.
-# (The list of packages has been gathered from
-# share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs.)
-unwanted_in_ltsp_chroot="cups \
-cups-browsed \
-readahead \
-readahead-fedora \
-hdparm \
-hddtemp \
-lvm2 \
-munin-node \
-xfs \
-resolvconf \
-network-manager \
-wpasupplicant \
-openvpn \
-ppp \
-modemmanager \
-consolekit \
-network-manager-openvpn \
-network-manager-pptp \
-network-manager-vpnc \
-popularity-contest \
-system-config-lvm"
-
-# Remove only if called inside LTSP chroot
-if [ -f /etc/lts.conf ] ; then
-     for i in $unwanted_in_ltsp_chroot; do
-          apt-get --auto-remove -y purge $i
-     done
-fi
-
-exit $retval

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git