[debian-edu-commits] r81816 - in branches/wheezy/debian-edu: . debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-26 10:21:39 +0000 (Fri, 26 Jul 2013)
New Revision: 81816

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/control
Log:
Generated.

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-07-26 10:18:33 UTC (rev 81815)
+++ branches/wheezy/debian-edu/debian/control	2013-07-26 10:21:39 UTC (rev 81816)
@@ -4,7 +4,6 @@
 Priority: extra
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>,
- Morten Werner Forsbring <werner at debian.org>,
  Holger Levsen <holger at debian.org>,
  Steffen Joeris <white at debian.org>,
  Patrick Winnertz <winnie at debian.org>,
@@ -15,8 +14,8 @@
  Andreas B. Mundt <andi.mundt at web.de>
 Build-Depends: debhelper (>= 6.0.7), blends-dev (>= 0.6.16.2)
 Standards-Version: 3.9.4
-Vcs-Browser: http://svn.debian.org/wsvn/debian-edu/trunk/src/debian-edu/
-Vcs-Svn: svn://svn.debian.org/debian-edu/trunk/src/debian-edu/
+Vcs-Browser: http://anonscm.debian.org/wsvn/debian-edu/trunk/src/debian-edu/
+Vcs-Svn: svn://anonscm.debian.org/debian-edu/trunk/src/debian-edu/
 Homepage: http://www.skolelinux.org
 
 XS-Comment: This is a specific package which contains a tasksel helper. It doesn't make sense to put it in tasks.
@@ -69,7 +68,7 @@
 Section: gnome
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: education-common, gdm3, gimp, gnome, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, libreoffice-base, libreoffice-calc, libreoffice-draw, libreoffice-filter-binfilter, libreoffice-gnome, libreoffice-gtk, libreoffice-impress, libreoffice-java-common, libreoffice-math, libreoffice-writer, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer2
+Recommends: education-common, gdm3, gimp, gnome, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, libreoffice-base, libreoffice-calc, libreoffice-draw, libreoffice-filter-binfilter, libreoffice-gnome, libreoffice-gtk, libreoffice-impress, libreoffice-java-common, libreoffice-math, libreoffice-writer, ssh-askpass-gnome | ssh-askpass, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer2
 Suggests: dasher, gnochm, gnome-accessibility-themes, gnome-mag, gnome-orca, gok, iceweasel-gnome-support, x-display-manager
 Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
@@ -79,7 +78,7 @@
 Section: kde
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: amarok, ark, bluedevil, digikam, dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer2, freespacenotifier, kaddressbook, kamera, kcalc, kcharselect, kde-l10n-ca, kde-l10n-de, kde-l10n-el, kde-l10n-es, kde-l10n-fr, kde-l10n-it, kde-l10n-lv, kde-l10n-nl, kde-l10n-ptbr, kde-l10n-sv, kde-standard, kdeaccessibility, kdeedu, kdegraphics-strigi-analyzer, kdegraphics-thumbnailers, kdemultimedia-kio-plugins, kdepasswd, kdepimlibs-kio-plugins, kdeutils, kdewallpapers, kdf, kdm, kfloppy, kinfocenter, kipi-plugins, kmail, kmix, knotes, konq-plugins, konqueror, konsole, konversation | kopete, korganizer, krdc, krfb, kscreensaver, ksnapshot, kturtle, kwalletmanager, libreoffice-kde, menu, printer-applet, update-notifier-kde, virtuoso-minimal
+Recommends: amarok, ark, bluedevil, digikam, dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer2, freespacenotifier, kaddressbook, kamera, kcalc, kcharselect, kde-l10n-ca, kde-l10n-de, kde-l10n-el, kde-l10n-es, kde-l10n-fr, kde-l10n-it, kde-l10n-lv, kde-l10n-nl, kde-l10n-ptbr, kde-l10n-sv, kde-standard, kdeaccessibility, kdeedu, kdegraphics-strigi-analyzer, kdegraphics-thumbnailers, kdemultimedia-kio-plugins, kdepasswd, kdepimlibs-kio-plugins, kdeutils, kdewallpapers, kdf, kdm, kfloppy, kinfocenter, kipi-plugins, kmail, kmix, knotes, konq-plugins, konqueror, konsole, konversation | kopete, korganizer, krdc, krfb, kscreensaver, ksnapshot, ksshaskpass | ssh-askpass, kturtle, kwalletmanager, libreoffice-kde, menu, printer-applet, update-notifier-kde, virtuoso-minimal
 Suggests: digikamimageplugins, kaddressbook-plugins, kate-plugins, kcron, kde, kde-full, kde-l10n-se, kdeaddons-kfile-plugins, kdebase, kdenetwork-kfile-plugins, kdepim-kfile-plugins, kedit, kfilereplace, kfind, kiconedit, kiosktool, kmid, kmidi, knode, kpaint, kpm, krecord, kruler, kscd, kschoolmenu, kuser, kview, noatun, noatun-plugins, quanta, x-display-manager
 Description: Debian Edu KDE desktop applications
  This metapackage depends on various KDE office and desktop applications
@@ -89,7 +88,7 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: aqualung, blueman, chmsee, desktop-file-utils, education-common, evince-gtk, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lightdm, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer2, xchat
+Recommends: aqualung, blueman, chmsee, desktop-file-utils, education-common, evince-gtk, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lightdm, lxde, mtpaint, osmo, parcellite, pidgin, ssh-askpass, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer2, xchat
 Suggests: x-display-manager
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
@@ -120,7 +119,7 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: blueman, dbus-x11, education-common, lightdm, system-config-printer, tango-icon-theme, xfce4, xfce4-goodies
+Recommends: blueman, dbus-x11, education-common, lightdm, ssh-askpass, system-config-printer, tango-icon-theme, xfce4, xfce4-goodies
 Suggests: x-display-manager
 Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-07-26 10:18:33 UTC (rev 81815)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-07-26 10:21:39 UTC (rev 81816)
@@ -112,6 +112,7 @@
  libreoffice-filter-binfilter
  libreoffice-java-common
  totem
+ ssh-askpass-gnome
 
 Task: education-desktop-kde
 Section: debian-edu
@@ -184,6 +185,7 @@
  kde-l10n-sv
  kde-l10n-se
  libreoffice-kde
+ ksshaskpass
 
 Task: education-desktop-lxde
 Section: debian-edu
@@ -301,6 +303,7 @@
  gstreamer0.10-pulseaudio
  synaptic
  blueman
+ ssh-askpass
 
 Task: education-desktop-other
 Section: debian-edu
@@ -739,6 +742,7 @@
  tango-icon-theme
  dbus-x11
  blueman
+ ssh-askpass
 
 Task: education-lang-da
 Section: debian-edu