[SCM] KDE metapackages branch, master, updated. debian/70-12-g6ef229e

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 2c268f38ab990a4ef040e8c0b60ff316e82ddae1
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Sep 27 21:24:49 2011 +0200

    Comment out kdegraphics and kdeedu metapackages.
    
    They should be reenabled once we are done with its dependencies.
---
 debian/control |  112 ++++++++++++++++++++++++++++----------------------------
 debian/rules   |    2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/debian/control b/debian/control
index 15422b1..d7189e3 100644
--- a/debian/control
+++ b/debian/control
@@ -113,62 +113,62 @@ Description: base applications from the official KDE release (meta-package)
  This package provides core applications for the KDE 4 desktop.
 
 
-Package: kdeedu
-Architecture: all
-Depends: ${misc:Depends},
- blinken (>= ${kde:Version}),
- cantor (>= ${kde:Version}),
- kalgebra (>= ${kde:Version}),
- kalzium (>= ${kde:Version}),
- kanagram (>= ${kde:Version}),
- kbruch (>= ${kde:Version}),
- kgeography (>= ${kde:Version}),
- khangman (>= ${kde:Version}),
- kig (>= ${kde:Version}),
- kiten (>= ${kde:Version}),
- klettres (>= ${kde:Version}),
- kmplot (>= ${kde:Version}),
- kstars (>= ${kde:Version}),
- ktouch (>= ${kde:Version}),
- kturtle (>= ${kde:Version}),
- kwordquiz (>= ${kde:Version}),
- marble (>= ${kde:Version}),
- parley (>= ${kde:Version}),
- rocs (>= ${kde:Version}),
- step (>= ${kde:Version})
-Description: educational applications from the official KDE release
- KDE is produced by an international technology team that creates free and open
- source software for desktop and portable computing. Among KDE's products are a
- modern desktop system for Linux and UNIX platforms, comprehensive office
- productivity and groupware suites and hundreds of software titles in many
- categories including Internet and web applications, multimedia, entertainment,
- educational, graphics and software development.
- .
- This metapackage includes educational applications provided with the
- official release of KDE.
-
-Package: kdegraphics
-Architecture: all
-Depends: ${misc:Depends},
- gwenview (>= ${kde:Version}),
- kamera (>= ${kde:Version}),
- kcolorchooser (>= ${kde:Version}),
- kgamma (>= ${kde:Version}),
- kolourpaint4 (>= ${kde:Version}),
- kruler (>= ${kde:Version}),
- ksnapshot (>= ${kde:Version}),
- okular (>= ${kde:Version})
-Recommends: kdegraphics-strigi-plugins (>= ${kde:Version}),
-Description: graphics applications from the official KDE release
- KDE is produced by an international technology team that creates free and open
- source software for desktop and portable computing. Among KDE's products are a
- modern desktop system for Linux and UNIX platforms, comprehensive office
- productivity and groupware suites and hundreds of software titles in many
- categories including Internet and web applications, multimedia, entertainment,
- educational, graphics and software development.
- .
- This metapackage includes graphics applications provided with the official
- release of KDE.
+#Package: kdeedu
+#Architecture: all
+#Depends: ${misc:Depends},
+# blinken (>= ${kde:Version}),
+# cantor (>= ${kde:Version}),
+# kalgebra (>= ${kde:Version}),
+# kalzium (>= ${kde:Version}),
+# kanagram (>= ${kde:Version}),
+# kbruch (>= ${kde:Version}),
+# kgeography (>= ${kde:Version}),
+# khangman (>= ${kde:Version}),
+# kig (>= ${kde:Version}),
+# kiten (>= ${kde:Version}),
+# klettres (>= ${kde:Version}),
+# kmplot (>= ${kde:Version}),
+# kstars (>= ${kde:Version}),
+# ktouch (>= ${kde:Version}),
+# kturtle (>= ${kde:Version}),
+# kwordquiz (>= ${kde:Version}),
+# marble (>= ${kde:Version}),
+# parley (>= ${kde:Version}),
+# rocs (>= ${kde:Version}),
+# step (>= ${kde:Version})
+#Description: educational applications from the official KDE release
+# KDE is produced by an international technology team that creates free and open
+# source software for desktop and portable computing. Among KDE's products are a
+# modern desktop system for Linux and UNIX platforms, comprehensive office
+# productivity and groupware suites and hundreds of software titles in many
+# categories including Internet and web applications, multimedia, entertainment,
+# educational, graphics and software development.
+# .
+# This metapackage includes educational applications provided with the
+# official release of KDE.
+#
+#Package: kdegraphics
+#Architecture: all
+#Depends: ${misc:Depends},
+# gwenview (>= ${kde:Version}),
+# kamera (>= ${kde:Version}),
+# kcolorchooser (>= ${kde:Version}),
+# kgamma (>= ${kde:Version}),
+# kolourpaint4 (>= ${kde:Version}),
+# kruler (>= ${kde:Version}),
+# ksnapshot (>= ${kde:Version}),
+# okular (>= ${kde:Version})
+#Recommends: kdegraphics-strigi-plugins (>= ${kde:Version}),
+#Description: graphics applications from the official KDE release
+# KDE is produced by an international technology team that creates free and open
+# source software for desktop and portable computing. Among KDE's products are a
+# modern desktop system for Linux and UNIX platforms, comprehensive office
+# productivity and groupware suites and hundreds of software titles in many
+# categories including Internet and web applications, multimedia, entertainment,
+# educational, graphics and software development.
+# .
+# This metapackage includes graphics applications provided with the official
+# release of KDE.
 
 Package: kde-sc-dev-latest
 Architecture: all
diff --git a/debian/rules b/debian/rules
index bb5f181..ea41523 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ KOFFICE_VERSION := 1:2.3.3
 DEV_LATEST_VERSION := 4:4.7.1
 DEV_PREV_VERSION := 4:4.7.1
 
-KDE_VERSION_METAPKGS := kdebase-apps kdeedu kdegraphics kdegraphics-libs-data
+KDE_VERSION_METAPKGS := kdebase-apps kdegraphics-libs-data
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
 DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)

-- 
KDE metapackages