Update Debian and Ubuntu packaging to match recent renaming

15 files changed, 88 insertions, 88 deletions

diff --git a/debian/squeeze/tdemultimedia/debian/changelog b/debian/squeeze/tdemultimedia/debian/changelog
index 37b689f66..70dc106df 100644
--- a/debian/squeeze/tdemultimedia/debian/changelog
+++ b/debian/squeeze/tdemultimedia/debian/changelog
@@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
 
 tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
 
-  * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package.
+  * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 22:37:33 +0000
 
@@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low
 tdemultimedia (4:3.1.4-1) unstable; urgency=low
 
   * New upstream release.
-  * Document how to use timidity with kmid. (Closes: #195019)
+  * Document how to use timidity with tdemid. (Closes: #195019)
   * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686)
   * kaboodle Recommends libarts1-xine. (Closes: #214118)
 
@@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
     is the proper name for it.
   * rename timidity to ktimidity and provide timidity yet we don't conflict
     with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files
-    for timidity/kmidi to /etc/kde2/kmidi and conffile them all.  kmidi and
+    for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all.  tdemidi and
     ktimidity both seem to work find for me here now...hopefully it will do
     the same for you folks.
-  * Build kmidi/ktimidity with support for most of it's different interfaces. 
+  * Build tdemidi/ktimidity with support for most of it's different interfaces. 
     Not sure if this is how it'll end up being in the end.  This includes the
     default Xaw, Ncurses, and Slang.
   * Fixes these problems: 
@@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low
   * Update menu bits to include new kde menu removal tag
   * a few upstream fixes
   * Update build-depends to recognize real | virtual
-  * Adding menu entry for kmid...oops
+  * Adding menu entry for tdemid...oops
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 15:34:00 -0700
 
@@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low
 
 tdemultimedia (4:2.0-final-5) unstable; urgency=low
  
-  * building with --enable-debug as it seems kmidi croaks if built without
+  * building with --enable-debug as it seems tdemidi croaks if built without
     debug
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Nov 2000 01:10:00 -0700
@@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low
 tdemultimedia (4:2.0-final-3.1) unstable; urgency=low
  
   * minor upstream fixes
-  * more work on kmidi, kmid, and kaiman
+  * more work on tdemidi, tdemid, and kaiman
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
                                                                                 
@@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low
 
 tdemultimedia (4:2.0-20001011-2) unstable; urgency=low
  
-  * Trying to fix up kmidi
+  * Trying to fix up tdemidi
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 19:30:00 -0700
                                                                                 
@@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low
 tdemultimedia (4:2.0-20000925-2) unstable; urgency=low
  
   * More upstream fixes
-  * More work on kmidi - Moving timidity patches into the proper dir
+  * More work on tdemidi - Moving timidity patches into the proper dir
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 06:00:00 -0700
 
@@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low
 tdemultimedia (4:2.0-20000911-0) unstable; urgency=low
  
   * more upstream fixes
-  * More kmidi fixes
+  * More tdemidi fixes
   * Breaking tdemultimedia down
  
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 11 Sep 2000 04:30:00 -0700
diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control
index cf85ef6b0..42f607611 100644
--- a/debian/squeeze/tdemultimedia/debian/control
+++ b/debian/squeeze/tdemultimedia/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdemultimedia-trinity (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity (<< 4:14.0.0)
-Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
+Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version})
 Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official Trinity release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
@@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror
  This package is part of Trinity, as a component of the KDE multimedia module.
  See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information.
 
-Package: kmid-trinity
+Package: tdemid-trinity
 Section: sound
 Architecture: any
-Replaces: kmid-trinity (<< 4:14.0.0)
-Breaks: kmid-trinity (<< 4:14.0.0)
+Replaces: tdemid-trinity (<< 4:14.0.0)
+Breaks: tdemid-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: MIDI/karaoke player for Trinity
diff --git a/debian/squeeze/tdemultimedia/debian/control.in b/debian/squeeze/tdemultimedia/debian/control.in
index 7b20cca6d..4bf762241 100644
--- a/debian/squeeze/tdemultimedia/debian/control.in
+++ b/debian/squeeze/tdemultimedia/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdemultimedia
 Section: tde
 Architecture: all
-Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
 Suggests: tdemultimedia-doc-html (>= ${Source-Version})
 Description: multimedia apps from the official KDE release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release
 Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
@@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror
  This package is part of KDE, as a component of the KDE multimedia module.
  See the 'kde' and 'tdemultimedia' packages for more information.
 
-Package: kmid
+Package: tdemid
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/squeeze/tdemultimedia/debian/copyright b/debian/squeeze/tdemultimedia/debian/copyright
index 8957d914a..f85e02329 100644
--- a/debian/squeeze/tdemultimedia/debian/copyright
+++ b/debian/squeeze/tdemultimedia/debian/copyright
@@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 
 
 aktion, arts/builder, arts/runtime, arts/tools,
-kfile-plugins, kmid, kmidi, koncd, kscd
+kfile-plugins, tdemid, tdemidi, koncd, kscd
 -----------------------------------------------
 GPL
 
diff --git a/debian/squeeze/tdemultimedia/debian/icons/kmid-16.xpm b/debian/squeeze/tdemultimedia/debian/icons/tdemid-16.xpm
index 0a510090a..64ad03b59 100644
--- a/debian/squeeze/tdemultimedia/debian/icons/kmid-16.xpm
+++ b/debian/squeeze/tdemultimedia/debian/icons/tdemid-16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kmid-16[] = {
+static char *tdemid-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 104 2",
 "   c black",
diff --git a/debian/squeeze/tdemultimedia/debian/icons/kmid.xpm b/debian/squeeze/tdemultimedia/debian/icons/tdemid.xpm
index fb669aa72..c4cbb3bf1 100644
--- a/debian/squeeze/tdemultimedia/debian/icons/kmid.xpm
+++ b/debian/squeeze/tdemultimedia/debian/icons/tdemid.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *kmid[] = {
+static char *tdemid[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 213 2",
 "   c black",
diff --git a/debian/squeeze/tdemultimedia/debian/kmid-trinity.install b/debian/squeeze/tdemultimedia/debian/kmid-trinity.install
deleted file mode 100644
index e77e1784a..000000000
--- a/debian/squeeze/tdemultimedia/debian/kmid-trinity.install
+++ /dev/null
@@ -1,40 +0,0 @@
-debian/tmp/opt/trinity/bin/kmid
-debian/tmp/opt/trinity/lib/trinity/libkmidpart.la
-debian/tmp/opt/trinity/lib/trinity/libkmidpart.so
-debian/tmp/opt/trinity/lib/libkmidlib.so.0
-debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0
-debian/tmp/opt/trinity/share/applications/tde/kmid.desktop
-debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar
-debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar
-debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar
-debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar
-debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3
-debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb
-debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3
-debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb
-debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm
-debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
-debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm
-debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc
-debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map
-debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png
-debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop
-debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop
-
-debian/icons/kmid.xpm		/opt/trinity/share/pixmaps
-debian/icons/kmid-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu b/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu
deleted file mode 100644
index ca828ea94..000000000
--- a/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu
+++ /dev/null
@@ -1,11 +0,0 @@
-?package(kmid):\
-	needs="X11"\
-	section="Apps/Sound"\
-	hints="TDE"\
-	title="KMid"\
-	icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\
-	command="/opt/trinity/bin/kmid"
-
-# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm
-# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm
diff --git a/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1 b/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1
index 76f29a181..2e9e5704d 100644
--- a/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1
@@ -14,7 +14,7 @@ because the original program does not have a manual page.
 .PP
 .B Kaboodle
 is a simple KMedia (aRts) player for KDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in khtml, too.
+or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
 It is meant for simple stuff like playing a quick video or sound file. 
 .B Kaboodle
 does not accept plugins, does not have a playlist or volume control and other such features.
@@ -205,10 +205,10 @@ shared over more than one screen.
 Specifies the X display to run KDE on.
 .IP KDESYCOCA
 Specifies and alternative path for the 
-.I ksycoca
+.I tdesycoca
 KDE system configuration cache file.
 The default path is
-/tmp/kde-$USER/ksycoca
+/tmp/kde-$USER/tdesycoca
 .IP DCOPSERVER
 Specifies an alternative path for the DCOP server file. The default
 file is
diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules
index 1e7e0647c..58e944e5d 100755
--- a/debian/squeeze/tdemultimedia/debian/rules
+++ b/debian/squeeze/tdemultimedia/debian/rules
@@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \
+PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
diff --git a/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install
new file mode 100644
index 000000000..c36f2d16a
--- /dev/null
+++ b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install
@@ -0,0 +1,40 @@
+debian/tmp/opt/trinity/bin/tdemid
+debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so
+debian/tmp/opt/trinity/lib/libtdemidlib.so.0
+debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0
+debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop
+debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar
+debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar
+debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar
+debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar
+debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3
+debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb
+debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3
+debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb
+debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png
+debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm
+debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc
+debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map
+debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png
+debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop
+debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop
+
+debian/icons/tdemid.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdemid-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu
new file mode 100644
index 000000000..5f3ec9248
--- /dev/null
+++ b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu
@@ -0,0 +1,11 @@
+?package(tdemid):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="TDE"\
+	title="KMid"\
+	icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\
+	command="/opt/trinity/bin/tdemid"
+
+# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm
+# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
deleted file mode 100644
index 0d5dc5893..000000000
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: tdemultimedia-doc-html-kmid
-Title: KMid Handbook
-Author: Antonio Larrosa Jimenez
-Abstract: KMid is a midi/karaoke multimedia player for KDE.
-Section: Apps/Music
-
-Format: HTML
-Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html
-Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html
-
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
new file mode 100644
index 000000000..e4d54da22
--- /dev/null
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
@@ -0,0 +1,10 @@
+Document: tdemultimedia-doc-html-tdemid
+Title: KMid Handbook
+Author: Antonio Larrosa Jimenez
+Abstract: KMid is a midi/karaoke multimedia player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html
+
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 4edb170bf..97d3eb309 100644
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
 debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
 debian/tmp/opt/trinity/lib/libtdeinit_krec.la
 debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
-debian/tmp/opt/trinity/lib/libkmidlib.la
-debian/tmp/opt/trinity/lib/libkmidlib.so
+debian/tmp/opt/trinity/lib/libtdemidlib.la
+debian/tmp/opt/trinity/lib/libtdemidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la
 debian/tmp/opt/trinity/lib/libmpeg.so
 debian/tmp/opt/trinity/lib/libnoatun.la