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

[holger at alioth.debian.org]

Author: holger
Date: 2013-06-16 21:46:07 +0000 (Sun, 16 Jun 2013)
New Revision: 80797

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/common
   branches/wheezy/debian-edu/tasks/desktop-other
   branches/wheezy/debian-edu/tasks/lang-ja-desktop
   branches/wheezy/debian-edu/tasks/lang-zh_TW-desktop
Log:
Replace transitional dummy fonts packages in tasks with their real
dependend packages.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-06-16 21:28:09 UTC (rev 80796)
+++ branches/wheezy/debian-edu/debian/changelog	2013-06-16 21:46:07 UTC (rev 80797)
@@ -8,6 +8,8 @@
   [ Holger Levsen ]
   * Remove menu-xdg from tasks/desktop-kde. See #502192 and
     http://lists.debian.org/201306162325.37014.holger@layer-acht.org
+  * Replace transitional dummy fonts packages in tasks with their real
+    dependend packages.
 
  -- Holger Levsen <holger at debian.org>  Sun, 16 Jun 2013 12:58:15 +0200
 

Modified: branches/wheezy/debian-edu/tasks/common
===================================================================
--- branches/wheezy/debian-edu/tasks/common	2013-06-16 21:28:09 UTC (rev 80796)
+++ branches/wheezy/debian-edu/tasks/common	2013-06-16 21:46:07 UTC (rev 80797)
@@ -146,12 +146,12 @@
              python-at-spi, python-notify, \
              scim-gtk2-immodule, scim-modules-socket, \
              scim-modules-table, scim-tables-additional, screem, \
-             sessreg, thunar, ttf-arabeyes, \
-             ttf-bengali-fonts, ttf-devanagari-fonts, \
-             ttf-gujarati-fonts, ttf-indic-fonts, ttf-kannada-fonts, \
-             ttf-lao, ttf-malayalam-fonts, ttf-oriya-fonts, \
-             ttf-punjabi-fonts, ttf-tamil-fonts, ttf-telugu-fonts, \
-             ttf-thai-tlwg, unattended-upgrades, upstart, w3m, \
+             sessreg, thunar, fonts-arabeyes, \
+             fonts-beng, fonts-deva, \
+             fonts-gujr, fonts-indic, fonts-knda, \
+             fonts-lao, fonts-mlym, fonts-orya, \
+             fonts-guru, fonts-taml, fonts-telu, \
+             fonts-thai-tlwg, unattended-upgrades, upstart, w3m, \
              wamerican, xdriinfo, xfce4-terminal, xfdesktop4, \
              xfsprogs, xkeyboard-config, xmessage, xpmutils
 Why:         Include packages found in Edubuntu on the DVD, until we know if

Modified: branches/wheezy/debian-edu/tasks/desktop-other
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-other	2013-06-16 21:28:09 UTC (rev 80796)
+++ branches/wheezy/debian-edu/tasks/desktop-other	2013-06-16 21:46:07 UTC (rev 80797)
@@ -11,9 +11,9 @@
 Depends:     xorg, xserver-xorg-input-all, xserver-xorg-video-all, libgl1-mesa-dri, \
              numlockx, unifont, gsfonts-x11, \
              xfonts-base-transcoded, xfonts-75dpi-transcoded, \
-             ttf-mgopen, ttf-freefont, ttf-liberation, ttf-linex
-Recommends:  ttf-larabie-deco
-Suggests:    xfonts-100dpi-transcoded, ttf-malayalam-fonts
+             fonts-mgopen, fonts-freefont-ttf, fonts-liberation, fonts-linex
+Recommends:  fonts-larabie-deco
+Suggests:    xfonts-100dpi-transcoded, fonts-mlym
 Why:         X11 Window system
 Responsible: Petter Reinholdtsen
 NeedConfig:  no
@@ -510,7 +510,7 @@
 Ignore:      ttf-mscorefonts-installer | msttcorefonts
 Why:         Make it easier to fetch fonts from microsoft by providing
              the installation package on the DVD.  We provide
-             ttf-liberation which is a free software alternative to
+             fonts-liberation which is a free software alternative to
              the MS fonts.
 Responsible: Petter Reinholdtsen
 NeedConfig:  no
@@ -539,12 +539,12 @@
 Responsible: Petter Reinholdtsen
 NeedConfig:  No
 
-Suggests:    ttf-arphic-uming, im-switch, scim-chewing, scim-tables-zh
+Suggests:    fonts-arphic-uming, im-switch, scim-chewing, scim-tables-zh
 Why:         Chinese fonts, input method support
 Responsible: Andrew Lee
 NeedConfig:  no
 
-Ignore:      ttf-dzongkha
+Ignore:      fonts-dzongkha
 Why:         Dzongkha / Butan support
 Responsible: ?
 NeedConfig:  ?

Modified: branches/wheezy/debian-edu/tasks/lang-ja-desktop
===================================================================
--- branches/wheezy/debian-edu/tasks/lang-ja-desktop	2013-06-16 21:28:09 UTC (rev 80796)
+++ branches/wheezy/debian-edu/tasks/lang-ja-desktop	2013-06-16 21:46:07 UTC (rev 80797)
@@ -6,7 +6,7 @@
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Recommends:  ttf-vlgothic, ibus-anthy
+Recommends:  fonts-vlgothic, ibus-anthy
 Avoid:       cmap-adobe-japan1
 Why:         Japanese support.  Avoid the non-free japanese packages on
              the DVD.

Modified: branches/wheezy/debian-edu/tasks/lang-zh_TW-desktop
===================================================================
--- branches/wheezy/debian-edu/tasks/lang-zh_TW-desktop	2013-06-16 21:28:09 UTC (rev 80796)
+++ branches/wheezy/debian-edu/tasks/lang-zh_TW-desktop	2013-06-16 21:46:07 UTC (rev 80797)
@@ -12,13 +12,13 @@
 Responsible: ?
 NeedConfig:  ?
 
-Depends:     ttf-arphic-uming, ttf-wqy-zenhei, ttf-wqy-microhei, \
+Depends:     fonts-arphic-uming, ttf-wqy-zenhei, ttf-wqy-microhei, \
              im-switch, ibus-chewing, ibus-table-cangjie, ibus-array
 Why:         Chinese fonts, input methods support
 Responsible: Andrew Lee
 NeedConfig:  no
 
-Depends:     ttf-arphic-ukai
+Depends:     fonts-arphic-ukai
 Why:         Chinese Printing fonts both for Simplified Chinese and Traditional Chinese
 Responsible: Andrew Lee
 NeedConfig:  no