[debian-edu-commits] debian-edu/ 01/01: Clean up tasks a bit. Remove these non-existing and obsolete packages from the avoid list: gcc-4.0-base, ibm-jdk1.1-installer, jdk1.1, kaffe, php4-cli, php4, libapache2-mod-php4.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository debian-edu.

commit 246cc5520255a6e7b67d2c63ea63585f7cf596e8
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Aug 13 22:37:51 2014 +0200

    Clean up tasks a bit.  Remove these non-existing and obsolete packages from the avoid list: gcc-4.0-base, ibm-jdk1.1-installer, jdk1.1, kaffe, php4-cli, php4, libapache2-mod-php4.
---
 debian/changelog    | 3 +++
 tasks/common        | 2 +-
 tasks/desktop-other | 1 -
 tasks/main-server   | 3 +--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fcc1e0..f9183d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ debian-edu (1.720~0.git.2014-07-26) unstable; urgency=low
   * Remove libnss-ldap as alternative for libnss-ldapd in
     tasks/networked-common.  Depend on nslcd to get a working daemon
     installed instead of the nonworking pynslcd.
+  * Clean up tasks a bit.  Remove these non-existing and obsolete
+    packages from the avoid list: gcc-4.0-base, ibm-jdk1.1-installer,
+    jdk1.1, kaffe, php4-cli, php4, libapache2-mod-php4.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 26 Jul 2014 12:11:31 +0200
 
diff --git a/tasks/common b/tasks/common
index 6491941..4105c38 100644
--- a/tasks/common
+++ b/tasks/common
@@ -215,7 +215,7 @@ Avoid:       libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-oss, \
              kterm, mlterm, mlterm-tiny, mrxvt, multi-gnome-terminal, \
              pterm, ratpoison, rxvt, terminal.app, wterm, wterm-ml, \
              xfsprogs, sysv-rc-bootsplash, \
-             gcc-4.0-base, cdebconf-udeb, libdebian-installer4-udeb, \
+             cdebconf-udeb, libdebian-installer4-udeb, \
              libtextwrap1-udeb, libslang1-utf8-udeb, php5-cgi, \
              libsigc++-1.2-5c2, expect-tcl8.3, tk8.3, gobjc-4.2, gobjc++-4.2, \
              gfortran-4.2, aptitude-doc-cs, aptitude-doc-en, \
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 8090691..54136c2 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -255,7 +255,6 @@ NeedConfig:  no
 
 Recommends:  default-jre | openjdk-6-jre, icedtea-6-plugin | icedtea6-plugin
 Ignore:      sun-java6-jre, sun-java6-plugin
-Avoid:       ibm-jdk1.1-installer, jdk1.1, kaffe
 Why:         We need a Java run-time environment, but possibly no
              development tools in the standard installation.  Info om
              Debian and Java is available from
diff --git a/tasks/main-server b/tasks/main-server
index 4ac6a55..6fdc58b 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -105,8 +105,7 @@ Responsible: Petter Reinholdtsen
 NeedConfig:  yes - set NTP server (client: ntp.intern, server: ntp.somewhere)
 
 Depends:     slbackup, slbackup-php
-Avoid:       php4-cli, php4, libapache2-mod-php4
-Why:         The backup system, and it's admin tool.  Avoid PHP4 for Lenny
+Why:         The backup system, and it's admin tool.
 Responsible: Ronny Aasen
 NeedConfig:  yes - debconf (only the slbackup package)
 

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