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

Tue May 28 17:08:35 UTC 2013

Author: holger
Date: 2013-05-28 17:08:35 +0000 (Tue, 28 May 2013)
New Revision: 80243

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/debian/control
Log:
release as 1.708 to sid and wheezy-test

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================

--- branches/wheezy/debian-edu/debian/changelog	2013-05-28 17:00:44 UTC (rev 80242)
+++ branches/wheezy/debian-edu/debian/changelog	2013-05-28 17:08:35 UTC (rev 80243)
@@ -1,10 +1,5 @@
-debian-edu (1.708~svn80109) wheezy-test; urgency=low
+debian-edu (1.708) unstable; urgency=low
 
-  * UNRELEASED - the debian-edu package is special, while it's unreleased it
-    has to have the right distro set in the distro field of the unreleased
-    changelog entry, so we add an extra paragraph like this one until it's
-    uploaded.
-
   [ Holger Levsen ]
   * Add lintian-overrides for all binary packages affected by #708879.
   * Add debian/source.lintian-overrides to suppress the unknown-field-in-dsc
@@ -22,7 +17,7 @@
   * Switch from vnc4server to tightvncserver as the xrdp backend, as it
     seem to be be more up to date and actively maintained.
 
- -- Holger Levsen <holger at debian.org>  Fri, 17 May 2013 20:52:06 +0200
+ -- Holger Levsen <holger at debian.org>  Tue, 28 May 2013 18:53:59 +0200
 
 debian-edu (1.707) unstable; urgency=low
 

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-05-28 17:00:44 UTC (rev 80242)
+++ branches/wheezy/debian-edu/debian/control	2013-05-28 17:08:35 UTC (rev 80243)
@@ -14,7 +14,7 @@
  Andrew Lee (李健秋) <ajqlee at debian.org>,
  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
+Standards-Version: 3.9.3
 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/
 Homepage: http://www.skolelinux.org
@@ -89,7 +89,7 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: aqualung, chmsee, desktop-file-utils, education-common, epdfview, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer, xchat
+Recommends: aqualung, chmsee, desktop-file-utils, education-common, evince-gtk, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer, xchat
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
  desktop applications that are useful for teachers and their students.
@@ -115,6 +115,15 @@
  collaborative learning. It was introduced on the One Laptop Per Child
  (OLPC) XO laptop but is useful on other devices as well.
 
+Package: education-desktop-xfce
+Section: x11
+Architecture: any
+Depends: education-tasks (= ${binary:Version})
+Recommends: dbus-x11, education-common, system-config-printer, tango-icon-theme, xfce4, xfce4-goodies
+Description: Debian Edu Xfce desktop applications
+ This metapackage depends on various XFCE components that are useful
+ for teachers and their students.
+
 Package: education-development
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
@@ -265,7 +274,7 @@
 Package: education-thin-client-server
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: atftpd | tftpd-hpa, education-workstation, gstreamer0.10-pulseaudio, iptables, isc-dhcp-server-ldap, ltsp-server-standalone, ltspfs, nagios-nrpe-server, nagios-plugins-standard, nbd-server, pulseaudio, pulseaudio-esound-compat, pulseaudio-utils, rdiff-backup, tftp, vnc4server, xrdp
+Recommends: atftpd | tftpd-hpa, education-workstation, gstreamer0.10-pulseaudio, iptables, isc-dhcp-server-ldap, ltsp-server-standalone, ltspfs, nagios-nrpe-server, nagios-plugins-standard, nbd-server, pulseaudio, pulseaudio-esound-compat, pulseaudio-utils, rdiff-backup, tftp, tightvncserver, xrdp
 Suggests: italc-client, italc-master, libpulse-mainloop-glib0, ltsp-controlaula
 Description: Debian Edu networked thin client server packages
  A metapackage containing dependencies for packages required on all

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-05-28 17:00:44 UTC (rev 80242)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-05-28 17:08:35 UTC (rev 80243)
@@ -280,7 +280,7 @@
  desktop-file-utils
  totem
  aqualung
- epdfview
+ evince-gtk
  galculator
  osmo
  parcellite
@@ -640,6 +640,107 @@
  python-gst0.10
  avahi-daemon
 
+Task: education-desktop-xfce
+Section: debian-edu
+Description: Debian Edu Xfce desktop applications
+ This metapackage depends on various XFCE components that are useful
+ for teachers and their students.
+Relevance: 10
+Enhances: education-desktop-other
+Test-preferred-desktop: xfce
+Key: 
+ education-desktop-xfce
+Packages: list
+ education-common
+ rsyslog
+ procinfo
+ openssh-client
+ cfengine2
+ vim
+ nullidentd
+ openbsd-inetd
+ man-db
+ manpages
+ ethtool
+ hdparm
+ pciutils
+ nictools-pci
+ apt-listchanges
+ debian-archive-keyring
+ debian-edu-archive-keyring
+ resolvconf
+ psmisc
+ mii-diag
+ lsscsi
+ sysfsutils
+ etherwake
+ mlocate
+ reportbug
+ bind9-host
+ traceroute
+ tcptraceroute
+ iftop
+ less
+ tcpdump
+ bc
+ wget
+ strace
+ nmap
+ eject
+ libwww-perl
+ mtools
+ ncftp
+ dmidecode
+ hwinfo
+ procmail
+ iproute
+ mtr-tiny
+ fping
+ iotop
+ debian-edu-doc-en
+ debian-edu-config
+ debian-edu-install
+ debconf-utils
+ consolekit
+ libpam-ck-connector
+ cpufrequtils
+ cups
+ foomatic-db
+ foomatic-db-engine
+ foomatic-db-gutenprint
+ foomatic-filters
+ pnm2ppa
+ hpijs
+ hpijs-ppds
+ hplip
+ ijsgutenprint
+ cifs-utils
+ iputils-arping
+ finger
+ gdebi-core
+ python-gtk2
+ python-vte
+ rsync
+ memtest86+
+ deborphan
+ hddtemp
+ htop
+ screen
+ mc
+ lshw
+ dhcping
+ convmv
+ system-config-lvm
+ gdb
+ libpam-tmpdir
+ readahead-fedora
+ bash-completion
+ xfce4
+ xfce4-goodies
+ system-config-printer
+ tango-icon-theme
+ dbus-x11
+
 Task: education-lang-da
 Section: debian-edu
 Description: Debian Edu applications for Danish installs.
@@ -2337,7 +2438,7 @@
  nagios-nrpe-server
  nagios-plugins-standard
  xrdp
- vnc4server
+ tightvncserver
 
 Task: education-workstation
 Section: debian-edu


