Merge lp:~debfx/ubuntu-seeds/kubuntu.oneiric into lp:~ubuntu-core-dev/ubuntu-seeds/kubuntu.oneiric

[Felix Geyer]

s/kpackagekit/muon/

[lp:~debfx/ubuntu-seeds/kubuntu.oneiric]

1044. By Scott Kitterman on 2011-05-27

Merge debfx seed updates - Drop kpackagekit and add muon.

[Scott Kitterman (kitterman)]

review: Approve

=== modified file 'dvd'
--- dvd	2011-05-26 12:55:30 +0000
+++ dvd	2011-05-27 16:03:34 +0000
@@ -177,7 +177,6 @@
  * plasma-widget-ktorrent
  * (kdevelop)
  * (kaffeine)
- * (muon)
  * (kamoso) # Built in camera support added per UDS-O discussions
 
 == Meta ==

=== modified file 'kubuntu-common'
--- kubuntu-common	2011-04-07 11:35:22 +0000
+++ kubuntu-common	2011-05-27 16:03:34 +0000
@@ -84,7 +84,9 @@
 == everything else KDE ==
 
  * (userconfig)       # In place of kuser (which is on the dvd)
- * (kpackagekit)
+ * (muon)
+ * (muon-installer)
+ * (muon-notifier)
  * (gtk2-engines-oxygen)
  * (kdesudo) # simpler and more reliable than kdesu
  * xdg-user-dirs
@@ -98,7 +100,7 @@
  * (kubuntu-default-settings)
  * (plasma-widgets-addons) 
  * (kubuntu-notification-helper)
- * (gdebi-kde) # Necessary until KPK-aptcc or QApt can do .deb installs
+ * (qapt-deb-installer)
  * (oxygen-cursor-theme)
  * (oxygen-icon-theme)
  * (oxygen-icon-theme-complete) [i386]

=== modified file 'supported'
--- supported	2011-03-28 08:07:47 +0000
+++ supported	2011-05-27 16:03:34 +0000
@@ -69,7 +69,6 @@
  * libk3b6-extracodecs
  * oxygen-cursor-theme-extra
  * gtk2-engines-oxygen
- * kdiamond-kde4
 # * koffice-doc-html
 # * koffice-dbg
 # * koffice-doc
@@ -99,4 +98,3 @@
  * kttsd
  * kcron
  * virtuoso-nepomuk 
- * kde-config-synaptiks