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

[holger at alioth.debian.org]

Author: holger
Date: 2013-06-17 16:27:25 +0000 (Mon, 17 Jun 2013)
New Revision: 80834

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/debian/control
   branches/wheezy/debian-edu/tasks/desktop-other
Log:
Re-add planner to tasks/desktop-other, thus partly revert r80831 - planner will get it's .desktop file back. (See #665956)

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-06-17 14:27:30 UTC (rev 80833)
+++ branches/wheezy/debian-edu/debian/changelog	2013-06-17 16:27:25 UTC (rev 80834)
@@ -6,9 +6,9 @@
     uploaded.
   
   [ Holger Levsen ]
-  * tasks: Drop planner, xdrawchem, xjig and xsok from our tasks as they
-    don't have a proper desktop menu entry and thus won't show up now that
-    menu-xdg was removed.
+  * tasks: Drop xdrawchem, xjig and xsok from our tasks as they don't have
+    a proper desktop menu entry and thus won't show up now that menu-xdg
+    was removed.
 
  -- Holger Levsen <holger at debian.org>  Mon, 17 Jun 2013 00:45:09 +0200
 

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-06-17 14:27:30 UTC (rev 80833)
+++ branches/wheezy/debian-edu/debian/control	2013-06-17 16:27:25 UTC (rev 80834)
@@ -98,7 +98,7 @@
 Package: education-desktop-other
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: alsa-base, alsa-utils, avahi-daemon, browser-plugin-gnash | mozilla-plugin-gnash, bzip2, cheese, chromium, cups-bsd, cups-client, debian-edu-artwork, default-jre | openjdk-6-jre, djview-plugin, dvgrab, education-astronomy, education-chemistry, education-electronics, education-geography, education-graphics, education-language, education-logic-games, education-mathematics, education-misc, education-music, education-physics, ffmpeg, fonts-freefont-ttf, fonts-larabie-deco, fonts-liberation, fonts-linex, fonts-mgopen, freerdp-x11 | rdesktop, gcj-jre-headless, gcompris, gecko-mediaplayer | mozilla-plugin-vlc | totem-mozilla, gimp, gimp-data-extras, gimp-ufraw, gnome-themes, gnucap, gnuchess, gnupg-agent, gnupg2 | gnupg, goplay, gsfonts-x11, gstreamer0.10-alsa, gstreamer0.10-ffmpeg, gstreamer0.10-fluendo-mp3, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-x, gtk-recordmydesktop, icedtea-6-plugin | icedtea6-plugin, iceweasel, iceweasel-l10n-de, iceweasel-l10n-el, iceweasel-l10n-en-gb, iceweasel-l10n-es-ar, iceweasel-l10n-es-es, iceweasel-l10n-eu, iceweasel-l10n-fr, iceweasel-l10n-it, iceweasel-l10n-pt-br, iceweasel-l10n-sv-se, inkscape, isc-dhcp-client, k3b | brasero, k3b-i18n | brasero, kdenlive, konqueror-plugin-gnash, ktuberling, libgl1-mesa-dri, libreoffice, libreoffice-help-el, libreoffice-help-es, libreoffice-help-fr, libreoffice-help-pt-br, libreoffice-help-sv, libreoffice-l10n-ca, libreoffice-l10n-de, libreoffice-l10n-el, libreoffice-l10n-es, libreoffice-l10n-fr, libreoffice-l10n-nl, libreoffice-l10n-pt-br, libreoffice-l10n-sv, myspell-ca, myspell-de-de, myspell-el-gr, myspell-en-gb, myspell-en-us, myspell-es, myspell-fi, myspell-fr, myspell-it, myspell-nl, myspell-pt-br, myspell-pt-pt, numlockx, ocrad, openclipart, openclipart-libreoffice, openshot, pavucontrol, sane, sane-utils, skanlite, stopmotion, synaptic, tuxmath, tuxpaint, tuxpaint-config, unifont, unzip, vgrabbj, xfonts-75dpi-transcoded, xorg, xserver-xorg-input-all, xserver-xorg-video-all, zip
+Recommends: alsa-base, alsa-utils, avahi-daemon, browser-plugin-gnash | mozilla-plugin-gnash, bzip2, cheese, chromium, cups-bsd, cups-client, debian-edu-artwork, default-jre | openjdk-6-jre, djview-plugin, dvgrab, education-astronomy, education-chemistry, education-electronics, education-geography, education-graphics, education-language, education-logic-games, education-mathematics, education-misc, education-music, education-physics, ffmpeg, fonts-freefont-ttf, fonts-larabie-deco, fonts-liberation, fonts-linex, fonts-mgopen, freerdp-x11 | rdesktop, gcj-jre-headless, gcompris, gecko-mediaplayer | mozilla-plugin-vlc | totem-mozilla, gimp, gimp-data-extras, gimp-ufraw, gnome-themes, gnucap, gnuchess, gnupg-agent, gnupg2 | gnupg, goplay, gsfonts-x11, gstreamer0.10-alsa, gstreamer0.10-ffmpeg, gstreamer0.10-fluendo-mp3, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-x, gtk-recordmydesktop, icedtea-6-plugin | icedtea6-plugin, iceweasel, iceweasel-l10n-de, iceweasel-l10n-el, iceweasel-l10n-en-gb, iceweasel-l10n-es-ar, iceweasel-l10n-es-es, iceweasel-l10n-eu, iceweasel-l10n-fr, iceweasel-l10n-it, iceweasel-l10n-pt-br, iceweasel-l10n-sv-se, inkscape, isc-dhcp-client, k3b | brasero, k3b-i18n | brasero, kdenlive, konqueror-plugin-gnash, ktuberling, libgl1-mesa-dri, libreoffice, libreoffice-help-el, libreoffice-help-es, libreoffice-help-fr, libreoffice-help-pt-br, libreoffice-help-sv, libreoffice-l10n-ca, libreoffice-l10n-de, libreoffice-l10n-el, libreoffice-l10n-es, libreoffice-l10n-fr, libreoffice-l10n-nl, libreoffice-l10n-pt-br, libreoffice-l10n-sv, myspell-ca, myspell-de-de, myspell-el-gr, myspell-en-gb, myspell-en-us, myspell-es, myspell-fi, myspell-fr, myspell-it, myspell-nl, myspell-pt-br, myspell-pt-pt, numlockx, ocrad, openclipart, openclipart-libreoffice, openshot, pavucontrol, planner, sane, sane-utils, skanlite, stopmotion, synaptic, tuxmath, tuxpaint, tuxpaint-config, unifont, unzip, vgrabbj, xfonts-75dpi-transcoded, xorg, xserver-xorg-input-all, xserver-xorg-video-all, zip
 Suggests: adept, atlantik, atlantikdesigner, auctex, avahi-autoipd, avahi-discover, browser-plugin-libreoffice, controlaula, dbdesigner, dhcp3-client, dia, fet, flashplugin-nonfree, flashplugin-nonfree-pulse, fonts-arphic-uming, fonts-mlym, foomatic-gui, gcompris-sound-cs, gcompris-sound-de, gcompris-sound-en, gcompris-sound-es, gcompris-sound-eu, gcompris-sound-fi, gcompris-sound-fr, gcompris-sound-hu, gcompris-sound-it, gcompris-sound-mr, gcompris-sound-nl, gcompris-sound-pt, gcompris-sound-ptbr, gcompris-sound-ru, gcompris-sound-so, gcompris-sound-sv, gcompris-sound-tr, geg, gettext, gnupg-doc, gnuplot, gstreamer0.10-audiosink, gstreamer0.10-esd, gtablix, gtk-qt-engine, gv, icedove, icedove-l10n-ca, icedove-l10n-de, icedove-l10n-el, icedove-l10n-es-es, icedove-l10n-fr, icedove-l10n-it, iceweasel-l10n-af, iceweasel-l10n-ar, iceweasel-l10n-be, iceweasel-l10n-bg, iceweasel-l10n-ca, iceweasel-l10n-cs, iceweasel-l10n-cy-gb, iceweasel-l10n-dz-bt, iceweasel-l10n-et-ee, iceweasel-l10n-fa-ir, iceweasel-l10n-fi, iceweasel-l10n-fur-it, iceweasel-l10n-fy-nl, iceweasel-l10n-ga-ie, iceweasel-l10n-gu-in, iceweasel-l10n-he, iceweasel-l10n-hu, iceweasel-l10n-ka, iceweasel-l10n-ko, iceweasel-l10n-ku, iceweasel-l10n-lt, iceweasel-l10n-mk, iceweasel-l10n-mn, iceweasel-l10n-nl, iceweasel-l10n-pa-in, iceweasel-l10n-pl, iceweasel-l10n-pt-pt, iceweasel-l10n-ro, iceweasel-l10n-roa-es-val, iceweasel-l10n-ru, iceweasel-l10n-sk, iceweasel-l10n-sl, iceweasel-l10n-tr, iceweasel-l10n-uk-ua, iceweasel-l10n-zh-cn, iceweasel-l10n-zh-tw, im-switch, kaffeine-mozilla, kasteroids, katomic, kbabel, kbackgammon, kbattleship, kblackbox, kbounce, kchart, kdnssd, kernel-package, keuklid, kformula, kfouleggs, kgeo, kgoldrunner, kgraph, kig, kino, kivio, kjumpingcube, klearnspelling, klickety, klogic, kmahjongg, kmines, kmultiply, knorskverbs, kolf, kolourpaint, konquest, koshell, kpaint, kpat, kpercentage, kpoker, kppp, kreversi, ksame, kshisen, ksirtet, ksmiletris, ksnake, kspaceduel, ktron, kugar, kuser, kworldclock, lacheck, libdvdcss2, libflashsupport, libncurses5-dev, libreoffice-filter-binfilter, libreoffice-filter-mobiledev, libreoffice-help-en, libreoffice-help-zh-tw, libreoffice-l10n-common, libreoffice-l10n-en-us, libreoffice-l10n-en-za, libreoffice-l10n-zh-tw, libreoffice-style-crystal, libreoffice-style-default, libwine-alsa, libwine-oss, lightspeed, lyx, mdns-scan, monopd, mozilla-mplayer, myspell-de-at, myspell-de-ch, myspell-fr-gut, mythes-en-us, ncftp, netpbm, ogle-gui, openmovieeditor, pgdesigner, pitivi, postgresql, postgresql-client, pppoeconf, rsibreak | workrave, scim-chewing, scim-tables-zh, smbclient, sodipodi, sql-ledger, tablix2, texlive, texlive-doc-base, texlive-latex-base, texmacs, wget, wine, wine-doc, xfonts-100dpi-transcoded, xfonts-base-transcoded, xine-ui
 Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  This metapackage depends on various office and desktop applications

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-06-17 14:27:30 UTC (rev 80833)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-06-17 16:27:25 UTC (rev 80834)
@@ -394,6 +394,7 @@
  gnucap
  tuxpaint
  tuxpaint-config
+ planner
  gimp
  gimp-data-extras
  gimp-ufraw
@@ -1581,6 +1582,7 @@
  gnucap
  tuxpaint
  tuxpaint-config
+ planner
  gimp
  gimp-data-extras
  gimp-ufraw
@@ -1893,6 +1895,7 @@
  gnucap
  tuxpaint
  tuxpaint-config
+ planner
  gimp
  gimp-data-extras
  gimp-ufraw
@@ -2255,6 +2258,7 @@
  gnucap
  tuxpaint
  tuxpaint-config
+ planner
  gimp
  gimp-data-extras
  gimp-ufraw
@@ -2596,6 +2600,7 @@
  gnucap
  tuxpaint
  tuxpaint-config
+ planner
  gimp
  gimp-data-extras
  gimp-ufraw

Modified: branches/wheezy/debian-edu/tasks/desktop-other
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-other	2013-06-17 14:27:30 UTC (rev 80833)
+++ branches/wheezy/debian-edu/tasks/desktop-other	2013-06-17 16:27:25 UTC (rev 80834)
@@ -402,6 +402,11 @@
 
 Note: ANDRE
 
+Recommends:  planner
+Why:         Project management.  Changed name from mrproject to planner
+Responsible: ?
+NeedConfig:  ?
+
 Suggests:    gnuplot, geg
 Why:         Graph plotting programs.  gnuplot was requested by math teacher.
 Responsible: ?