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

[holger at alioth.debian.org]

Author: holger
Date: 2013-05-17 18:48:53 +0000 (Fri, 17 May 2013)
New Revision: 80107

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/debian/control.stub
Log:
release as 1.707 to Debian sid and Debian Edu wheezy-test

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-05-17 18:47:58 UTC (rev 80106)
+++ branches/wheezy/debian-edu/debian/changelog	2013-05-17 18:48:53 UTC (rev 80107)
@@ -1,10 +1,5 @@
-debian-edu (1.707~svn79943) wheezy-test; urgency=low
+debian-edu (1.707) 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 ]
   * README.source: better explain how to actually build this package today.
   * debian/control: remove obsolete XS-DM-Upload-Allowed: field.
@@ -15,7 +10,7 @@
   * Move gosa-desktop from tasks/desktop-lxde to tasks/networked to
     provide a consistent menu entry for all desktop environments.
 
- -- Holger Levsen <holger at debian.org>  Sun, 05 May 2013 12:14:24 +0200
+ -- Holger Levsen <holger at debian.org>  Fri, 17 May 2013 20:33:55 +0200
 
 debian-edu (1.706) unstable; urgency=low
 

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-05-17 18:47:58 UTC (rev 80106)
+++ branches/wheezy/debian-edu/debian/control	2013-05-17 18:48:53 UTC (rev 80107)
@@ -220,7 +220,7 @@
 Package: education-networked
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: education-networked-common, libpam-krb5, network-manager, nscd
+Recommends: education-networked-common, gosa-desktop, libpam-krb5, network-manager, nscd
 Description: Debian Edu networked minimal packages
  A metapackage containing dependencies for packages required on all
  networked installations (workstation and main-server, but not

Modified: branches/wheezy/debian-edu/debian/control.stub
===================================================================
--- branches/wheezy/debian-edu/debian/control.stub	2013-05-17 18:47:58 UTC (rev 80106)
+++ branches/wheezy/debian-edu/debian/control.stub	2013-05-17 18:48:53 UTC (rev 80107)
@@ -17,7 +17,6 @@
 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
-XS-DM-Upload-Allowed: yes
 
 XS-Comment: This is a specific package which contains a tasksel helper. It doesn't make sense to put it in tasks.
 Package: education-tasks

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-05-17 18:47:58 UTC (rev 80106)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-05-17 18:48:53 UTC (rev 80107)
@@ -1126,6 +1126,7 @@
  libpam-krb5
  nscd
  network-manager
+ gosa-desktop
  iptables
  bind9
  ldap2zone
@@ -1295,6 +1296,7 @@
  libpam-krb5
  nscd
  network-manager
+ gosa-desktop
 
 Task: education-roaming-workstation
 Section: debian-edu
@@ -2106,6 +2108,7 @@
  libpam-krb5
  nscd
  network-manager
+ gosa-desktop
  education-desktop-other
  xorg
  xserver-xorg-input-all
@@ -2457,6 +2460,7 @@
  libpam-krb5
  nscd
  network-manager
+ gosa-desktop
  education-desktop-other
  xorg
  xserver-xorg-input-all