[debian-edu-commits] debian-edu/ 02/03: Drop education-desktop-sugar meta package, as Jessie will be released without sugar. (Closes: #782504)

Holger Levsen holger at moszumanska.debian.org
Tue Apr 14 12:30:50 UTC 2015


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

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

commit 87d99d1979bde45bfcc7bb613b755116b546524c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 13:05:15 2015 +0200

    Drop education-desktop-sugar meta package, as Jessie will be released without sugar. (Closes: #782504)
---
 debian-edu-tasks.desc                            | 119 -----------------------
 debian/changelog                                 |   2 +
 debian/control                                   |  40 --------
 debian/education-desktop-sugar.lintian-overrides |   4 -
 tasks/desktop-sugar                              |  52 ----------
 5 files changed, 2 insertions(+), 215 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 6b54ca0..3dec2d6 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -724,125 +724,6 @@ Packages: list
  pavucontrol
  goplay
 
-Task: education-desktop-sugar
-Section: debian-edu
-Description: Debian Edu sugar desktop environment
- This metapackage depends on various sugar applications. Sugar is a
- graphical user interface aimed at children which promotes sharing and
- collaborative learning. It was introduced on the One Laptop Per Child
- (OLPC) XO laptop but is useful on other devices as well.
-Relevance: 10
-Test-edu-profile: Sugar
-Key: 
- education-desktop-sugar
-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
- lsscsi
- sysfsutils
- etherwake
- mlocate
- reportbug
- bind9-host
- traceroute
- tcptraceroute
- iftop
- less
- tcpdump
- bc
- wget
- strace
- nmap
- eject
- libwww-perl
- mtools
- ncftp
- dmidecode
- hwinfo
- procmail
- iproute2
- mtr-tiny
- fping
- iotop
- debian-edu-doc-en
- debian-edu-config
- debian-edu-install
- debconf-utils
- consolekit
- libpam-ck-connector
- cpufrequtils
- unattended-upgrades
- cups
- foomatic-db
- foomatic-db-engine
- foomatic-db-gutenprint
- cups-browsed
- printer-driver-pnm2ppa
- printer-driver-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
- valgrind
- libpam-tmpdir
- libnss-myhostname
- readahead-fedora
- bash-completion
- command-not-found
- xserver-xorg
- xinit
- xorg
- gdm3
- sugar-browse-activity
- sugar-calculate-activity
- sugar-pippy-activity
- sugar-turtleart-activity
- sugar-irc-activity
- sugar-record-activity
- sugar-physics-activity
- network-manager
- net-tools
- gstreamer0.10-plugins-good
- xserver-xephyr
- x11-xserver-utils
- ttf-dejavu-extra
- python-gst0.10
- avahi-daemon
-
 Task: education-desktop-xfce
 Section: debian-edu
 Description: Debian Edu Xfce desktop applications
diff --git a/debian/changelog b/debian/changelog
index ba2dddd..0aeb426 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu (1.812) UNRELEASED; urgency=medium
 
   * Add cups-browsed to task-common, to support automatic printer discovery.
     (Closes: #779645)
+  * Drop education-desktop-sugar meta package, as Jessie will be released
+    without sugar. (Closes: #782504) 
 
  -- Holger Levsen <holger at debian.org>  Tue, 10 Mar 2015 16:25:17 +0100
 
diff --git a/debian/control b/debian/control
index 9bb4c97..1edcb2a 100644
--- a/debian/control
+++ b/debian/control
@@ -701,46 +701,6 @@ Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Package: education-desktop-sugar
-Section: metapackages
-Architecture: any
-Depends: education-tasks (= ${binary:Version})
-Recommends: avahi-daemon,
- education-common,
- gdm3,
- gstreamer0.10-plugins-good,
- net-tools,
- network-manager,
- openssh-client,
- python-gst0.10,
- sugar-browse-activity,
- sugar-calculate-activity,
- sugar-irc-activity,
- sugar-physics-activity,
- sugar-pippy-activity,
- sugar-record-activity,
- sugar-turtleart-activity,
- ttf-dejavu-extra,
- x11-xserver-utils,
- xinit,
- xorg,
- xserver-xephyr,
- xserver-xorg
-Suggests: etoys,
- etoys-doc,
- squeak-vm,
- sucrose-0.88,
- sugar-chat-activity-0.86,
- sugar-doc,
- sugar-emulator-0.88,
- sugar-session-0.88,
- sugar-write-activity-0.86
-Description: Debian Edu sugar desktop environment
- This metapackage depends on various sugar applications. Sugar is a
- graphical user interface aimed at children which promotes sharing and
- 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: metapackages
 Architecture: any
diff --git a/debian/education-desktop-sugar.lintian-overrides b/debian/education-desktop-sugar.lintian-overrides
deleted file mode 100644
index 0085984..0000000
--- a/debian/education-desktop-sugar.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-education-desktop-sugar binary: depends-on-metapackage recommends: xorg
-education-desktop-sugar binary: depends-on-x-metapackage recommends: xorg
-education-desktop-sugar binary: maintainer-script-empty postrm
-education-desktop-sugar binary: maintainer-script-empty preinst
diff --git a/tasks/desktop-sugar b/tasks/desktop-sugar
deleted file mode 100644
index 48ee42d..0000000
--- a/tasks/desktop-sugar
+++ /dev/null
@@ -1,52 +0,0 @@
-Task: Sugar
-Section: metapackages
-Architecture: any
-Test-edu-profile: Sugar
-Description: Debian Edu sugar desktop environment
- This metapackage depends on various sugar applications. Sugar is a
- graphical user interface aimed at children which promotes sharing and
- collaborative learning. It was introduced on the One Laptop Per Child
- (OLPC) XO laptop but is useful on other devices as well.
-
-Depends:     education-common
-Why:         Need the common packages
-Responsible: Petter Reinholdtsen
-NeedConfig:  no
-
-Depends:     xserver-xorg, xinit, xorg
-Why:         The X server and related packages.
-Responsible: Holger Levsen
-NeedConfig:  no
-
-Depends:     gdm3
-Why:         A sugar desktop needs a login manager
-Responsible: Mike Gabriel
-NeedConfig:  ?
-
-Depends:     sucrose-0.88, \
-	     sugar-browse-activity, \
-	     sugar-calculate-activity, \
-	     sugar-chat-activity-0.86, \
-	     sugar-pippy-activity, \
-	     sugar-write-activity-0.86, \
-	     sugar-turtleart-activity, \
-	     sugar-irc-activity, \
-	     sugar-record-activity, \
-	     sugar-physics-activity, \
-	     sugar-session-0.88, \
-	     sugar-emulator-0.88, \
-             network-manager
-Recommends:  net-tools, gstreamer0.10-plugins-good, xserver-xephyr, \
-             x11-xserver-utils, openssh-client, ttf-dejavu-extra, \
-             python-gst0.10, avahi-daemon
-Suggests:    sugar-doc, etoys, etoys-doc, squeak-vm
-Avoid:       xdm
-Why:         Sugar desktop environment
-Responsible: Luke Faraone
-NeedConfig:  no
-
-Ignore:      ejabberd
-Why:         This is the collaboration server used by Sugar.  Should probably be
-             included in the main-server instead of the desktop.
-Responsible: Holger Levsen
-NeedConfig:  ?

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



More information about the debian-edu-commits mailing list