[Blends-commit] [SCM] ezgo branch, master, updated. 25d51441cdd8ab3ce3fa4dc23e44ce2b967bc525
Franklin Weng
franklin at goodhorse.idv.tw
Mon Apr 7 09:29:45 UTC 2014
The following commit has been merged in the master branch:
commit d8e0871d415b22862702d955e13589979c06acfa
Author: Franklin Weng <franklin at goodhorse.idv.tw>
Date: Mon Apr 7 16:56:53 2014 +0800
Review ezgo tasks.
diff --git a/debian/control.stub b/debian/control.stub
index db4e4d4..d1c8a9f 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -21,6 +21,7 @@ Description: Artwork for ezgo11
self-learning.
.
This package contains artwork for ezgo.
+Conflicts: kubuntu-settings-desktop, kubuntu-settings-netbook
Package: ezgo-menu
Architecture: all
diff --git a/tasks/accessories b/tasks/accessories
index 2b02589..c6bccb7 100644
--- a/tasks/accessories
+++ b/tasks/accessories
@@ -6,24 +6,14 @@ Description: EzGo Accessories
.
This is the selection of Accessories.
-Depends: lxterminal
-
-Depends: gedit
-
-Depends: gnome-utils
-
-Depends: gcalctool
-
Depends: convertall
-Depends: tomboy
-
-Depends: stardict
+Depends: wiican
-Depends: gtkwhiteboard
+Depends: kate
-Depends: xournal
+Depends: vim-gtk
-Depends: python-whiteboard
+Depends: kcalc
-Depends: wiican
+Depends: kmag
diff --git a/tasks/common b/tasks/common
index 3321b8a..a58b5ed 100644
--- a/tasks/common
+++ b/tasks/common
@@ -16,14 +16,12 @@ Depends: xserver-xorg-video-all
Depends: xserver-xorg-input-all
-Depends: xorg
+Recommends: xorg
Depends: libgl1-mesa-dri
Depends: bash-completion
-Depends: dhcp3-client
-
Depends: openssh-client
-Depends: task-kde-desktop
+Depends: openssh-server
diff --git a/tasks/education b/tasks/education
index 8093a1a..9ec3338 100644
--- a/tasks/education
+++ b/tasks/education
@@ -9,60 +9,28 @@ Description: EzGo Education
.
This is the selection of education tools.
-Depends: drgeo
-
-Depends: kig
-
-Depends: kmplot
+Depends: kdeedu
-Depends: kbruch
-
-Depends: kalgebra
+Depends: drgeo
Depends: wxmaxima
-Depends: kalzium
-
Depends: ghemical
Depends: avogadro
Depends: gchempaint
-Depends: gcu-bin
-
Depends: bkchem
Depends: pymol
-Depends: step
-
-Depends: kstars
-
Depends: stellarium
Depends: celestia
-Depends: kgeography
-
-Depends: marble
-
-Depends: klettres
-
-Depends: khangman
-
-Depends: kanagram
-
-Depends: kwordquiz
-
-Depends: parley
-
Depends: gcompris
-Depends: ktouch
-
-Depends: kturtle
-
Depends: kayali
Homepage: http://kayali.sourceforge.net/
License: free
diff --git a/tasks/games b/tasks/games
index e056cd2..c8b7be6 100644
--- a/tasks/games
+++ b/tasks/games
@@ -9,38 +9,20 @@ Description: EzGo Games
.
This is the selection of games.
-Depends: ktuberling
-
Depends: tuxmath
Depends: tuxtype
Depends: gnome-games
-Depends: knetwalk
-
-Depends: pinball
-
-Depends: lbreakout2
-
-Depends: frozen-bubble
+Depends: kdegames
Depends: kblocks
-Depends: kolf
-
-Depends: tuxpuck
-
Depends: supertux
-Depends: planetpenguin-racer
-
Depends: pingus
Depends: supertuxkart
-Depends: torcs
-
Depends: atomix
-
-Depends: numptyphysics
diff --git a/tasks/imaging b/tasks/graphics
similarity index 62%
rename from tasks/imaging
rename to tasks/graphics
index f976ce9..23ac716 100644
--- a/tasks/imaging
+++ b/tasks/graphics
@@ -1,5 +1,5 @@
-Task: Imaging
-Description: EzGo imaging
+Task: Graphics
+Description: ezgo graphics
The EzGo is a Debian Pure Blends project which collects a set of free
software and aims to promote the usage of free software on teaching and
self-learning.
@@ -25,25 +25,10 @@ Depends: digikam
Depends: f-spot
-Depends: eog
-
Depends: gwenview
Depends: cheese
-Depends: qcad
-
-Depends: ktoon
-
-Depends: pencil
-Homepage: http://www.pencil-animation.org/
-License: free
-WNPP: #490702
-Pkg-Description: drawing traditional hand-drawn animations
- Pencil is an animation/drawing software which lets you create
- traditional hand-drawn animation (cartoon) using both bitmap and vector
- graphics.
-
Depends: blender
Depends: ballview
diff --git a/tasks/lang-vi_VN-desktop b/tasks/lang-vi_VN-desktop
deleted file mode 100644
index bdad3e7..0000000
--- a/tasks/lang-vi_VN-desktop
+++ /dev/null
@@ -1,36 +0,0 @@
-Task: Vietnamese Desktop
-Architecture: any
-Metapackage: false
-Description: Vietnamese support for Debian EzGo Desktop
- This metapackage depends on various office and desktop applications
- that are useful for teachers and their students.
-
-Depends: openoffice.org-l10n-vi
-Why: Vietnamese packages for OpenOffice.org
-
-Depends: im-switch
-Why: input method support
-
-Depends: scim-unikey
-
-Depends: ibus-unikey
-
-Depends: stardict-free-vietnamese-dict
-Homepage: http://stardict.sourceforge.net/Dictionaries_misc.php
-License: Free Vietnamese Dictionary Project license
-Responsible: Lê Quốc Tuấn <mr.lequoctuan at gmail.com>
-Pkg-Description: Stardict dictionary from Free Vietnamese Dictionary Project
- A various dictionaries from Free Vietnamese Dictionary Project includes:
- - English-Vietnamese dictionary
- - French-Vietnamese dictionary
- - German-Vietnamese dictionary
- - Norwegian-Vietnamese dictionary
- - Russian-Vietnamese dictionary
- - Vietnamese-English dictionary
- - Vietnamese-French dictionary
- - Vietnamese-German dictionary
- - Vietnamese-Vietnamese dictionary
- .
- Free Vietnamese Dictionary Project:
- http://www.informatik.uni-leipzig.de/~duc/Dict/install.html
-
diff --git a/tasks/lang-zh_TW-desktop b/tasks/lang-zh_TW-desktop
index e87932c..d8108a5 100644
--- a/tasks/lang-zh_TW-desktop
+++ b/tasks/lang-zh_TW-desktop
@@ -1,56 +1,18 @@
Task: Traditional Chinese Desktop
Architecture: any
Metapackage: false
-Description: Traditional Chinese support for Debian EzGo Desktop
+Description: Traditional Chinese support for Debian ezgo Desktop
This metapackage depends on various office and desktop applications
that are useful for teachers and their students.
-Depends: openoffice.org-help-zh-tw, \
- openoffice.org-l10n-zh-tw
-Why: Traditional Chinese packages for OpenOffice.org
-Responsible: ?
-NeedConfig: ?
-
Depends: ttf-arphic-uming, ttf-arphic-ukai, ttf-wqy-zenhei, ttf-wqy-microhei
Why: Chinese fonts
-Depends: ttf-tw-kai
-Homepage: http://www.cns11643.gov.tw/AIDB/download.do?name=字型下載
-License: non-free
-Responsible: Andrew Lee <ajqlee at debian.org>
-Pkg-Description: CNS11643 fonts from Taiwanese government
- TW-Sung and TW-Kai fonts are created by Directorage-General of Budget,
- Accounting and Statistics, Executive Yuan, (R.O.C.) Taiwan and under
- CNS11643 national standard and includes mapping to UNICODE.
-
-Depends: ttf-tw-sung
-Homepage: http://www.cns11643.gov.tw/AIDB/download.do?name=字型下載
-License: non-free
-Responsible: Andrew Lee <ajqlee at debian.org>
-Pkg-Description: CNS11643 fonts from Taiwanese government
- TW-Sung and TW-Kai fonts are created by Directorage-General of Budget,
- Accounting and Statistics, Executive Yuan, (R.O.C.) Taiwan and under
- CNS11643 national standard and includes mapping to UNICODE.
-
-Depends: ttf-cwtex
-Homepage: http://cle.linux.org.tw/fonts/cwttf/center/
-License: GPL2
-WNPP: #469480
-Pkg-Description: cwTex TrueType Fonts
- cwTex TrueType Fonts was orientate from cwTeX's Type 1 fonts and includes
- Alexej Kryukov's CM-LGC fonts and Koanughi Un's Korean fonts.
- .
- It provides five TrueType Fonts in different styles/family names:
- * cwming.ttf MingTi Style cwTeXMing
- * cwkai.ttf KaiShuTi Style cwTeXKai
- * cwfs.ttf FangSungTi Style cwTeXFangSong
- * cwheib.ttf CuHeiTi Style cwTeXHeiBold
- * cwyen.ttf YuanTi Style cwTeXYen
-
-Depends: im-switch, hime
+Depends: im-switch
Why: input method support
Responsible: Andrew Lee
NeedConfig: no
-Depends: kde-l10n-zhtw
+Depends: kde-l10n-zhtw
+Depends: openoffice.org-l10n-zh-tw
diff --git a/tasks/multimedia b/tasks/multimedia
index 79c89f8..8191ed3 100644
--- a/tasks/multimedia
+++ b/tasks/multimedia
@@ -26,14 +26,8 @@ Depends: tuxguitar
Depends: rosegarden
-Depends: gnome-media
-
Depends: sound-juicer
-Depends: gtk-recordmydesktop
-
-Depends: kino
-
Depends: kdenlive
Depends: oggconvert
diff --git a/tasks/network b/tasks/network
index e1d583c..dacdc51 100644
--- a/tasks/network
+++ b/tasks/network
@@ -8,40 +8,16 @@ Description: EzGo network
Depends: iceweasel
-Depends: kompozer
-
-Depends: icedove
-
-Depends: evolution
-
Depends: pidgin
Depends: kopete
-Depends: emesene
-
-Depends: ekiga
-
Depends: pcmanx-gtk2
Depends: gftp
Depends: filezilla
-Depends: vinagre
-
-Depends: tsclient
-
-Depends: transmission
+Depends: krdc
-Depends: exe
-WNPP: #501895
-License: GPL
-Homepage: http://sourceforge.net/apps/trac/exe/wiki
-Pkg-URL: http://eduforge.org/frs/download.php/842/python2.5-exe_1.04.0.3532-ubuntu1_i386.deb
-Pkg-Description: the eLearning XHTML editor
- The eXe project is an authoring environment to enable teachers to publish
- web content without the need to become proficient in HTML or XML markup.
- Content generated using eXe can be used by any Learning Management System.
-
-Depends: amsn
+Depends: ekiga
--
Blend for educatipn with asian specific adaptations
More information about the Blends-commit
mailing list