[Blends-commit] [SCM] ezgo branch, master, updated. a10c12de097f291f8b55c96da92047e2512840a0

Franklin franklin at goodhorse.idv.tw
Wed Sep 17 07:04:38 UTC 2014 

The following commit has been merged in the master branch:
commit a10c12de097f291f8b55c96da92047e2512840a0
Author: Franklin <franklin at goodhorse.idv.tw>
Date:   Wed Sep 17 15:03:20 2014 +0800

    Fix tasks dependency packages

diff --git a/debian/changelog b/debian/changelog
index d66fd9f..45304fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ezgo (11.0) UNRELEASED; urgency=low
+ezgo (11.1) UNRELEASED; urgency=low
 
   [ Andreas Tille ]
   * Versioned Build-Depends blends-dev >= 0.6.91
@@ -6,9 +6,13 @@ ezgo (11.0) UNRELEASED; urgency=low
     from the tasks dir and add long description to contro.stub.
 
   [ Franklin Weng ]
-  * Change the version of debian ezgo to 11.0.
+  * Change the version of debian ezgo to 11.1.
+  * Fix bugs in ezgo-artwork
+  * Add zh_CN support in ezgo-menu
+  * Sync the dependencies in meta packages and tasks
+  * -
 
- -- Franklin Weng <franklin at ip-server.everfocus.com.tw>  Fri, 28 Mar 2014 14:18:01 +0800
+ -- Franklin Weng <franklin at teabbs.goodhorse.idv.tw>  Thu, 28 Aug 2014 10:36:24 +0800
 
 ezgo (0.8.0) unstable; urgency=low
 
diff --git a/ezgo-tasks.desc b/ezgo-tasks.desc
index c9b7c41..b754dd1 100644
--- a/ezgo-tasks.desc
+++ b/ezgo-tasks.desc
@@ -1,7 +1,7 @@
 Task: ezgo-accessories
 Section: ezgo
-Description: ezgo Accessories
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Accessories
+ 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.
  .
@@ -18,8 +18,8 @@ Packages: list
 
 Task: ezgo-common
 Section: ezgo
-Description: ezgo common
- The ezgo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo common
+ ezgo is a Debian Pure Blends project which collects a set of free
  and open source software, as well as many public domain tutorials.  ezgo
  aims to introduce the world of free and open source software to those who
  have never heard or touched it.  It is also good for teaching and
@@ -36,12 +36,11 @@ Packages: list
  bash-completion
  openssh-client
  openssh-server
- xorg
 
 Task: ezgo-education
 Section: ezgo
-Description: ezgo Education
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Education
+ 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.
  .
@@ -68,8 +67,8 @@ Packages: list
 
 Task: ezgo-games
 Section: ezgo
-Description: ezgo Games
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Games
+ 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.
  .
@@ -85,7 +84,6 @@ Packages: list
  tuxtype
  gnome-games
  kdegames
- kblocks
  supertux
  pingus
  supertuxkart
@@ -93,8 +91,8 @@ Packages: list
 
 Task: ezgo-graphics
 Section: ezgo
-Description: ezgo Graphics
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Graphics
+ 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.
  .
@@ -121,7 +119,6 @@ Packages: list
  ardesia
  fotowall
  shotwell
- sweethome3d
  hugin
 
 Task: ezgo-lang-zh_TW-desktop
@@ -137,8 +134,8 @@ Packages: list
 
 Task: ezgo-multimedia
 Section: ezgo
-Description: ezgo Multimedia
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Multimedia
+ 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.
  .
@@ -148,12 +145,9 @@ Key:
  ezgo-multimedia
 Packages: list
  audacious
- rhythmbox
  amarok
  vlc
  totem
- smplayer
- mplayer
  audacity
  tuxguitar
  rosegarden
@@ -167,8 +161,8 @@ Packages: list
 
 Task: ezgo-network
 Section: ezgo
-Description: ezgo Network
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Network
+ 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.
  .
@@ -177,19 +171,17 @@ Relevance: 10
 Key: 
  ezgo-network
 Packages: list
- iceweasel
  pidgin
  kopete
  pcmanx-gtk2
  gftp
  filezilla
  krdc
- ekiga
 
 Task: ezgo-office
 Section: ezgo
-Description: ezgo Office
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Office
+ 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.
  .
@@ -202,5 +194,6 @@ Packages: list
  dia
  okular
  planner
+ pdfshuffler
  scribus
 
diff --git a/tasks/accessories b/tasks/accessories
index 5a7c875..66cdca3 100644
--- a/tasks/accessories
+++ b/tasks/accessories
@@ -1,6 +1,6 @@
 Task: Accessories
-Description: ezgo Accessories
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Accessories
+ 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.
  .
@@ -8,8 +8,6 @@ Description: ezgo Accessories
 
 Depends: convertall
 
-Depends: wiican
-
 Depends: kate
 
 Depends: vim-gtk
diff --git a/tasks/common b/tasks/common
index a58b5ed..9fc5c27 100644
--- a/tasks/common
+++ b/tasks/common
@@ -1,6 +1,6 @@
 Task: Common
-Description: ezgo common
- The ezgo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo common
+ ezgo is a Debian Pure Blends project which collects a set of free
  and open source software, as well as many public domain tutorials.  ezgo
  aims to introduce the world of free and open source software to those who
  have never heard or touched it.  It is also good for teaching and
@@ -8,16 +8,10 @@ Description: ezgo common
  .
  This is the common set of packages needed by ezgo.
 
-Depends: ezgo-menu
-
-Depends: ezgo-artwork
-
 Depends: xserver-xorg-video-all
 
 Depends: xserver-xorg-input-all
 
-Recommends: xorg
-
 Depends: libgl1-mesa-dri
 
 Depends: bash-completion
diff --git a/tasks/education b/tasks/education
index 02900d8..c3d9fa3 100644
--- a/tasks/education
+++ b/tasks/education
@@ -1,6 +1,6 @@
 Task: Education
-Description: ezgo Education
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Education
+ 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.
  .
diff --git a/tasks/games b/tasks/games
index 1332572..e0d43df 100644
--- a/tasks/games
+++ b/tasks/games
@@ -1,6 +1,6 @@
 Task: Games
-Description: ezgo Games
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Games
+ 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.
  .
@@ -17,8 +17,6 @@ Depends: gnome-games
 
 Depends: kdegames
 
-Depends: kblocks
-
 Depends: supertux
 
 Depends: pingus
diff --git a/tasks/graphics b/tasks/graphics
index 08a3dd8..3802c5e 100644
--- a/tasks/graphics
+++ b/tasks/graphics
@@ -1,6 +1,6 @@
 Task: Graphics
-Description: ezgo Graphics
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Graphics
+ 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.
  .
@@ -39,6 +39,4 @@ Depends: fotowall
 
 Depends: shotwell
 
-Depends: sweethome3d
-
 Depends: hugin
diff --git a/tasks/lang-zh_TW-desktop b/tasks/lang-zh_TW-desktop
index d8108a5..4ddf256 100644
--- a/tasks/lang-zh_TW-desktop
+++ b/tasks/lang-zh_TW-desktop
@@ -15,4 +15,7 @@ NeedConfig:  no
 
 Depends:     kde-l10n-zhtw
 
-Depends:     openoffice.org-l10n-zh-tw
+Depends:     chromium-browser-l10n
+
+Depends:     firefox-locale-zh-hant
+
diff --git a/tasks/multimedia b/tasks/multimedia
index 1dada88..0f87e8b 100644
--- a/tasks/multimedia
+++ b/tasks/multimedia
@@ -1,6 +1,6 @@
 Task: Multimedia
-Description: ezgo Multimedia
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Multimedia
+ 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.
  .
@@ -8,16 +8,12 @@ Description: ezgo Multimedia
 
 Depends: audacious
 
-Depends: rhythmbox
-
 Depends: amarok
 
 Depends: vlc
 
 Depends: totem
 
-Depends: smplayer
-
 Depends: mplayer
 
 Depends: audacity
@@ -36,18 +32,6 @@ Depends: k3b
 
 Depends: brasero
 
-Depends: xvidcap
-Homepage: http://xvidcap.sourceforge.net/
-License: non-free
-Pkg-URL: http://debian-multimedia.org/dists/unstable/main/binary-i386/package/xvidcap.php
-Responsible: Christian Marillat <marillat at debian.org>
-Pkg-Description: Screen video capture for X
- A screen capture enabling you to capture videos off your X-Window desktop
- for illustration or documentation purposes. It is intended to be a
- standards-based alternative to tools like Lotus ScreenCam.
- .
- Video can be saved in MPEG or AVI files format.
-
 Depends: mscore
 
 Depends: imagination
diff --git a/tasks/network b/tasks/network
index 32dd0b7..6aaad15 100644
--- a/tasks/network
+++ b/tasks/network
@@ -1,12 +1,14 @@
 Task: Network
-Description: ezgo Network
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Network
+ 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.
  .
  This is the selection of networking related packages.
 
-Depends: iceweasel
+Depends: firefox
+
+Depends: chromium-browser
 
 Depends: pidgin
 
@@ -20,4 +22,3 @@ Depends: filezilla
 
 Depends: krdc
 
-Depends: ekiga
diff --git a/tasks/office b/tasks/office
index fb56417..e7ea16c 100644
--- a/tasks/office
+++ b/tasks/office
@@ -1,6 +1,6 @@
 Task: Office
-Description: ezgo Office
- The EzGo is a Debian Pure Blends project which collects a set of free
+Description: debian ezgo Office
+ 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.
  .
@@ -8,8 +8,6 @@ Description: ezgo Office
 
 Depends: openclipart
 
-Depends: openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-base, openoffice.org-draw, openoffice.org-ogltrans
-
 Depends: xmind
 Homepage: http://www.xmind.net/
 License: free
@@ -26,8 +24,6 @@ Depends: dia
 
 Depends: okular
 
-Depends: pdfedit
-
 Depends: planner
 
 Depends: ganttproject
@@ -46,7 +42,7 @@ Pkg-Description: Gantt chart based project scheduling and management tool
   * MS Project import/export
   * WebDAV based groupwork
 
-Depends: ppdfshuffler
+Depends: pdfshuffler
 
 Depends: scribus
 

-- 
Blend for educatipn with asian specific adaptations

More information about the Blends-commit mailing list