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

holger at alioth.debian.org holger at alioth.debian.org
Sat Mar 2 20:20:51 UTC 2013 

Author: holger
Date: 2013-03-02 20:20:51 +0000 (Sat, 02 Mar 2013)
New Revision: 79261

Added:
   branches/wheezy/debian-edu/sources.list.wheezy-test
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/sources.list.squeeze-test
   branches/wheezy/debian-edu/sources.list.stable
Log:
release to wheezy-test

* Add sources.list.wheezy-test for Debian development needs.
* Update sources.list.squeeze-test to reflect that squeeze is stable
  remove references to non-US from sources.list.stable.
* Update debian-edu-tasks.desc and debian/control after running make-dist
  (which distribution set to wheezy-test in debian/changelog) and building 
  the resulting source archive. (This is described in README.source)

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-03-02 20:14:58 UTC (rev 79260)
+++ branches/wheezy/debian-edu/debian/changelog	2013-03-02 20:20:51 UTC (rev 79261)
@@ -1,11 +1,20 @@
-debian-edu (1.702+nmu1) UNRELEASED; urgency=low
+debian-edu (1.703) wheezy-test; urgency=low
 
+  [ Wolfgang Schweer ]
   * Add debian-edu-config-gosa-netgroups to main-server depends.
   * Add dovecot-gssapi to main-server depends, cause Kerberos support is now
     covered in a separate package).
 
- -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 01 Feb 2013 18:31:37 +0100
+  [ Holger Levsen ]
+  * Add sources.list.wheezy-test for Debian development needs.
+  * Update sources.list.squeeze-test to reflect that squeeze is stable
+    remove references to non-US from sources.list.stable.
+  * Update debian-edu-tasks.desc and debian/control after running make-dist
+    (which distribution set to wheezy-test in debian/changelog) and building 
+    the resulting source archive. (This is described in README.source)
 
+ -- Holger Levsen <holger at debian.org>  Sat, 02 Mar 2013 20:53:01 +0100
+
 debian-edu (1.702) unstable; urgency=low
 
   [ Andreas Tille ]

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-03-02 20:14:58 UTC (rev 79260)
+++ branches/wheezy/debian-edu/debian/control	2013-03-02 20:20:51 UTC (rev 79261)
@@ -120,8 +120,8 @@
 Package: education-development
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: autoconf, build-essential, bwbasic, ddd, education-menus, fp-compiler, fp-docs, fp-ide, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gfx, fp-units-gtk2, fp-units-i386, fp-units-misc, fp-units-multimedia, fp-units-net, fp-units-rtl, fp-utils, fpc-source, kdevelop, kommander, kturtle, lazarus, python, squeak-vm, subversion, umbrello
-Suggests: eclipse, gambas2, quanta, swi-prolog, swi-prolog-clib, swi-prolog-doc, swi-prolog-http, swi-prolog-semweb, swi-prolog-sgml, swi-prolog-table, swi-prolog-xpce, tcl8.5-dev, tk8.5-dev
+Recommends: autoconf, build-essential, bwbasic, ddd, education-menus, fp-compiler, fp-docs, fp-ide, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gfx, fp-units-gtk2, fp-units-misc, fp-units-multimedia, fp-units-net, fp-units-rtl, fp-utils, fpc-source, kdevelop, kommander, kturtle, lazarus, python, squeak-vm, subversion, umbrello
+Suggests: eclipse, fp-units-i386, gambas2, quanta, swi-prolog, swi-prolog-clib, swi-prolog-doc, swi-prolog-http, swi-prolog-semweb, swi-prolog-sgml, swi-prolog-table, swi-prolog-xpce, tcl8.5-dev, tk8.5-dev
 Description: Debian Edu software development related educational applications
  This metapackage depends on various applications that can be used to
  develop applications in schools.  The idea is to support integrated
@@ -186,7 +186,7 @@
 Package: education-main-server
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: apache2, atftpd | tftpd-hpa, bind9 | pdns-backend-ldap, dovecot-imapd, education-networked, exim4-daemon-heavy, gosa, gosa-help-de, gosa-help-en, gosa-help-fr, gosa-help-nl, gosa-plugin-dhcp, gosa-plugin-dhcp-schema, gosa-plugin-dns, gosa-plugin-dns-schema, gosa-plugin-ldapmanager, gosa-plugin-samba, gosa-plugin-sudo, gosa-plugin-sudo-schema, gosa-schema, iptables, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, krb5-kdc-ldap, ldap2zone | pdns-recursor, libapache2-mod-auth-kerb, libsasl2-modules-gssapi-mit, links, makepasswd, memtest86+, munin, nagios-nrpe-plugin, nagios-plugins-standard, nagios3, nfs-kernel-server, ntp, openssl, samba, samba-common-bin, sitesummary, slapd, slbackup, slbackup-php, smbclient, smbldap-tools, squid, syslinux, tdb-tools
+Recommends: apache2, atftpd | tftpd-hpa, bind9 | pdns-backend-ldap, debian-edu-config-gosa-netgroups, dovecot-gssapi, dovecot-imapd, education-networked, exim4-daemon-heavy, gosa, gosa-help-de, gosa-help-en, gosa-help-fr, gosa-help-nl, gosa-plugin-dhcp, gosa-plugin-dhcp-schema, gosa-plugin-dns, gosa-plugin-dns-schema, gosa-plugin-ldapmanager, gosa-plugin-samba, gosa-plugin-sudo, gosa-plugin-sudo-schema, gosa-schema, iptables, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, krb5-kdc-ldap, ldap2zone | pdns-recursor, libapache2-mod-auth-kerb, libsasl2-modules-gssapi-mit, links, makepasswd, memtest86+, munin, nagios-nrpe-plugin, nagios-plugins-standard, nagios3, nfs-kernel-server, ntp, openssl, samba, samba-common-bin, sitesummary, slapd, slbackup, slbackup-php, smbclient, smbldap-tools, squid, syslinux, tdb-tools
 Suggests: apache2-doc, calamaris, debian-edu-fr-all, debian-edu-fr-skels, debian-installer-6.0-netboot-amd64, debian-installer-6.0-netboot-i386, dlint, dnswalk, dovecot-pop3d, dsh, gosa-plugin-goto, krb5-doc, libsasl2-modules-ldap, lwat, mysql-client, nagios3-doc, nfs-server, nslint, ocsinventory-reports, ocsinventory-server, samba-doc, sarg, squidguard, webalizer
 Description: Debian Edu main 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-03-02 20:14:58 UTC (rev 79260)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-03-02 20:20:51 UTC (rev 79261)
@@ -884,12 +884,12 @@
 Enhances: education-desktop-other, education-lang-ja
 Packages: list
  ttf-vlgothic
- scim-anthy
  scim-skk
- scim-prime
  scim-canna
  scim-tables-ja
+ scim-anthy
  scim-uim
+ scim-prime
  openoffice.org-l10n-ja
  openoffice.org-help-ja
  iceweasel-l10n-ja
@@ -1142,6 +1142,7 @@
  slapd
  openssl
  dovecot-imapd
+ dovecot-gssapi
  exim4-daemon-heavy
  links
  nfs-kernel-server
@@ -1174,6 +1175,7 @@
  gosa-help-de
  gosa-help-fr
  gosa-help-nl
+ debian-edu-config-gosa-netgroups
  krb5-kdc
  krb5-admin-server
  krb5-kdc-ldap

Modified: branches/wheezy/debian-edu/sources.list.squeeze-test
===================================================================
--- branches/wheezy/debian-edu/sources.list.squeeze-test	2013-03-02 20:14:58 UTC (rev 79260)
+++ branches/wheezy/debian-edu/sources.list.squeeze-test	2013-03-02 20:20:51 UTC (rev 79261)
@@ -1,3 +1,3 @@
 # Use testing as final target for Debian Edu meta packages
-deb http://ftp.skolelinux.org/debian/ testing main contrib non-free
+deb http://ftp.skolelinux.org/debian/ stable main contrib non-free
 deb http://ftp.skolelinux.org/skolelinux/ squeeze-test local

Modified: branches/wheezy/debian-edu/sources.list.stable
===================================================================
--- branches/wheezy/debian-edu/sources.list.stable	2013-03-02 20:14:58 UTC (rev 79260)
+++ branches/wheezy/debian-edu/sources.list.stable	2013-03-02 20:20:51 UTC (rev 79261)
@@ -1,2 +1 @@
 deb http://ftp.debian.org/debian/ stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US/ stable/non-US main contrib non-free

Added: branches/wheezy/debian-edu/sources.list.wheezy-test
===================================================================
--- branches/wheezy/debian-edu/sources.list.wheezy-test	                        (rev 0)
+++ branches/wheezy/debian-edu/sources.list.wheezy-test	2013-03-02 20:20:51 UTC (rev 79261)
@@ -0,0 +1,3 @@
+# Use testing as final target for Debian Edu meta packages
+deb http://ftp.skolelinux.org/debian/ testing main contrib non-free
+deb http://ftp.skolelinux.org/skolelinux/ wheezy-test local

More information about the debian-edu-commits mailing list