small fixes to changes

18 files changed, 21 insertions, 477 deletions

diff --git a/sets/kde b/sets/kde
deleted file mode 100644
index b6f2c55e74d..00000000000
--- a/sets/kde
+++ /dev/null
@@ -1,16 +0,0 @@
-# What didn't fit anywhere so far
-kde-base/kate:4.1
-kde-base/kde-l10n:4.1
-kde-base/kdeplasma-addons:4.1
-
-@kdeadmin-4.1
-@kdeartwork-4.1
-@kdebase-4.1
-@kdeedu-4.1
-@kdegames-4.1
-@kdegraphics-4.1
-@kdemultimedia-4.1
-@kdenetwork-4.1
-@kdepim-4.1
-@kdetoys-4.1
-@kdeutils-4.1
diff --git a/sets/kde-3.5 b/sets/kde-3.5
new file mode 100644
index 00000000000..a406820c03e
--- /dev/null
+++ b/sets/kde-3.5
@@ -0,0 +1,21 @@
+# We don't include kdesdk on the global set
+kde-base/kde-l18n:3.5
+
+@kdeaddons-3.5
+@kdeadmin-3.5
+@kdeartwork-3.5
+@kdebase-3.5
+@kdeedu-3.5
+@kdegames-3.5
+@kdegraphics-3.5
+@kdemultimedia-3.5
+@kdenetwork-3.5
+@kdepim-3.5
+@kdetoys-3.5
+@kdeutils-3.5
+
+#@kdeaccessibility-3.5
+
+#for developers
+#@kdesdk-3.5    <-tomorrow!!
+#@kdewebdev-3.5
\ No newline at end of file
diff --git a/sets/kde-4 b/sets/kde-4
deleted file mode 100644
index c1d1a53b2ce..00000000000
--- a/sets/kde-4
+++ /dev/null
@@ -1,228 +0,0 @@
-kde-base/kate:kde-4
-kde-base/kdeaccessibility-colorschemes:kde-4
-kde-base/kdeaccessibility-iconthemes:kde-4
-kde-base/kmag:kde-4
-kde-base/kmousetool:kde-4
-kde-base/kmouth:kde-4
-kde-base/kttsd:kde-4
-kde-base/kcron:kde-4
-kde-base/knetworkconf:kde-4
-kde-base/ksystemlog:kde-4
-kde-base/kuser:kde-4
-kde-base/kdeartwork-colorschemes:kde-4
-kde-base/kdeartwork-emoticons:kde-4
-kde-base/kdeartwork-iconthemes:kde-4
-kde-base/kdeartwork-kscreensaver:kde-4
-kde-base/kdeartwork-kworldclock:kde-4
-kde-base/kdeartwork-sounds:kde-4
-kde-base/kdeartwork-styles:kde-4
-kde-base/kdeartwork-wallpapers:kde-4
-kde-base/kdeartwork-icewm-themes:kde-4
-kde-base/dolphin:kde-4
-kde-base/drkonqi:kde-4
-kde-base/kappfinder:kde-4
-kde-base/kcheckpass:kde-4
-kde-base/kcminit:kde-4
-kde-base/kcmshell:kde-4
-kde-base/kcontrol:kde-4
-kde-base/kde-menu:kde-4
-kde-base/kde-menu-icons:kde-4
-kde-base/kde-wallpapers:kde-4
-kde-base/kdebase-cursors:kde-4
-kde-base/kdebase-data:kde-4
-kde-base/kdebase-kioslaves:kde-4
-kde-base/kdebase-startkde:kde-4
-kde-base/kdebugdialog:kde-4
-kde-base/kdepasswd:kde-4
-kde-base/kdesu:kde-4
-kde-base/kdialog:kde-4
-kde-base/kdm:kde-4
-kde-base/keditbookmarks:kde-4
-kde-base/kfile:kde-4
-kde-base/kfind:kde-4
-kde-base/khelpcenter:kde-4
-kde-base/khotkeys:kde-4
-kde-base/kiconfinder:kde-4
-kde-base/kinfocenter:kde-4
-kde-base/kioclient:kde-4
-kde-base/klipper:kde-4
-kde-base/kmenuedit:kde-4
-kde-base/kmimetypefinder:kde-4
-kde-base/knetattach:kde-4
-kde-base/knewstuff:kde-4
-kde-base/knotify:kde-4
-kde-base/konqueror:kde-4
-kde-base/konsole:kde-4
-kde-base/kpasswdserver:kde-4
-kde-base/kquitapp:kde-4
-kde-base/kreadconfig:kde-4
-kde-base/krunner:kde-4
-kde-base/kscreensaver:kde-4
-kde-base/ksmserver:kde-4
-kde-base/ksplash:kde-4
-kde-base/kstart:kde-4
-kde-base/kstartupconfig:kde-4
-kde-base/kstyles:kde-4
-kde-base/ksysguard:kde-4
-kde-base/ksystraycmd:kde-4
-kde-base/ktimezoned:kde-4
-kde-base/ktraderclient:kde-4
-kde-base/kuiserver:kde-4
-kde-base/kurifilter-plugins:kde-4
-kde-base/kwin:kde-4
-kde-base/kwrite:kde-4
-kde-base/libkonq:kde-4
-kde-base/libkworkspace:kde-4
-kde-base/libplasma:kde-4
-kde-base/libtaskmanager:kde-4
-kde-base/nepomuk:kde-4
-kde-base/nsplugins:kde-4
-kde-base/phonon-xine:kde-4
-kde-base/plasma-apps:kde-4
-kde-base/plasma-workspace:kde-4
-kde-base/renamedlg-plugins:kde-4
-kde-base/solid:kde-4
-kde-base/solid-hardware:kde-4
-kde-base/soliduiserver:kde-4
-kde-base/systemsettings:kde-4
-kde-base/blinken:kde-4
-kde-base/kalgebra:kde-4
-kde-base/kalzium:kde-4
-kde-base/kanagram:kde-4
-kde-base/kbruch:kde-4
-kde-base/kgeography:kde-4
-kde-base/khangman:kde-4
-kde-base/kig:kde-4
-kde-base/kiten:kde-4
-kde-base/klettres:kde-4
-kde-base/kmplot:kde-4
-kde-base/kpercentage:kde-4
-kde-base/kstars:kde-4
-kde-base/ktouch:kde-4
-kde-base/kturtle:kde-4
-kde-base/kwordquiz:kde-4
-kde-base/libkdeedu:kde-4
-kde-base/marble:kde-4
-kde-base/parley:kde-4
-kde-base/step:kde-4
-kde-base/bovo:kde-4
-kde-base/katomic:kde-4
-kde-base/kbattleship:kde-4
-kde-base/kblackbox:kde-4
-kde-base/kblocks:kde-4
-kde-base/kbounce:kde-4
-kde-base/kbreakout:kde-4
-kde-base/kdiamond:kde-4
-kde-base/kfourinline:kde-4
-kde-base/kgoldrunner:kde-4
-kde-base/kiriki:kde-4
-kde-base/kjumpingcube:kde-4
-kde-base/klines:kde-4
-kde-base/kmahjongg:kde-4
-kde-base/kmines:kde-4
-kde-base/knetwalk:kde-4
-kde-base/kolf:kde-4
-kde-base/kollision:kde-4
-kde-base/konquest:kde-4
-kde-base/kpat:kde-4
-kde-base/kreversi:kde-4
-kde-base/ksame:kde-4
-kde-base/kshisen:kde-4
-kde-base/ksirk:kde-4
-kde-base/kspaceduel:kde-4
-kde-base/ksquares:kde-4
-kde-base/ktuberling:kde-4
-kde-base/kubrick:kde-4
-kde-base/libkdegames:kde-4
-kde-base/libkmahjongg:kde-4
-kde-base/lskat:kde-4
-kde-base/gwenview:kde-4
-kde-base/kamera:kde-4
-kde-base/kcolorchooser:kde-4
-kde-base/kgamma:kde-4
-kde-base/kolourpaint:kde-4
-kde-base/kruler:kde-4
-kde-base/ksnapshot:kde-4
-kde-base/libkdcraw:kde-4
-kde-base/libkexiv2:kde-4
-kde-base/libkipi:kde-4
-kde-base/libksane:kde-4
-kde-base/okular:kde-4
-kde-base/svgpart:kde-4
-kde-base/kdegraphics-strigi-analyzer:kde-4
-kde-base/dragonplayer:kde-4
-kde-base/juk:kde-4
-kde-base/kdemultimedia-kioslaves:kde-4
-kde-base/kmix:kde-4
-kde-base/kscd:kde-4
-kde-base/libkcddb:kde-4
-kde-base/libkcompactdisc:kde-4
-kde-base/kdenetwork-filesharing:kde-4
-kde-base/kdnssd:kde-4
-kde-base/kget:kde-4
-kde-base/knewsticker:kde-4
-kde-base/kopete:kde-4
-kde-base/kppp:kde-4
-kde-base/krdc:kde-4
-kde-base/krfb:kde-4
-kde-base/lilo-config:kde-4
-kde-base/kfloppy:kde-4
-kde-base/ksudoku:kde-4
-kde-base/akonadi:kde-4
-kde-base/akregator:kde-4
-kde-base/kaddressbook:kde-4
-kde-base/kalarm:kde-4
-kde-base/kdemaildir:kde-4
-kde-base/kdepim-icons:kde-4
-kde-base/kdepim-kresources:kde-4
-kde-base/kdepim-strigi-analyzer:kde-4
-kde-base/kdepim-wizards:kde-4
-kde-base/kitchensync:kde-4
-kde-base/kjots:kde-4
-kde-base/kleopatra:kde-4
-kde-base/kmail:kde-4
-kde-base/kmailcvt:kde-4
-kde-base/knode:kde-4
-kde-base/knotes:kde-4
-kde-base/kode:kde-4
-kde-base/kontact:kde-4
-kde-base/kontactinterfaces:kde-4
-kde-base/korganizer:kde-4
-kde-base/ktimetracker:kde-4
-kde-base/ktnef:kde-4
-kde-base/libkdepim:kde-4
-kde-base/libkholidays:kde-4
-kde-base/libkleo:kde-4
-kde-base/libkpgp:kde-4
-kde-base/libksieve:kde-4
-kde-base/mimelib:kde-4
-kde-base/cervisia:kde-4
-kde-base/kapptemplate:kde-4
-kde-base/kate:kde-4
-kde-base/kbugbuster:kde-4
-kde-base/kcachegrind:kde-4
-kde-base/kdeaccounts-plugin:kde-4
-kde-base/kdesdk-kioslaves:kde-4
-kde-base/kdesdk-misc:kde-4
-kde-base/kdesdk-scripts:kde-4
-kde-base/kdesdk-strigi-analyzer:kde-4
-kde-base/kompare:kde-4
-kde-base/kstartperf:kde-4
-kde-base/kuiviewer:kde-4
-kde-base/lokalize:kde-4
-kde-base/umbrello:kde-4
-kde-base/amor:kde-4
-kde-base/kteatime:kde-4
-kde-base/ktux:kde-4
-kde-base/kweather:kde-4
-kde-base/ark:kde-4
-kde-base/kcalc:kde-4
-kde-base/kcharselect:kde-4
-kde-base/kdessh:kde-4
-kde-base/kdf:kde-4
-kde-base/kgpg:kde-4
-kde-base/ktimer:kde-4
-kde-base/kwallet:kde-4
-kde-base/superkaramba:kde-4
-kde-base/sweeper:kde-4
-kde-base/okteta:kde-4
diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility
deleted file mode 100644
index a6bb07e1fb6..00000000000
--- a/sets/kdeaccessibility
+++ /dev/null
@@ -1,6 +0,0 @@
-kde-base/kdeaccessibility-colorschemes
-kde-base/kdeaccessibility-iconthemes
-kde-base/kmag
-kde-base/kmousetool
-kde-base/kmouth
-kde-base/kttsd
diff --git a/sets/kdeadmin b/sets/kdeadmin
deleted file mode 100644
index 3f55c68d90c..00000000000
--- a/sets/kdeadmin
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kcron
-kde-base/knetworkconf
-kde-base/ksystemlog
-kde-base/kuser
diff --git a/sets/kdeartwork b/sets/kdeartwork
deleted file mode 100644
index 30a6c52f65c..00000000000
--- a/sets/kdeartwork
+++ /dev/null
@@ -1,9 +0,0 @@
-kde-base/kdeartwork-colorschemes
-kde-base/kdeartwork-emoticons
-kde-base/kdeartwork-iconthemes
-kde-base/kdeartwork-kscreensaver
-kde-base/kdeartwork-kworldclock
-kde-base/kdeartwork-sounds
-kde-base/kdeartwork-styles
-kde-base/kdeartwork-wallpapers
-kde-base/kdeartwork-icewm-themes
diff --git a/sets/kdebase b/sets/kdebase
deleted file mode 100644
index c5968e95bcf..00000000000
--- a/sets/kdebase
+++ /dev/null
@@ -1,67 +0,0 @@
-kde-base/dolphin
-kde-base/drkonqi
-kde-base/kappfinder
-kde-base/kcheckpass
-kde-base/kcminit
-kde-base/kcmshell
-kde-base/kcontrol
-kde-base/kde-menu
-kde-base/kde-menu-icons
-kde-base/kde-wallpapers
-kde-base/kdebase-cursors
-kde-base/kdebase-data
-kde-base/kdebase-kioslaves
-kde-base/kdebase-startkde
-kde-base/kdebugdialog
-kde-base/kdepasswd
-kde-base/kdesu
-kde-base/kdialog
-kde-base/kdm
-kde-base/keditbookmarks
-kde-base/kfile
-kde-base/kfind
-kde-base/khelpcenter
-kde-base/khotkeys
-kde-base/kiconfinder
-kde-base/kinfocenter
-kde-base/kioclient
-kde-base/klipper
-kde-base/kmenuedit
-kde-base/kmimetypefinder
-kde-base/knetattach
-kde-base/knewstuff
-kde-base/knotify
-kde-base/konqueror
-kde-base/konsole
-kde-base/kpasswdserver
-kde-base/kquitapp
-kde-base/kreadconfig
-kde-base/krunner
-kde-base/kscreensaver
-kde-base/ksmserver
-kde-base/ksplash
-kde-base/kstart
-kde-base/kstartupconfig
-kde-base/kstyles
-kde-base/ksysguard
-kde-base/ksystraycmd
-kde-base/ktimezoned
-kde-base/ktraderclient
-kde-base/kuiserver
-kde-base/kurifilter-plugins
-kde-base/kwin
-kde-base/kwrite
-kde-base/libkonq
-kde-base/libkworkspace
-kde-base/libplasma
-kde-base/libtaskmanager
-kde-base/nepomuk
-kde-base/nsplugins
-kde-base/phonon-xine
-kde-base/plasma-apps
-kde-base/plasma-workspace
-kde-base/renamedlg-plugins
-kde-base/solid
-kde-base/solid-hardware
-kde-base/soliduiserver
-kde-base/systemsettings
diff --git a/sets/kdeedu b/sets/kdeedu
deleted file mode 100644
index e8ca4cfd9a2..00000000000
--- a/sets/kdeedu
+++ /dev/null
@@ -1,20 +0,0 @@
-kde-base/blinken
-kde-base/kalgebra
-kde-base/kalzium
-kde-base/kanagram
-kde-base/kbruch
-kde-base/kgeography
-kde-base/khangman
-kde-base/kig
-kde-base/kiten
-kde-base/klettres
-kde-base/kmplot
-kde-base/kpercentage
-kde-base/kstars
-kde-base/ktouch
-kde-base/kturtle
-kde-base/kwordquiz
-kde-base/libkdeedu
-kde-base/marble
-kde-base/parley
-kde-base/step
diff --git a/sets/kdegames b/sets/kdegames
deleted file mode 100644
index 2c8b7051a9d..00000000000
--- a/sets/kdegames
+++ /dev/null
@@ -1,32 +0,0 @@
-kde-base/bovo
-kde-base/katomic
-kde-base/kbattleship
-kde-base/kblackbox
-kde-base/kblocks
-kde-base/kbounce
-kde-base/kbreakout
-kde-base/kdiamond
-kde-base/kfourinline
-kde-base/kgoldrunner
-kde-base/kiriki
-kde-base/kjumpingcube
-kde-base/klines
-kde-base/kmahjongg
-kde-base/kmines
-kde-base/knetwalk
-kde-base/kolf
-kde-base/kollision
-kde-base/konquest
-kde-base/kpat
-kde-base/kreversi
-kde-base/ksame
-kde-base/kshisen
-kde-base/ksirk
-kde-base/kspaceduel
-kde-base/ksquares
-kde-base/ktuberling
-kde-base/kubrick
-kde-base/libkdegames
-kde-base/libkmahjongg
-kde-base/lskat
-kde-base/ksudoku
diff --git a/sets/kdegraphics b/sets/kdegraphics
deleted file mode 100644
index ec5ced8f9bd..00000000000
--- a/sets/kdegraphics
+++ /dev/null
@@ -1,14 +0,0 @@
-kde-base/gwenview
-kde-base/kamera
-kde-base/kcolorchooser
-kde-base/kgamma
-kde-base/kolourpaint
-kde-base/kruler
-kde-base/ksnapshot
-kde-base/libkdcraw
-kde-base/libkexiv2
-kde-base/libkipi
-kde-base/libksane
-kde-base/okular
-kde-base/svgpart
-kde-base/kdegraphics-strigi-analyzer
diff --git a/sets/kdemultimedia b/sets/kdemultimedia
deleted file mode 100644
index 6eb87b4fc2a..00000000000
--- a/sets/kdemultimedia
+++ /dev/null
@@ -1,7 +0,0 @@
-kde-base/dragonplayer
-kde-base/juk
-kde-base/kdemultimedia-kioslaves
-kde-base/kmix
-kde-base/kscd
-kde-base/libkcddb
-kde-base/libkcompactdisc
diff --git a/sets/kdenetwork b/sets/kdenetwork
deleted file mode 100644
index d6379a1d4c9..00000000000
--- a/sets/kdenetwork
+++ /dev/null
@@ -1,8 +0,0 @@
-kde-base/kdenetwork-filesharing
-kde-base/kdnssd
-kde-base/kget
-kde-base/knewsticker
-kde-base/kopete
-kde-base/kppp
-kde-base/krdc
-kde-base/krfb
diff --git a/sets/kdeoptional b/sets/kdeoptional
deleted file mode 100644
index 7e83b82ad43..00000000000
--- a/sets/kdeoptional
+++ /dev/null
@@ -1,3 +0,0 @@
-kde-base/lilo-config
-kde-base/kfloppy
-@kdeaccessibility
diff --git a/sets/kdepim b/sets/kdepim
deleted file mode 100644
index 9b08c7d4945..00000000000
--- a/sets/kdepim
+++ /dev/null
@@ -1,28 +0,0 @@
-kde-base/akonadi
-kde-base/akregator
-kde-base/kaddressbook
-kde-base/kalarm
-kde-base/kdemaildir
-kde-base/kdepim-icons
-kde-base/kdepim-kresources
-kde-base/kdepim-strigi-analyzer
-kde-base/kdepim-wizards
-kde-base/kitchensync
-kde-base/kjots
-kde-base/kleopatra
-kde-base/kmail
-kde-base/kmailcvt
-kde-base/knode
-kde-base/knotes
-kde-base/kode
-kde-base/kontact
-kde-base/kontactinterfaces
-kde-base/korganizer
-kde-base/ktimetracker
-kde-base/ktnef
-kde-base/libkdepim
-kde-base/libkholidays
-kde-base/libkleo
-kde-base/libkpgp
-kde-base/libksieve
-kde-base/mimelib
diff --git a/sets/kdesdk b/sets/kdesdk
deleted file mode 100644
index 59cbaf42143..00000000000
--- a/sets/kdesdk
+++ /dev/null
@@ -1,15 +0,0 @@
-kde-base/cervisia
-kde-base/kapptemplate
-kde-base/kate
-kde-base/kbugbuster
-kde-base/kcachegrind
-kde-base/kdeaccounts-plugin
-kde-base/kdesdk-kioslaves
-kde-base/kdesdk-misc
-kde-base/kdesdk-scripts
-kde-base/kdesdk-strigi-analyzer
-kde-base/kompare
-kde-base/kstartperf
-kde-base/kuiviewer
-kde-base/lokalize
-kde-base/umbrello
diff --git a/sets/kdetoys b/sets/kdetoys
deleted file mode 100644
index 79b4b33794f..00000000000
--- a/sets/kdetoys
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/amor
-kde-base/kteatime
-kde-base/ktux
-kde-base/kweather
diff --git a/sets/kdeutils b/sets/kdeutils
deleted file mode 100644
index 4551dfc8cce..00000000000
--- a/sets/kdeutils
+++ /dev/null
@@ -1,11 +0,0 @@
-kde-base/ark
-kde-base/kcalc
-kde-base/kcharselect
-kde-base/kdessh
-kde-base/kdf
-kde-base/kgpg
-kde-base/ktimer
-kde-base/kwallet
-kde-base/superkaramba
-kde-base/sweeper
-kde-base/okteta
diff --git a/sets/kdewebdev b/sets/kdewebdev
deleted file mode 100644
index be1ebafcc31..00000000000
--- a/sets/kdewebdev
+++ /dev/null
@@ -1,5 +0,0 @@
-kde-base/kfilereplace
-kde-base/kimagemapeditor
-kde-base/klinkstatus
-kde-base/kommander
-kde-base/kxsldbg