[debian-edu-commits] debian-edu/ 01/04: Generated.

[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 a1c87b0bbadf45a6591b9777c8352f338aceb383
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 10 09:36:49 2014 +0200

    Generated.
---
 debian-edu-tasks.desc | 7 ++-----
 debian/control        | 4 +++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 2e5fe88..ab75710 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -1411,7 +1411,6 @@ Packages: list
  sitesummary-client
  openssh-server
  shutdown-at-night
- jxplorer
  killer
  nvram-wakeup
  libpam-krb5
@@ -1584,7 +1583,6 @@ Packages: list
  sitesummary-client
  openssh-server
  shutdown-at-night
- jxplorer
  killer
  nvram-wakeup
  libpam-krb5
@@ -1704,7 +1702,6 @@ Packages: list
  sitesummary-client
  openssh-server
  shutdown-at-night
- jxplorer
  killer
  nvram-wakeup
  education-desktop-other
@@ -2367,7 +2364,6 @@ Packages: list
  sitesummary-client
  openssh-server
  shutdown-at-night
- jxplorer
  killer
  nvram-wakeup
  libpam-krb5
@@ -2581,6 +2577,7 @@ Packages: list
  pavucontrol
  goplay
  krb5-auth-dialog
+ jxplorer
  gstreamer0.10-pulseaudio
  pulseaudio
  pulseaudio-esound-compat
@@ -2705,7 +2702,6 @@ Packages: list
  sitesummary-client
  openssh-server
  shutdown-at-night
- jxplorer
  killer
  nvram-wakeup
  libpam-krb5
@@ -2919,4 +2915,5 @@ Packages: list
  pavucontrol
  goplay
  krb5-auth-dialog
+ jxplorer
 
diff --git a/debian/control b/debian/control
index 68ec9cf..a13a215 100644
--- a/debian/control
+++ b/debian/control
@@ -423,7 +423,7 @@ Recommends: alsa-base,
  freerdp-x11 | rdesktop,
  gcj-jre-headless,
  gcompris,
- gecko-mediaplayer | totem-mozilla,
+ gecko-mediaplayer,
  gimp,
  gimp-data-extras,
  gimp-ufraw,
@@ -691,6 +691,7 @@ Suggests: adept,
  texlive-doc-base,
  texlive-latex-base,
  texmacs,
+ totem-mozilla,
  wget,
  wine,
  xfonts-100dpi-transcoded,
@@ -1243,6 +1244,7 @@ Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: education-desktop-other,
  education-networked,
+ jxplorer,
  krb5-auth-dialog
 Suggests: kredentials
 Description: Debian Edu networked workstation packages

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