Initial commit of the Mandriva patches and spec files.

This includes the main dependencies and core packages, but very little else.
author: Tim Williams <tmw@autotrain.org> 2011-10-14 13:51:18 +0100
committer: Tim Williams <tmw@autotrain.org> 2011-10-14 13:51:18 +0100
commit: ec2515f058c60d2478a549f58376db628ba556b9 (patch)
tree: aefbde1b807005611b397e01ebc5782c7d27ff91 /mandriva/2010.2
parent: bba295da1161579c6fe734680c827e50a3585131 (diff)
download: tde-packaging-ec2515f058c60d2478a549f58376db628ba556b9.tar.gz
tde-packaging-ec2515f058c60d2478a549f58376db628ba556b9.zip
100 files changed, 14055 insertions, 0 deletions
diff --git a/mandriva/2010.2/common-patches/ac264.patch b/mandriva/2010.2/common-patches/ac264.patch
new file mode 100644
index 000000000..284545fa6
--- /dev/null
+++ b/mandriva/2010.2/common-patches/ac264.patch
@@ -0,0 +1,24 @@
+--- kdelibs-3.5.10/admin/configure.in.min~	2008-08-19 22:28:39.000000000 +0200
++++ kdelibs-3.5.10/admin/configure.in.min	2009-08-17 19:13:01.823156420 +0200
+@@ -44,6 +44,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+--- kdelibs-3.5.10/configure.in.in~	2006-05-22 20:14:23.000000000 +0200
++++ kdelibs-3.5.10/configure.in.in	2009-08-17 19:16:04.549804009 +0200
+@@ -25,6 +25,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_LIBLTDL_CONVENIENCE
+ 
diff --git a/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
new file mode 100644
index 000000000..0610d6df5
--- /dev/null
+++ b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
@@ -0,0 +1,66 @@
+2009-12-10  Stepan Kasal  <skasal@redhat.com>
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
++++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+ 
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[ 
++  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++  CFLAGS=" $CFLAGS"
++  AC_PROG_CC
++  CXXFLAGS=" $CXXFLAGS"
++  AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+   AC_ARG_ENABLE(debug,
+ 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
+   [
+@@ -3141,11 +3151,6 @@
+     [kde_use_profiling="no"]
+   )
+ 
+-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+-  CFLAGS=" $CFLAGS"
+-
+-  AC_PROG_CC 
+-
+   AC_PROG_CPP
+ 
+   if test "$GCC" = "yes"; then
+@@ -3174,10 +3179,6 @@
+      LDFLAGS=""
+   fi
+ 
+-  CXXFLAGS=" $CXXFLAGS"
+-
+-  AC_PROG_CXX
+-
+   KDE_CHECK_FOR_BAD_COMPILER
+ 
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+@@ -3503,8 +3504,8 @@
+ AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+ AC_REQUIRE([KDE_CHECK_LIB64])
+ 
+-AC_OBJEXT
+-AC_EXEEXT
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
+ 
+ AM_PROG_LIBTOOL
+ AC_LIBTOOL_CXX
diff --git a/mandriva/2010.2/common-patches/readme.txt b/mandriva/2010.2/common-patches/readme.txt
new file mode 100644
index 000000000..282020b80
--- /dev/null
+++ b/mandriva/2010.2/common-patches/readme.txt
@@ -0,0 +1,2 @@
+This directory contains some common patches which are applied to the majority
+of the Trinity sources.
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
new file mode 100644
index 000000000..1a2323267
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
@@ -0,0 +1,13 @@
+--- arts-1.5.3/mcop/mcoputils.cc	2005-12-22 21:20:23.000000000 -0200
++++ arts-1.5.3/mcop/mcoputils.cc.new	2006-07-19 14:44:08.000000000 -0300
+@@ -371,7 +371,9 @@
+ 	}
+ 	if (!mcop_dir)
+ 	{
+-	   arts_fatal("can't create mcop directory");
++      return "Unable to create mcop directory";
++
++	   // arts_fatal("can't create mcop directory");
+ 	}
+ 	string tmpdir = mcop_dir;
+ 	return tmpdir+"/"+name;
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
new file mode 100644
index 000000000..2adce7f91
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
@@ -0,0 +1,70 @@
+? flow/audioiooss.cc,v
+? flow/audioioossthreaded.cc,v
+Index: flow/Makefile.am
+===================================================================
+RCS file: /home/kde/arts/flow/Makefile.am,v
+retrieving revision 1.79
+diff -u -3 -p -r1.79 Makefile.am
+--- flow/Makefile.am	18 Nov 2004 20:19:59 -0000	1.79
++++ flow/Makefile.am	25 Feb 2005 13:58:07 -0000
+@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
+ 
+ libartsflow_idl_la_SOURCES = artsflow.cc
+ libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+-libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
++libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4) -lresmgr
+ 
+ libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
+   $(top_builddir)/flow/gsl/libgsl.la
+Index: flow/audioiooss.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioiooss.cc,v
+retrieving revision 1.17
+diff -u -3 -p -r1.17 audioiooss.cc
+--- flow/audioiooss.cc	20 Nov 2004 04:55:21 -0000	1.17
++++ flow/audioiooss.cc	25 Feb 2005 13:58:07 -0000
+@@ -49,6 +49,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -157,7 +158,9 @@ bool AudioIOOSS::open()
+ 		return false;
+ 	}
+ 
+-	audio_fd = ::open(_deviceName.c_str(), mode, 0);
++	audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++	if(audio_fd == -1)
++		audio_fd = ::open(_deviceName.c_str(), mode, 0);
+ 
+ 	if(audio_fd == -1)
+ 	{
+Index: flow/audioioossthreaded.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioioossthreaded.cc,v
+retrieving revision 1.6
+diff -u -3 -p -r1.6 audioioossthreaded.cc
+--- flow/audioioossthreaded.cc	20 Jan 2005 12:34:01 -0000	1.6
++++ flow/audioioossthreaded.cc	25 Feb 2005 13:58:07 -0000
+@@ -50,6 +50,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -202,7 +203,9 @@ bool AudioIOOSSThreaded::open()
+ 		return false;
+ 	}
+ 
+-	audio_fd = ::open(_deviceName.c_str(), mode, 0);
++	audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++	if(audio_fd == -1)
++		audio_fd = ::open(_deviceName.c_str(), mode, 0);
+ 
+ 	if(audio_fd == -1)
+ 	{
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
new file mode 100644
index 000000000..d5de29ace
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
@@ -0,0 +1,20 @@
+--- arts-1.5.9/mcop/mcoputils.cc.orig	2008-06-02 09:28:23.000000000 -0300
++++ arts-1.5.9/mcop/mcoputils.cc	2008-06-02 09:28:42.000000000 -0300
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <limits.h>
+ #include <netdb.h>
+ #include <errno.h>
+ #include <config.h>
+--- arts-1.5.9/artsc/artsdsp.c.orig	2008-06-02 09:27:24.000000000 -0300
++++ arts-1.5.9/artsc/artsdsp.c	2008-06-02 09:27:52.000000000 -0300
+@@ -21,6 +21,7 @@
+  */
+ 
+ #define _GNU_SOURCE 1
++#undef _FORTIFY_SOURCE
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/mandriva/2010.2/dependencies/arts/arts3.spec b/mandriva/2010.2/dependencies/arts/arts3.spec
new file mode 100644
index 000000000..ab0bb5d6c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts3.spec
@@ -0,0 +1,347 @@
+%define compile_apidox 1
+%{?_no_apidox: %{expand: %%global compile_apidox 0}}
+%define oname arts
+%define epoch_arts 30000001
+
+# Define short-cuts for libification
+%define major	1
+
+%define libname	%mklibname arts %{major}
+
+%define lib_name_orig libarts
+
+Name: arts3
+Summary: Arts - Libraries
+Version: 1.5.12
+Release: %mkrel 1
+Epoch: %{epoch_arts}
+Group: Graphical desktop/KDE3
+License: ARTISTIC BSD GPL_V2 LGPL_V2 QPL_V1.0
+BuildRoot: %_tmppath/%name-%version-%release-root
+Requires(pre): %{libname} = %{epoch_arts}:%version-%release
+URL: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
+Patch0: arts-1.5.3-resmgr.patch
+Patch2: arts-1.5.3-mcop-msgkill.patch
+Patch4: arts-1.5.9-gcc4.3.x-compile.patch
+Patch5: kde-3.5.10-acinclude.patch
+BuildRequires: kde3-macros
+BuildRequires: audiofile-devel
+BuildRequires: qt3-devel
+BuildRequires: glib2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: resmgr-devel
+BuildRequires: X11-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires:	esound-devel
+BuildRequires:	multiarch-utils >= 1.0.3
+BuildRequires:	jackit-devel
+BuildRequires:  libvorbis-devel
+BuildRequires: libtqtinterface-devel >= 3.5.12
+BuildConflicts: mas-devel
+Obsoletes:	aethera =< 0.9.3-5mdk
+Obsoletes: brahms =< 1.02-3mdk
+Obsoletes: dotNETStyle =< 0.9.2-2mdk 
+Obsoletes: drivetweak-kde- =< 0.9.1-1mdk 
+Obsoletes: guarddog =< 1.9.14-1mdk
+Obsoletes:  k3b =< 0.5.1-2mdk
+Obsoletes: karchiver =< 2.0.5-3mdk
+Obsoletes: kdestudio =< 2.0.0-10mdk 
+Obsoletes: kdevmon =< 0.4.5-2mdk
+Obsoletes: keduca =< 0.4-6mdk
+Obsoletes: keurocalc =< 0.5.8-1mdk
+Obsoletes:  kfontinst =< 0.10-1mdk
+Obsoletes: kgesture =< 0.3-6mdk
+Obsoletes: kguitar =< 0.4-2mdk 
+Obsoletes: kinkatta =< 1.00-1mdk
+Obsoletes: kmag =< 0.7-1mdk
+Obsoletes: kmymoney2 =< 0.4-1mdk
+Obsoletes: knetfilter =< 2.2.5-1mdk 
+Obsoletes: komba2 =< 0.72-1mdk 
+Obsoletes: koncd =< 1.0rc2-2mdk
+Obsoletes: konnector =< 0.5-4mdk
+Obsoletes:	konverse =< 0.2-3mdk
+Obsoletes: kover =< 0.8.3-2mdk
+Obsoletes: kreatecd =< 1.1.0-2mdk
+Obsoletes: krpmbuilder =< 0.2.6-4mdk
+Obsoletes: krusader =< 1.01-1mdk
+Obsoletes: kshowmail =< 2.2.3-1mdk
+Obsoletes: ksnuffle =< 2.2-6mdk
+Obsoletes: ksplashml =< 0.92-1mdk
+Obsoletes: kstars =< 0.8.5-1mdk
+Obsoletes: kstocks =< 2.0.2-8mdk
+Obsoletes: ktexmaker2 =< 1.7-2mdk
+Obsoletes: ktouch =< 1.0-4mdk
+Obsoletes: kuickshow =< 0.8.2-3mdk
+Obsoletes:  kwatch =< 2.2.0-1mdk
+Obsoletes: kwave =< 0.6.3-3mdk
+Obsoletes: kwintv =< 0.8.11-5mdk
+Obsoletes: kxicq2 =< 0.7.6-1mdk
+Obsoletes: kxmleditor =< 0.7.1-2mdk
+Obsoletes: libbrahms0 =< 1.02-3mdk
+Obsoletes: libkarchiver2 =< 2.0.5-3mdk
+Obsoletes: libkguitar1 =< 0.4-2mdk
+Obsoletes: libxmms-kde1 =< 6.5-5mdk
+Obsoletes: sakuraplayer =< 1.0.6-1mdk umlmodeller =< 1.0.3-5mdk 
+Obsoletes: cervisia =< 1.4.1-7mdk
+Obsoletes: kbiff =< 3.5.4-3mdk
+Obsoletes:  kcpuload =< 1.90-11mdk
+Obsoletes: kdbg =< 1.2.5-1mdk
+Obsoletes: kdeaddons3
+Obsoletes: kdeadmin3
+Obsoletes: kdeartwork3
+Obsoletes: kdebindings3
+Obsoletes: kdemultimedia3
+Obsoletes: kdemultimedia3-aktion
+Obsoletes: kdenetwork3
+Obsoletes: kdepim3
+Obsoletes: kdesdk3
+Obsoletes: kdetoys3
+Obsoletes: kdeutils3
+Obsoletes: kdevelop3
+Obsoletes: klogic =< 1.35-1mdk
+Obsoletes: klyx =< 2.0-17mdk
+Obsoletes: kmago =< 1.1.2-5mdk
+Obsoletes: knetload =< 1.91-8mdk
+Obsoletes: koffice =< 1.1.1-14mdk
+Obsoletes: kpl2 =< 2.3.0-1mdk
+Obsoletes: krootwarning =< 8.2-13mdk
+Obsoletes: krozat =< 8.2-13mdk
+Obsoletes: ksetiwatch =< 2.2.5-1mdk
+Obsoletes: ktelnet =< 0.7b1-13mdk
+Obsoletes: kvirc =< 2.1.1-5mdk
+Obsoletes: libqt2-devel =< 2.3.1-29mdk
+Obsoletes: licq-kde =< 1.0.4-2mdk
+Obsoletes: qt2-designer =< 2.3.1-29mdk
+Obsoletes: qtrans =< 0.1.1-7mdk
+Obsoletes: quanta =< 2.0.1-2mdk
+Obsoletes: kdelibs-sound 
+Obsoletes:	%{libname}-static-devel
+Obsoletes:  arts3 < %{epoch_arts}:1.5.3
+Provides:	arts3 = %{epoch_arts}:%version-%release
+BuildConflicts:	unsermake
+Conflicts: arts < 30000001:1.5.10-4
+Provides: arts = %epoch_arts:%version-%release
+
+%description
+aRts is a short form for "analog realtime synthesizer". The idea of the whole 
+thing is to create/process sound using small modules which do certain tasks. 
+These may be create a waveform (oscillators), play samples, filter data, add 
+signals, perform effects like delay/flanger/chorus, or output the data to the
+soundcard.
+
+%files
+%defattr(-,root,root,-)
+%_kde3_bindir/artscat
+%_kde3_bindir/artsd    
+%_kde3_bindir/artsplay  
+%_kde3_bindir/artsshell    
+%_kde3_bindir/artsdsp  
+%_kde3_bindir/artsrec   
+%_kde3_bindir/artswrapper
+
+#----------------------------------------------------------------------
+
+%package -n %{libname}
+Group:      System/Libraries
+Summary:    The libraries for arts 
+Obsoletes:  libarts2, libarts3
+Requires: libtqtinterface >= 3.5.12-1
+
+%description -n %{libname}
+Libraries needed for arts.
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%files -n %{libname}
+%defattr(-,root,root,-)
+%_kde3_libdir/*.la
+%_kde3_libdir/*.so.*
+%dir %_kde3_libdir/mcop/
+%_kde3_libdir/mcop/*
+%_sysconfdir/ld.so.conf.d/*
+
+#----------------------------------------------------------------------
+
+%package devel
+Group: Development/KDE and Qt
+Summary:	Development files for arts
+Requires: %{libname} = %{epoch_arts}:%version-%release
+Obsoletes: %{_lib}arts1-devel
+Obsoletes: libarts2-devel
+Obsoletes: libarts3-devel
+Provides: arts-devel
+Provides: libarts-devel
+Conflicts: arts <= %epoch_arts:1.5.3-5mdv2007
+
+%description devel
+Development libraries for arts.
+
+%files devel
+%defattr(-,root,root,-)
+%_kde3_bindir/artsc-config
+%multiarch %_kde3_bindir/*/artsc-config
+%_kde3_bindir/mcopidl
+%_kde3_libdir/*.so
+%_kde3_includedir/*
+
+#----------------------------------------------------------------------
+
+%prep
+%setup -q -n %oname-%version
+%patch0 -p0 -b .resmgr
+%patch2 -p1 -b .msgkill
+%patch4 -p1 -b .gcc4.3
+%patch5 -p1
+
+%build
+# Patch from resmgr needs rebuild builsystem
+make -f admin/Makefile.common
+QTDIR=%qt3dir
+export QTDIR
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+
+%configure_kde3 \
+	--without-nas \
+
+%make
+
+
+%install
+rm -fr %buildroot
+
+%makeinstall_std
+%multiarch_binaries $RPM_BUILD_ROOT%{_kde3_bindir}/artsc-config
+%multiarch_includes $RPM_BUILD_ROOT%{_kde3_includedir}/arts/gsl/gslconfig.h
+
+install -d %buildroot/%_sysconfdir/ld.so.conf.d
+cat > %buildroot/%_sysconfdir/ld.so.conf.d/%{libname}.conf <<EOF
+%_kde3_libdir
+EOF
+
+
+%clean
+rm -fr %buildroot
+
+
+
+
+
+%changelog
+* Thu Feb 03 2011 Tim Williams <tim@my-place.org.uk> 30000001:1.5.12-11mdf2010.2
++ Add Trinity KDE 3.5.12 sources
++ Add libtqtinterface dependencies
+- Remove arts-1.5.0-check_tmp_dir.patch and fix_autotools.patch, no longer necessary
+
+* Tue May 04 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.1
++ Rebuild
+
+* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.0
++ Use automake 1.11 and above
++ Patch for built with autoconf 2.65
++ Fix package group
+
+* Tue Nov 14 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-10mdv2010.0
+- Remove some of the obsoletes which are causing problems
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-9mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-8mdv2009.1
++ Revision: 361978
+- fix apparent typo in provides/conflicts change of r356949
+
+* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-7mdv2009.1
++ Revision: 361677
+- fix new obsolete for biarch
+
+* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-6mdv2009.1
++ Revision: 361121
+- The return of undead. Changing name from libarts1-devel to a real arts3-devel
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-5mdv2009.1
++ Revision: 356949
+- Add provides
+
+* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-4mdv2009.1
++ Revision: 355208
+- Remove old spec file
+- Update to new name
+- Change arts to arts3 ( kde3 reintroduction step 1 )
+
+* Sat Feb 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-3mdv2009.1
++ Revision: 345972
+- rebuild due to removed i586 binaries
+
+* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000001:1.5.10-2mdv2009.1
++ Revision: 300956
+- rebuild for xcb changes
+
+* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-1mdv2009.0
++ Revision: 276164
+- Update for probably the last upstream arts from kde3
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 30000001:1.5.9-8mdv2009.0
++ Revision: 264319
+- rebuild early 2009.0 package (before pixel changes)
+
+  + Pixel <pixel@mandriva.com>
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-7mdv2009.0
++ Revision: 214278
+- Fix compilations against gcc 4.3.x. Close bug https://qa.mandriva.com/show_bug.cgi?id=41171
+
+  + Funda Wang <fundawang@mandriva.org>
+    - rebuild for new qt3
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Rebuild because of qt3 move
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-3mdv2009.0
++ Revision: 200792
+- Begin changes for kde. Time to go to /opt
+- Added arts.conf on ld.so.conf.d
+
+* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.9-2mdv2008.1
++ Revision: 189485
+- Fix groups ( tks to pterjan)
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-1mdv2008.1
++ Revision: 167752
+- Last arts ever arrived. 1.5.9. This will be the last update for old codebase and closing the cycle of stable releases of KDE3
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix description-line-too-long
+    - kill re-definition of %%buildroot on Pixel's request
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+* Tue Oct 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.8-1mdv2008.1
++ Revision: 101650
+- Arts 1.5.8 from kde 3.5.8
+- Add Patch5, it fixes problems between aRts and Knotify
+
+  + Per Øyvind Karlsen <peroyvind@mandriva.org>
+    - add buildconflict on unsermake as it gets used by default if installed and breaks building
+
+  + Anssi Hannula <anssi@mandriva.org>
+    - remove hardcoded packager tag
+
+* Mon May 21 2007 Olivier Blin <oblin@mandriva.com> 30000001:1.5.7-2mdv2008.0
++ Revision: 29295
+- build with esound support
+
+* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.7-1mdv2008.0
++ Revision: 27452
+- 1.5.7 release
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
new file mode 100644
index 000000000..7d9a65452
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
@@ -0,0 +1,116 @@
+Name: kde3-macros
+Version: 3.5.12
+Release: %mkrel 1
+Group: Development/KDE and Qt
+Summary: Base install macros for kde 3
+Source: kde3.macros
+URL: http://www.mandriva.com
+License: GPL
+BuildArch: noarch
+Requires: rpm-manbo-setup-build >= 2-7
+BuildRoot: %{_tmppath}/%{name}-buildroot
+
+%description
+Base install macros for kde 3
+
+%files 
+%defattr(-,root,root)
+%_sysconfdir/rpm/macros.d/kde3.macros
+
+%install
+rm -rf %buildroot
+install -d -m 755 %buildroot%_sysconfdir/rpm/macros.d
+install -m 644 %SOURCE0 %buildroot%_sysconfdir/rpm/macros.d/
+
+%clean
+rm -rf %buildroot
+
+
+
+
+%changelog
+* Thu Feb 16 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.1
++ Rebuild for Trinity 3.5.12
++ Add extra-libs and extra-includes so build can find tqtinterface
++ Add --enable-closure
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.1
++ Rebuild for MDV 2010.1
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-4mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Mon Oct 27 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-3mdv2009.1
++ Revision: 297523
+- specify qt3 dir
+
+* Wed Sep 24 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
++ Revision: 287688
+- add libdir to pkgconfig dir
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
++ Revision: 285306
+- Update version and fix bug 43876 - /etc/profile.d/91kde3.sh should contain redefination of PKG_CONFIG_PATH
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-15mdv2009.0
++ Revision: 264759
+- rebuild early 2009.0 package (before pixel changes)
+
+* Fri Jun 06 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-14mdv2009.0
++ Revision: 216405
+- Requires rpm-manbo-setup-build for %%before_configure
+
+* Thu Jun 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-13mdv2009.0
++ Revision: 215104
+- change configure_kde3 to use %%before_configure
+
+* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-12mdv2009.0
++ Revision: 213551
+- Proper new qtdir libraries
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-11mdv2009.0
++ Revision: 212725
+- Revert of the previous commit
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
++ Revision: 212717
+- Fix macros
+
+* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-9mdv2009.0
++ Revision: 205308
+- Fix typo
+
+* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-8mdv2009.0
++ Revision: 204698
+- Add clean_kde3_icon_cache and update_kde3_icon_cache macros
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-7mdv2009.0
++ Revision: 200791
+- Yes, we need a copy. Sometimes we loose a lot of time that we don't have
+  because some nitpicking pointing.
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-6mdv2009.0
++ Revision: 200553
+- Using again configure2_5x. Some impatient people can't wait some work in progress...
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-4mdv2009.0
++ Revision: 200535
+- Added xinerama and alsa
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
++ Revision: 200534
+- Added mitshm and enable-libfam
+
+* Fri May 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-2mdv2009.0
++ Revision: 200518
+- Created configure_kde macro to make kde3 build easier too like kde4 and make transition to /opt less painfull. Thanks to Blino for the help.
+  There's no need anymore add all define switches, even for libsuffix detection, so if you want:
+- Disable enable-final: use --define _disable_final=1
+- Compile with debug full: use --define _unstable=1
+- Compile in non 32bits arch: No need add the usual lib test
+
+* Sun Apr 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-1mdv2009.0
++ Revision: 192655
+- import kde3-macros
+
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3.macros b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
new file mode 100644
index 000000000..688ee04f6
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
@@ -0,0 +1,57 @@
+%use_enable_final %{!?_disable_final:--enable-final}
+%use_unstable %{?_unstable:--enable-debug=full}
+
+%_kde3_prefix /opt/kde3
+%_kde3_libdir %_kde3_prefix/%_lib
+%_kde3_iconsdir %_kde3_prefix/share/icons
+%_kde3_sysconfdir %_sysconfdir
+%_kde3_datadir %_kde3_prefix/share
+%_kde3_configdir %_kde3_datadir/config
+%_kde3_appsdir %_kde3_datadir/apps
+%_kde3_docdir %_kde3_prefix/share/doc
+%_kde3_bindir %_kde3_prefix/bin
+%_kde3_sbindir %_kde3_prefix/sbin
+%_kde3_includedir %_kde3_prefix/include
+%_kde3_mandir %_kde3_prefix/share/man
+%_kde3_autostart %_kde3_prefix/share/autostart
+
+%configure_kde3 \\\
+  %before_configure ; \
+  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
+  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
+  PKG_CONFIG_PATH="%{_kde3_libdir}/pkgconfig:%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" \
+  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
+	--prefix=%{_kde3_prefix} \\\
+	--bindir=%{_kde3_bindir} \\\
+	--sbindir=%{_kde3_sbindir} \\\
+	--sysconfdir=%{_sysconfdir} \\\
+	--datadir=%{_kde3_datadir} \\\
+	--includedir=%{_kde3_includedir} \\\
+	--libdir=%{_kde3_libdir} %use_unstable %use_enable_final \\\
+	--infodir=%{_infodir} \\\
+	--mandir=%{_mandir} \\\
+	--disable-static \\\
+	--enable-mitshm \\\
+	--with-ipv6-lookup=auto \\\
+	--with-pic \\\
+	--with-xinerama \\\
+	--with-alsa \\\
+	--enable-libfam \\\
+	--enable-pcre \\\
+	--with-qt-dir=%{qt3dir} --with-qt-includes=%{qt3include} --with-qt-libraries=%{qt3lib}\\\
+        --with-extra-libs=%{_kde3_libdir} --with-extra-includes=%{_kde3_includedir}/tqt \\\
+	%if "%{_lib}" != "lib" \
+	--enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \\\
+	%endif \
+	--disable-rpath \\\
+        --enable-closure \\\
+	$CONFIGURE_XPATH
+# Rebuild icon cache
+%update_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true; fi \
+%{nil}
+
+%clean_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_kde3_iconsdir}/%{1}/index.theme ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true ; fi \
+%{nil}
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
new file mode 100644
index 000000000..3bba9bb56
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
@@ -0,0 +1,135 @@
+# TODO
+# - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
+#   libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
+#   /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
+#   workarounded in spec r1.2 commit
+#
+# Conditional build:
+%bcond_with		qt4     # Enable Qt4 support (this will disable all Qt3 support)
+
+%define epoch_kdelibs 30000000
+
+Summary:	Interface and abstraction library for Qt and Trinity
+Name:		libtqtinterface
+Version:	3.5.12
+Release:	%mkrel 1
+#Epoch:          %epoch_kdelibs
+License:	GPL v2
+Group:		Graphical desktop/KDE3
+Source0:	http://mirror.its.uidaho.edu/pub/trinity/releases/%{version}/dependencies/tqtinterface-%{version}.tar.gz
+# Source0-md5:	361c45961184f01f95d3b771138c8229
+Patch0:         tqt-comments.patch
+Patch1:         tqglobal-comments.patch
+Patch2: 	tqt-r1217318.diff
+URL:		http://trinity.pearsoncomputing.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libltdl-devel
+BuildRequires:	libtool
+BuildRequires:	pkgconfig
+BuildRequires:	qt3-devel
+BuildRequires:	sed >= 4.0
+#BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %_tmppath/%name-%version-%release-root
+
+
+%description
+This package includes libraries that abstract the underlying Qt system
+from the actual Trinity code, allowing easy, complete upgrades to new
+versions of Qt.
+
+It also contains various functions that have been removed from newer
+versions of Qt, but are completely portable and isolated from other
+APIs such as Xorg. This allows the Trinity project to efficiently
+perform certain operations that are infeasible or unneccessarily
+difficult when using pure Qt4 or above.
+
+%package devel
+Summary:	Header files for libtqtinterface library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libtqtinterface
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Header files for libtqtinterface library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libtqtinterface.
+
+%prep
+%setup -qc
+mv dependencies/tqtinterface/* .
+%patch0 -p0
+%patch1 -p0
+%patch2 -p2
+
+# libtool copy
+rm -r libltdl
+%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
+
+# remove copy of QtCore and QtGui devel headers
+rm -r qtinterface/qt4 qtinterface/tqt4
+%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
+
+%build
+make -f admin/Makefile.common cvs
+
+QTDIR=%qt3dir ; export QTDIR;
+PATH=%{qt3dir}/bin:$PATH; export PATH;
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+
+%configure_kde3 \
+        --includedir=%{_kde3_includedir}/tqt \
+%if "%{_lib}" == "lib64"
+	--enable-libsuffix=64 \
+%endif
+	%{?with_qt4:--enable-qt4}
+
+%{__make} \
+	LIBTOOL="%{_bindir}/libtool -v"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# force -j1 or USE_QTX is replaced _after_ file is installed
+%{__make} -j1 install \
+	DESTDIR=$RPM_BUILD_ROOT \
+
+# --disable-static did not work, rm it again
+#rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_kde3_libdir}/libtqt.so.*.*.*
+%attr(755,root,root) %{_kde3_libdir}/libtqt.a
+%ghost %attr(755,root,root) %{_kde3_libdir}/libtqt.so.4
+
+%files devel
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING README
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt1
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt2
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt3
+%attr(755,root,root) %{_kde3_bindir}/dcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidl2cpp-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidlng-tqt
+%attr(755,root,root) %{_kde3_bindir}/mcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/moc-tqt
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace-stream
+%dir %{_kde3_includedir}/tqt
+%{_kde3_includedir}/tqt/tq*.h
+%{_kde3_libdir}/libtqt.la
+%{_kde3_libdir}/libtqt.so
+
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* Wed Feb 1 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvf2010.2
++ Rewrite for MDV 2010.2
++ Spec based on revision 1.4 from PLD linux
++ Add tqt-comments.patch, tqglobal-comments.patch. My compiler doesn't like // comments.
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
new file mode 100644
index 000000000..332a7d57c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
@@ -0,0 +1,26 @@
+--- qtinterface/tqglobal.h.orig	2011-02-04 12:35:10.215472605 +0000
++++ qtinterface/tqglobal.h	2011-02-04 12:35:45.537474675 +0000
+@@ -26,18 +26,18 @@
+ 
+ #ifdef USE_QT3
+ 
+-// Pull in all Qt3 global defines
++/* Pull in all Qt3 global defines */
+ 
+ #include <qglobal.h>
+ 
+-#endif // USE_QT3
++#endif /* USE_QT3 */
+ 
+ #ifdef USE_QT4
+ 
+-// Pull in all Qt4 global defines
++/* Pull in all Qt4 global defines */
+ 
+ #include <Qt/qglobal.h>
+ 
+-#endif // USE_QT4
++#endif /* USE_QT4 */
+ 
+ #endif /* TQGLOBAL_H */
+\ No newline at end of file
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
new file mode 100644
index 000000000..e367613f8
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
@@ -0,0 +1,23 @@
+--- qtinterface/tqt.h.orig	2010-08-31 00:37:01.000000000 +0100
++++ qtinterface/tqt.h	2011-02-03 13:48:47.483987570 +0000
+@@ -42,7 +42,7 @@
+ #define TQT_METHOD(a)	METHOD(a)
+ #define TQT_SLOT(a)	SLOT(a)
+ #define TQT_SIGNAL(a)	SIGNAL(a)
+-#endif // __cplusplus
++#endif
+ 
+ #ifdef USE_QT3
+ #define qint64			long
+@@ -1319,11 +1319,4 @@
+ #define TQXmlDefaultHandler QXmlDefaultHandler
+ #endif
+ 
+-// Undo any damage caused by the tqt-replace utility
+-//#define QCStringList TQCStringList
+-//#define QtWIN TQtWIN
+-
+-//#include "kdemacros.h.in"
+-//#define TQT_EXPORT KDE_EXPORT
+-
+ #endif /* TQT_H */
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
new file mode 100644
index 000000000..cd9ca03bd
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
@@ -0,0 +1,12 @@
+Index: dependencies/tqtinterface/qtinterface/tqt.h
+===================================================================
+--- dependencies/tqtinterface/qtinterface/tqt.h	(revision 1217317)
++++ dependencies/tqtinterface/qtinterface/tqt.h	(revision 1217318)
+@@ -85,6 +85,7 @@
+ #define TQ_ControlButton	ControlButton
+ #define TQ_AltButton		AltButton
+ #define TQ_MetaButton		MetaButton
++#define TQ_WFlags		TQt::WFlags
+ #define TQIODevice_OpenModeFlag int
+ 
+ #define TQAlignCenter AlignCenter
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
new file mode 100644
index 000000000..c901da7a1
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
@@ -0,0 +1,35 @@
+diff -Naur mandriva-kde-config-2009.0/kdm/backgroundrc mandriva-kde-config.yeni/kdm/backgroundrc
+--- mandriva-kde-config-2009.0/kdm/backgroundrc	2006-08-23 20:58:15.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/backgroundrc	2009-11-24 21:35:26.592448000 +0200
+@@ -13,6 +13,6 @@
+ Program=
+ ReverseBlending=false
+ UseSHM=false
+-Wallpaper=/usr/share/mdk/backgrounds/default.png
++Wallpaper=/usr/share/mdk/backgrounds/default.jpg
+ WallpaperList=
+ WallpaperMode=Scaled
+diff -Naur mandriva-kde-config-2009.0/kdm/kdmrc mandriva-kde-config.yeni/kdm/kdmrc
+--- mandriva-kde-config-2009.0/kdm/kdmrc	2008-06-23 21:03:31.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/kdmrc	2009-12-15 00:27:11.727822403 +0200
+@@ -451,7 +451,7 @@
+ # The theme to use for the greeter. Can point to either a directory or an XML
+ # file.
+ # Default is ""
+-Theme=/usr/share/mdk/dm
++Theme=/opt/kde3/share/config/kdm/themes/2010
+ 
+ # Core config for local displays
+ [X-:*-Core]
+diff -Naur mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml mandriva-kde-config.yeni/kdm/themes/2008/2008.xml
+--- mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml	2007-09-12 01:17:40.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/themes/2008/2008.xml	2009-11-25 02:13:17.273313000 +0200
+@@ -2,7 +2,7 @@
+ <!DOCTYPE greeter SYSTEM "greeter.dtd">
+ <greeter>
+   <item type="pixmap">
+-    <normal file="/usr/share/mdk/backgrounds/default.png"/>
++    <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
+     <pos x="0" y="0" width="100%" height="100%"/>
+   </item>
+ 
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
new file mode 100644
index 000000000..ac58f6a1e
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
new file mode 100644
index 000000000..5bb7c8d31
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
@@ -0,0 +1,907 @@
+%define epoch_kdelibs 30000000
+%define oname mandriva-kde-config
+
+Name: mandriva-kde3-config
+Summary: Mandriva KDE configuration
+Version: 2010.2
+Release: %mkrel 1
+URL: http://www.mandriva.com
+Group: Graphical desktop/KDE3
+BuildRoot: %_tmppath/%name-buildroot
+BuildRequires: kde3-macros
+Source0: %{oname}-%{version}.tar.bz2
+# OpenOffice.org icons. Should be in a separate package
+# in the future, since they're shared between kde, OOo
+# and maybe others
+Source1: ooo-icons.tar.bz2
+Source2: opendocument-mime.tar.bz2
+Patch0: fix_kdmtheme.patch
+License: GPL
+BuildArch: noarch
+Obsoletes: %{name} < %version-%release
+Obsoletes: mandriva-kde-config
+Provides: mandriva-kde-config = %version-%release
+
+
+%description
+This package regroups all specific Mandriva config file for KDE.
+(kicker config etc.)
+
+#--------------------------------------------------------------------
+
+%package common
+Group: Graphical desktop/KDE3
+Summary: Common configs used for Mandriva theme
+Requires(pre): update-alternatives
+Requires: urw-fonts
+Obsoletes: %{name}-common < %version-%release
+Obsoletes: mandriva-kde-config-common
+Provides: mandriva-kde-config-common = %version-%release
+
+%description common
+common configs used for Mandriva theme
+
+%post common
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config 9
+
+%postun common
+if ! [ -e /var/lib/mandriva/kde-profiles/common/upstream-kde-config ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/common/upstream-kde-config
+fi
+
+%files common
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/
+%dir %_localstatedir/lib/mandriva/kde-profiles/common
+%_localstatedir/lib/mandriva/kde-profiles/common/*
+
+#--------------------------------------------------------------------
+
+%package -n powerpack-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Obsoletes: powerpackplus-kde-config < 2008.0 
+Provides: powerpack-kde-config = %version-%release
+Provides: powerpackplus-kde-config = %version-%release
+Obsoletes: powerpack-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: powerpack-kde3-config < %version-%release
+
+%pre -n powerpack-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop
+fi
+
+%post -n powerpack-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/powerpack/kderc 10
+
+%postun -n powerpack-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/powerpack/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/powerpack/kderc
+fi
+
+%description -n powerpack-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%files -n powerpack-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/powerpack
+%_localstatedir/lib/mandriva/kde-profiles/powerpack/*
+
+#--------------------------------------------------------------------
+
+%package -n one-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: one-kde-config = %version-%release
+Obsoletes: one-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: one-kde3-config < %version-%release
+
+%description -n one-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n one-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop
+fi
+
+%post -n one-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/one/kderc 10
+
+%postun -n one-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/one/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/one/kderc
+fi
+
+%files -n one-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/one
+%_localstatedir/lib/mandriva/kde-profiles/one/*
+
+
+#--------------------------------------------------------------------
+
+%package -n flash-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: flash-kde-config = %version-%release
+Obsoletes: flash-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: flash-kde3-config < %version-%release
+
+%description -n flash-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n flash-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop
+fi
+
+%post -n flash-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/flash/kderc 10
+
+%postun -n flash-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/flash/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/flash/kderc
+fi
+
+%files -n flash-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/flash
+%_localstatedir/lib/mandriva/kde-profiles/flash/*
+
+
+#--------------------------------------------------------------------
+
+%package -n free-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: qt4-style-iaora
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: download-kde-config-2007 < 2008.0 
+Provides:	download-kde-config-2007
+Obsoletes: discovery-kde-config < 2008.0
+Provides: discovery-kde-config = %version-%release
+Provides: free-kde-config = %version-%release
+Obsoletes: free-kde-config
+Obsoletes: free-kde3-config < %version-%release
+
+%description -n free-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n free-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop
+fi
+
+%post -n free-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/free/kderc 10
+
+%postun -n free-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/free/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/free/kderc
+fi
+
+%files -n free-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/free
+%_localstatedir/lib/mandriva/kde-profiles/free/*
+
+
+#--------------------------------------------------------------------
+# KDM
+
+%package -n mandriva-kdm3-config
+Summary: Mandriva KDM config file
+Group: Graphical desktop/KDE3
+Obsoletes: kdebase-kdm-config-file < 2008.0
+Provides: kdm-config-file = %version-%release
+# For upgrade 
+Provides: kdebase-kdm-config-file = 2:%version 
+Conflicts: kdebase-progs <= 3.5.1-15.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(post): perl-MDK-Common
+Obsoletes: mandriva-kdm-config
+Provides: mandriva-kdm-config = %version-%release
+
+
+%description -n mandriva-kdm3-config
+Mandriva KDM config file
+
+%trigger -n mandriva-kdm3-config -- kdebase-kdm-config-file 
+perl -MMDK::Common -e 'update_gnomekderc("%{_kde3_configdir}/kdm/kdmrc", "General", "ConsoleTTYs", "tty1,tty2,tty3,tty4,tty5,tty6", "ServerVTs", "-7")'
+
+%files -n mandriva-kdm3-config
+%defattr(0644,root,root,0755)
+%config(noreplace) %_kde3_configdir/kdm/backgroundrc
+%config(noreplace) %_kde3_configdir/kdm/kdmrc
+%_kde3_configdir/kdm/themes
+
+#---------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version} -a 1 -a 2
+%patch0 -p1
+
+%install
+rm -rf %buildroot
+# Create profile dirs
+mkdir -p %buildroot/%{_kde3_configdir}
+mkdir -p %buildroot/%_localstatedir/lib/mandriva
+
+mv kde-profiles %buildroot/%_localstatedir/lib/mandriva
+mv kdm %buildroot/%{_kde3_configdir}
+
+# openoffice icons, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+cp -a ooo-icons/hicolor %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+
+# openoffice mimetypes, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+cp -a opendocument-mime/* %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+# XXX we have to rename them to the same name provided by kdelibs-common, otherwise the
+# global ones are used.
+pushd %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+    mv openoffice.org2.4-oasis-drawing.desktop vnd.oasis.opendocument.graphics.desktop
+    mv openoffice.org2.4-oasis-drawing-template.desktop vnd.oasis.opendocument.graphics-template.desktop
+    mv openoffice.org2.4-oasis-master-document.desktop vnd.oasis.opendocument.text-master.desktop
+    mv openoffice.org2.4-oasis-formula.desktop vnd.oasis.opendocument.formula.desktop
+    mv openoffice.org2.4-oasis-spreadsheet.desktop vnd.oasis.opendocument.spreadsheet.desktop
+    mv openoffice.org2.4-oasis-spreadsheet-template.desktop vnd.oasis.opendocument.spreadsheet-template.desktop
+    mv openoffice.org2.4-oasis-text.desktop vnd.oasis.opendocument.text.desktop
+    mv openoffice.org2.4-oasis-text-template.desktop vnd.oasis.opendocument.text-template.desktop
+    mv openoffice.org2.4-oasis-web-template.desktop vnd.oasis.opendocument.text-web.desktop
+    mv openoffice.org2.4-oasis-presentation.desktop vnd.oasis.opendocument.presentation.desktop
+    mv openoffice.org2.4-oasis-presentation-template.desktop vnd.oasis.opendocument.presentation-template.desktop
+    mv openoffice.org2.4-spreadsheet.desktop vnd.sun.xml.calc.desktop
+    mv openoffice.org2.4-spreadsheet-template.desktop vnd.sun.xml.calc.template.desktop
+    mv openoffice.org2.4-presentation.desktop vnd.sun.xml.impress.desktop
+    mv openoffice.org2.4-presentation-template.desktop vnd.sun.xml.impress.template.desktop
+    mv openoffice.org2.4-drawing.desktop  vnd.sun.xml.draw.desktop
+    mv openoffice.org2.4-drawing-template.desktop vnd.sun.xml.draw.template.desktop
+    mv openoffice.org2.4-text.desktop vnd.sun.xml.writer.desktop
+    mv openoffice.org2.4-text-template.desktop vnd.sun.xml.writer.template.desktop
+    mv openoffice.org2.4-master-document.desktop vnd.sun.xml.writer.master.desktop
+    mv openoffice.org2.4-formula.desktop vnd.sun.xml.math.desktop
+popd
+
+
+for name in flash free one powerpack; do
+    echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
+    echo "prefixes=/var/lib/mandriva/kde-profiles/common,%_localstatedir/lib/mandriva/kde-profiles/$name" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
+	# create the symlink to the desktop data
+    mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop
+    ln -s %_datadir/mdk/desktop/$name %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop/DesktopLinks
+done
+
+# Upstream
+echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
+echo "prefixes=%{_kde3_prefix}" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
+
+# Bookmarks
+mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/{free,flash,one,powerpack}/share/apps/konqueror/
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-download.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/free/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/one/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-powerpack.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/konqueror/bookmarks.xml
+
+%clean
+rm -rf %buildroot
+
+
+%changelog
+* Fri Feb 4 2011 Tim Williams <tim@my-place.org.uk> 2010.2-1mvt2010.2
++ Rebuild for 2010.2
+
+* Fri Jul 16 2010 Tim Williams <tim@my-place.org.uk> 2010.1-1mvt2010.1
++ Rebuild for 2010.1
+
+* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-3mvt2010.0
++ Prevent to install old 2009.0 packages
++ Change mandriva-kdm-config package name to mandriva-kdm3-config to avoid possible future
+conflicts. (Mandriva developer may decide to change mandriva-kdm4-config to this one)
+
+* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-2mvt2010.0
++ Fix ksplash and wallpaper issues
+
+* Fri Jan 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-1mvt2010.0
++ Rebuild source for 2010.0
+  - Mandriva 2010.0 KDM theme added
+  - Mandriva 2010.0 KSplash theme added
+
+* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2009.0-11mvt2010.0
++ Fixed pacakge name to avoid old official Mandriva package upgrade
+
+* Wed Nov 18 2009 Tim Williams <tim@my-place.org.uk> 2009.0-10mdv2010.0
++ Add konq-home.patch. Changes default start page to avoid crash when viewing the default /usr/share/doc/HTML/index.html
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2009.0-9mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Fri Sep 19 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-8mdv2009.0
++ Revision: 285971
+- Mandriva simple splash for kde3
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-7mdv2009.0
++ Revision: 285202
+- Update Mandriva Simple kde3 splash
+
+* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-6mdv2009.0
++ Revision: 278597
+- Fix profilerc due new .desktop files
+
+* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-5mdv2009.0
++ Revision: 265832
+- Start to disable basic services of kde3. kde4 runs kded daemon from kde3 to enable easy way to run kde3 applications. We don't want duplicate media notifiers, writed and other similar daemons.
+
+* Mon Jul 28 2008 Anne Nicolas <anne.nicolas@mandriva.com> 2009.0-4mdv2009.0
++ Revision: 251563
+- add qt4-style-iaora require
+
+* Mon Jun 23 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2009.0-3mdv2009.0
++ Revision: 228397
+- Changing X11* references in kdmrc to /usr/share/X11...
+
+  + Pixel <pixel@mandriva.com>
+    - adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
+
+* Wed May 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2009.0-2mdv2009.0
++ Revision: 207234
+- Update Flash design
+
+* Tue May 06 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-1mdv2009.0
++ Revision: 201967
+- Fixed kdm position of new config file. Bye bye /etc/kde
+
+* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-27mdv2008.1
++ Revision: 191678
+- Kmenu font size
+
+* Tue Apr 01 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-26mdv2008.1
++ Revision: 191389
+- I've commited this file with a wrong dir path. Fixed now...
+- Adding support to Mentor Office Keyboard again, with VolumeKeys disabled, because
+  it's a kmilo function
+
+* Fri Mar 28 2008 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 2008.1-25mdv2008.1
++ Revision: 190961
+- add openoffice icons and openoffice mimetypes so that
+  opendocuments use the latest iconset from openoffice.org.
+  Closes: #26311
+
+* Thu Mar 27 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-24mdv2008.1
++ Revision: 190675
+- Fixing Multimedia keyboard pb, by removing Mentor Office Wireless Keyboard shortcuts
+
+* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-23mdv2008.1
++ Revision: 187866
+- Fix https://qa.mandriva.com/show_bug.cgi?id=37109
+- Line up icons by default on desktop
+
+* Wed Mar 12 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-22mdv2008.1
++ Revision: 187106
+- Fixing minipager issue, by adding a default config file acording to
+  https://qa.mandriva.com/show_bug.cgi?id=37796
+
+* Mon Mar 10 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-21mdv2008.1
++ Revision: 183669
+- Fixing lockout-buttons in kicker to save their configurations affter logout.
+
+* Fri Mar 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-20mdv2008.1
++ Revision: 181604
+- Bookmarking made easy...
+
+* Thu Mar 06 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-19mdv2008.1
++ Revision: 181059
+- Use the right color scheme for KDM greeter
+- Add the config for the default wallpaper for 2008.1
+
+* Wed Mar 05 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-18mdv2008.1
++ Revision: 180241
+- Houston, we're out of space icons...
+
+* Mon Mar 03 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-17mdv2008.1
++ Revision: 177993
+- Updated with transparent buttons
+- Removed scaled allowing button getting good sizing and centerd position
+
+* Fri Feb 29 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-16mdv2008.1
++ Revision: 176912
+- Fix shutdown kfm image
+
+* Fri Feb 29 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-15mdv2008.1
++ Revision: 176750
+- Make sure the right colors are used
+
+* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-14mdv2008.1
++ Revision: 175931
+- New release containing:
+   * Fixed default colors for the kde profiles
+   * Removed shadows from the status labels of splash themes
+   * Updated kmenu icons
+   * Updated metabar images
+
+* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-13mdv2008.1
++ Revision: 175813
+- New release updating splash themes and color schemes for 2008.1
+
+* Mon Feb 25 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-12mdv2008.1
++ Revision: 175126
+- Proper faces dir for kdm
+
+* Fri Feb 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-11mdv2008.1
++ Revision: 173976
+- Add a simple splash screen for the ones who don't like the full screen splash
+
+* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-10mdv2008.1
++ Revision: 173041
+- Fix the button background colors
+
+* Fri Feb 15 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-9mdv2008.1
++ Revision: 169003
+- Add a default configuration file to minipagerapplet
+
+* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-8mdv2008.1
++ Revision: 168879
+- No use of external player as standard
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix summary-not-capitalized
+
+* Fri Feb 01 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-7mdv2008.1
++ Revision: 161221
+- Change the kside top images to match the new layout
+
+* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-6mdv2008.1
++ Revision: 147151
+- Make standard menu default again
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+* Fri Dec 21 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-5mdv2008.1
++ Revision: 136414
+- Kicker's clockapplet was not saving their options
+  when exits only one clock on kicker. Now its working.
+
+* Tue Dec 18 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-4mdv2008.1
++ Revision: 132432
+- Added media applet in kicker by default
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+    - do not hardcode man pages extension
+
+* Thu Dec 13 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-3mdv2008.1
++ Revision: 119505
+- Fix upgrade from non alternatives /etc/kderc
+- Moved common kdeglobal settings for kdeglobals in common and removed the duplicated in the profiles
+- Set kspell default encoding for UTF8
+
+* Thu Nov 22 2007 Thierry Vignaud <tvignaud@mandriva.com> 2008.1-2mdv2008.1
++ Revision: 111300
+- reupload (missing on x86_64)
+
+* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.1-1mdv2008.1
++ Revision: 102378
+- Update tarball with merged patches
+
+* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.0-31mdv2008.1
++ Revision: 102229
+- Add patch to activate klipper
+
+* Tue Oct 23 2007 Olivier Blin <oblin@mandriva.com> 2008.0-30mdv2008.1
++ Revision: 101644
+- update Flash splash (from Helio)
+
+* Thu Oct 18 2007 Olivier Blin <oblin@mandriva.com> 2008.0-29mdv2008.1
++ Revision: 100018
+- add flash-kde-config
+
+* Tue Oct 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-28mdv2008.0
++ Revision: 94768
+- Make the Mandriva theme select the proper components (#33822)
+
+* Mon Oct 01 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-27mdv2008.0
++ Revision: 94151
+- Use the ia_ora style and colors in kdm
+
+* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-26mdv2008.0
++ Revision: 93584
+- Restore kicker pager
+- Use official preview for moodin theme
+- Use sound notification only for session start and stop
+- Properly obsolete the discovery and powerpackplus kde config packages
+- Make all obsoletes tags versioned
+
+* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-24mdv2008.0
++ Revision: 93095
+- Use DesktopLinks instead of Desktop to put icons on desktop (this way they get
+  copied to the user home dir (#33204)
+
+* Tue Sep 25 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-23mdv2008.0
++ Revision: 92891
+- Enforce kaffeine as the default player for One and Free
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Flatten people image on powerpack images
+
+* Fri Sep 21 2007 Anne Nicolas <anne.nicolas@mandriva.com> 2008.0-21mdv2008.0
++ Revision: 91776
+- update sources
+- add metabar themes
+
+* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-20mdv2008.0
++ Revision: 91199
+- Add squared icons for the K menu
+
+* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-19mdv2008.0
++ Revision: 91017
+- Fix One color scheme
+
+* Tue Sep 18 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-18mdv2008.0
++ Revision: 89764
+- Define totem as the default player for powerpack
+
+* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-17mdv2008.0
++ Revision: 89272
+- Use the desktop icons from desktop-common-data so that they are proper
+  translated
+
+* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-16mdv2008.0
++ Revision: 85869
+- Multimedia direction change
+
+* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-15mdv2008.0
++ Revision: 85852
+- Fix kickoff button
+
+* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-14mdv2008.0
++ Revision: 85758
+- KDM changes
+- Sound changes
+
+* Wed Sep 12 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-13mdv2008.0
++ Revision: 84580
+- Fixed clock position
+- Fixed "fat" menu letters
+- Fixed spacing on itens
+
+* Mon Sep 10 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-12mdv2008.0
++ Revision: 84142
+- ksmserver image change
+- kdm call grub instead of lilo
+- Proper naming
+
+* Thu Sep 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-11mdv2008.0
++ Revision: 81020
+- Font and config
+- kdm, kicker and Free splash update
+
+* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-9mdv2008.0
++ Revision: 80365
+- Position text
+- New kicker buttons
+- No kdm userlist
+- New ia_ora one scheme
+
+* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-8mdv2008.0
++ Revision: 79481
+- Updated themes
+
+* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-7mdv2008.0
++ Revision: 78913
+- Starting migrate kde theme for 2008.0
+
+* Mon Aug 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-5mdv2008.0
++ Revision: 59467
+- Restore original images lost on svn crash
+
+* Thu Aug 02 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-4mdv2008.0
++ Revision: 58316
+- Fixed splash, removing Galaxy at last !
+- Removed wallpaper patch, commited on svn
+- Fixed Discovery theme
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] change wallpaper link to more userfriendly one (bug #10638)'
+
+* Fri Jun 08 2007 Anssi Hannula <anssi@mandriva.org> 2008.0-3mdv2008.0
++ Revision: 37525
+- do not remove profile alternatives when upgrading package
+
+* Fri Jun 08 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-2mdv2008.0
++ Revision: 37505
+- Added possibility to change to upstream kde config, as requested by Anssi
+
+* Mon Jun 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-1mdv2008.0
++ Revision: 35211
+- Removed old faulty updatekdeprofiles for a solution based on update-alternatives. Simple, using
+  cascade for common avoiding symlinks, and letting have one profile read instead of a list of
+  profiles that never keep same order
+- Added hardcoded files present before on kdebase package
+- Changed konsole config for Linux schema, instead of white one
+
+
+* Fri Apr 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-25mdv2007.1
++ Revision: 150809
+- Fix nsplugins config
+
+* Wed Mar 28 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-24mdv2007.1
++ Revision: 149172
+- Fix kicker default icon
+
+* Tue Mar 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-23mdv2007.1
++ Revision: 149058
+- Fix kdesktop icon order
+
+* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-22mdv2007.1
++ Revision: 148090
+- Fix windows key
+
+* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-21mdv2007.1
++ Revision: 147454
+- Fix konsole default config
+
+* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-20mdv2007.1
++ Revision: 147276
+- don't autostart klipper
+
+* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-19mdv2007.1
++ Revision: 146426
+- Fix selected text color
+
+* Thu Mar 15 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-18mdv2007.1
++ Revision: 144247
+- Fix title text color
+
+* Wed Mar 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-17mdv2007.1
++ Revision: 143441
+- Fix kicker top
+  Fix kdesktop icons order
+
+* Mon Mar 12 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-16mdv2007.1
++ Revision: 141633
+- Update kside top
+
+* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-15mdv2007.1
++ Revision: 140413
+- Add jam search engine
+
+* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-14mdv2007.1
++ Revision: 134313
+- Add specific desktop file
+
+* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-13mdv2007.1
++ Revision: 134007
+- Fix free color
+
+* Mon Mar 05 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-12mdv2007.1
++ Revision: 133018
+- Minor fix
+
+* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-10mdv2007.1
++ Revision: 130993
+- Update preview
+
+* Thu Mar 01 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-9mdv2007.1
++ Revision: 130605
+- Update moodin picture
+
+* Tue Feb 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-8mdv2007.1
++ Revision: 126305
+- Fix kicker config
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-7mdv2007.1
++ Revision: 121648
+- Fix kicker config
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-6mdv2007.1
++ Revision: 121631
+- New kside
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-5mdv2007.1
++ Revision: 121620
+- Fix version
+- Add kicker 16x16 icons
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-4mdv2007.1
++ Revision: 121083
+- Add kside
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-3mdv2007.1
++ Revision: 121080
+- New update
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-2mdv2007.1
++ Revision: 121001
+- Fix icons pos
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-1mdv2007.1
++ Revision: 120949
+- New version
+- New source
+
+* Thu Nov 16 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-29mdv2007.1
++ Revision: 85037
+- Touch default kdmrc to been able to provide userlist
+
+  + Laurent Montel <lmontel@mandriva.com>
+    - New package (2006-09-22 28mdv)
+      Fix kmplayer backend
+    - New package (2006-09-20 27mdv)
+      Fix migrate kdm from 2006 (thanks Pixel)
+    - New package (26mdv 2006-09-19)
+      Only description into menu for one/discovery
+
+* Tue Sep 19 2006 Laurent Montel <lmontel@mandriva.com> 2007-25mdv2007.0
++ Revision: 61919
+- New package( 2006-09-18 25mdv)
+  Fix wav encodage
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-24mdv2007.0
++ Revision: 61581
+- New sound
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-23mdv2007.0
++ Revision: 61570
+- New package (2006-09-15 23mdv)
+  Add new mdk statup function
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-22mdv2007.0
++ Revision: 61542
+- New package (2006-09-15 22mdv)
+  Add default sounds
+
+* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-21mdv2007.0
++ Revision: 61458
+- New package (2006-09-14 21mdv)
+  Use double click
+
+* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-20mdv2007.0
++ Revision: 61419
+- New version
+  Fix kicker right button
+
+* Wed Sep 13 2006 Laurent Montel <lmontel@mandriva.com> 2007-19mdv2007.0
++ Revision: 61072
+- New package (2006-09-12 19mdv)
+  Rename download->free
+  Fix typo
+- Add missing test
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-18mdv2007.0
++ Revision: 60840
+- New package (2006-09-11 18mdv)
+  Workaround for Requires(preun) which doesn't work
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-17mdv2007.0
++ Revision: 60830
+- New package (2006-09-11 16mdv)
+  Fix device on desktop
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-16mdv2007.0
++ Revision: 60764
+- New package (2006-09-11 16mdv)
+  Fix default color, don't display tooltip by default
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-15mdv2007.0
++ Revision: 60757
+- New package (2006-09-11 15mdv)
+  Fix kicker default apps
+
+* Sat Sep 09 2006 Laurent Montel <lmontel@mandriva.com> 2007-14mdv2007.0
++ Revision: 60598
+- New package (2006-09-08 14mdv)
+  Use by default ia_ora-kde theme
+
+* Thu Sep 07 2006 Laurent Montel <lmontel@mandriva.com> 2007-13mdv2007.0
++ Revision: 60211
+- New package (2006/09/06 -13mdv)
+  /var/lib/mandriva now is owned by this package
+  Add requires postun (need to uninstall package)
+
+* Wed Sep 06 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-12mdv2007.0
++ Revision: 60141
+- Added new configuration for kscd
+
+* Wed Sep 06 2006 Laurent Montel <lmontel@mandriva.com> 2007-11mdv2007.0
++ Revision: 60084
+- New package (2006-09-05 2007-10mdv)
+  Now each distro load correct scheme files
+- Fix typo
+
+* Fri Sep 01 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-10mdv2007.0
++ Revision: 59028
+- Xdmcp back to disabled due popular demand.
+- Fixed post update of profile ( Thanks to Nanar )
+
+* Thu Aug 31 2006 Laurent Montel <lmontel@mandriva.com> 2007-9mdv2007.0
++ Revision: 58847
+- Fix kside
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fixed background defaults. Thanks to Laurent Montel
+    - Moved configs for a non versionated directories. Requested by Pixel and Laurent
+    - Fixed the clean generation if /etc/kderc.
+    - Fixed kcookiejar config, which for some reason is making some people getting
+      the cookies ask dialog back
+
+* Tue Aug 29 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-7mdv2007.0
++ Revision: 58364
+- Fix install for directories with space ( Galaxy )
+- Use the right tarball
+- Return to old Galaxy name for ksplash. Keep Mandriva2007 for "in the middel of
+  cooker" upgrade
+- Fixed invalid resources
+- Set 2 desktops for discovery
+
+* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-6mdv2007.0
++ Revision: 57975
+- Moved terminal from rxvt to xterm in failsafe session of kdm. rxvt not support
+  utf-8 and most installations are using this by default
+- Fixed bug http://qa.mandriva.com/show_bug.cgi?id=24690 ( Wrong X path )
+- enabled xdmcp by default. System listen just locally.
+
+* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-5mdv2007.0
++ Revision: 57956
+- Fixed type on ksplash theme rc
+- Fixed kdm postinstall
+
+* Thu Aug 24 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-4mdv2007.0
++ Revision: 57753
+- Fixed updatekdeprofile by Nanar ( thanks )
+- Fixed config paths
+- Fixed upgrade of kdm config
+- Uploaded Mandriva configs for svn on soft
+- Added kside images ( depends on remove switch patch on kdebase )
+- Added new ksplash theme ( will have different color ones ones ? )
+- First fully operational package. Thanks to Nanar for all help
+- import mandriva-kde-config-2007-1mdv2007.0
+
+  + Olivier Thauvin <nanardon@mandriva.org>
+    - preserv order of value
+    - the regexp need an eol marker
+    - no space around the ,
+
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2
new file mode 100644
index 000000000..b58f085ce
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2
new file mode 100644
index 000000000..8bac1f5de
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2
diff --git a/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
new file mode 100644
index 000000000..353759bce
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
@@ -0,0 +1,33 @@
+From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 16 Apr 2010 16:17:04 +0200
+Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument
+
+gdk_window_set_transient_for cannot be used with parent = NULL to
+unset transient hint (unlike gtk_ version which can). Replacement
+code is taken from gtk_window_transient_parent_unrealized
+
+Applied cleanly at least over 0.8.0 and 0.7.6
+
+More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236
+---
+ gtk+-2/pinentry-gtk-2.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
+index 7cd7616..fdd5822 100644
+--- a/gtk+-2/pinentry-gtk-2.c
++++ b/gtk+-2/pinentry-gtk-2.c
+@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
+ {
+   gdk_keyboard_ungrab (gdk_event_get_time (event));
+   /* Unmake window transient for the root window.  */
+-  gdk_window_set_transient_for (win->window, NULL);
++  gdk_property_delete (win->window,
++                       gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
+ }
+ 
+ 
+-- 
+1.6.6.1
+
diff --git a/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch b/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch
new file mode 100644
index 000000000..6162ba583
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch
@@ -0,0 +1,35 @@
+Index: gtk+-2/pinentry-gtk-2.c
+===================================================================
+--- gtk+-2/pinentry-gtk-2.c (revision 228)
++++ gtk+-2/pinentry-gtk-2.c (revision 229)
+@@ -52,6 +52,7 @@
+ #endif
+ 
+ static pinentry_t pinentry;
++static int grab_failed;
+ static int passphrase_ok;
+ typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t;
+ static confirm_value_t confirm_value;
+@@ -135,7 +136,11 @@
+     return;
+ 
+   if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
+-    g_error ("could not grab keyboard");
++    {
++      g_critical ("could not grab keyboard");
++      grab_failed = 1;
++      gtk_main_quit ();
++    }
+ }
+ 
+ 
+@@ -520,7 +525,7 @@
+   while (gtk_events_pending ())
+     gtk_main_iteration ();
+ 
+-  if (confirm_value == CONFIRM_CANCEL)
++  if (confirm_value == CONFIRM_CANCEL || grab_failed)
+     pe->canceled = 1;
+ 
+   pinentry = NULL;
+
diff --git a/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch b/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch
new file mode 100644
index 000000000..86bca6ae9
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch
@@ -0,0 +1,17 @@
+Index: gtk+-2/pinentry-gtk-2.c
+===================================================================
+--- gtk+-2/pinentry-gtk-2.c
++++ gtk+-2/pinentry-gtk-2.c	2010-05-13 08:17:10.000000000 +0200
+@@ -306,8 +306,11 @@
+ 	g_signal_connect (G_OBJECT (win),
+ 			  "realize", G_CALLBACK (make_transient), NULL);
+ 
++      //we need to grab the keyboard when its visible! not when its mapped (there is a difference)
++      g_object_set(G_OBJECT(win), "events", GDK_VISIBILITY_NOTIFY_MASK | GDK_STRUCTURE_MASK, NULL);
++
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "map-event" : "focus-in-event",
++            pinentry->grab ? "visibility-notify-event" : "focus-in-event",
+ 			G_CALLBACK (grab_keyboard), NULL);
+       g_signal_connect (G_OBJECT (win),
+ 			pinentry->grab ? "unmap-event" : "focus-out-event",
diff --git a/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch b/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch
new file mode 100644
index 000000000..81bfa0f3d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch
@@ -0,0 +1,26 @@
+From 0cc3dd71213687ccb5ec0a1866864558bf03260b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 7 May 2010 14:45:44 +0200
+Subject: [PATCH] Fix qt4 pinentry window created in the background
+
+This is probably just a workaround. Proper fix is being investigated.
+---
+ qt4/pinentrydialog.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
+index 8644136..6064ab9 100644
+--- a/qt4/pinentrydialog.cpp
++++ b/qt4/pinentrydialog.cpp
+@@ -63,7 +63,6 @@ void raiseWindow( QWidget* w )
+     SetForegroundWindowEx( w->winId() );
+ #endif
+     w->raise();
+-    w->activateWindow();
+ }
+ 
+ QPixmap icon( QStyle::StandardPixmap which )
+-- 
+1.6.6.1
+
+
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz
new file mode 100644
index 000000000..3e24fda74
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig
new file mode 100644
index 000000000..983b32057
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper b/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper
new file mode 100644
index 000000000..2d63a8744
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 Fedora Project
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+# Anna Bernathova <anicka@novell.com> 2006
+# Pavel Nemec <pnemec@novell.com> 2006
+# Rex Dieter <rdieter@fedoraproject.org> 2009
+#
+# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) 
+
+if [ -z "$PINENTRY_BINARY" ]; then
+
+kde_running=
+if [ -n "$KDE_FULL_SESSION" ]; then
+    kde_running=1
+elif [ -n "$DISPLAY" ]; then
+    xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+    if test $? -eq 0; then
+        kde_running=1
+    fi
+else
+    arg=
+    display=
+    for opt in "$@"; do
+        if [ "$opt" = "--display" ]; then
+            arg=1
+        elif [ -n "$arg" ]; then
+            display="$opt"
+        else
+            arg=
+        fi
+    done
+    if [ -n "$display" ]; then
+        DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+        if test $? -eq 0; then
+            kde_running=1
+        fi
+    fi
+fi
+
+# if KDE is detected and pinentry-qt exists, use pinentry-qt
+if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt4 ]
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
+# otherwise test if pinentry-gtk-2 is installed
+elif [ -x /usr/bin/pinentry-gtk-2 ] 
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
+# otherwise test if pinentry-qt4 is installed
+elif [ -x /usr/bin/pinentry-qt ]
+then
+        export PINENTRY_BINARY="/usr/bin/pinentry-qt"
+# otherwise test if pinentry-qt exists although KDE is not detected
+elif [ -x /usr/bin/pinentry-qt4 ]
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
+# pinentry-curses is installed by default 
+else
+    export PINENTRY_BINARY="/usr/bin/pinentry-curses"
+        
+fi
+fi
+
+exec $PINENTRY_BINARY "$@"
+
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry.spec b/mandriva/2010.2/dependencies/pinentry/pinentry.spec
new file mode 100644
index 000000000..0fff9919d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry.spec
@@ -0,0 +1,310 @@
+Name: pinentry
+Version: 0.8.0
+Release: %mkrel 7
+Summary: Collection of simple PIN or passphrase entry dialogs
+Source0: ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.gz
+Source1: %{SOURCE0}.sig
+Source2: pinentry-wrapper
+Patch0:  0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
+Patch1:  0002-Fix-sigabrt-on-fail-grab-r229.patch
+Patch2:  0003-pinentry-gtk-x11-race.patch  
+Patch3:  0004-Fix-qt4-pinentry-window-created-in-the-background.patch
+License: GPLv2+
+Group: System/Kernel and hardware
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL: http://www.gnupg.org/
+Requires(post): info-install
+Requires(preun):info-install
+BuildRequires: libgtk+2.0-devel
+BuildRequires: libcap-devel
+BuildRequires: ncurses-devel
+BuildRequires: qt4-devel
+BuildRequires: gettext-devel
+Obsoletes:     %name-curses < 0.8.0-2
+
+%description 
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+%pre
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt4 ||:
+
+%files 
+%defattr(-,root,root)
+%doc README TODO ChangeLog NEWS AUTHORS THANKS
+%{_bindir}/pinentry
+%{_bindir}/pinentry-curses
+%{_infodir}/*.info*
+
+#-----------------------------------------------------------------------------------------
+
+%package gtk2
+Summary: GTK+ interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: pinentry-gtk
+
+%description gtk2
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides GTK+ interface of the dialog.
+
+%files gtk2
+%defattr(-,root,root)
+%_bindir/pinentry-gtk-2
+
+#-----------------------------------------------------------------------------------------
+
+%package qt4
+Summary: QT4 interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: %name-qt < 0.7.6-3
+
+%description qt4
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides QT4 interface of the dialog.
+
+%files qt4
+%defattr(-,root,root)
+%{_bindir}/pinentry-qt*
+
+
+#-----------------------------------------------------------------------------------------
+%package qt3
+Summary: QT3 interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name} = %{version}-%{release}
+Provides: %{name}-qt = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildRequires: qt3-devel
+
+%description qt3
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides QT3 interface of the dialog.
+
+%post qt3
+update-alternatives --install /usr/bin/pinentry pinentry /usr/bin/pinentry-qt 1
+ --slave /usr/bin/pinentry-qt pinentry-qt /usr/bin/pinentry-qt
+
+%postun qt3
+if [ "$1" = "0" ]; then
+   update-alternatives --remove pinentry /usr/bin/pinentry-qt3
+fi
+
+%files qt3
+%defattr(-,root,root)
+%{_bindir}/pinentry-qt
+
+#-----------------------------------------------------------------------------------------
+
+%prep
+%setup -q 
+%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p1
+
+%build
+./autogen.sh
+
+%configure2_5x \
+	--disable-pinentry-gtk \
+        --enable-pinentry-qt \
+        --with-qt-dir=%qt3dir \
+	--enable-pinentry-qt4 \
+	--enable-pinentry-gtk2 \
+    --with-qt4-dir=%qt4dir \
+	--disable-rpath
+
+%make
+%install
+rm -rf %{buildroot}
+%makeinstall_std
+
+#Remove link we will use update alternative
+rm -f %{buildroot}%{_bindir}/pinentry
+
+install -p -m755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pinentry 
+
+pushd $RPM_BUILD_ROOT%{_bindir}
+#ln -s pinentry-qt4 pinentry-qt
+popd
+
+%clean
+rm -rf %{buildroot}
+
+
+
+
+%changelog
+* Mon Jul 28 2011 Tim Williams <tim@my-place.org.uk> 0.8.0-7mdv2010.2
++ Rebuild for Trinity repo
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.8.0-6mdv2010.1
++ Restore qt3 package due to KDE3 sanity...
+
+* Thu May 13 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-5mdv2010.1
++ Revision: 544667
+- Add fedora patches fixing segfault in the gtk pinentry
+- Fix pinentry-qt4 showing in background
+
+* Wed Mar 31 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-3mdv2010.1
++ Revision: 530268
+- Add a symlink for pinentry-qt ( Bug #58457 )
+- Remove qt3 support
+
+* Fri Mar 05 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-2mdv2010.1
++ Revision: 514581
+- Use patch from fedora to handle no display settings (Bug #46841 )
+  Add a pinentry-gui provide to qt4 qt and gtk2 subpackages
+
+* Wed Mar 03 2010 Frederik Himpe <fhimpe@mandriva.org> 0.8.0-1mdv2010.1
++ Revision: 513991
+- Update to new version 0.8.0
+- Remove patch to build with QT 4.5: integrated upstream
+
+* Thu Sep 17 2009 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.7.6-3mdv2010.0
++ Revision: 444182
+- Obsolete qt3 packages
+
+* Tue Sep 15 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.6-2mdv2010.0
++ Revision: 443111
+- Make teuf happy. ( And obsoletes pinentry-qt )
+
+* Tue Jul 14 2009 Frederik Himpe <fhimpe@mandriva.org> 0.7.6-1mdv2010.0
++ Revision: 395922
+- Update to new version 0.7.6
+- Remove patches integrated upstream
+- Add moc patch to fix build with QT 4.5
+
+* Thu Mar 26 2009 Frederic Crozat <fcrozat@mandriva.com> 0.7.5-7mdv2009.1
++ Revision: 361357
+- Add missing buildrequires on gettext-devel
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Restore qt3 package due t kde3 insanity...
+    - Fixed last bit of curses fallback on pinentry-qt4 dialog
+    - Make qt4 pinentry dialog automake complaint, avoiding duplicate os secdring code and allowing to fallback on curses
+      if no display is available, like their counterparts.
+
+* Wed Jan 07 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.5-4mdv2009.1
++ Revision: 326682
+- We should made old binary names available in case user decided put the explicit binary name in their gpg.conf,
+  pointing to pinentry-qt and pinentry-gtk instead of have it clean allowing gpg-agent programs like use the
+  standard /usr/bin/pinentry ( which is handled by alternatives in Mandriva ).
+  Since new packages obsolete old ones, is possible to add a slave for the alternatives rule linking old names, solving the upgrade path issue.
+
+* Mon Jan 05 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.5-3mdv2009.1
++ Revision: 325155
+- Rediff gtk transient patch
+- Disable qt3 vuild
+- Added pinentry qt4 from kde playground svn. Dialog ui need some love.
+- Move name gtk to gtk2 and obsolete old pinentry-gtk ( was gtk2 already )
+- qt4 package obsoletes old pinentry-qt
+
+* Mon Jul 07 2008 Oden Eriksson <oeriksson@mandriva.com> 0.7.5-2mdv2009.0
++ Revision: 232371
+- rebuilt against new libcap
+
+* Mon Mar 17 2008 Olivier Blin <oblin@mandriva.com> 0.7.5-1mdv2008.1
++ Revision: 188312
+- do not remove alternatives in postun if the package is not removed
+- move pinentry-curses in a new pinentry-curses package to make
+  pinentry a virtual package (so that qt/gtk versions can be selected
+  when pinentry is required)
+- realize the window as transient if keyboard is grabbed (from upstream SVN)
+- fix keyboard grab (from Gentoo)
+- fix build with latest glib that broke g_malloc API (from upstream ML)
+- restore BuildRoot
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - drop not applied patch
+    - set buildrequires on libcap-devel
+    - new version
+    - new license policy
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Tue Dec 11 2007 Guillaume Rousse <guillomovitch@mandriva.org> 0.7.4-1mdv2008.1
++ Revision: 117509
+- new version
+
+* Mon Sep 10 2007 Per Øyvind Karlsen <peroyvind@mandriva.org> 0.7.3-2mdv2008.0
++ Revision: 84038
+- fix broken info entry (P0, should fix #32534)
+- $QTLIB is already set by /etc/profile.d/qt3.sh, so don't set it in spec
+
+* Thu Jul 26 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 0.7.3-1mdv2008.0
++ Revision: 55628
+- correct configure options
+- nuke rpath
+- update to the latest version
+- Import pinentry
+
+
+
+* Mon Sep 18 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.7.2-6mdv2007.0
+- Rebuild
+
+* Fri Jul 28 2006 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-5
+- Add patch to disable gtk-1.2 support
+
+* Mon Jun 19 2006 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-4
+- Add patch from Rapha�l Gertz to use update-alternative 
+
+* Fri Feb 24 2006 Nicolas L�cureuil <neoclust@mandriva.org> 0.7.2-3mdk
+- Add Requires(post|preun): fix ticket #17416
+- use mkrel
+
+* Sat May 28 2005 Christiaan Welvaart <cjw@daneel.dyndns.org> 0.7.2-2mdk
+- add BuildRequires: libgtk+2.0-devel
+
+* Tue May 17 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-1mdk
+- 0.7.2
+
+* Mon Mar 14 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.7.1-4mdk
+- fix build on lib64 platforms
+
+* Tue Mar 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.7.1-3mdk
+- Rebuild
+
+* Sat Jun 19 2004 Abel Cheung <deaddog@deaddog.org> 0.7.1-2mdk
+- Rebuild with new gcc
+
+* Thu May 20 2004 Abel Cheung <deaddog@deaddog.org> 0.7.1-1mdk
+- New version
+- Don't build against libcap
+
+* Sat Jan 24 2004 Abel Cheung <deaddog@deaddog.org> 0.7.0-1mdk
+- New version
+- Enable all interfaces
+
+* Fri Nov 14 2003 Florin <florin@mandrakesoft.com> 0.6.9-2mdk
+- rebuild
+
+* Wed Apr 30 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.9-1mdk
+- Update version
+
+* Tue Feb 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.8-1mdk
+- Update and fix spec file thanks to <fabrice-marie-sec@ifrance.com>
+
+* Tue Jan 28 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.6-2mdk
+- Fix link as report Jason Straight <jason@JeetKuneDoMaster.net>
+
+* Wed Dec 11 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.6-1mdk
+- update spec file from Fabrice MARIE <fabrice-marie-sec@ifrance.com>
+
+* Sat Oct 19 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.5-1mdk
+- Initial package
diff --git a/mandriva/2010.2/dependencies/resmgr/desktopdev b/mandriva/2010.2/dependencies/resmgr/desktopdev
new file mode 100644
index 000000000..3a66e2cf8
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/desktopdev
@@ -0,0 +1,17 @@
+#!/bin/bash
+# This adds a USB device to the "desktop usb" group.
+# You just need to create an entry "desktopdev ..." in a usermap file
+# and it will be picked up automatically.
+
+# Mandriva uses udev, you don't have to create a usermap
+# If you want this script to be called, you have to create an udev
+# rule in /etc/udev/rules.d/ that starts it, using
+# RUN+="/etc/udev/agents.d/usb/desktopdev"
+
+if [ -x /sbin/resmgr ]; then
+	if [ "${ACTION}" = "add" ]; then
+		/sbin/resmgr ${ACTION} ${DEVICE} desktop usb && exit 0
+	else
+		/sbin/resmgr ${ACTION} ${DEVICE} desktop && exit 0
+	fi
+fi
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch
new file mode 100644
index 000000000..5ad0a4971
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch
@@ -0,0 +1,10 @@
+--- resmgr-1.0/pam_resmgr.c   2003-03-05 14:32:19.000000000 +0100
++++ resmgr-1.0.patched/pam_resmgr.c 2006-07-26 02:22:59.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <ctype.h>
++#include <syslog.h>
+ 
+ #include <security/pam_modules.h>
+ #include "protocol.h"
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2
new file mode 100644
index 000000000..a064ace5d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff
new file mode 100644
index 000000000..96bb34c2b
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff
@@ -0,0 +1,10 @@
+--- class.c	2002-11-11 05:31:46.000000000 -0500
++++ class.c.oden	2008-07-18 07:26:19.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include "resmgrd.h"
+ 
+ res_class_t *		res_classes;
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff
new file mode 100644
index 000000000..6cf062d51
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff
@@ -0,0 +1,33 @@
+--- Makefile	2003-04-10 10:21:01.000000000 +0200
++++ Makefile.oden	2008-07-18 21:41:19.000000000 +0200
+@@ -23,6 +23,8 @@
+ LIBBASE	= libresmgr.so
+ LIB	= $(LIBBASE).$(VERSION)
+ LIBOBJS	= $(addprefix .lobjs/,conn.o client.o glob.o)
++LDFLAGS	= 
++PAMLIBS	= -lpam
+ 
+ ALL	= $(SRV) $(CLT) $(LIB) $(PAM) tester
+ 
+@@ -46,17 +48,17 @@
+ 	rm -rf $(ALL) $(LIBBASE) .objs .lobjs
+ 
+ $(SRV):	$(SRVOBJS) $(LIB)
+-	$(CC) -o $@ $(SRVOBJS) -L. -lresmgr
++	$(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr
+ 
+ $(CLT):	$(CLTOBJS) $(LIB)
+-	$(CC) -o $@ $(CLTOBJS) -L. -lresmgr
++	$(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr
+ 
+ $(LIB): $(LIBOBJS)
+-	$(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS)
++	$(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS) 
+ 	ln -sf $(LIB) $(LIBBASE)
+ 
+ $(PAM): $(PAMOBJS) $(LIB)
+-	$(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr
++	$(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr 
+ 
+ tester: .objs/tester.o $(LIB)
+ 	$(CC) -o $@ .objs/tester.o -L. -lresmgr
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff
new file mode 100644
index 000000000..8f409cf39
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff
@@ -0,0 +1,23 @@
+--- Makefile	2008-07-18 21:48:27.000000000 +0200
++++ Makefile.oden	2008-07-18 21:49:27.000000000 +0200
+@@ -33,15 +33,15 @@
+ install: $(ALL)
+ 	mkdir -p $(SBINDIR) $(LIBDIR) $(MANDIR)/man{1,3,5,8} \
+ 		$(ETCDIR) $(PAMDIR) $(INCDIR)
+-	install -m 555 $(LIB) $(LIBDIR)
+-	install -m 555 $(PAM) $(PAMDIR)
++	install -m 755 $(LIB) $(LIBDIR)
++	install -m 755 $(PAM) $(PAMDIR)
+ 	if [ ! -f $(ETCDIR)/resmgr.conf ]; then \
+ 		install -m 644 etc/resmgr.conf $(ETCDIR); \
+ 	fi
+-	install -m 444 resmgr.h $(INCDIR)
+-	install -m 555 -s $(CLT) $(SRV) $(SBINDIR)
++	install -m 644 resmgr.h $(INCDIR)
++	install -m 755 -s $(CLT) $(SRV) $(SBINDIR)
+ 	for x in 1 3 5 8; do \
+-		install -m 444 doc/*.$$x $(MANDIR)/man$$x; \
++		install -m 644 doc/*.$$x $(MANDIR)/man$$x; \
+ 	done
+ 
+ clean distclean:
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch
new file mode 100644
index 000000000..4c45e8b86
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch
@@ -0,0 +1,12 @@
+diff -ur resmgr-1.0.orig/utils.c resmgr-1.0/utils.c
+--- resmgr-1.0.orig/utils.c	2003-03-05 14:32:19.000000000 +0100
++++ resmgr-1.0/utils.c	2005-03-16 11:47:58.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	sprintf(buffer, "%03d ", code);
+ 	n = strlen(buffer);
+ 	vsnprintf(buffer+n, sizeof(buffer)-n, fmt, ap);
+-	vlog(LOG_INFO, "%s", buffer);
++	def_log("%s", buffer);
+ 	va_end(ap);
+ }
+ 
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.conf b/mandriva/2010.2/dependencies/resmgr/resmgr.conf
new file mode 100644
index 000000000..a6294c709
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.conf
@@ -0,0 +1,69 @@
+# This is the default set of devices people logged in on the desktop get
+# access to:
+class desktop
+#
+# Standard multimedia devices
+add /dev/audio		desktop
+add /dev/mixer		desktop
+add /dev/dsp		desktop
+add /dev/sequencer	desktop
+add /dev/video		desktop
+#
+# Modem device
+add /dev/modem         desktop
+#
+# CD-ROMs - giving permission to open the corresponding SCSI
+# device is highly useful for CD writers such as cdrecord.
+add /dev/cdrom		desktop scsi paride
+add /dev/cdrom1		desktop scsi paride
+add /dev/cdrecorder	desktop scsi
+add /dev/dvd		desktop scsi paride
+add /dev/dvd1		desktop scsi paride
+add /dev/sr0		desktop scsi
+add /dev/sr1		desktop scsi
+add /dev/sr2		desktop scsi
+add /dev/sr3		desktop scsi
+#
+# Dito for SCSI scanners, which all use /dev/scanner symlink.
+add /dev/scanner	desktop scsi
+#
+# And USB scanners.
+add /dev/usbscanner    desktop
+add /dev/usb/scanner   desktop
+add /dev/usb/scanner0  desktop
+add /dev/usb/scanner1  desktop
+add /dev/usb/scanner2  desktop
+add /dev/usb/scanner3  desktop
+add /dev/usb/scanner4  desktop
+add /dev/usb/scanner5  desktop
+add /dev/usb/scanner6  desktop
+add /dev/usb/scanner7  desktop
+#
+# make /dev/console accessible read-only
+add /dev/console   desktop read-only
+
+#
+# This rule grants access to users logged in locally
+#
+allow desktop          tty=/dev/tty[1-9]* || tty=tty[1-9]* || tty=:0
+
+# For serial gphoto cameras.
+# add /dev/ttyS0 desktop
+# add /dev/ttyS1 desktop
+#
+# Sample rules, do not enable by default:
+#
+# This rule denies access to users uucp and news
+#
+# deny  desktop		user=uucp || user=news
+#
+# This rule gives access to all members of group wheel
+#
+# allow	desktop		group=wheel
+# 
+# To make resmgr work with ssh, for instance, add the following
+# line to /etc/pam.d/ssh:
+# 	session    optional   pam_resmgr.so fake_ttyname
+# When a user logs in, a resmgr session will be opened, and
+# access will be granted automaticially to all resource classes
+# matched via access control statements in resmgr.conf.
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.init b/mandriva/2010.2/dependencies/resmgr/resmgr.init
new file mode 100644
index 000000000..815931a09
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.init
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# chkconfig: 2345 15 15
+# description: The resource manager is a framework to give user applications
+# access to certain device files. The resource manager daemon can be configured
+# to give certain users access to different resource classes.
+# processname: resmgr
+# pidfile: /var/run/resmgr.pid
+#
+### BEGIN INIT INFO
+# Provides: resmgr
+# Default-Start: 2 3 4 5
+# Short-Description:  A program to allow arbitrary access to device files
+# Description: The resource manager is a framework to give user applications \
+# access to certain device files. The resource manager daemon can be configured \
+# to give certain users access to different resource classes.
+### END INIT INFO
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+RESMGR_BIN=/sbin/resmgrd
+
+case "$1" in
+    start)
+    	gprintf "Starting resource manager services: "
+      daemon $RESMGR_BIN
+      RETVAL=$?
+      echo
+      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/resmgr
+      ;;
+    stop)
+      gprintf "Shutting down resmgr services: "
+      killproc resmgr
+      RETVAL=$?
+
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/resmgr
+	;;
+  restart|reload)
+	$0 stop
+	$0 start
+	RETVAL=$?
+	;;
+  status)
+	status resmgr
+	RETVAL=$?
+	;;
+  *)
+	gprintf "Usage: resmgr {start|stop|status|restart|reload}\n"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.spec b/mandriva/2010.2/dependencies/resmgr/resmgr.spec
new file mode 100644
index 000000000..a657321dc
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.spec
@@ -0,0 +1,212 @@
+%define	major 1
+%define	libname %mklibname %{name} %{major}
+%define develname %mklibname %{name} -d
+
+Summary:	A program to allow arbitrary access to device files
+Name:		resmgr
+Version:	1.0
+Release:	%mkrel 14
+License:	GPLv2
+Group:		System/Servers
+URL: 		http://www.lst.de/~okir/resmgr/
+Source:		ftp://ftp.lst.de/pub/people/okir/%{name}/%{name}-%{version}.tar.bz2
+Source1:	resmgr.init
+Source2:	resmgr.conf
+Source3:	desktopdev
+Patch0: 	resmgr-1.0-syslog.patch 
+Patch1: 	resmgr-va_list.patch
+Patch2: 	resmgr-glibc28.diff
+Patch3: 	resmgr-linkage_fix.diff
+Patch4: 	resmgr-permission_fix.diff
+Requires(post): rpm-helper
+Requires(preun): rpm-helper
+BuildRequires:	pam-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%package -n	%{libname}
+Summary:	Shared libraries for %{name}
+Group:		System/Libraries
+
+%description -n	%{libname}
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%package -n	%{develname}
+Summary:	Development headers and libraries for %{name}
+Group:		Development/C
+Requires:	%{libname} = %{version}
+Provides:	lib%{name}-devel = %{version}-%{release}
+Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%{mklibname resmgr 1 -d}
+
+%description -n	%{develname}
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%prep
+
+%setup -q
+%patch0 -p1 -b .syslog
+%patch1 -p1 -b .va_list
+%patch2 -p0 -b .glibc28
+%patch3 -p0 -b .linkage_fix
+%patch4 -p0 -b .permission_fix
+
+%build
+%make CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{ldflags}"
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall_std LIBDIR=%{buildroot}/%{_lib} PAMDIR=%{buildroot}/%{_lib}/security
+
+ln -sf libresmgr.so.* %{buildroot}/%{_lib}/libresmgr.so
+install -m755 %{SOURCE1} -D %{buildroot}%{_initrddir}/%{name}
+mkdir -p %{buildroot}/usr/sbin/
+ln -s ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
+# install config file
+install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.conf
+install -c -m755 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/udev/agents.d/usb/desktopdev
+
+%post
+%_post_service %{name}
+
+%preun
+%_preun_service %{name}
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc README TODO ANNOUNCE
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%{_initrddir}/%{name}
+%{_sysconfdir}/udev/agents.d/usb/desktopdev
+%{_sbindir}/rc%{name}
+/sbin/%{name}
+/sbin/%{name}d
+%{_mandir}/man*/*
+
+%files -n %{libname}
+%defattr(-,root,root)
+/%{_lib}/*.so.*
+/%{_lib}/security/*
+
+%files -n %{develname}
+%defattr(-,root,root)
+/%{_lib}/*.so
+%{_includedir}/%{name}.h
+
+
+%changelog
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.0-14mdv2010.2
++ Rebuild for Trinity
+
+* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 1.0-13mdv2010.0
++ Revision: 426907
+- rebuild
+
+* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-12mdv2009.1
++ Revision: 317576
+- use %%ldflags
+
+* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-11mdv2009.0
++ Revision: 238350
+- fix linkage
+- fix errors in the init script
+- fix permissions (for strip + debug packaging)
+
+* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-10mdv2009.0
++ Revision: 238102
+- added P1 from pld
+- fix build, P2 + -D_GNU_SOURCE
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - rebuild
+
+  + Pixel <pixel@mandriva.com>
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Wed Mar 05 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-8mdv2008.1
++ Revision: 179431
+- rebuild
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Wed Aug 01 2007 Adam Williamson <awilliamson@mandriva.org> 1.0-7mdv2008.0
++ Revision: 57363
+- rebuild for 2008
+- new devel policy
+- spec clean
+
+
+* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-31 20:51:47 (42877)
+- Increase release number
+
+* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-31 20:50:48 (42876)
+- Fix for http://qa.mandriva.com/show_bug.cgi?id=23968 ( wrong init services )
+
+* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-26 03:39:04 (42167)
+- Moved to subversion
+- Added patch from Jan Ciger to fix syslog defines
+
+* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-26 03:11:36 (42165)
+- import resmgr-1.0-4mdk
+
+* Wed Jan 18 2006 Olivier Blin <oblin@mandriva.com> 1.0-4mdk
+- fix pam files installation on x86_64
+- buildrequire pam-devel
+- drop hotplug requirement
+
+* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 1.0-3mdk
+- move hotplug script to in udev agents.d directory
+- update Source4 to explain how it should be handled with udev
+
+* Sun Jun 12 2005 Per �yvind Karlsen <pkarlsen@mandriva.com> 1.0-2mdk
+- rebuild
+- fix requires
+- do not mark init file as config file
+- %%{1}mdv2007.0
+
+* Fri May 21 2004 Per �yvind Karlsen <peroyvind@linux-mandrake.com> 1.0-1mdk
+- initial mdk release (based on suse package)
+
diff --git a/mandriva/2010.2/kdebase/detect-media-types.patch b/mandriva/2010.2/kdebase/detect-media-types.patch
new file mode 100644
index 000000000..85c1c771b
--- /dev/null
+++ b/mandriva/2010.2/kdebase/detect-media-types.patch
@@ -0,0 +1,33 @@
+--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig	2011-02-04 15:59:27.725473830 +0000
++++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp	2011-02-04 16:00:30.800473078 +0000
+@@ -17,7 +17,6 @@
+ */
+ 
+ #include "halbackend.h"
+-#include "linuxcdpolling.h"
+ 
+ #include <stdlib.h>
+ #include <locale.h>
+@@ -586,19 +585,12 @@
+         medium->setIconName(TQString::null);
+ 
+         /* check if the disc id a vcd or a video dvd */
+-        DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
+-        switch (type)
+-        {
+-        case DiscType::VCD:
++        if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
+             mimeType = "media/vcd";
+-            break;
+-        case DiscType::SVCD:
++        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
+             mimeType = "media/svcd";
+-            break;
+-        case DiscType::DVD:
++        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
+             mimeType = "media/dvdvideo";
+-            break;
+-        }
+     }
+     else
+     {
diff --git a/mandriva/2010.2/kdebase/fix_openssl.patch b/mandriva/2010.2/kdebase/fix_openssl.patch
new file mode 100644
index 000000000..373a39b4b
--- /dev/null
+++ b/mandriva/2010.2/kdebase/fix_openssl.patch
@@ -0,0 +1,30 @@
+diff -Naur kdebase-3.5.10/kcontrol/crypto/crypto.cpp kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp
+--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2006-10-01 20:31:49.000000000 +0300
++++ kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp	2010-05-05 08:27:59.323611142 +0300
+@@ -2321,7 +2321,7 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-SSL_METHOD *meth;
++SSL_METHOD const *meth;
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2337,7 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    SSL_CIPHER const *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2365,7 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    SSL_CIPHER const *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
diff --git a/mandriva/2010.2/kdebase/kde3-kdebase.spec b/mandriva/2010.2/kdebase/kde3-kdebase.spec
new file mode 100644
index 000000000..c32420e11
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kde3-kdebase.spec
@@ -0,0 +1,2445 @@
+%define _requires_exceptions devel\(linux-gate\)\\|perl\(open\)
+
+%define support_ldap 1
+
+%define compile_apidox 0
+%{?_no_apidox: %{expand: %%global compile_apidox 0}}
+
+%define compile_smb 1
+%{?_no_smb: %{expand: %%global compile_smb 0}}
+
+%define use_kickoff_menu 1
+%{?_disable_kickoff_menu: %{expand: %%global use_kickoff_menu 0}}
+
+%define lib_name_orig libkdebase
+%define lib_major 4
+%define lib_name %mklibname kde3base %lib_major
+%define lib_name_fixed %mklibname kdebase %lib_major
+%define epoch_kdelibs 30000000
+%define epoch_arts 30000001
+
+%define lib_name_orig_kttsd %mklibname kttsd
+%define lib_major_kttsd 0
+%define lib_name_kttsd %lib_name_orig_kttsd%lib_major_kttsd
+
+%define oname kdebase
+%define rname kdebase3
+
+Name: kde3-kdebase
+Summary: K Desktop Environment - Core files
+Version: 3.5.12
+Release: %mkrel 6
+Epoch: 1
+Group: Graphical desktop/KDE3
+License:	GPL
+URL: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
+Source1: mandriva-profile-chooser-2.0.tar.bz2
+Source2: kdm-migrate.pl
+Source3: mandriva-startkde
+Source4: kdebase-3.5-kde.pam
+Source5: kdebase-3.5-kde3-np
+Source8: kdebase-3.5-wizard_small.png
+Source9: kdebase-konsole-fixed-font.conf
+Source10: kdeeject
+Source11: net_applet.desktop
+Source12: xsettings-kde.desktop
+Source13: mandriva-mdvonline.desktop
+Source14: mandriva-gurpmi.desktop
+Source15: x-urpmi.desktop
+Source16: x-urpmi-media.desktop
+Source100: kickoff-mandriva-data.tar.bz2 
+#Source200: kdebase-3.5.12-configure
+
+###             ###
+### Patch party ###
+###             ###
+# Please keep it this section organised
+Patch1: kdebase-kscreensaver-pamd.patch
+Patch2:	kdebase-3.5.3-fix-media-fuser.patch
+Patch3:	kdebase-3.4.0-fix-scrnsaver.patch
+Patch4:	kdebase-3.5.10-fix-vibrate-dialog.patch
+Patch7: kdebase-3.3.2-fix-kdm-theme-mdk.patch
+Patch8: kdebase-3.4.2-fix-kdm-server-args.patch
+Patch9: kdebase-3.5.3-logout-without-confirmation.patch
+Patch20: kdebase-3.5.7-clock-drakclock.patch
+# LZMA support
+Patch21: kdebase-3.5.7-lzma_support.patch 
+# GTK ia_ora settings fix
+Patch22: kdebase-3.5.4-fix-gtk-style.patch
+Patch24: kdebase-3.5.7-kdesktop_firstrun.patch
+Patch26: kdebase-3.5.7-translation-override.patch
+# fix firstboot focusing
+Patch27: kdebase-3.4.2-mdkft.patch
+Patch28: kdebase-3.5.7-khelpcenter-htdigsearch-path.patch
+Patch35: kdebase-post-3.5.8-add-change-session-icon.patch
+Patch37: kdebase-post-3.5.9-screensaver-onlyshowin-kde.patch
+Patch39: kdebase-post-3.5.9-Fix-kcontrol-menu-entry.patch
+Patch41: kdebase-3.5.12-kdm-kcontrol-usericon.patch
+Patch42: kdebase-post-3.5.9-bookmark-global-copy.patch
+Patch43: kdebase-3.5.9-update-usb.ids.patch
+Patch44: kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch
+Patch60: khotkeys-only_kde.patch
+################################################
+#Patches from Pardus Linux
+Patch104: detect-media-types.patch
+Patch111: mediamanager-mount-point-utf8.diff
+Patch112: media_saferemove.patch
+Patch113: turkish-preview.patch
+################################################
+Patch120: fix_openssl.patch
+Patch130: kdebase-3.5.12-config.patch
+Patch131: kde-3.5.10-acinclude.patch
+Patch132: kdebase-3.5.12-move-xdg-menu-dir.patch
+Patch133: kdebase-3.5.12-startkde.patch
+Patch134: kdebase-3.5.12-menus.patch
+Patch135: kdebase-3.5.12-fix-kcontrol-menu.patch
+
+BuildRequires: kdelibs3-devel >= %epoch_kdelibs:3.5.5
+BuildRequires: fontconfig-devel >= 2.1-9mdk
+BuildRequires: mkfontdir
+BuildRequires: mkfontscale
+BuildRequires: pam-devel
+BuildRequires: freetype2-devel
+BuildRequires: libsasl-devel
+BuildRequires: openldap-devel
+BuildRequires: avahi-compat-libdns_sd-devel 
+BuildRequires: avahi-client-devel
+BuildRequires: libsmbclient-devel > 3.0
+BuildRequires: libieee1284-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: hal-devel 
+BuildRequires: libdbus-qt-1-devel
+BuildRequires: libusb-devel
+BuildRequires: libxml2-utils
+BuildRequires: X11-devel
+BuildRequires: mesaglut-devel
+BuildRequires: bdftopcf
+BuildRequires: imake
+BuildRequires: automake >= 1.6.1
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: libraw1394-devel
+BuildRequires: qt3-doc
+BuildRequires: lua-devel
+BuildRequires: resmgr-devel
+BuildRequires: xinitrc
+BuildRequires: lm_sensors-devel >  2.10
+BuildRequires: liblazy-devel >= 0.2
+BuildRequires: libbeagle-devel >= 0.3.0
+%if %use_kickoff_menu
+BuildConflicts: lm_utils
+BuildConflicts: lm_utils-devel
+BuildConflicts: liblm_sensors1
+BuildConflicts: liblm_sensors1-devel
+%endif
+Suggests: %name-progs
+Suggests: %name-konsole
+Suggests: %name-kdeprintfax
+Suggests: %name-kate
+Suggests: %name-kmenuedit
+Suggests: %name-ksysguard
+Conflicts: kdebase <= 3.1.94-13mdk
+Provides: %oname = %{epoch}:%{version}-%{release}
+Provides: %rname = %{epoch}:%{version}-%{release}
+BuildRoot: %_tmppath/%name-%version-%release-root
+
+%description
+Core applications for the K Desktop Environment.
+Here is an overview of the directories:
+
+	- drkonqi: if ever an app crashes (heaven forbid!) then Dr.Konqi will be so
+          kind and make a stack trace. This is a great help for the
+          developers to fix the bug.
+	- kappfinder: searches your hard disk for non-KDE applications, e.g. Acrobat
+             Reader (tm) and installs those apps under the K start button
+	- kate: a fast and advanced text editor with nice plugins
+	- kcheckpass: small program to enter and check passwords, only to be used by
+             other programs
+	- kcontrol: the KDE Control Center allows you to tweak the KDE settings
+	- kdcop: GUI app to browse for DCOP interfaces, can also execute them
+	- kdebugdialog: allows you to specify which debug messages you want to see
+	- kdeprint: the KDE printing system
+	- kdesktop: you guessed it: the desktop above the panel
+	- kdesu: a graphical front end to "su"
+	- kdm: replacement for XDM, for those people that like graphical logins
+	- kfind: find files
+	- khelpcenter: the app to read all great documentation about KDE
+	- khotkeys: intercepts keys and can call applications
+	- kicker: the panel at the botton with the K start button and the 
+				taskbar etc
+	- kioslave: infrastructure that helps make every application internet 
+				enabled e.g. to directly save a 
+				file to ftp://place.org/dir/file.txt
+	- klipper: enhances and extenses the X clipboard
+	- kmenuedit: edit for the menu below the K start button
+	- konqueror: the file manager and web browser you get easily used to
+	- kpager: applet to show the contents of the virtual desktops
+	- kpersonalizer: the customization wizard you get when you first start KDE
+	- kreadconfig: a tool for shell scripts to get info from KDE's config files
+	- kscreensaver: the KDE screensaver environment and lot's of savers
+	- ksmserver: the KDE session manager (saves program status on login, 
+				restarts those program at the next login)
+	- ksplash: the screen displayed while KDE starts
+	- kstart: to launch applications with special window properties
+         such as iconified etc
+	- ksysguard: task manager and system monitor, even for remote systems
+	- ksystraycmd: allows to run any application in the system tray
+	- ktip: gives you tips how to use KDE
+	- kwin: the KDE window manager
+	- kxkb: a keyboard map tool
+	- legacyimport: odd name for a cute program to load GTK themes
+	- libkonq: some libraries needed by Konqueror
+	- nsplugins: together with OSF/Motif or Lesstif allows you to use Netscape
+			(tm) plugins in Konqueror
+
+%files
+%doc README
+
+#-----------------------------------------------------------------------------
+
+%package progs
+Summary: K Desktop Environment - Core files
+Group: Development/KDE and Qt
+Obsoletes: kfontinst < 1:3.5.9
+Obsoletes: kio_fish < 1:3.5.9
+Provides: kfontinst3
+Provides: kde3-kfontinst 
+Provides: kio_fish3 
+Provides: kde3-kio_fish
+Provides: %oname-progs = %{epoch}:%{version}-%{release}
+Provides: %rname-progs = %{epoch}:%{version}-%{release}
+Obsoletes:       %rname-common
+Obsoletes:       %oname-common
+Requires(post):  desktop-file-utils
+Requires(postun):desktop-file-utils
+Requires: 	 ksplash-engine-moodin
+# We use an external krandr
+Requires: krandr
+# For kio-fish MDK bug#16934
+Requires: openssh-clients
+Requires: xinit
+Requires: iceauth
+Requires: xkbcomp
+Requires: xsetroot
+Requires: xset
+Requires: setxkbmap
+Requires: xmessage
+Requires: htdig
+Requires: xprop
+Obsoletes: kdebase <= 3.1-83mdk
+Obsoletes: kdebase3 <= 1:3.5.9
+Obsoletes: mandrake-menu-directory 
+Provides: kdebase3 = %{epoch}:%{version}-%{release}
+Obsoletes: %rname-common
+Obsoletes: %oname-common
+Conflicts: kdebase-common <= 3.2.3-97mdk
+Conflicts: kdebase3-common < 1:3.5.9.mdv
+Conflicts: kdeutils-kdepasswd <= 3.2.3-100mdk
+Conflicts: mandrakelinux-kde-config-file <= 10.1-6mdk
+Conflicts: kdeutils =< 2.2.2-28mdk  
+Conflicts: kdebase <= 3.1-84mdk
+Conflicts: galaxy-kde < 0.9.5-1mdk
+Conflicts: galaxy-kde-kwin < 0.9.5-1mdk
+Requires(pre):	kdelibs3 >= %{epoch_kdelibs}:3.3.2-6mdk
+Requires: arts3 >= %{epoch_arts}:1.1.2-2mdk
+Requires: %lib_name = %{epoch}:%{version}-%{release}
+Requires: kde-config-file >= 10.2-2mdk
+#Requires: mdklaunchhelp >= 9.1
+Requires: kdebase-servicemenu
+Requires: initscripts >= 7.04-3mdk 
+Requires: desktop-common-data
+Requires: indexhtml >= 9.0-2mdk
+Requires: libsmbclient
+Requires: %name-common = %{epoch}:%{version}-%{release}
+Requires: qt >= 3.3.6-1mdk
+Requires: kdelibs3-common >= 3.3.2-54mdk
+Requires: sasl-plug-plain
+Requires: %name-ksysguard
+
+%description progs
+Core applications for the K Desktop Environment.
+Here is an overview of the directories:
+
+	- drkonqi: if ever an app crashes (heaven forbid!) then Dr.Konqi will be so
+          kind and make a stack trace. This is a great help for the
+          developers to fix the bug.
+	- kappfinder: searches your hard disk for non-KDE applications, e.g. Acrobat
+             Reader (tm) and installs those apps under the K start button
+	- kate: a fast and advanced text editor with nice plugins
+	- kcheckpass: small program to enter and check passwords, only to be used by
+             other programs
+	- kcontrol: the KDE Control Center allows you to tweak the KDE settings
+	- kdcop: GUI app to browse for DCOP interfaces, can also execute them
+	- kdebugdialog: allows you to specify which debug messages you want to see
+	- kdeprint: the KDE printing system
+	- kdesktop: you guessed it: the desktop above the panel
+	- kdesu: a graphical front end to "su"
+	- kdm: replacement for XDM, for those people that like graphical logins
+	- kfind: find files
+	- khelpcenter: the app to read all great documentation about KDE
+	- khotkeys: intercepts keys and can call applications
+	- kicker: the panel at the botton with the K start button and the 
+				taskbar etc
+	- kioslave: infrastructure that helps make every application internet 
+				enabled e.g. to directly save a 
+				file to ftp://place.org/dir/file.txt
+	- klipper: enhances and extenses the X clipboard
+	- kmenuedit: edit for the menu below the K start button
+	- konqueror: the file manager and web browser you get easily used to
+	- kpager: applet to show the contents of the virtual desktops
+	- kpersonalizer: the customization wizard you get when you first start KDE
+	- kreadconfig: a tool for shell scripts to get info from KDE's config files
+	- kscreensaver: the KDE screensaver environment and lot's of savers
+	- ksmserver: the KDE session manager (saves program status on login, 
+				restarts those program at the next login)
+	- ksplash: the screen displayed while KDE starts
+	- kstart: to launch applications with special window properties
+         such as iconified etc
+	- ksystraycmd: allows to run any application in the system tray
+	- ktip: gives you tips how to use KDE
+	- kwin: the KDE window manager
+	- kxkb: a keyboard map tool
+	- legacyimport: odd name for a cute program to load GTK themes
+	- libkonq: some libraries needed by Konqueror
+	- nsplugins: together with OSF/Motif or Lesstif allows you to use Netscape
+			(tm) plugins in Konqueror
+
+%post progs
+%make_session
+
+%postun progs
+%make_session
+
+%files progs
+%defattr(-,root,root)
+%_sysconfdir/X11/wmsession.d/*KDE3
+%_kde3_bindir/kde3
+%_kde3_bindir/kfontinst
+%_kde3_bindir/khc_indexbuilder
+%_kde3_bindir/kwin_killer_helper
+%_kde3_bindir/kwriteconfig
+%_kde3_bindir/kinfocenter
+%_kde3_bindir/klocaldomainurifilterhelper
+%_kde3_bindir/appletproxy
+%_kde3_bindir/drkonqi
+%_kde3_bindir/kdialog
+%_kde3_bindir/extensionproxy
+%_kde3_bindir/kdm-migrate.pl
+%_kde3_bindir/kaccess
+%_kde3_bindir/kappfinder
+%attr(4755,root,root) %_kde3_bindir/kcheckpass
+%_kde3_bindir/kcminit
+%_kde3_bindir/kcontrol
+%_kde3_bindir/kwin_rules_dialog
+%_kde3_bindir/kcontroledit
+%_kde3_bindir/kdeinstallktheme
+%_kde3_bindir/kdepasswd
+%_kde3_bindir/kfontview
+%dir %_kde3_appsdir/kfontview/
+%_kde3_appsdir/kfontview/kfontviewpart.rc
+%_kde3_appsdir/kfontview/kfontviewui.rc
+%dir %_kde3_appsdir/remoteview/
+%_kde3_appsdir/remoteview/smb-network.desktop
+%_kde3_bindir/kdcop
+%_kde3_bindir/kdebugdialog
+%_kde3_bindir/kdeeject
+%_kde3_bindir/kdesktop
+%_kde3_bindir/kfind
+%_kde3_bindir/ksystraycmd
+%_kde3_bindir/kdesktop_lock
+%_kde3_bindir/kdesu
+%attr(2755,root,nogroup) %_kde3_bindir/kdesud
+%_kde3_bindir/keditbookmarks
+%_kde3_bindir/keditfiletype
+%_kde3_bindir/kfmclient
+%_kde3_bindir/khelpcenter
+%_kde3_bindir/khotkeys
+%_kde3_bindir/kicker
+%_kde3_bindir/kjobviewer
+%_kde3_bindir/klipper
+%_kde3_bindir/konqueror
+%_kde3_bindir/kpager
+%_kde3_bindir/kpersonalizer
+%_kde3_bindir/kprinter 
+%_kde3_bindir/krdb
+%_kde3_bindir/kreadconfig
+%_kde3_bindir/ksmserver
+%_kde3_bindir/ksplash
+%_kde3_bindir/kstart
+%_kde3_bindir/ktip
+%_kde3_bindir/kwebdesktop
+%_kde3_bindir/kwin
+%_kde3_bindir/kwrite
+%_kde3_bindir/kxkb
+%_kde3_bindir/startkde*
+
+%_kde3_bindir/kpm
+%_kde3_bindir/lpr-kprinter
+%_kde3_bindir/qtcups
+#
+#
+#
+# David - 3.0-0.beta1.8mdk - Screensavers
+#                            Please not included those which can have legal
+#                            issue (kmatrix is a good example)
+%_kde3_bindir/kblankscrn.kss
+%_kde3_bindir/krandom.kss
+%_kde3_bindir/kapplymousetheme
+#_kde3_bindir/kio_system_documenthelper
+%_kde3_bindir/kcminit_startup
+
+#-----------------------------------------------------------------------------
+
+%package ksysguard
+Summary: Ksysguard
+Group: Graphical desktop/KDE3
+Provides: %oname-ksysguard = %{epoch}:%{version}-%{release}
+Provides: %rname-ksysguard = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-ksysguard
+Obsoletes: %rname-ksysguard
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+%description ksysguard
+KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+be installed on a remote machine to enable ksysguard on another machine
+to monitor it through the daemon running there.
+
+%files ksysguard
+%defattr(-,root,root)
+%_kde3_bindir/ksysguardd
+%_kde3_bindir/ksysguard
+%dir %_kde3_appsdir/ksysguard/
+%_kde3_appsdir/ksysguard/*
+%_kde3_datadir/applications/kde/ksysguard.desktop
+%doc %_kde3_docdir/HTML/en/ksysguard
+%exclude %_sysconfdir/ksysguarddrc
+
+#-----------------------------------------------------------------------------
+
+%package konsole
+Summary: Konsole
+Group: Graphical desktop/KDE3
+Requires: %name-common = %{epoch}:%{version}-%{release}
+Obsoletes: %lib_name-konsole < 1:3.5.9
+Conflicts: %lib_name < %epoch:3.5.3-11mdv2007.0
+Requires: %name-progs = %{epoch}:%{version}-%{release}
+Requires: fontconfig
+Requires: x11-font-misc-misc
+Provides: konsole3 = %{epoch}:%{version}-%{release}
+Provides: kde3-konsole = %{epoch}:%{version}-%{release}
+Provides: %oname-konsole = %{epoch}:%{version}-%{release}
+Provides: %rname-konsole = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-konsole
+Obsoletes: %rname-konsole
+
+%description konsole
+A shell program similar to xterm for KDE
+
+%post konsole
+/usr/sbin/update-alternatives --install /usr/bin/xvt xvt /usr/bin/konsole 35
+/usr/bin/fc-cache
+%if %mdkversion < 200900
+%update_menus
+%endif
+
+%postun konsole
+%if %mdkversion < 200900
+%clean_menus
+%endif
+if [ "$1" = "0" ]; then
+   /usr/sbin/update-alternatives --remove xvt /usr/bin/konsole
+fi
+
+%files konsole
+%defattr(-,root,root)
+%_kde3_bindir/konsole
+%dir %_kde3_appsdir/konsole/
+%_kde3_appsdir/konsole/*
+%_kde3_datadir/applications/kde/konsole.desktop
+%doc %_kde3_docdir/HTML/en/kcontrol/kcmkonsole
+%doc %_kde3_docdir/HTML/en/konsole
+%_kde3_libdir/kde3/kcm_konsole.*
+%_kde3_libdir/kde3/kickermenu_konsole.*
+%_kde3_libdir/kde3/libkonsolepart.*
+%_kde3_libdir/kde3/konsole.*
+%_sysconfdir/fonts/conf.d/99-konsole.conf
+%_kde3_libdir/libkdeinit_konsole.*
+# We dont need 9x15, as already provided by system
+%exclude %_kde3_appsdir/konsole/fonts/9x15.pcf.gz 
+
+#-----------------------------------------------------------------------------
+
+%package kdeprintfax
+Summary:	Kdeprintfax
+Group:		Graphical desktop/KDE3
+Requires:	%name-progs = %{epoch}:%{version}-%{release}
+Requires:	%name-common = %{epoch}:%{version}-%{release}
+Requires:	enscript
+Requires:	efax
+Provides: kdeprintfax3 = %{epoch}:%{version}-%{release}
+Provides: kde3-kdeprintfax = %{epoch}:%{version}-%{release}
+Provides: %oname-kdeprintfax = %{epoch}:%{version}-%{release}
+Provides: %rname-kdeprintfax = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-kdeprintfax
+Obsoletes: %rname-kdeprintfax
+
+%description kdeprintfax
+Programm to send fax
+
+%files kdeprintfax
+%defattr(-,root,root)
+%_kde3_bindir/kdeprintfax
+%dir %_kde3_appsdir/kdeprintfax
+%_kde3_appsdir/kdeprintfax/*
+%_kde3_datadir/applications/kde/kdeprintfax.desktop
+
+#-----------------------------------------------------------------------------
+
+%package kate
+Summary:	Kate
+Group:		Graphical desktop/KDE3
+Requires:	%name-progs = %{epoch}:%{version}-%{release}
+Requires:	%name-common = %{epoch}:%{version}-%{release}
+Requires:	%lib_name-kate = %{epoch}:%{version}-%{release}
+Conflicts: %lib_name < %epoch:3.5.3-11mdv2007.0
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Provides: kate3  = %{epoch}:%{version}-%{release}
+Provides: kde3-kate  = %{epoch}:%{version}-%{release}
+Provides: %oname-kate = %{epoch}:%{version}-%{release}
+Provides: %rname-kate = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-kate
+Obsoletes: %rname-kate
+
+%description kate
+A fast and advanced text editor with nice plugins
+
+%files kate
+%defattr(-,root,root)
+%_kde3_bindir/kate
+%config(noreplace) %_kde3_datadir//config/katerc
+%doc %_kde3_docdir/HTML/en/kate
+%dir %_kde3_appsdir/kate/
+%_kde3_appsdir/kate/*
+%_kde3_datadir/applications/kde/kate.desktop
+%_kde3_libdir/kde3/kate.la
+%_kde3_libdir/kde3/kate.so
+
+#-----------------------------------------------------------------------------
+
+%package -n %lib_name-kate
+Summary:	Libraries for Kate
+Group:		System/Libraries
+Provides: 	%lib_name_orig-kate = %{epoch}:%{version}-%{release}
+Obsoletes: %lib_name-kate-devel < 1:3.5.9
+Conflicts: kdebase <= 3.1.94-13mdk
+Conflicts: %lib_name < %epoch:3.5.3-11mdv2007.0
+
+%description -n %lib_name-kate
+Libraries for kate program
+
+%files -n %lib_name-kate
+%defattr(-,root,root)
+%_kde3_libdir/libkdeinit_kate.la
+%_kde3_libdir/libkateinterfaces.la
+%_kde3_libdir/libkateinterfaces.so.*
+%_kde3_libdir/libkdeinit_kate.so
+%_kde3_libdir/libkateutils.so.*
+%_kde3_libdir/libkateutils.la
+%_kde3_libdir/kde3/kickermenu_kate.*
+
+#-----------------------------------------------------------------------------
+
+%package -n %lib_name
+Group:   System/Libraries
+Summary: Libraries for kdebase
+Requires: %name-session-plugins
+%if %use_kickoff_menu
+Requires: kde3-kio-sysinfo
+Requires: kde3-kickoff-i18n
+%endif
+Provides: %lib_name_orig = %{epoch}:%{version}-%{release}
+Provides: %lib_name_fixed = %{epoch}:%{version}-%{release}
+Conflicts: %lib_name_kttsd <= 0.3.0
+Conflicts: kdeartwork <= 3.3.2-14mdk
+Conflicts: %lib_name <= %epoch:3.5.5-10mdv2007.1
+Obsoletes: kdebase-kcontrol-data < 1:3.5.9
+
+%description -n %lib_name
+Libraries for the K Desktop Environment.
+
+%files -n %lib_name
+%defattr(-,root,root)
+%_kde3_libdir/libkasbar.la
+%_kde3_libdir/libkdeinit_appletproxy.la
+%_kde3_libdir/libkdeinit_extensionproxy.la
+%_kde3_libdir/libkdeinit_kdesktop.la
+%_kde3_libdir/libkdeinit_keditbookmarks.la
+%_kde3_libdir/libkdeinit_kfmclient.la
+%_kde3_libdir/libkdeinit_khotkeys.la
+%_kde3_libdir/libkdeinit_kicker.la
+%_kde3_libdir/libkdeinit_kjobviewer.la
+%_kde3_libdir/libkdeinit_klipper.la
+%_kde3_libdir/libkdeinit_konqueror.la
+%_kde3_libdir/libkdeinit_ksmserver.la
+%_kde3_libdir/libkdeinit_kwin.la
+%_kde3_libdir/libkdeinit_kwrite.la
+%_kde3_libdir/libkdeinit_kxkb.la
+%_kde3_libdir/libkickermain.la
+%if %use_kickoff_menu
+%_kde3_libdir/libkickoffsearch_interfaces.la
+#_kde3_libdir/kde3/kickoffsearch_*
+%_kde3_libdir/libkickoffsearch_interfaces.so.*
+%endif
+%_kde3_libdir/libkonqsidebarplugin.la
+%_kde3_libdir/libkonq.la
+%_kde3_libdir/libksgrd.la
+%_kde3_libdir/libtaskbar.la
+%_kde3_libdir/libtaskmanager.la
+%_kde3_libdir/libkdeinit_kcontrol.la
+%_kde3_libdir/libkdeinit_kcminit.la
+%_kde3_libdir/libkdeinit_kprinter.la
+%_kde3_libdir/libksplashthemes.so.*
+%_kde3_libdir/kde3/kio_*
+%_kde3_libdir/libkdeinit_kprinter.so
+%_kde3_libdir/libkickermain.so.*
+%_kde3_libdir/libkonqsidebarplugin.so.*
+%_kde3_libdir/libkonq.so.*
+%_kde3_libdir/libksgrd.so.*
+%_kde3_libdir/libtaskbar.so.*
+%_kde3_libdir/libtaskmanager.so.*
+%_kde3_libdir/libkdeinit_khelpcenter.la
+%_kde3_libdir/libkdeinit_khelpcenter.so
+%_kde3_libdir/libkasbar.so.*
+%_kde3_libdir/libkdeinit_appletproxy.so
+%_kde3_libdir/libkdeinit_extensionproxy.so
+%_kde3_libdir/libkdeinit_kdesktop.so
+%_kde3_libdir/libkdeinit_keditbookmarks.so
+%_kde3_libdir/libkdeinit_kfmclient.so
+%_kde3_libdir/libkdeinit_khotkeys.so
+%_kde3_libdir/libkdeinit_kicker.so
+%_kde3_libdir/libkdeinit_kjobviewer.so
+%_kde3_libdir/libkdeinit_klipper.so
+%_kde3_libdir/libkdeinit_konqueror.so
+%_kde3_libdir/libkdeinit_ksmserver.so
+%_kde3_libdir/libkdeinit_kwin.so
+%_kde3_libdir/libkdeinit_kwrite.so
+%_kde3_libdir/libkdeinit_kxkb.so
+%_kde3_libdir/libkdeinit_kcontrol.so
+%_kde3_libdir/libkdeinit_kcminit.so
+%_kde3_libdir/libkdeinit_kaccess.so
+%_kde3_libdir/libkdecorations.so.*
+%_kde3_libdir/libkdecorations.la
+%_kde3_libdir/libkdeinit_kaccess.la
+%_kde3_libdir/libksplashthemes.la
+%_kde3_libdir/libkdeinit_kcontroledit.la
+%_kde3_libdir/libkdeinit_kcontroledit.so
+%_kde3_libdir/libkdeinit_kwin_rules_dialog.la
+%_kde3_libdir/libkdeinit_kwin_rules_dialog.so
+%_kde3_libdir/libkfontinst.la
+%_kde3_libdir/libkfontinst.so.*
+%_kde3_libdir/kde3/khotkeys_arts.la
+%_kde3_libdir/kde3/khotkeys_arts.so
+%_kde3_libdir/libkhotkeys_shared.la
+%_kde3_libdir/libkhotkeys_shared.so.*
+%_kde3_libdir/kde3/kcminit_startup.la
+%_kde3_libdir/kde3/kcminit_startup.so
+%_kde3_libdir/libkdeinit_kcminit_startup.la
+%_kde3_libdir/libkdeinit_kcminit_startup.so
+%_kde3_libdir/kde3/kded_homedirnotify.la
+%_kde3_libdir/kde3/kded_homedirnotify.so
+%_kde3_libdir/kde3/kded_medianotifier.la
+%_kde3_libdir/kde3/kded_medianotifier.so
+%_kde3_libdir/kde3/exrthumbnail.la
+%_kde3_libdir/kde3/exrthumbnail.so
+%_kde3_libdir/kde3/kded_khotkeys.la
+%_kde3_libdir/kde3/kded_khotkeys.so
+%_kde3_libdir/kde3/kded_mediamanager.la
+%_kde3_libdir/kde3/kded_mediamanager.so
+%_kde3_libdir/kde3/kded_remotedirnotify.la
+%_kde3_libdir/kde3/kded_remotedirnotify.so
+%_kde3_libdir/kde3/kded_systemdirnotify.la
+%_kde3_libdir/kde3/kded_systemdirnotify.so
+%_kde3_libdir/kde3/kfile_media.la
+%_kde3_libdir/kde3/kfile_media.so
+%_kde3_libdir/kde3/kfile_trash.la
+%_kde3_libdir/kde3/kfile_trash.so
+%_kde3_libdir/kde3/kwin3_plastik.la
+%_kde3_libdir/kde3/kwin3_plastik.so
+%_kde3_libdir/kde3/kwin_plastik_config.la
+%_kde3_libdir/kde3/kwin_plastik_config.so
+%_kde3_libdir/kde3/libkhtmlkttsdplugin.la
+%_kde3_libdir/kde3/libkhtmlkttsdplugin.so
+%_kde3_libdir/kde3/media_panelapplet.la
+%_kde3_libdir/kde3/media_panelapplet.so
+%_kde3_libdir/kde3/trash_panelapplet.la
+%_kde3_libdir/kde3/trash_panelapplet.so
+%_kde3_libdir/kde3/libkfontviewpart.la
+%_kde3_libdir/kde3/libkfontviewpart.so
+%_kde3_libdir/kde3/kwin_rules_dialog.la
+%_kde3_libdir/kde3/kwin_rules_dialog.so
+%_kde3_libdir/kde3/sidebar_panelextension.la
+%_kde3_libdir/kde3/sidebar_panelextension.so
+%dir %_kde3_libdir/kconf_update_bin/
+%_kde3_libdir/kconf_update_bin/khotkeys_update
+%_kde3_libdir/kconf_update_bin/kwin_update_window_settings
+%_kde3_libdir/kconf_update_bin/kicker-3.4-reverseLayout
+%_kde3_libdir/kconf_update_bin/kwin_update_default_rules
+%_kde3_libdir/kde3/appletproxy.la
+%_kde3_libdir/kde3/appletproxy.so
+%_kde3_libdir/kde3/cursorthumbnail.la
+%_kde3_libdir/kde3/cursorthumbnail.so
+%_kde3_libdir/kde3/djvuthumbnail.la
+%_kde3_libdir/kde3/djvuthumbnail.so
+%_kde3_libdir/kde3/extensionproxy.la
+%_kde3_libdir/kde3/extensionproxy.so
+%_kde3_libdir/kde3/kaccess.la
+%_kde3_libdir/kde3/kaccess.so
+%_kde3_libdir/kde3/kcminit.la
+%_kde3_libdir/kde3/kcminit.so
+%_kde3_libdir/kde3/kcontrol.la
+%_kde3_libdir/kde3/kcontrol.so
+%_kde3_libdir/kde3/kded_konqy_preloader.la
+%_kde3_libdir/kde3/kded_konqy_preloader.so
+%_kde3_libdir/kde3/kdesktop.la
+%_kde3_libdir/kde3/kdesktop.so
+%_kde3_libdir/kde3/keditbookmarks.la
+%_kde3_libdir/kde3/keditbookmarks.so
+%_kde3_libdir/kde3/kfmclient.la
+%_kde3_libdir/kde3/kfmclient.so
+%_kde3_libdir/kde3/khotkeys.la
+%_kde3_libdir/kde3/khotkeys.so
+%_kde3_libdir/kde3/kicker.la
+%_kde3_libdir/kde3/kicker.so
+%_kde3_libdir/kde3/kjobviewer.la
+%_kde3_libdir/kde3/kjobviewer.so
+%_kde3_libdir/kde3/klipper.la
+%_kde3_libdir/kde3/klipper.so
+%_kde3_libdir/kde3/konqsidebar_web.la
+%_kde3_libdir/kde3/konqsidebar_web.so
+%_kde3_libdir/kde3/konqueror.la
+%_kde3_libdir/kde3/konqueror.so
+%_kde3_libdir/kde3/kprinter.la
+%_kde3_libdir/kde3/kprinter.so
+%_kde3_libdir/kde3/ksmserver.la
+%_kde3_libdir/kde3/ksmserver.so
+%_kde3_libdir/kde3/ksplashdefault.la
+%_kde3_libdir/kde3/ksplashdefault.so
+%_kde3_libdir/kde3/ksplashredmond.la
+%_kde3_libdir/kde3/ksplashredmond.so
+%_kde3_libdir/kde3/ksplashstandard.la
+%_kde3_libdir/kde3/ksplashstandard.so
+%_kde3_libdir/kde3/kwin.la
+%_kde3_libdir/kde3/kwin.so
+%_kde3_libdir/kde3/kwin3_default.la
+%_kde3_libdir/kde3/kwin3_default.so
+%_kde3_libdir/kde3/kwin3_keramik.la
+%_kde3_libdir/kde3/kwin3_keramik.so
+%_kde3_libdir/kde3/kwin3_laptop.la
+%_kde3_libdir/kde3/kwin3_laptop.so
+%_kde3_libdir/kde3/kwin3_modernsys.la
+%_kde3_libdir/kde3/kwin3_modernsys.so
+%_kde3_libdir/kde3/kwin3_redmond.la
+%_kde3_libdir/kde3/kwin3_redmond.so
+%_kde3_libdir/kde3/kwin3_b2.la
+%_kde3_libdir/kde3/kwin3_b2.so
+%_kde3_libdir/kde3/kwin3_quartz.la
+%_kde3_libdir/kde3/kwin3_quartz.so
+%_kde3_libdir/kde3/kwin3_web.la
+%_kde3_libdir/kde3/kwin3_web.so
+%_kde3_libdir/kde3/kwin_b2_config.la
+%_kde3_libdir/kde3/kwin_b2_config.so
+%_kde3_libdir/kde3/kwin_quartz_config.la
+%_kde3_libdir/kde3/kwin_quartz_config.so
+%_kde3_libdir/kde3/kwin_default_config.la
+%_kde3_libdir/kde3/kwin_default_config.so
+%_kde3_libdir/kde3/kwin_keramik_config.la
+%_kde3_libdir/kde3/kwin_keramik_config.so
+%_kde3_libdir/kde3/kwin_modernsys_config.la
+%_kde3_libdir/kde3/kwin_modernsys_config.so
+%_kde3_libdir/kde3/kwrite.la
+%_kde3_libdir/kde3/kwrite.so
+%_kde3_libdir/kde3/kxkb.la
+%_kde3_libdir/kde3/kxkb.so
+%_kde3_libdir/kde3/libkfindpart.la
+%_kde3_libdir/kde3/libkfindpart.so
+%_kde3_libdir/kde3/menu_panelapplet.la
+%_kde3_libdir/kde3/menu_panelapplet.so
+%_kde3_libdir/kde3/kstyle_keramik_config.la
+%_kde3_libdir/kde3/kstyle_keramik_config.so
+%_kde3_libdir/kde3/kcm_*
+%exclude %_kde3_libdir/kde3/kcm_konsole.*
+%exclude %_kde3_libdir/kde3/kcm_nsplugins.*
+%exclude %_kde3_libdir/kde3/kcm_randr.*
+%_kde3_libdir/kde3/kcontroledit.la
+%_kde3_libdir/kde3/kcontroledit.so
+%_kde3_libdir/kde3/kded_kwrited.la
+%_kde3_libdir/kde3/kded_kwrited.so
+%_kde3_libdir/kde3/konq_remoteencoding.la
+%_kde3_libdir/kde3/konq_remoteencoding.so
+%_kde3_libdir/kde3/konqsidebar_tree.la
+%_kde3_libdir/kde3/liblocaldomainurifilter.la
+%_kde3_libdir/kde3/liblocaldomainurifilter.so
+%_kde3_libdir/kde3/clock_panelapplet.so*
+%_kde3_libdir/kde3/dockbar_panelextension.so*
+%_kde3_libdir/kde3/htmlthumbnail.so
+%_kde3_libdir/kde3/imagethumbnail.so
+%_kde3_libdir/kde3/kasbar_panelextension.so*
+%_kde3_libdir/kde3/khelpcenter.so
+%_kde3_libdir/kde3/klipper_panelapplet.so
+%_kde3_libdir/kde3/konq_aboutpage.so
+%_kde3_libdir/kde3/konq_iconview.so
+%_kde3_libdir/kde3/konq_listview.so
+%_kde3_libdir/kde3/konq_shellcmdplugin.so
+%_kde3_libdir/kde3/konq_sidebar.so
+%_kde3_libdir/kde3/konq_sidebartree_bookmarks.so
+%_kde3_libdir/kde3/konq_sidebartree_dirtree.so
+%_kde3_libdir/kde3/konq_sidebartree_history.so
+%_kde3_libdir/kde3/konqsidebar_tree.so
+%_kde3_libdir/kde3/konq_sound.so
+%_kde3_libdir/kde3/launcher_panelapplet.so*
+%_kde3_libdir/kde3/libkdeprint_part.so
+%_kde3_libdir/kde3/libkshorturifilter.so
+%_kde3_libdir/kde3/libkuriikwsfilter.so
+%_kde3_libdir/kde3/libkurisearchfilter.so
+%_kde3_libdir/kde3/lockout_panelapplet.so*
+%_kde3_libdir/kde3/minipager_panelapplet.so*
+%_kde3_libdir/kde3/naughty_panelapplet.so*
+%_kde3_libdir/kde3/run_panelapplet.so*
+%_kde3_libdir/kde3/sysguard_panelapplet.so*
+%_kde3_libdir/kde3/systemtray_panelapplet.so*
+%_kde3_libdir/kde3/taskbar_panelapplet.so*
+%_kde3_libdir/kde3/taskbar_panelextension.so*
+%_kde3_libdir/kde3/textthumbnail.so
+%_kde3_libdir/kde3/kded_favicons.so
+%_kde3_libdir/kde3/fontthumbnail.so
+%_kde3_libdir/kde3/kfile_font.so
+%_kde3_libdir/kde3/libkmanpart.so
+%_kde3_libdir/kde3/clock_panelapplet.la
+%_kde3_libdir/kde3/dockbar_panelextension.la
+%_kde3_libdir/kde3/htmlthumbnail.la
+%_kde3_libdir/kde3/imagethumbnail.la
+%_kde3_libdir/kde3/kasbar_panelextension.la
+%_kde3_libdir/kde3/khelpcenter.la
+%_kde3_libdir/kde3/media_propsdlgplugin.la
+%_kde3_libdir/kde3/media_propsdlgplugin.so
+%_kde3_libdir/kde3/klipper_panelapplet.la
+%_kde3_libdir/kde3/konq_aboutpage.la
+%_kde3_libdir/kde3/konq_iconview.la
+%_kde3_libdir/kde3/konq_listview.la
+%_kde3_libdir/kde3/konq_shellcmdplugin.la
+%_kde3_libdir/kde3/konq_sidebar.la
+%_kde3_libdir/kde3/konq_sidebartree_bookmarks.la
+%_kde3_libdir/kde3/konq_sidebartree_dirtree.la
+%_kde3_libdir/kde3/konq_sidebartree_history.la
+%_kde3_libdir/kde3/konq_sound.la
+%_kde3_libdir/kde3/launcher_panelapplet.la
+%_kde3_libdir/kde3/libkdeprint_part.la
+%_kde3_libdir/kde3/libkshorturifilter.la
+%_kde3_libdir/kde3/libkuriikwsfilter.la
+%_kde3_libdir/kde3/libkurisearchfilter.la
+%_kde3_libdir/kde3/lockout_panelapplet.la
+%_kde3_libdir/kde3/minipager_panelapplet.la
+%_kde3_libdir/kde3/naughty_panelapplet.la
+%_kde3_libdir/kde3/run_panelapplet.la
+%_kde3_libdir/kde3/sysguard_panelapplet.la
+%_kde3_libdir/kde3/systemtray_panelapplet.la
+%_kde3_libdir/kde3/taskbar_panelapplet.la
+%_kde3_libdir/kde3/taskbar_panelextension.la
+%_kde3_libdir/kde3/textthumbnail.la
+%_kde3_libdir/kde3/kded_favicons.la
+%_kde3_libdir/kde3/fontthumbnail.la
+%_kde3_libdir/kde3/kfile_font.la
+%_kde3_libdir/kde3/libkmanpart.la
+%_kde3_libdir/kde3/kickermenu_*
+%exclude %_kde3_libdir/kde3/kickermenu_konsole.*
+%exclude %_kde3_libdir/kde3/kickermenu_kate.*
+
+#-----------------------------------------------------------------------------
+
+%package common
+Group:          Graphical desktop/KDE3
+Summary:        Config file and icons file for %name
+Requires(pre):  %lib_name = %{epoch}:%{version}-%{release}
+Conflicts:	    kdemoreartwork-plastik <= 0.3.3-1mdk
+Conflicts:      kdebase <= 3.2.3-97mdk
+Conflicts:		kdeedu <= 1:3.2.3
+Conflicts:		mandriva-theme <= 1.0.6
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Obsoletes:      kdebase-kcontrol-data < 1:3.5.9
+Provides:       %oname-common = %{epoch}:%{version}-%{release}
+Provides:       %rname-common = %{epoch}:%{version}-%{release}
+Obsoletes:      %rname-common
+Obsoletes:      %oname-common
+
+%description common
+This packages contains all icons, config file etc...
+
+%files common
+%defattr(-,root,root)
+%_sysconfdir/xdg/kde
+%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-hicolor.*
+%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-crystalsvg.*
+%config(noreplace) /etc/pam.d/kde3
+%config(noreplace) /etc/pam.d/kscreensaver3
+%config(noreplace) /etc/pam.d/kde3-np
+%config(noreplace) %_kde3_configdir/kdesktop_custom_menu1
+%config(noreplace) %_kde3_configdir/kdesktop_custom_menu2
+%config(noreplace) %_kde3_configdir/klipperrc
+%config(noreplace) %_kde3_configdir/konqsidebartng.rc
+%config(noreplace) %_kde3_configdir/kshorturifilterrc
+%config(noreplace) %_kde3_configdir/kxkb_groups
+%config(noreplace) %_kde3_datadir/fonts/override/fonts.dir
+%_kde3_bindir/kxdglauncher
+%_kde3_bindir/kasbar
+%_kde3_bindir/kbookmarkmerger
+%_kde3_bindir/kcheckrunning
+%_kde3_bindir/khc_docbookdig.pl
+%_kde3_bindir/khc_htdig.pl
+%_kde3_bindir/khc_htsearch.pl
+%_kde3_bindir/khc_mansearch.pl
+%_kde3_bindir/khc_beagle_index.pl
+%_kde3_bindir/khc_beagle_search.pl
+%_kde3_bindir/kio_media_mounthelper
+%_kde3_bindir/knetattach
+%_kde3_bindir/kompmgr
+%_kde3_bindir/ksplashsimple
+%_kde3_bindir/ktrash
+%_kde3_appsdir/khtml/kpartplugins/*.desktop
+%_kde3_appsdir/khtml/kpartplugins/*.rc
+%dir %_kde3_docdir/HTML/
+%dir %_kde3_docdir/HTML/en/
+%dir %_kde3_datadir/desktop-directories/
+%_kde3_datadir/desktop-directories/*.directory
+%doc %_kde3_docdir/HTML/en/kcontrol
+# Exclude just the ones that not belongs here
+%exclude %_kde3_docdir/HTML/en/kcontrol/kcmkonsole
+%doc %_kde3_docdir/HTML/en/kdebugdialog
+%doc %_kde3_docdir/HTML/en/kdcop
+%doc %_kde3_docdir/HTML/en/kdesu
+%doc %_kde3_docdir/HTML/en/kdm
+%doc %_kde3_docdir/HTML/en/kfind
+%doc %_kde3_docdir/HTML/en/ksplashml
+%doc %_kde3_docdir/HTML/en/kxkb
+%doc %_kde3_docdir/HTML/en/khelpcenter
+%doc %_kde3_docdir/HTML/en/kdeprint
+%doc %_kde3_docdir/HTML/en/kicker
+%doc %_kde3_docdir/HTML/en/knetattach
+%doc %_kde3_docdir/HTML/en/kioslave
+%doc %_kde3_docdir/HTML/en/klipper
+%doc %_kde3_docdir/HTML/en/konqueror
+%doc %_kde3_docdir/HTML/en/kpager
+%doc %_kde3_docdir/HTML/en/kwrite
+%doc %_kde3_docdir/HTML/en/kompmgr
+%doc %_kde3_docdir/HTML/en/kinfocenter
+%dir %_kde3_appsdir/kinfocenter/
+%_kde3_appsdir/kinfocenter/kinfocenterui.rc
+%_kde3_datadir/applnk/.hidden/*.desktop
+%exclude %_kde3_datadir/applnk/.hidden/randr.desktop
+%_kde3_datadir/applnk/.hidden/.directory
+%_kde3_datadir/applnk/*.desktop
+%dir %_kde3_datadir/applnk/Internet/
+%_kde3_datadir/applnk/Internet/*.desktop
+%dir %_kde3_datadir/applnk/Settings/LookNFeel/
+%dir %_kde3_datadir/applnk/Settings/LookNFeel/Themes/
+%_kde3_datadir/applnk/Settings/LookNFeel/Themes/*.desktop
+%_kde3_datadir/applnk/Settings/LookNFeel/*.desktop
+%dir %_kde3_datadir/applnk/Settings/WebBrowsing/
+%_kde3_datadir/applnk/Settings/WebBrowsing/*.desktop
+%exclude %_kde3_datadir/applnk/Settings/WebBrowsing/nsplugin.desktop
+%_kde3_datadir/applnk/System/ScreenSavers/*.desktop
+%_kde3_datadir/applnk/System/*.desktop
+%dir %_kde3_datadir/applnk/Toys/
+%_kde3_datadir/applnk/Toys/*.desktop
+%dir %_kde3_datadir/applnk/Utilities/
+%_kde3_datadir/applnk/Utilities/*.desktop
+%dir %_kde3_configdir.kcfg/
+%_kde3_configdir.kcfg/*.kcfg
+%dir %_kde3_appsdir/
+%dir %_kde3_appsdir/clockapplet/
+%_kde3_appsdir/clockapplet/*
+%dir %_kde3_appsdir/kthememanager/themes/
+%_kde3_appsdir/kthememanager/themes/*
+%dir %_kde3_appsdir/kcontroledit/
+%_kde3_appsdir/kcontroledit/*
+%dir %_kde3_appsdir/drkonqi/
+%_kde3_appsdir/drkonqi/*
+%doc %_kde3_docdir/HTML/en/kappfinder/man-kappfinder.1.docbook
+%dir %_kde3_appsdir/kappfinder/
+%_kde3_appsdir/kappfinder/*
+%exclude %_kde3_appsdir/kappfinder/apps/Games/Roguelikes/*.desktop
+%exclude %_kde3_appsdir/kappfinder/apps/Games/Arcade/*.desktop
+%dir %_kde3_appsdir/kbookmark/
+%_kde3_appsdir/kbookmark/*
+%dir %_kde3_appsdir/kcmcss/
+%_kde3_appsdir/kcmcss/*
+%dir %_kde3_appsdir/kcminput/
+%_kde3_appsdir/kcminput/*
+%dir %_kde3_appsdir/kcmkeys
+%_kde3_appsdir/kcmkeys/*
+%dir %_kde3_appsdir/kcmlocale/
+%_kde3_appsdir/kcmlocale/*
+%dir %_kde3_appsdir/khotkeys/
+%_kde3_appsdir/khotkeys/*
+%dir %_kde3_appsdir/kcontrol/
+%_kde3_appsdir/kcontrol/*
+%dir %_kde3_appsdir/kconf_update/
+%_kde3_appsdir/kconf_update/*.upd
+%_kde3_appsdir/kconf_update/*.pl
+%_kde3_appsdir/kconf_update/*.sh
+%dir %_kde3_appsdir/kcm_componentchooser
+%_kde3_appsdir/kcm_componentchooser/*
+%dir %_kde3_appsdir/kdcop
+%_kde3_appsdir/kdcop/*
+%dir %_kde3_appsdir/kdeprint_part
+%_kde3_appsdir/kdeprint_part/*
+%dir %_kde3_appsdir/kdeprint
+%_kde3_appsdir/kdeprint/*
+%dir %_kde3_appsdir/kdesktop
+%_kde3_appsdir/kdesktop/*
+%dir %_kde3_appsdir/kdewizard
+%_kde3_appsdir/kdewizard/*
+%dir %_kde3_appsdir/kdisplay
+%_kde3_appsdir/kdisplay/*
+%dir %_kde3_appsdir/keditbookmarks/
+%_kde3_appsdir/keditbookmarks/*
+%dir %_kde3_appsdir/kfindpart/
+%_kde3_appsdir/kfindpart/*
+%dir %_kde3_appsdir/khelpcenter/
+%_kde3_appsdir/khelpcenter/*
+%dir %_kde3_appsdir/kicker
+%_kde3_appsdir/kicker/*
+%dir %_kde3_appsdir/kio_finger/
+%_kde3_appsdir/kio_finger/*
+%dir %_kde3_appsdir/kio_info/
+%_kde3_appsdir/kio_info/*
+%dir %_kde3_appsdir/kjobviewer/
+%_kde3_appsdir/kjobviewer/*
+%dir %_kde3_appsdir/konqiconview/
+%_kde3_appsdir/konqiconview/*
+%dir %_kde3_appsdir/konqlistview/
+%_kde3_appsdir/konqlistview/*
+%dir %_kde3_appsdir/konqsidebartng/
+%_kde3_appsdir/konqsidebartng/*
+%dir %_kde3_appsdir/konqueror/
+%_kde3_appsdir/konqueror/*
+%dir %_kde3_appsdir/kpersonalizer
+%_kde3_appsdir/kpersonalizer/*
+%dir %_kde3_appsdir/ksplash/
+%_kde3_appsdir/ksplash/*
+%dir %_kde3_appsdir/kwin/
+%_kde3_appsdir/kwin/*
+%dir %_kde3_appsdir/kwrite/
+%_kde3_appsdir/kwrite/*
+%dir %_kde3_appsdir/kaccess
+%_kde3_appsdir/kaccess/*
+%_kde3_appsdir/kio_man/kio_man.css
+%dir %_kde3_appsdir/ksmserver
+%_kde3_appsdir/ksmserver/*
+%dir %_kde3_appsdir/naughtyapplet/
+%_kde3_appsdir/naughtyapplet/*
+%dir %_kde3_datadir/autostart/
+%_kde3_datadir/autostart/*
+%_kde3_iconsdir/*/*/actions/*
+%_kde3_iconsdir/*/*/apps/*
+%_kde3_iconsdir/*/*/devices/*
+%_kde3_datadir/locale/en_US
+%_kde3_datadir/locale/l10n/*
+%_kde3_datadir/applications/kde/*.desktop
+%exclude %_kde3_datadir/applications/kde/kate.desktop
+%exclude %_kde3_datadir/applications/kde/kdeprintfax.desktop
+%exclude %_kde3_datadir/applications/kde/kmenuedit.desktop
+%exclude %_kde3_datadir/applications/kde/konsole.desktop
+%exclude %_kde3_datadir/applications/kde/ksysguard.desktop
+%exclude %_kde3_datadir/applications/kde/krandrtray.desktop
+%dir %_kde3_appsdir/kcmusb
+%_kde3_appsdir/kcmusb/*
+%dir %_kde3_appsdir/systemview
+%_kde3_appsdir/systemview/*
+%dir %_kde3_datadir/mimelnk/
+%dir %_kde3_datadir/mimelnk/application
+%_kde3_datadir/mimelnk/application/*
+%dir %_kde3_datadir/mimelnk/media
+%_kde3_datadir/mimelnk/media/*
+%dir %_kde3_datadir/mimelnk/print/
+%_kde3_datadir/mimelnk/print/*
+%dir %_kde3_datadir/mimelnk/fonts/
+%_kde3_datadir/mimelnk/fonts/*
+%dir %_kde3_datadir/mimelnk/inode/
+%_kde3_datadir/mimelnk/inode/system_directory.desktop
+%dir %_kde3_datadir/services
+%_kde3_datadir/services/*
+%dir %_kde3_datadir/servicetypes/
+%_kde3_datadir/servicetypes/*
+%dir %_kde3_datadir/sounds/
+%_kde3_datadir/sounds/*
+%dir %_kde3_datadir/templates/
+%_kde3_datadir/templates/*
+%_kde3_datadir/templates/.source
+%dir %_kde3_datadir/wallpapers/
+%_kde3_datadir/wallpapers/*
+%dir %_kde3_appsdir/kcmview1394/
+%_kde3_appsdir/kcmview1394/oui.db
+# Don't autostart ktip
+%exclude %_kde3_datadir/autostart/ktip.desktop
+# Not on desktop
+%exclude %_kde3_appsdir/kdesktop/DesktopLinks/System.desktop
+# Disable superuser modes
+%exclude %_kde3_datadir/applications/kde/konsolesu.desktop
+%exclude %_kde3_datadir/applications/kde/konquerorsu.desktop
+# Disable internal krandrtray. Using new 1.2 based by Boiko
+%exclude %_kde3_datadir/applications/kde/krandrtray.desktop
+%exclude %_kde3_bindir/krandrtray
+
+#-----------------------------------------------------------------------------
+
+%package -n %lib_name-devel
+Summary:    Devel stuff for kdebase
+Group:	    Development/KDE and Qt
+Obsoletes:  %lib_name-kate-devel < 1:3.5.9
+Obsoletes:  kdebase3-devel < 1:3.5.9
+Requires:   kdelibs3-devel >= %{epoch_kdelibs}:3.5.3
+Requires:   %lib_name = %{epoch}:%{version}-%{release} 
+Requires:   %lib_name-kate = %{epoch}:%{version}-%{release} 
+Provides:   kdebase-devel = %{epoch}:%{version}-%{release}
+Provides:   kdebase3-devel = %{epoch}:%{version}-%{release}
+Provides:   %lib_name_fixed-devel
+Conflicts:  kdebase <= 3.1.94-13mdk
+
+%description  -n %lib_name-devel
+This package contains header files needed if you wish to build applications
+based on kdebase.
+
+%files -n %lib_name-devel
+%defattr(-,root,root)
+%_kde3_includedir/*
+%_kde3_libdir/libkateinterfaces.so
+%_kde3_libdir/libkateutils.so
+%_kde3_libdir/libkickermain.so
+%if %use_kickoff_menu
+%_kde3_libdir/libkickoffsearch_interfaces.so
+%endif
+%_kde3_libdir/libkonqsidebarplugin.so
+%_kde3_libdir/libkonq.so
+%_kde3_libdir/libksgrd.so
+%_kde3_libdir/libtaskbar.so
+%_kde3_libdir/libtaskmanager.so
+%_kde3_libdir/libkdecorations.so
+%_kde3_libdir/libksplashthemes.so
+%_kde3_libdir/libkhotkeys_shared.so
+%_kde3_libdir/libkfontinst.so
+%_kde3_libdir/libkasbar.so
+
+#-----------------------------------------------------------------------------
+
+%if %compile_apidox
+
+%package devel-doc
+Group:Development/KDE and Qt
+Summary: Development documentation for %name
+Requires: kdelibs-devel-doc
+BuildRequires: doxygen 
+BuildRequires: graphviz
+BuildRequires: kdelibs-devel-doc
+
+%description devel-doc
+This packages contains all development documentation for kdelibs
+
+%files devel-doc
+%defattr(-,root,root,-)
+%doc %_kde3_docdir/HTML/en/kdebase-apidocs
+
+%endif
+
+#-----------------------------------------------------------------------------
+
+%package nsplugins
+Summary:	Netscape Plugins for kdebase
+Group:		Graphical desktop/KDE3
+Requires:	%name-progs = %{epoch}:%{version}-%{release}
+Obsoletes:     kdebase3-nsplugins < 1:3.5.9
+Provides:      kdebase3-nsplugins = %{epoch}:%{version}-%{release}
+Obsoletes: kdebase-kcontrol-nsplugins < 1:3.5.9
+Provides:       %oname-nsplugins = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-nsplugins
+Obsoletes: %rname-nsplugins
+
+%description nsplugins
+This package contains the Netscape plugins for konqueror files.
+
+%files nsplugins
+%defattr(-,root,root)
+%_kde3_bindir/nspluginscan
+%_kde3_bindir/nspluginviewer
+%_kde3_datadir/applnk/Settings/WebBrowsing/nsplugin.desktop
+%_kde3_appsdir/plugin/nspluginpart.rc
+%_kde3_libdir/kde3/libnsplugin.*
+%_kde3_libdir/kde3/kcm_nsplugins.*
+
+#-----------------------------------------------------------------------------
+
+%package session-plugins
+Summary:    Session plugins for kdesktop/kdm
+Group:      Graphical desktop/KDE3
+%define release_min_mkrel_kdebase %mkrel 4
+Conflicts:     %lib_name  <= %epoch:3.5.5-%release_min_mkrel_kdebase
+Provides:       %oname-session-plugins = %{epoch}:%{version}-%{release}
+Provides:       %rname-session-plugins = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-session-plugins
+Obsoletes: %rname-session-plugins
+
+%description session-plugins
+This package contains sessions plugins for kdesktop kdm.
+It allows to login into with kdm and lock/unlock kdesktop screensaver.
+
+
+%files session-plugins
+%defattr(-,root,root)
+%_kde3_libdir/kde3/kgreet_winbind.la
+%_kde3_libdir/kde3/kgreet_winbind.so
+%_kde3_libdir/kde3/kgreet_classic.la
+%_kde3_libdir/kde3/kgreet_classic.so
+%_kde3_libdir/kde3/kgreet_pam.la
+%_kde3_libdir/kde3/kgreet_pam.so
+
+
+#-----------------------------------------------------------------------------
+
+%package kdm
+Summary: kdm for kdebase
+Group: Graphical desktop/KDE3
+Requires: kdm-config-file
+Provides: kdm3 = %{epoch}:%{version}-%{release}
+Provides: kde3-kdm = %{epoch}:%{version}-%{release}
+Provides: dm
+Requires: xinitrc
+Requires: %name-session-plugins
+Requires: %name-common
+Obsoletes: kdebase-kdm-config-file <= %epoch:%version-%release
+%define release_min_mkrel %mkrel 10
+Provides:  %oname-kdm = %{epoch}:%{version}-%{release}
+Provides:  %rname-kdm = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-kdm
+Obsoletes: %rname-kdm
+
+%description kdm
+This package contains kdm.
+
+%post kdm
+%make_session
+
+%files kdm
+%defattr(-,root,root)
+%_kde3_bindir/kdm
+%_kde3_bindir/kdmctl
+%_kde3_bindir/kdm_config
+%_kde3_bindir/kdm_greet
+%_kde3_bindir/krootimage
+%_kde3_bindir/genkdmconf
+%dir %_kde3_appsdir/kdm
+%_kde3_appsdir/kdm/*
+%dir %_kde3_docdir/kdm/
+%_kde3_docdir/kdm/README
+%_kde3_configdir/kdm/README
+%{_sysconfdir}/logrotate.d/kdm3
+%exclude %_kde3_appsdir/kdm/sessions/
+%exclude %_kde3_configdir/kdm/X*
+%exclude %_kde3_configdir/kdm/kdmrc
+%exclude %_kde3_configdir/kdm/backgroundrc
+
+#-----------------------------------------------------------------------------
+
+%package kmenuedit
+Summary: kmenuedit 
+Group: Graphical desktop/KDE3
+Obsoletes: %lib_name-kmenuedit < 1:3.5.9
+Conflicts: %name-common <= 1:3.5.8 
+Provides: kmenuedit3 = %{epoch}:%{version}-%{release}
+Provides: kde3-kmenuedit = %{epoch}:%{version}-%{release}
+Provides:  %oname-kmenuedit = %{epoch}:%{version}-%{release}
+Provides:  %rname-kmenuedit = %{epoch}:%{version}-%{release}
+Obsoletes: %oname-kmenuedit
+Obsoletes: %rname-kmenuedit
+
+%description kmenuedit
+Kmenuedit for kdebase
+
+%files kmenuedit
+%defattr(-,root,root)
+%_kde3_bindir/kmenuedit
+%doc %_kde3_docdir/HTML/en/kmenuedit
+%dir %_kde3_appsdir/kmenuedit/
+%_kde3_appsdir/kmenuedit/*
+%_kde3_datadir/applications/kde/kmenuedit.desktop
+%_kde3_libdir/kde3/kmenuedit.*
+%_kde3_libdir/libkdeinit_kmenuedit.*
+
+#-----------------------------------------------------------------------------
+
+%prep
+%setup -q -a 1 -n %oname-%version
+
+%patch1 -p1 -b .screensaver_pam
+%patch2 -p1 -b .fix_media_fuser_path
+%patch3 -p1 -b .fix_screensaver
+%patch4 -p0 -b .fix_vibrate_dialog
+%patch7 -p1 -b .fix_kdm_theme
+%patch8 -p1 -b .fix_kdm_server_args
+%patch9 -p1 -b .fix_logout_without_confirmation
+# Categories not apply anymore
+%patch20 -p1 -b .drakclock
+%patch21 -p1 -b .lzma_support
+%patch22 -p1 -b .fix_gtk_style
+%patch24 -p1 -b .kdesktop_firstrun
+%patch26 -p1 -b .translation_kdm
+%patch27 -p1 -b .fix_firstboot
+%patch28 -p1 -b .khelpcenter_htsearch_path
+%patch35 -p0 -b .add_switch_icons
+%patch37 -p0 -b .fix_showOnly_screensaver
+%patch39 -p1 -b .kcontrol_menu_entry
+%patch41 -p0
+%patch42 -p1 -b .bookmark_copy
+%patch43 -p0 -b .update_usb.ids
+%patch44 -p0
+%patch60 -p1
+#########################################
+#Begin patch with Pardus patches
+%patch104 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p0
+##########################################
+#%if %mdkversion > 201000
+%patch120 -p1
+#%endif
+%patch130 -p0
+%patch131 -p1
+%patch132 -p0
+%patch133 -p0
+%patch134 -p1
+%patch135 -p0
+
+%if %use_kickoff_menu
+# kickoff data
+tar xfj %SOURCE100
+%endif
+
+%build
+%define _disable_ld_no_undefined 1
+
+#
+#cp configure configure.orig
+#rm -f configure
+#cp %SOURCE200 configure
+
+export QTDIR=%qt3dir
+export KDEDIR=%{_kde3_prefix}
+#export CFLAGS="$CFLAGS -DPIC -fPIC"
+#export CXXFLAGS="$CXXFLAGS -DPIC -fPIC"
+export CXXFLAGS="$CXXFLAGS -I/usr/lib/qt3/include/ "
+
+%if %use_kickoff_menu
+export CXXFLAGS="$CXXFLAGS -DKDELIBS_SUSE -I/usr/include/libbeagle "
+export CFLAGS="$CFLAGS -DKDELIBS_SUSE -I/usr/include/libbeagle "
+%endif
+
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+make -f admin/Makefile.common cvs
+
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+
+%configure_kde3 \
+   --with-pam=kde3 \
+   --with-kss-pam=kscreensaver3 \
+   --with-cdparanoia \
+   --without-lame \
+   --with-vorbis \
+   --with-qt-libraries=%qt3lib \
+%if %support_ldap			
+   --with-ldap \
+%else
+   --without-ldap \
+%endif			
+  --with-hal \
+  --with-extra-includes=/usr/include/avahi-compat-libdns_sd/:/opt/kde3/include/tqt \
+  --with-extra-libs=/opt/kde3/lib
+
+%if %use_kickoff_menu
+# We need create kicker config settings before 
+# due still using auto* things, otherwise compilation breaks
+pushd kicker/kicker/core
+    make extensionSettings.h
+popd
+#pushd kicker/kicker/ui
+#    make kmenubase.h
+#popd
+%endif
+
+%make
+
+%if %compile_apidox
+   make apidox
+%endif
+
+%install
+rm -fr %buildroot
+
+export RUN_KAPPFINDER=no
+export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
+make DESTDIR=%buildroot install
+
+# Install kde pam configuration file
+install -d -m 0755 %buildroot%_sysconfdir/pam.d/
+install -m 0644 %SOURCE4 %buildroot%_sysconfdir/pam.d/kde3
+install -m 0644 %SOURCE5 %buildroot%_sysconfdir/pam.d/kde3-np
+
+# Install kscreensaver pam configuration file
+install -m 0644 kscreensaver.pamd %buildroot%_sysconfdir/pam.d/kscreensaver3
+
+# Keep KDM migration
+install -m 0644 %SOURCE2 %buildroot/%_kde3_bindir/
+
+# Add chksession support
+# David - 3.0-0.beta1.8mdk - We don't use the _sysconfdir macro here because
+#                            this file need to be installed in /etc/ and not
+#                            in /opt/kde3/etc/ (or KDE 3 will not be displayed
+#                            in KDM/GDM.
+#                            We will also need to rename 11KDE in 01KDE when
+#                            KDE 3 will be used as default KDE.
+install -d -m 0775 %buildroot/%{_sysconfdir}/X11/wmsession.d/
+cat << EOF > %buildroot/%{_sysconfdir}/X11/wmsession.d/01KDE3
+NAME=KDE
+ICON=kde-wmsession.xpm
+DESC=The K Desktop Environment
+EXEC=%_kde3_bindir/startkde
+SCRIPT:
+exec %_kde3_bindir/startkde
+EOF
+
+
+# David - 2.1-0.20010210.1mdk - Change kdesud owners and permission (per request
+#                               of binary)
+# David - 2.1-1mdk - It seems that Coolo made some modifications in Makefile to
+#                    set that automatically in KDE post 2.1. To check in next
+#                    CVS code update
+chmod 2755 %buildroot/%_kde3_bindir/kdesud
+chmod 4755 %buildroot/%_kde3_bindir/kcheckpass 
+
+# Link KDM images directory to faces directory
+rm -fr %buildroot/%_kde3_appsdir/kdm/pics/users/
+pushd  %buildroot/%_kde3_appsdir/kdm/pics
+	ln -s %{_datadir}/mdk/faces users
+popd
+
+# Remove KDE hat...
+rm -f %buildroot/%_kde3_appsdir/kdewizard/pics/wizard_small.png
+# ...and install a safe image
+install -m 0644 %SOURCE8 %buildroot/%_kde3_appsdir/kdewizard/pics/wizard_small.png
+
+# David - 2.2.0.beta1.3mdk - Remove a potential problem with Apple
+rm -f %buildroot/%_kde3_datadir/wallpapers/default_blue.jpg
+
+install -d %buildroot/%_kde3_appsdir/kdesktop/Desktop
+
+# David - 2.2.2-77mdk - The QtCUPS and KUPS packages are taken from the distro,
+#                       because QtCUPS got integrated into KDE and is "kprinter"
+#                       now and KUPS is the KDE Printing Manager now (KDE
+#                       Control Center, "System"/"Printing Manager". The tools
+#                       are generalized to aso work with LPD or LPRng. To help
+#                       the old-fashioned users who always type "kups" and
+#                       "qtcups" at the command prompt
+(
+cd %buildroot/%_kde3_bindir
+ln -s kprinter qtcups
+ln -s kprinter lpr-kprinter
+)
+
+# Console font to fontconfig
+install -d -m 0755 %buildroot/%_sysconfdir/fonts/conf.d
+install -m 0644 %SOURCE9 %buildroot/%_sysconfdir/fonts/conf.d/99-konsole.conf
+
+# Mandriva startkde
+#install -m 0755 %SOURCE3 %buildroot/%_kde3_bindir/startkde
+
+# logrotate
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cat << EOF > %{buildroot}%{_sysconfdir}/logrotate.d/kdm3
+/var/log/kdm3.log {
+    weekly
+    notifempty
+    missingok
+    nocompress
+}
+EOF
+
+install -m 0755 %SOURCE10 %buildroot/%_kde3_bindir/kdeeject
+
+install -m 0755 %SOURCE11 %buildroot/%_kde3_datadir/autostart/
+install -m 0755 %SOURCE12 %buildroot/%_kde3_datadir/autostart/
+install -m 0755 %SOURCE13 %buildroot/%_kde3_datadir/autostart/
+install -m 0755 %SOURCE14 %buildroot/%_kde3_datadir/applnk/.hidden/
+install -m 0755 %SOURCE15 %buildroot/%_kde3_datadir/mimelnk/application/
+install -m 0755 %SOURCE16 %buildroot/%_kde3_datadir/mimelnk/application/
+
+# automatic gtk icon cache update on rpm installs/removals
+# (see http://wiki.mandriva.com/en/Rpm_filetriggers)
+install -d %buildroot%{_var}/lib/rpm/filetriggers
+cat > %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-hicolor.filter << EOF
+^./opt/kde3/share/icons/hicolor/
+EOF
+cat > %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-hicolor.script << EOF
+#!/bin/sh
+if [ -x /usr/bin/gtk-update-icon-cache ]; then 
+  /usr/bin/gtk-update-icon-cache --force --quiet /opt/kde3/share/icons/hicolor
+fi
+EOF
+chmod 755 %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-hicolor.script
+
+cat > %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-crystalsvg.filter << EOF
+^./opt/kde3/share/icons/crystalsvg/
+EOF
+cat > %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-crystalsvg.script << EOF
+#!/bin/sh
+if [ -x /usr/bin/gtk-update-icon-cache ]; then 
+  /usr/bin/gtk-update-icon-cache --force --quiet /opt/kde3/share/icons/crystalsvg
+fi
+EOF
+chmod 755 %buildroot%{_var}/lib/rpm/filetriggers/gtk-icon-cache-kde3-crystalsvg.script
+
+desktop-file-install \
+  --add-category="System" \
+  --add-only-show-in="KDE" \
+  --dir %buildroot%_kde3_datadir/applications/kde \
+  --add-only-show-in="KDE" \
+	%buildroot%_kde3_datadir/applications/kde/KControl.desktop
+
+#Fix xdg dir
+#mkdir %buildroot/etc/xdg/kde
+#mv %buildroot/etc/xdg/menus %buildroot/etc/xdg/kde
+
+%clean
+rm -fr %buildroot
+
+
+
+%changelog
+* Wed Jul 27 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-6mvt2010.2
++ Fix kcontrol meni patch mysteriously missing from last build. Trying again...
++ Fix problem with kdebase-3.5.12-kdm-kcontrol-usericon.patch
+
+* Tue Jul 26 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-5mvt2010.2
++ Add kdebase-3.5.12-kdm-kcontrol-usericon.patch
+
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-4mvt2010.2
++ Add kdebase-3.5.12-fix-kcontrol-menu.patch
+
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-3mvt2010.2
++ Add kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch
++ Add kdebase-3.5.12-move-xdg-menu-dir.patch
++ Add kdebase-3.5.12-startkde.patch
+
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-2mvt2010.2
++ Fix xdg dirs
+
+* Fri Feb 2 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
++ Rebuild for MDV 2010.2 and Trinity 3.5.12
++ Fix the following patches for compatibility with code changes:
+  kdebase-3.5.3-fix-media-fuser.patch
+  kdebase-3.4.0-fix-scrnsaver.patch
+  kdebase-3.5.10-fix-vibrate-dialog.patch
+  kdebase-3.3.2-fix-kdm-theme-mdk.patch
+  kdebase-3.5.7-clock-drakclock.patch
+  kdebase-3.5.4-fix-gtk-style.patch
+  kdebase-3.5.7-kdesktop_firstrun.patch
+  kdebase-3.5.7-khelpcenter-htdigsearch-path.patch
+  kdebase-3.5.8-kmenu_tooltip_support.patch
+  detect-media-types.patch
+  mediamanager-mount-point-utf8.diff
+  turkish-preview.patch
++ Comment out for later removal if not needed
+  kdebase-3.5.10-fix-build.patch
+  kdebase-3.5.10-fix-build-beagle.patch
+  kdm-utf8-password.patch
+  kio_media_i18n.patch
+  kate_desktop_file.patch
+  select-wm-gui.diff
+- Remove the following patches which don't work, aren't needed or are now in the core:
+  kdebase-3.5.6-rubberband.patch
+  kdebase-3.5.4-rubberband-kcmstyle.patch
+  kdebase-3.5.10-konqsidebar-restrictions.patch
+  kdebase-post-3.5.10-kickoff-kicker.patch
+  kdebase-post-3.5.8-kickoff-kcontrol.patch
+  kdebase-post-3.5.10-kickoff-mandriva.patch
+  kdebase-3.5.8-new_kside_top_layout.patch
+  kdebase-post-3.5.9-kickoff-button.patch
+  kdebase-3.5.6-kicker-kmenu.patch
+  kdebase-3.5.6-kicker-top.patch
+  kdebase-3.5.8-menu_icon_switch.patch
+  suspend-unmount.diff
+  kdebase-3.5.7-xdg-user-dirs-dirpath.patch
+  kdebase-3.5.10-ksmserver-timed.patch
+  kdebase-3.5.7-handle_fstab_unomunt.patch
+  kdebase-3.5.8-kdm-suspend.patch
+  kdebase-3.5.10-ksmserver-suspend.patch
+  kdebase-3.5.8-theme-selector.patch
+  kdebase-kdm-makeitcool.patch
+  kdebase-kdm-consolekit.patch
+  kdebase-3.5.8-kmenu_tooltip_support.patch
+  kcontrol-energy.diff
+  kdebase-3.5.9-kdesktop-crossfade.patch
+  kdebase-3.5.9-kdm-kcontrol-usericon.patch
+  kdebase-post-3.5.9-bookmark-global-copy.patch
+  kdebase-post-3.5.9-kbackground-xml-selector.patch
+  kdebase-3.5.9-kdesktop-resize-bug.patch
+  kdebase-post-3.5.9-kickoff-shadow-zoom.patch
+  kdebase-3.5.9-kdesktop-bg-nullImage.patch
+  kdebase-3.5.9-kdesktop-desktop_change-bug.patch
+  kdebase-3.5.10-gcc4.patch
+  kdebase-post-3.5.10-rev863267.patch
+  kdebase-post-3.5.10-rev864963.patch
+  add-polkit-support-to-halbackend.patch
+  change-monetary-symbol-to-TL.patch
+  kdebase-3.5.10-nspluginloader-fix-load-plugins-on-demand.patch
+  konsole_url_handling.patch
+  fix_autotools.patch
+  systray_order.diff
+
+* Fri Jul 16 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-34mvt2010.1
+- Removed kdebase-3.5.10-xdg-dirs-set-paths.patch, this was causing a build failure
+
+* Wed May 05 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-33mvt2010.1
++ Rebuild for 2010.1
++ Add fix_openssl.patch to fix compilation with new openssl package
+
+* Wed Mar 24 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-32mvt2010.0
++ Add Kwin patch (patch 118) to provide kde4-kwin and compiz wm support
++ Add systray order patch
+
+* Thu Feb 18 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-31mvt2010.0
++ Make default config dir as $HOME/.kde3 to avoid future conflicts with KDE4
++ Fix KControl doesn't show up in menu issue
+
+* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-30mvt2010.0
++ KDE builds with autoconf 2.65, add patch for this and
+  set autoconf to version 2.65
+
+* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-29mvt2010.0
++ Fix kdm won't provide dm issue
+
+* Fri Jan 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-28mvt2010.0
++ Add missing gurpmi and x-urpmi desktop files
++ Use automake 1.11 and above
++ KDE won't built with autoconf 2.64, fix spec file to 2.63
++ Add fancy application start animations
++ Patch kate.desktop so, multiple files could be opened in one kate session.
+
+* Thu Dec 31 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-27mvt2010.0
++ Add xdg-user-dirs implemention to kickoff menu style
+
+* Tue Dec 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-26mvt2010.0
++ Add Pardus patches to imporve usability and fix kio slave issues
+ - detect-media-types.patch
+ - add-polkit-support-to-halbackend.patch
+ - change-monetary-symbol-to-TL.patch
+ - kdebase-3.5.10-nspluginloader-fix-load-plugins-on-demand.patch
+ - kdm-utf8-password.patch
+ - kio_media_i18n.patch
+ - konsole_url_handling.patch
+ - mediamanager-mount-point-utf8.diff
+ - media_saferemove.patch
+ - turkish-preview.patch
+
+* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-25mvt2010.0
++ Fixed libname to avoid unwanted KDE4 upgrade
++ added fix_detect_media_types patch
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-24mdv2010.0
++ Rebuild for MDV 2010.0
++ kdebase-3.5.10-gcc4.patch
+
+* Thu Apr 23 2009 Frederic Crozat <fcrozat@mandriva.com> 1:3.5.10-23mdv2009.1
++ Revision: 368909
+- Don't build devel doc
+- Move session file to progs subpackage to fix filetrigger
+
+* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 1:3.5.10-22mdv2009.1
++ Revision: 361977
+- add more conflicts with old packages
+
+* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 1:3.5.10-21mdv2009.1
++ Revision: 361676
+- rebuild for missing packages on x86_64
+
+* Mon Mar 23 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-20mdv2009.1
++ Revision: 360568
+- Add back provide
+
+* Sun Mar 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-19mdv2009.1
++ Revision: 360323
+- More conflicts fixes
+
+* Sun Mar 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-18mdv2009.1
++ Revision: 360320
+- Fix conflicts
+
+  + Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+    - Don't provide and conflict same range of kdebase-ksysguard version,
+      remove Provides.
+    - Remove redundant Conflict for kdebase-ksysguard, keep the one with
+      greater epoch:version-release.
+    - Revert previous change for kdebase-ksysguard update error.
+
+* Fri Mar 20 2009 Herton Ronaldo Krzesinski <herton@mandriva.com.br> 1:3.5.10-16mdv2009.1
++ Revision: 359155
+- kdelibs-devel is now kdelibs3-devel, change requirements.
+- Fix following update error from older packages:
+  kdebase-ksysguard < 30000000:3.5.10-8 conflicts with kdebase3-ksysguard-1:3.5.10-15mdv2009.1.i586
+  kdebase-ksysguard < 1:3.5.10-9 conflicts with kdebase3-ksysguard-1:3.5.10-15mdv2009.1.i586
+
+* Wed Mar 18 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-15mdv2009.1
++ Revision: 357162
+- Add conflicts to ease upgrade
+
+* Wed Mar 18 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-14mdv2009.1
++ Revision: 357135
+- Remove Wrong requires
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-12mdv2009.1
++ Revision: 356609
+- Add Provides to ease upgrade
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-10mdv2009.1
++ Revision: 356311
+- Fix Requires
+
+* Mon Mar 16 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-9mdv2009.1
++ Revision: 355934
+- Adapt to new name
+- Build with beagle
+- Start to fix build
+- Change kdebase to kdebase3 ( kde3 reintroduction step 3 )
+
+  + Funda Wang <fundawang@mandriva.org>
+    - rediff consolekit patch
+    - rediff ksmserver-suspend patch
+    - rediff ksmserver-timed patch
+    - rediff kickoff mandriva patch
+    - rediff kickoff patch
+    - rediff vibrate dialog patch
+    - rebuild for new libraw1394
+
+* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 1:3.5.10-7mdv2009.1
++ Revision: 301160
+- drop krootwarning dep (it is broken and will only be rewritten for kde4, not
+  fixed)
+
+  + Oden Eriksson <oeriksson@mandriva.com>
+    - rebuilt against new libxcb
+
+* Mon Sep 29 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-6mdv2009.0
++ Revision: 289240
+- add upstream patch
+  Fix the passing the 'locale' mount option:
+- read the real locale from the environment (including the charset), the language is of no use to FS drivers,
+- do not attempt to store the locale in the config file, it has to be the current one,
+- only pass the locale if the filesystem type is ntfs-3g, HAL is broken and lists 'locale' as available with the Linux
+  in-kernel ntfs driver (http://bugs.freedesktop.org/show_bug.cgi?id=17753)
+
+* Mon Sep 29 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-5mdv2009.0
++ Revision: 289118
+- Fix source name
+- Add some autostart files
+- allow the entire range of valid ports on knetattach
+- Fix File list
+- fix name of logrotate file
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-3mdv2009.0
++ Revision: 285192
+- Moved wmsession to make upgrade easier
+
+* Wed Sep 10 2008 Frederic Crozat <fcrozat@mandriva.com> 1:3.5.10-2mdv2009.0
++ Revision: 283518
+- Fix filetriggers for icon cache, was using old path
+
+* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-1mdv2009.0
++ Revision: 276330
+- Update for probably the last upstream kdebase from kde3
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Fix Mounting USB sticks with spaces in label (Bug #30139)
+    - update hal privilege names to match newer hal versions (11.0 or newer)
+
+* Fri Jul 04 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-50mdv2009.0
++ Revision: 231887
+- Fixing khotkeys to autostart only with KDE
+- Removing CrossFade effect on KDE 3 desktop changes
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add patch 123: Avoid lockup after a failed login on LDAP systems, which give
+      'LDAP Password incorrect: try again' and want to get the right one again.
+    - Revive logrotate conf file
+
+* Tue Jun 24 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-47mdv2009.0
++ Revision: 228753
+- Fix Requires
+- [BUGFIX] Remove extra space in NAME (Bug #41612)
+
+* Mon Jun 16 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-45mdv2009.0
++ Revision: 220504
+- For some strange reason kdebase package not arrived on BS. Revuilding
+
+* Sun Jun 15 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-44mdv2009.0
++ Revision: 219246
+- fix kickoff underlinking
+
+  + Pixel <pixel@mandriva.com>
+    - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+    - add rpm filetrigger running gtk-update-icon-cache when rpm install/remove hicolor/crystalsvg icons for kde3
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Tue Jun 03 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-43mdv2009.0
++ Revision: 214530
+- rebuild for new qt3 libdir
+
+  + Danilo Cesar Lemes de Paula <danilo@mandriva.com>
+    - Decrease the number of steps of Hour based transitions (Kdesktop)
+
+* Mon May 19 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 1:3.5.9-42mdv2009.0
++ Revision: 208975
+- Use versioned obsoletes
+
+* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-41mdv2009.0
++ Revision: 205302
+- Fix macros for cache image
+
+* Tue May 06 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-40mdv2009.0
++ Revision: 201679
+- Fixed konsole font dir
+- Fixed session entry
+- removed ksysguard useless script ( was about time )
+
+* Mon May 05 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-39mdv2009.0
++ Revision: 201372
+- Same invalid arts require breaking x86_64
+
+* Sun May 04 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-38mdv2009.0
++ Revision: 201022
+- Moving for /opt
+- Adding patches using de then "inpatch  log info
+
+* Thu Apr 03 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-36mdv2008.1
++ Revision: 192288
+- Fixing last mistake in add unicode string instead of real utf8 string to translation in tooltip
+
+* Wed Apr 02 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-35mdv2008.1
++ Revision: 191983
+- Fixing a Kdesktop/background bug (screen come to black when there isn't any file into slideshow)
+
+* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-34mdv2008.1
++ Revision: 191799
+- Fixed kdeeject. We should stop to try using magic and not update it...
+
+* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-33mdv2008.1
++ Revision: 191677
+- Added possibility to enable/disable shadow on text on menu button. Default is false
+- Fixes "zoom" effect showing icons on big tooltips. The standard is 128x128
+
+* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-32mdv2008.1
++ Revision: 191620
+- Fix double copy and message advise on bookmarks initializing
+
+  + Danilo Cesar Lemes de Paula <danilo@mandriva.com>
+    - Adding KDesktop resize pb patch to buildsystem
+    - Solving the problem with background refresh delay when users tries to resize desktop with Krandr
+
+  + Gustavo Pichorim Boiko <boiko@mandriva.com>
+    - Fix tooltip internationalization on menus
+
+* Mon Mar 24 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-30mdv2008.1
++ Revision: 189790
+- kwin bugfix patch from branch
+
+* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-29mdv2008.1
++ Revision: 189486
+- Fix groups ( tks to pterjan)
+
+* Tue Mar 18 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-28mdv2008.1
++ Revision: 188630
+- kwin minimize fix from kdebase branch
+
+  + Danilo Cesar Lemes de Paula <danilo@mandriva.com>
+    - Fixing KControl/Background xml recover
+
+* Tue Mar 18 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-27mdv2008.1
++ Revision: 188503
+- Rebuilding the package with a higher release number to add
+  KControl/Background XML support.
+- Kcontrol/Background modified. Now users can select betwin normal slide show or
+  XML controled slide show
+
+* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-26mdv2008.1
++ Revision: 187964
+- Add conflicts on kmenuedit
+
+* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-25mdv2008.1
++ Revision: 187949
+- Fixing bug https://qa.mandriva.com/show_bug.cgi?id=38789
+
+* Tue Mar 11 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-24mdv2008.1
++ Revision: 185868
+- Fixing KBackground CrossFade effect bug, acording with
+  https://qa.mandriva.com/show_bug.cgi?id=38598
+
+* Mon Mar 10 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-23mdv2008.1
++ Revision: 183663
+- Update with trayproxy and messagebox patches.
+
+* Mon Mar 10 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-22mdv2008.1
++ Revision: 183489
+- Colorband fixed under Kbackground by using QImage insted QPixmap (and X11 stuffs)
+
+* Fri Mar 07 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-21mdv2008.1
++ Revision: 181614
+- Another chnage but not change because is already changed in the last change button change :-/
+- Copy global bookmark if exists to user dir, and if user doesn't have already one
+
+* Thu Mar 06 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-20mdv2008.1
++ Revision: 181053
+- KDM Userlist icon not resizes anymore for an arbitary size. Now users can have fun with baboon :-)
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add a Requires on mandriva-kde-translation
+
+* Thu Mar 06 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-18mdv2008.1
++ Revision: 180267
+- Translation support not needed here as this is done on kdelibs now
+- Add translation support for mandriva strings in kde
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fixed common icon taskbar resizing
+    - Fixed text over standard menu button
+
+  + Andreas Hasenack <andreas@mandriva.com>
+    - pam_nologin has to be in auth also for kde3-np
+    - move system-auth to the bottom of the session section
+      in the pam config files, or else a "sufficient" module
+      in the included file could prevent other modules *after*
+      the include statement from being called (#37801)
+    - pam_nologin's proper section is the account one, not auth
+
+* Tue Mar 04 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-16mdv2008.1
++ Revision: 178858
+- Adding a new support to Kbackground change Image acording a XML file, using crossFade effects
+
+* Tue Mar 04 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-15mdv2008.1
++ Revision: 178416
+- Post 3.5.9 bug fixes from kde branch.
+- Unbreaking lm_sensors
+- Fixing multiple crashes on khotkeys
+
+* Tue Mar 04 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-14mdv2008.1
++ Revision: 178249
+- Fix button sizing and alignment. No more auto resizing unless specified in max size. Button is now centralized.
+  Config entries KMenuButtonScale, TextRelativeXPos and TextRelativeYPos are obsoleted.
+  Added KMenuButtonMaxVSize. Mandriva defualt size for 2008.1 is 22, all kicker sizes larger than 32 will have their
+  own button scaled to the proper size.
+- Fix positioning of Text on both horizontal and vertical. Vertical calculation is not perfect but is more than ok for now.
+- kickoff now uses same button code, so no more ugly different buttons for both menus.
+
+* Fri Feb 29 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.9-13mdv2008.1
++ Revision: 176870
+- Fix the kdm theme selector so that it works using mandriva themes
+
+* Thu Feb 28 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-12mdv2008.1
++ Revision: 176428
+- Change mandrake_desk for desktop-common-data as requested by Frederic Crozat
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Update usb.ids database
+
+* Wed Feb 27 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-11mdv2008.1
++ Revision: 175935
+- Major KDM themer fixes. Userlist is now NIS and LDAP friendly
+- Fixed font weight in themer. Now is possible add font="Sans 12 WEIGHT", where weight can be any of Light, DemiBold Bold, Black or Normal.
+  Normal is default
+- Fixed non-local UserList ( NIS, LDAP, etc.. )
+- Added support to show or not real user name ( double line with real user name ). Default is false
+
+* Tue Feb 26 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-10mdv2008.1
++ Revision: 175599
+- KDM themer now have support for define icon users size
+- KDM themer userlist support now is fixed
+  TODO Alternate userlist background, possible button support
+- KDM kcontrol user small refactor to match XDG user face /usr/share/faces/. KDM comes next
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add patch42 : add translations support + Fix typo
+    - Fallback on official tarball and use patch until this is not on svn
+    - Add translation support on mandriva-profile-chooser
+    - [BUGFIX] Remove logrotate for kdm (Bug 34068)
+
+* Fri Feb 22 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.9-7mdv2008.1
++ Revision: 174010
+- Adding CrossFade effect into Kdesktop Background changes
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Fix Kcontrol menu entry to show that this is KDE related (Bug #35870)
+
+* Wed Feb 20 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-6mdv2008.1
++ Revision: 173263
+- Fixed kate bug bu Colin Guthrie
+- Fix BKO #158069 - Kate bad position
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [FEATURE] Add patch38: Fix Kcontrol energy module when Kpowersave is on  (Bug #32021)
+    - Delete $kdehome/Autostart/alignment-icons.desktop if it exist as we do not have it anymore
+      This file existed on 2007.1 so this make migration problem
+    - Remove if as backports are done
+    - Add switch for backports
+
+* Sat Feb 16 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-3mdv2008.1
++ Revision: 169312
+- make screensaver-onlyshowin-kde.patch patch back again
+
+* Fri Feb 15 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-2mdv2008.1
++ Revision: 168878
+- Make consolekit patch come back (Patch34)
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
++ Revision: 168526
+- Get away from branches. Last KDE 3 arriving !!
+- Removed post-3.5.8 patches intregrated
+- Patch for icon sizing on KDM listing disabled until formal spec arrive for new KDM
+
+* Wed Feb 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-17mdv2008.1
++ Revision: 167182
+- Make rpmlint happier
+- Add back icon for switch user option in Kmenu
+
+  + Gustavo Pichorim Boiko <boiko@mandriva.com>
+    - Add support for Tooltip in the KMenu entries showing an brief description of
+      what the application is for
+
+* Fri Feb 01 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.8-16mdv2008.1
++ Revision: 161250
+- Change the layout of the top row of the menu: now the KDE version is shown
+  on the right
+
+* Fri Feb 01 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-15mdv2008.1
++ Revision: 161169
+- Fixing mandriva-profile-chooser application to work with alternatives
+
+* Fri Jan 25 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-14mdv2008.1
++ Revision: 158031
+- Update kdm style gdm like patch, from make it cool branch
+- Update console kit patch
+
+* Tue Jan 22 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-13mdv2008.1
++ Revision: 156242
+- Fixing double top bar widget drawing. The situation that triggers double bars was directed connected to hability to show or
+  not recent apps on menu. With recent show enabled ( larger than 0 ), double bars are appearing.
+  With no recent show enabled, no bar appears at all.
+
+* Wed Jan 16 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-12mdv2008.1
++ Revision: 153912
+- [BUGFIX] Do not put kcontrol own widgets inside of QXEmbed. (Bug #36478)
+
+* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-11mdv2008.1
++ Revision: 147327
+- Kickoff should not be the default one. Thanks to neoclust to catch another fail point
+
+* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-10mdv2008.1
++ Revision: 147156
+- Fixed wrong icon on kickoff patch
+- Added menu icon switch patch for compilation without kickoff, as requested by Nicolas Lecureil
+- Time based logout dcop call for ksmserver.
+
+* Tue Jan 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-9mdv2008.1
++ Revision: 146890
+- Integrated all Mandriva changes in mandriva-kickoff.patch, including menu icon switch
+- Added switch of menu type in kcontrol
+- Removed obsolete patches
+- Integrated kicker top patch on mandriva kickoff patch
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Do not show screensavers on the menu
+
+* Tue Jan 08 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-8mdv2008.1
++ Revision: 146625
+- Bug Fixes in KDM Theme Selector.
+
+* Fri Jan 04 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-7mdv2008.1
++ Revision: 144918
+- Add a KDM Theme Selector in KControl
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+* Sun Dec 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-6mdv2008.1
++ Revision: 137336
+- first step to fix build against new beagle
+- Fix Beagle includes in kickoff patch
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Updated for lates branch with merged flash fix patches
+    - Disabled kickoff menu for now, since not all mandriva patches are integrated
+    - Recompile against new libldap
+    - libbeagle should be now 0.3.0 or higher
+    - Fixed apidocs install dir ( no more versioning )
+    - Added new flash patch for kdebase from novell
+    - Updated kickoff patch to fix compile order
+    - Commented old beagle query code ( old api )
+    - Add missing patch
+    - Enabled initial kickoff Mandriva changes patch
+    - Fixed liblazy api imcompatibilities
+    - Fixed consolekit patch
+    - Updated ksmserver suspend patch against liblazy
+    - Added kdm suspend patch against liblazy
+    - Proper tarball with admin included
+    - Added with-console-kit option in configure instead of use hardcoded WITH_CONSOLE_KIT
+    - Add first part of mandriva kickoff patch
+    - Beginning changes to kickoff update. Old patch replaced bu official from suse branch. Mandriva post patch coming, including button switch
+    - Updated to branch, as agreed between kde team
+    - Added new console-kit version of the patch, ready to be commited upstream uppon maintainer agreement
+    - Added Lubos flash patch to test
+    - removed all post-3.5.8 patches already included in new tarball
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+    - require the righ lm_sensor library
+    - rebuild for new libbeagle
+
+* Fri Nov 23 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.8-3mdv2008.1
++ Revision: 111505
+- Set QTDIR on startkde pointing to qt3, as qt4 will be the default qt in 2008.1
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Forwardport fixed ConsoleKit patch from Frederic Crozat (Patch18)
+      This fixes the kdm bug that prevent remote login (Bug #34786)
+
+* Sun Nov 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-2mdv2008.1
++ Revision: 105871
+- Add missing BuildRequire
+- Add usptream 3.5.9 branch patches
+  	- Fix memleak
+  	- Fix some compilation issues
+  	- Fix some DPMS issues
+- Add usptream 3.5.9 branch patches
+  	- Add better upstram fix for gdm 2.19+ ( Patch 149 )
+  	- Fix no_action with firefox under klipper ( Patch 154 )
+  	- Fix media unmount ( Patch 152 )
+
+* Thu Nov 01 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
++ Revision: 104717
+- Use mandriva icons on Kickoff
+- [BUGFIX] Add Network keyword to have wizard assistant shown (Bug #35185)
+- [BUGFIX] Fix quick launcher applet for Home url (Bug #34450)
+- Start to add kickoff back ( part 1 )
+- Remove merged patches
+  Update patch 110
+- Kde 3.5.8
+- Remove upstream merged patches
+
+* Tue Oct 23 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-41mdv2008.1
++ Revision: 101564
+- htsearch is installed in /usr/bin in our distro
+
+* Fri Oct 19 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-40mdv2008.1
++ Revision: 100208
+- [BUGFIX] Fix screensaver issue (Bug #32778)
+- [BUGFIX] Add htdig for building inex support (Bug #22053)
+
+* Fri Oct 12 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-39mdv2008.1
++ Revision: 97269
+- sysinfo has been renamed to kio-sysinfo
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix summary-ended-with-dot
+
+* Wed Oct 03 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-38mdv2008.0
++ Revision: 95068
+- Do not require kate, just suggest it
+
+* Tue Oct 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-37mdv2008.0
++ Revision: 94808
+- Fix the kdm translation patch by forwarding the LANG env var from kdm to the
+  greeter.
+- Re-add a wrongly removed patch fixing firstboot focusing on kdm
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fix kdm localization. Original code is bypassing all locales assigning only language set on kdmrc.
+      Now code validates LANGUAGE env var, otherwise fallbacks to kdmrc Language set and in the last
+      resource standard en_US.
+
+* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-36mdv2008.0
++ Revision: 93747
+- Fix unmounting of media devices that are on fstab (#30157)
+
+* Fri Sep 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-35mdv2008.0
++ Revision: 93510
+- [BUGFIX] Add icon for "Lock Current && Start New Session" (Bug #23900)
+
+* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-34mdv2008.0
++ Revision: 93093
+- Make kdesktop copy desktop files to the user home dir on first run (#33204)
+
+* Tue Sep 25 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-33mdv2008.0
++ Revision: 92923
+- Enable sound server at KDE startup (#32306)
+- Make kdebase-progs require the external KRandR
+
+* Fri Sep 21 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-32mdv2008.0
++ Revision: 91968
+- More menu fixes ( maybe latests ;) )
+- More menu fixes
+
+* Fri Sep 21 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-31mdv2008.0
++ Revision: 91828
+- Make the kmenu squared icon scale too.
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Do not show KTip on the menu (Bug #33757)
+    - [BUGFIX] Add logrotate file for KDM (Bug #23227)
+    - [BUGFIX] Do not show Kappfinder on the menu (Bug #33062)
+    - [BUGFIX] Do not show kicker kcm on menu (Bug #33064)
+    - [BUGFIX] Show KHelpcenter on the Documentation menu (Bug #32842)
+    - [BUGFIX] Do not display Kpersonaliser on the menu (Bug #33063)
+
+* Tue Sep 18 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-30mdv2008.0
++ Revision: 89722
+- Removed the unfinished button config dialog
+- Add a context menu entry making it possible to switch between mandriva menu
+  icon and the default kde menu icon.
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Do not display kpager (Bug #32671)
+    - [BUGFIX] move out Kjobviewer of system tool section (Bug #33439)
+
+* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-29mdv2008.0
++ Revision: 89321
+- Readd a patch to fix gtk color handling for Ia Ora
+
+* Fri Sep 14 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-27mdv2008.0
++ Revision: 85383
+- [BUGFIX] Make KControl appear on the menu (BUG #32678)
+- [BUGFIX] Fix compatibility with gdm 2.19 (BUG #31460)
+
+* Thu Sep 13 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-26mdv2008.0
++ Revision: 85319
+- Add lzma support (#32877)
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Do not display screensavers on the menu ( NoDisplay=true )
+
+* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-25mdv2008.0
++ Revision: 78999
+- Added lates patches fomr branch
+- Removed nsplugin patch, thanks to Fred Crozat that added workaround patch in gtk
+- Added call to drackclock, as required by Andreas
+
+* Thu Aug 30 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-23mdv2008.0
++ Revision: 76297
+- Another broken patch causing headaches. Now the "konqueror fixes" was leading to wrong test on tab
+  and rewriting location bar with invalid address from other tab. What did i say about non tested
+  patches and put non valid text inside ?
+- Lubos fixed my patch to linking pluginspath on nsplugins. Way better than use a static link.
+
+* Wed Aug 29 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-22mdv2008.0
++ Revision: 74618
+- Requires krandr
+- Fix again another invalid patch not tested. People should take care when add things without know
+  exactly if would work.
+
+  + Gustavo Pichorim Boiko <boiko@mandriva.com>
+    - Remove files that are now in the krandr packages
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add upstream patch from BRANCH "Avoid reports about X errors"
+
+* Tue Aug 28 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-20mdv2008.0
++ Revision: 72701
+- xrandr should not be requires anymore.
+
+  + Michael Scherer <misc@mandriva.org>
+    - fix typo leading to uninstallable package ( i guess "x andr" should be "xrandr" )
+
+* Mon Aug 27 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-19mdv2008.0
++ Revision: 72237
+- Removed krandrtray < 1.2 support. 1.2 support will be provided by external package for KDE 3.
+- Added recent patches from kdebase branch
+
+* Fri Aug 24 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-18mdv2008.0
++ Revision: 70790
+- Added xdg-user-dirs patch for enble in kde modification
+- Added new menu modifications asked by fcrozat
+- Removed old /etc/xdg/kde/menu
+- Added remaining branch patches
+
+* Tue Aug 21 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-17mdv2008.0
++ Revision: 68734
+- Reenable mozilla nsplugin code. The previous issue was triggered by a different bug.
+
+  + Funda Wang <fundawang@mandriva.org>
+    - fix file conflict between nsplugin and common subpackage
+
+* Thu Aug 16 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-15mdv2008.0
++ Revision: 64069
+- Again, nsplugin is behaving weirdly due to gtk init on flash plugin, happening just in i586. Boiko did a patch for old
+  nspluginviewer but not fix the new mozilla based code. For now mozilla base patch will be disabled
+  to keep Boiko's patch working and we will find a better solution after, since Mozilla code is way
+  improved...
+
+* Tue Aug 14 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-14mdv2008.0
++ Revision: 63176
+- Added post 3.5.7 patches from branch.
+- Added mozilla nspplugin sdk code patch
+- Removed erroneous xinerama options
+- Minor spec fix
+- Added konsole font for proper place. We do not need call an fc-cache forced on common package,
+  just on konsole, which provides de fixed font
+- Removed obsolete cal to kicker migrate
+
+* Mon Aug 13 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-13mdv2008.0
++ Revision: 62572
+- Fix some duplicates that were preventing a proper installation
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add OnlyShowIn on keyboard_layout.desktop file (bug #32471)
+    - Add upstream patch to fix konqueror issues (Patch211)
+    - Allow to have Konqueror on menu on non- WM
+    - [BUGFIX] Do not forget to call functions file (for gprintf) (Bug #32176)
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fix patch for menu in sidebar
+
+  + Anssi Hannula <anssi@mandriva.org>
+    - move kate, kmenuedit, konsole, ksysguard menu entries to their
+      respective packages to avoid having menu entries or mimetype
+      associations that only return an error
+
+* Fri Jul 27 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-12mdv2008.0
++ Revision: 56451
+- * Big Cleanup
+  Old menu files, upgrades and root interface removed. Root interface will be exchanged for a better
+  kde-config solution, if root interface still desired
+  Many patches are exchanged for upstream versions, and commited on upstream when relevant
+  Patches removed:
+- kdebase-3.0.3-fix-index-html.patch: Obsoleted
+- kdebase-3.1-fix-load-default-panel-appl-in-simplified-menu.patch: Obsoleted
+- kdebase-3.2-add-multimedia-key.patch: Hardcoded entry. Will be handled by kde-config
+- kdebase-3.2-fix-paste-action-in-konsole.patch: Not needed anymore. Upstream similar solution
+  already in code
+- kdebase-3.2-kde-info2html.patch: Use strict back.
+- kdebase-3.3-remove-help-entry-into-kdesktop.patch: Hardcoded entry. Will be handled by kde-config
+- kdebase-3.3.2-fix-miniclip-icon.patch: Hardcoded entry. Will be handled by kde-config
+- kdebase-3.4.0-fix-arts-mdk-bugs-11671.patch: Exchanged by upstream patch
+- kdebase-3.4.0-fix-mdk-merge-dir.patch: Not needed anymore
+- kdebase-3.4.0-konqueror-about.patch: Not needed anymore. Can be done in kde-config
+- kdebase-3.4.92-ksplashscreen-mdk.tar.bz: We're not using this anymore. Time to obsolete this old
+  code
+- kdebase-3.5.6-startkde.patch: Replaced for mandriva-startkde as file
+- kdebase-3.5.6-fix-screensaver-nodisplay.patch: Exchanged by upstream patch
+- kdebase-3.5.3-add-mdv-device.patch: No devices:/ anymore hardcoded
+- kdebase-3.5.4-fix-screensaver-onlyshowin-kde.patch: Exchanged by upstream patch
+- kdebase-3.5.6-disable-kicker-notify.patch: Obsoleted
+- kdebase-3.4.2-startkde-align-icones.patch: Hacked solution not applied anymore
+- kdebase-3.5.2-startkde-move-menu-directory.patch: Obsoleted
+- kdebase-3.5.3-fix-kthememanager-enable-button.patch: exchanged by upstream
+- kdebase-3.4.2-fix-wrap-crash.patch: Exchanged by upstream patch
+- kdebase-3.4.2-fix-default-kthememanager-name.patch: Hardcoded config
+- kdebase-3.5.3-xinerama.patch: Exchanged by upstream patch
+- kdebase-3.5.4-fix-gtk-style.patch: Hardcoded config
+- kdebase-3.5.3-install-script-kde.patch: Not needed anymore
+- kdebase-3.2.3-fix-makefile-crypto.patch: Exchanged by upstream patch
+- kdebase-3.5.6-launch-mcc.patch: Not applied anymore
+- kdebase-3.5.4-media-mnt.patch: Moving to standard /media
+- kdebase-3.5.6-fix-load-kmix.patch: Hardcoded config
+- kdebase-3.4.0-fix-mdk-bug-16007.patch: Obsoleted
+- kdebase-3.4.0-fix-kfileivi.patch: Exchanged by upstream patch
+- kdebase-3.5.6-kicker-desktop.patch: Hardcoded config
+- kdebase-3.4.2-mdkft.patch: Not needed anymore
+- kdebase-3.5.4-fix-old-icon-pos.patch: Obsoleted
+- kdebase-3.4.92-fix-detect-ntfs-partition.patch: Obsoleted
+- kdebase-3.4.2-kwin-theme.patch: Obsoletes by kde-config
+- kdebase-3.5.4-international-bookmarks.patch: Hardcoded config. Can go in kde-config
+- Avoid preview crashes when view is invalid
+
+* Fri Jul 27 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-11mdv2008.0
++ Revision: 56407
+- Workaround a flashplayer plugin bug that appeared after latest gtk update
+
+  + Frederic Crozat <fcrozat@mandriva.com>
+    - Patch183 (Fedora): add ConsoleKit support
+
+* Mon Jul 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-10mdv2008.0
++ Revision: 54628
+- Add proper patch
+- Fix Buildrequire
+- [BUGFIX] Fix kdeeject patch (closing bugs #30153 and #31830)
+- [BUGFIX] Add missing fatal_error function ( bug #31830)
+- [BUGFIX] Show key bindings in the menu (Bug #31558)
+- [BUGFIX] Do not own /etc/X11/wmsession.d ( bug #31561)
+-[BUGFIX] Fix typo on desktop file ( bug #31436)
+- Fix OnlyShowIn=KDE;
+
+  + Olivier Blin <oblin@mandriva.com>
+    - require kdebase-common in kdebase-kdm (for pam files)
+
+* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 1:3.5.7-8mdv2008.0
++ Revision: 36177
+- rebuild with correct optflags
+
+  + Christiaan Welvaart <spturtle@mandriva.org>
+    - remove kcontrol-ppc from filelist
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Remove hardcoded packager
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fix suspend menu on kickoff entries
+
+* Mon Jun 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-7mdv2008.0
++ Revision: 35224
+- Fix categories
+- Add Requires on sysinfo if Kickoff is build (bug #31168)
+- More category fixes
+- Remove patch90: Broken Klipper launch
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Removed ancient files
+    - Removed more hardcoded files and moved for config package
+    - Added konsole real transparency patch
+    - Better change the mess now before we reach new release. Moving only the daemon doesn't make sense since it's do nothnig alone, so move all ksysguard tool is more usefull.
+
+* Tue May 29 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-2mdv2008.0
++ Revision: 32543
+- [feature] Split ksysguardd in its own package (#16352)
+
+* Thu May 17 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-1mdv2008.0
++ Revision: 27565
+- BuildRequires mkfontscale
+- BuildRequires mkfontdir
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - 3.5.7 release
+    - Added translations for kickoff menu
+    - Modified kicker patches to match extra image on rtl languages
+    - Remove all references and ifdefs for old distributions.
+    - Removed old patches that od not apply or are solved in different way in upstream KDE
+    - Back to use stable branch.
+    - Removed all references to old menudir method. We are using xdg and xdg only now.
+    - As requested by users, kickoff menu adapted to Mandriva style as alternative.
+
+  + Olivier Blin <oblin@mandriva.com>
+    - add missing escape to fix configure
+
+* Mon Apr 23 2007 Laurent Montel <lmontel@mandriva.org> 1:3.5.6-35mdv2008.0
++ Revision: 17171
+- Fix nsplugins
+
diff --git a/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch b/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch
new file mode 100644
index 000000000..08deeb032
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch
@@ -0,0 +1,28 @@
+--- kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp--	2005-02-28 15:16:19.881739297 +0100
++++ kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp	2005-02-28 15:17:37.816468727 +0100
+@@ -57,11 +57,23 @@ KdmThemer::KdmThemer( const QString &_fi
+ 
+ 	// read the XML file and create DOM tree
+ 	TQString filename = _filename;
+-	if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
++        if ( _filename.startsWith("/usr/share/mdk/dm") )
++        {
++            if (!::access( TQFile::encodeName( filename + "/KdmGreeterTheme.desktop" ), R_OK )) {
++		KSimpleConfig cfg( filename + "/KdmGreeterTheme.desktop" );
++		cfg.setGroup( "GdmGreeterTheme" );
++		filename += '/' + cfg.readEntry( "Greeter" );
++            }
++        }
++        else
++        {
++            if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
+ 		KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
+ 		cfg.setGroup( "GdmGreeterTheme" );
+ 		filename += '/' + cfg.readEntry( "Greeter" );
+-	}
++            }
++        }
++
+ 	TQFile opmlFile( filename );
+ 	if (!opmlFile.open( IO_ReadOnly )) {
+ 		FDialog::box( widget(), errorbox, i18n( "Cannot open theme file %1" ).arg(filename) );
diff --git a/mandriva/2010.2/kdebase/kdebase-3.4.0-fix-scrnsaver.patch b/mandriva/2010.2/kdebase/kdebase-3.4.0-fix-scrnsaver.patch
new file mode 100644
index 000000000..b0e3723d3
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.4.0-fix-scrnsaver.patch
@@ -0,0 +1,18 @@
+--- kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp--	2005-04-12 05:03:07.927420021 -0400
++++ kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp	2005-04-12 05:04:27.259781143 -0400
+@@ -103,13 +103,14 @@ KScreenSaver::KScreenSaver(TQWidget *pare
+ 
+     // Add KDE specific screensaver path
+     TQString relPath="System/ScreenSavers/";
++#if 0 //disable because we mustn't use it	
+     KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
+     if (servGroup)
+     {
+       relPath=servGroup->relPath();
+       kdDebug() << "relPath=" << relPath << endl;
+     }
+-
++#endif
+     KGlobal::dirs()->addResourceType("scrsav",
+                                      KGlobal::dirs()->kde_default("apps") +
+                                      relPath);
diff --git a/mandriva/2010.2/kdebase/kdebase-3.4.2-fix-kdm-server-args.patch b/mandriva/2010.2/kdebase/kdebase-3.4.2-fix-kdm-server-args.patch
new file mode 100644
index 000000000..1e8afa2f9
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.4.2-fix-kdm-server-args.patch
@@ -0,0 +1,14 @@
+--- kdebase-3.4.2/kdm/config.def--	2005-09-08 15:28:23.000000000 +0200
++++ kdebase-3.4.2/kdm/config.def	2005-09-08 15:28:49.000000000 +0200
+@@ -1348,9 +1348,9 @@ Description:
+ 
+ Key: ServerArgsLocal
+ Type: string
+-Default: ""
++Default: "-nolisten tcp"
+ User: core
+-Instance: :*/"-nolisten tcp"
++Instance: */"-deferglyphs 16 -nolisten tcp"
+ Comment: &
+ Description:
+  Additional arguments for the &X-Server;s for local sessions.
diff --git a/mandriva/2010.2/kdebase/kdebase-3.4.2-mdkft.patch b/mandriva/2010.2/kdebase/kdebase-3.4.2-mdkft.patch
new file mode 100644
index 000000000..11f3021fe
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.4.2-mdkft.patch
@@ -0,0 +1,20 @@
+--- kdebase-3.4.2/kdm/kfrontend/kgapp.cpp--	2005-09-07 20:13:23.000000000 +0200
++++ kdebase-3.4.2/kdm/kfrontend/kgapp.cpp	2005-09-07 20:13:52.000000000 +0200
+@@ -140,7 +140,7 @@ kg_main( const char *argv0 )
+ 	app.setFont( _normalFont );
+ 
+ 	setup_modifiers( dpy, _numLockStatus );
+-	SecureDisplay( dpy );
++	//SecureDisplay( dpy );
+ 	KProcess *proc = 0;
+ 	if (!_grabServer) {
+ 		if (_useBackground) {
+@@ -226,7 +226,7 @@ kg_main( const char *argv0 )
+ 	KGVerify::done();
+ 
+ 	delete proc;
+-	UnsecureDisplay( dpy );
++	//UnsecureDisplay( dpy );
+ 	restore_modifiers();
+ 
+ 	XSetInputFocus( qt_xdisplay(), PointerRoot, PointerRoot, CurrentTime );
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5-kde.pam b/mandriva/2010.2/kdebase/kdebase-3.5-kde.pam
new file mode 100644
index 000000000..af09fed18
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5-kde.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth        include system-auth
+account    required	pam_nologin.so
+account    include system-auth
+password   include system-auth
+session    optional  pam_console.so
+session    include system-auth
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5-kde3-np b/mandriva/2010.2/kdebase/kdebase-3.5-kde3-np
new file mode 100644
index 000000000..c5da48f9b
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5-kde3-np
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth sufficient pam_permit.so
+auth       include system-auth
+account    required	pam_nologin.so
+account    include system-auth
+password   include system-auth
+session    optional  pam_console.so
+session    include system-auth
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5-wizard_small.png b/mandriva/2010.2/kdebase/kdebase-3.5-wizard_small.png
new file mode 100644
index 000000000..cafc0ed8d
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5-wizard_small.png
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.10-fix-vibrate-dialog.patch b/mandriva/2010.2/kdebase/kdebase-3.5.10-fix-vibrate-dialog.patch
new file mode 100644
index 000000000..a9b3a4fc5
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.10-fix-vibrate-dialog.patch
@@ -0,0 +1,86 @@
+--- kdesktop/lock/lockdlg.cc.fix_vibrate_dialog	2007-05-14 09:55:44.000000000 +0200
++++ kdesktop/lock/lockdlg.cc	2009-01-04 06:20:33.000000000 +0100
+@@ -53,6 +53,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+ #include <fixx11h.h>
++#include <kapplication.h>
+ 
+ #ifndef AF_LOCAL
+ # define AF_LOCAL	AF_UNIX
+@@ -202,6 +203,38 @@
+     }
+ }
+ 
++void PasswordDlg::movedialog( int _move )
++{
++     waitMoveDialog = true;
++     this->move(pos().x()+_move, pos().y());
++     TQTimer::singleShot( 50, this, SLOT(moveTimerDone()) );
++     while (waitMoveDialog)
++          kapp->processEvents();
++}
++
++void PasswordDlg::moveTimerDone()
++{
++     waitMoveDialog = false;
++}
++
++void PasswordDlg::badPasswordLogin()
++{
++     if ( mUnlockingFailed )
++     {
++          for ( int i = 0 ; i<2 ; i++)
++          {
++               movedialog( 10 );
++               movedialog( -20 );
++               movedialog( 20 );
++               movedialog( -20 );
++               movedialog( 20 );
++               movedialog( -10 );
++          }
++     }
++}
++
++
++
+ //---------------------------------------------------------------------------
+ //
+ // Handle timer events.
+@@ -332,6 +365,7 @@
+             ok->setEnabled(false);
+             cancel->setEnabled(false);
+             mNewSessButton->setEnabled( false );
++			badPasswordLogin();
+             return;
+         case AuthAbort:
+             return;
+--- kdesktop/lock/lockdlg.h.fix_vibrate_dialog	2005-09-10 10:25:41.000000000 +0200
++++ kdesktop/lock/lockdlg.h	2009-01-04 06:20:33.000000000 +0100
+@@ -55,7 +55,7 @@
+     void slotOK();
+     void layoutClicked();
+     void slotActivity();
+-
++	void moveTimerDone();
+ private:
+     void setLayoutText( const TQString &txt );
+     void capsLocked();
+@@ -71,6 +71,9 @@
+     void handleVerify();
+     void reapVerify();
+     void cantCheck();
++   void movedialog( int _move );
++   void badPasswordLogin();
++
+     GreeterPluginHandle *mPlugin;
+     KGreeterPlugin *greet;
+     TQFrame      *frame;
+@@ -86,6 +89,7 @@
+     TQStringList::iterator currLayout;
+     int         sPid, sFd;
+     TQListView   *lv;
++	bool        waitMoveDialog;
+ };
+ 
+ #endif
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-config.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-config.patch
new file mode 100644
index 000000000..922315b6e
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-config.patch
@@ -0,0 +1,12 @@
+--- admin/configure.in.min.orig	2011-07-13 14:02:37.735906184 +0100
++++ admin/configure.in.min	2011-07-13 14:03:14.916906166 +0100
+@@ -44,6 +44,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-fix-kcontrol-menu.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-fix-kcontrol-menu.patch
new file mode 100644
index 000000000..4e0113aeb
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-fix-kcontrol-menu.patch
@@ -0,0 +1,42 @@
+--- kcontrol/kcontrol/KControl.desktop	2011-07-20 12:08:11.913774590 +0100
++++ kcontrol/kcontrol/KControl.desktop.new	2011-07-22 10:21:25.604284524 +0100
+@@ -1,3 +1,4 @@
++
+ [Desktop Entry]
+ Exec=kcontrol -caption "%c" %i %m
+ Icon=kcontrol
+@@ -5,7 +6,7 @@
+ DocPath=kcontrol/index.html
+ X-KDE-StartupNotify=true
+ 
+-Name=KDE3 Control Center
++Name=Trinity Control Center
+ Name[af]=Beheer Sentrum
+ Name[ar]=مركز التحكم
+ Name[az]=İdarə Mərkəzi
+@@ -21,14 +22,14 @@
+ Name[da]=Kontrolcenter
+ Name[de]=Kontrollzentrum
+ Name[el]=Κέντρο ελέγχου
+-Name[en_GB]=Control Centre
++Name[en_GB]=Trinity Control Centre
+ Name[eo]=Stircentro
+ Name[es]=Centro de control
+ Name[et]=Juhtimiskeskus
+ Name[eu]=Kontrol gunea
+ Name[fa]=مرکز کنترل
+ Name[fi]=Ohjauskeskus
+-Name[fr]=Centre de configuration de KDE
++Name[fr]=Centre de configuration de Trinity
+ Name[fy]=Konfiguraasjesintrum
+ Name[ga]=Lárionad Rialaithe
+ Name[gl]=Centro de Control
+@@ -90,6 +91,6 @@
+ Name[zu]=Indawo Yokulawula
+ 
+ X-DCOP-ServiceType=Unique
+-Categories=Qt;KDE;Core;System;
++Categories=Qt;KDE;Core;System;X-MandrivaLinux-CrossDesktop;
++X-Desktop-File-Install-Version=0.16
+ OnlyShowIn=KDE;
+-NoDisplay=true
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-kdm-kcontrol-usericon.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-kdm-kcontrol-usericon.patch
new file mode 100644
index 000000000..173857044
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-kdm-kcontrol-usericon.patch
@@ -0,0 +1,198 @@
+--- kcontrol/kdm/kdm-users.cpp.nopatch	2011-07-19 11:06:21.493310808 +0100
++++ kcontrol/kdm/kdm-users.cpp	2011-07-19 11:15:19.120311520 +0100
+@@ -56,7 +56,7 @@
+     } else if (!stat( "/usr/portage", &st )) {	/* gentoo */
+ 	defminuid = "1000";
+ 	defmaxuid = "65000";
+-    } else if (!stat( "/etc/mandrake-release", &st )) {	/* mandrake - check before redhat! */
++    } else if (!stat( "/etc/mandriva-release", &st )) {	/* mandrake - check before redhat! */
+ 	defminuid = "500";
+ 	defmaxuid = "65000";
+     } else if (!stat( "/etc/redhat-release", &st )) {	/* redhat */
+@@ -74,12 +74,8 @@
+     // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
+     // and create them if necessary.
+     config->setGroup( "X-*-Greeter" );
+-    m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
++    m_pixDir = "/usr/share/faces/";
+     m_notFirst = false;
+-    TQDir testDir( m_userPixDir );
+-    if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
+-        KMessageBox::sorry( this, i18n("Unable to create folder %1").arg( testDir.absPath() ) );
+-    chmod( TQFile::encodeName( m_userPixDir ), 0755 );
+ 
+     m_defaultText = i18n("<default>");
+ 
+@@ -146,18 +142,6 @@
+     connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
+ 	     TQT_SLOT(slotChanged()) );
+ 
+-    faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
+-    TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users."
+-      " \"Admin\" represents the global folder; these are the pictures you can set below."
+-      " \"User\" means that KDM should read the user's $HOME/.face.icon file."
+-      " The two selections in the middle define the order of preference if both sources are available.") );
+-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
+-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+-    rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
+-    rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
+-    rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
+-    rbusronly = new TQRadioButton( i18n("User"), faceGroup );
+-
+     TQGroupBox *picGroup = new TQVGroupBox( i18n("User Images"), this );
+     TQWidget *hlpw = new TQWidget( picGroup );
+     usercombo = new KComboBox( hlpw );
+@@ -191,6 +175,7 @@
+     TQVBoxLayout *lLayout = new TQVBoxLayout( main, 10 );
+     lLayout->addWidget( minGroup );
+     lLayout->addWidget( usrGroup );
++	lLayout->addWidget( picGroup );
+     lLayout->addStretch( 1 );
+ 
+     TQVBoxLayout *mLayout = new TQVBoxLayout( main, 10 );
+@@ -199,11 +184,6 @@
+     mLayout->setStretchFactor( wstack, 1 );
+     main->setStretchFactor( mLayout, 1 );
+ 
+-    TQVBoxLayout *rLayout = new TQVBoxLayout( main, 10 );
+-    rLayout->addWidget( faceGroup );
+-    rLayout->addWidget( picGroup );
+-    rLayout->addStretch( 1 );
+-
+ }
+ 
+ void KDMUsersWidget::makeReadOnly()
+@@ -214,10 +194,6 @@
+     cbcomplete->setEnabled(false);
+     cbinverted->setEnabled(false);
+     cbusrsrt->setEnabled(false);
+-    rbadmonly->setEnabled(false);
+-    rbprefadm->setEnabled(false);
+-    rbprefusr->setEnabled(false);
+-    rbusronly->setEnabled(false);
+     wstack->setEnabled(false);
+     disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
+     userbutton->setAcceptDrops(false);
+@@ -232,7 +208,6 @@
+     wstack->setEnabled( en );
+     wstack->raiseWidget( cbinverted->isChecked() ? optoutlv : optinlv );
+     en = cbshowlist->isChecked();
+-    faceGroup->setEnabled( en );
+     if (!en) {
+ 	usercombo->setEnabled( false );
+ 	userbutton->setEnabled( false );
+@@ -243,12 +218,6 @@
+ 
+ void KDMUsersWidget::slotFaceOpts()
+ {
+-    bool en = !rbusronly->isChecked();
+-    usercombo->setEnabled( en );
+-    userbutton->setEnabled( en );
+-    if (en)
+-	slotUserSelected();
+-    else
+ 	rstuserbutton->setEnabled( false );
+ }
+ 
+@@ -257,13 +226,13 @@
+     TQString user = usercombo->currentText();
+     TQImage p;
+     if (user != m_defaultText &&
+-	p.load( m_userPixDir + user + ".face.icon" )) {
++        p.load( m_pixDir + user + ".png" )) {
+ 	rstuserbutton->setEnabled( !getuid() );
+     } else {
+-	p.load( m_userPixDir + ".default.face.icon" );
++        p.load( m_pixDir + "default.png" );
+ 	rstuserbutton->setEnabled( false );
+     }
+-    userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
++    userbutton->setPixmap( p );
+ }
+ 
+ 
+@@ -272,7 +241,7 @@
+     TQString user( usercombo->currentText() );
+     if (user == m_defaultText)
+     {
+-       user = ".default";
++       user = "default";
+        if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::cancel())
+             != KMessageBox::Yes)
+           return;
+@@ -286,8 +255,7 @@
+ 	return;
+     }
+ 
+-    p = p.smoothScale( 48, 48, TQImage::ScaleMin );
+-    TQString userpix = m_userPixDir + user + ".face.icon";
++    TQString userpix = m_pixDir + user + ".png";
+     if (!p.save( userpix, "PNG" ))
+         KMessageBox::sorry(this,
+ 	    i18n("There was an error saving the image:\n%1")
+@@ -319,7 +287,7 @@
+ 
+ void KDMUsersWidget::slotUnsetUserPix()
+ {
+-    TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
++    TQFile::remove( m_pixDir + usercombo->currentText() + ".png" );
+     slotUserSelected();
+ }
+ 
+@@ -368,11 +336,6 @@
+ 
+     config->writeEntry( "HiddenUsers", hiddenUsers );
+     config->writeEntry( "SelectedUsers", selectedUsers );
+-
+-    config->writeEntry( "FaceSource",
+-	rbadmonly->isChecked() ? "AdminOnly" :
+-	rbprefadm->isChecked() ? "PreferAdmin" :
+-	rbprefusr->isChecked() ? "PreferUser" : "UserOnly" );
+ }
+ 
+ 
+@@ -456,16 +419,6 @@
+     cbinverted->setChecked( config->readEntry( "ShowUsers" ) != "Selected" );
+     cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
+ 
+-    TQString ps = config->readEntry( "FaceSource" );
+-    if (ps == TQString::fromLatin1("UserOnly"))
+-	rbusronly->setChecked(true);
+-    else if (ps == TQString::fromLatin1("PreferUser"))
+-	rbprefusr->setChecked(true);
+-    else if (ps == TQString::fromLatin1("PreferAdmin"))
+-	rbprefadm->setChecked(true);
+-    else
+-	rbadmonly->setChecked(true);
+-
+     slotUserSelected();
+ 
+     slotShowOpts();
+@@ -480,7 +433,6 @@
+     cbcomplete->setChecked( false );
+     cbinverted->setChecked( true );
+     cbusrsrt->setChecked( true );
+-    rbadmonly->setChecked( true );
+     hiddenUsers.clear();
+     selectedUsers.clear();
+     slotShowOpts();
+diff -u -r kdebase-kdm/kcontrol/kdm/kdm-users.h kdebase-3.5.9/kcontrol/kdm/kdm-users.h
+--- kcontrol/kdm/kdm-users.h	2005-10-10 12:03:49.000000000 -0300
++++ kcontrol/kdm/kdm-users.h	2008-03-06 19:04:12.000000000 -0300
+@@ -86,14 +86,11 @@
+ 	QWidgetStack	*wstack;
+ 	KListView	*optoutlv, *optinlv;
+ 
+-	QButtonGroup	*faceGroup; // right
+-	QRadioButton	*rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;
+-
+ 	KComboBox	*usercombo; // right below
+ 	QPushButton	*userbutton;
+ 	QPushButton	*rstuserbutton;
+ 
+-	QString		m_userPixDir;
++	QString		m_pixDir;
+ 	QString		m_defaultText;
+ 	QStringList	hiddenUsers, selectedUsers;
+ 	QString		defminuid, defmaxuid;
+
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-menus.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-menus.patch
new file mode 100644
index 000000000..a5cb16850
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-menus.patch
@@ -0,0 +1,1049 @@
+diff -bur kdebase.orig//kappfinder/kappfinder.desktop kdebase/kappfinder/kappfinder.desktop
+--- kdebase.orig//kappfinder/kappfinder.desktop	2010-08-12 04:29:30.000000000 +0100
++++ kdebase/kappfinder/kappfinder.desktop	2011-07-19 11:42:37.774311301 +0100
+@@ -5,6 +5,7 @@
+ Terminal=false
+ X-KDE-StartupNotify=true
+ OnlyShowIn=KDE;
++NoDisplay=true
+ 
+ Name=Menu Updating Tool
+ Name[af]=Kieslys opdateer program
+Only in kdebase/kappfinder: kappfinder.desktop.orig
+diff -bur kdebase.orig//kate/data/kate.desktop kdebase/kate/data/kate.desktop
+--- kdebase.orig//kate/data/kate.desktop	2010-08-12 04:29:24.000000000 +0100
++++ kdebase/kate/data/kate.desktop	2011-07-19 11:42:37.775311319 +0100
+@@ -93,4 +93,4 @@
+ Terminal=false
+ InitialPreference=8
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;TextEditor;
++Categories=Qt;KDE;X-MandrivaLinux-MoreApplications-Development-Tools;
+Only in kdebase/kate/data: kate.desktop.orig
+diff -bur kdebase.orig//kcontrol/access/kcmaccess.desktop kdebase/kcontrol/access/kcmaccess.desktop
+--- kdebase.orig//kcontrol/access/kcmaccess.desktop	2010-08-12 04:28:28.000000000 +0100
++++ kdebase/kcontrol/access/kcmaccess.desktop	2011-07-19 11:42:22.752311329 +0100
+@@ -3,7 +3,7 @@
+ Type=Application
+ Exec=kcmshell kcmaccess
+ DocPath=kcontrol/kcmaccess/index.html
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=access
+ X-KDE-Init=access
+Only in kdebase/kcontrol/access: kcmaccess.desktop.orig
+diff -bur kdebase.orig//kcontrol/arts/arts.desktop kdebase/kcontrol/arts/arts.desktop
+--- kdebase.orig//kcontrol/arts/arts.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/arts/arts.desktop	2011-07-19 11:42:22.788311685 +0100
+@@ -238,3 +238,4 @@
+ Keywords[zu]=aRts,Umlekeleli Womsindo,artsd,Okuzwakalayo,Umsindo,Isiqaliso, ukubonakala koxhumano olusakazekile,Ukubonakala ngale,ukubaluleka,okunezingxemye ezimbili,okunezingxenye ezimbili eziphendulanayo,isikhathi sokuphendula, Umxubi,Izinga lomsindo,KMix,Xuba,ngena ngaphakathi,MIDI,umlungisi womsindo, umculo
+ 
+ Categories=Qt;KDE;X-KDE-settings-sound;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/arts: arts.desktop.orig
+diff -bur kdebase.orig//kcontrol/background/background.desktop kdebase/kcontrol/background/background.desktop
+--- kdebase.orig//kcontrol/background/background.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/background/background.desktop	2011-07-19 11:42:22.774311291 +0100
+@@ -238,3 +238,4 @@
+ Keywords[zu]=inkundla yangemuva,ama-desktop,imibala,imibala,izithombe,amaphepha ezindonga,ukuxubanisa,ukulinganisa,cache,amaphepha ezindonga eziningi,pixmap
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/background: background.desktop.orig
+diff -bur kdebase.orig//kcontrol/bell/bell.desktop kdebase/kcontrol/bell/bell.desktop
+--- kdebase.orig//kcontrol/bell/bell.desktop	2010-08-12 04:28:26.000000000 +0100
++++ kdebase/kcontrol/bell/bell.desktop	2011-07-19 11:42:22.789311587 +0100
+@@ -4,6 +4,7 @@
+ Type=Application
+ DocPath=kcontrol/bell/index.html
+ Categories=Qt;KDE;X-KDE-settings-sound;
++OnlyShowIn=KDE;
+ 
+ 
+ X-KDE-Library=bell
+Only in kdebase/kcontrol/bell: bell.desktop.orig
+diff -bur kdebase.orig//kcontrol/clock/clock.desktop kdebase/kcontrol/clock/clock.desktop
+--- kdebase.orig//kcontrol/clock/clock.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/clock/clock.desktop	2011-07-19 11:42:22.789311587 +0100
+@@ -248,3 +248,4 @@
+ Keywords[zh_TW]=clock,日期,時間,時區
+ 
+ Categories=Qt;KDE;X-KDE-settings-system;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/clock: clock.desktop.orig
+diff -bur kdebase.orig//kcontrol/colors/colors.desktop kdebase/kcontrol/colors/colors.desktop
+--- kdebase.orig//kcontrol/colors/colors.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/colors/colors.desktop	2011-07-19 11:42:22.775311523 +0100
+@@ -250,3 +250,4 @@
+ Keywords[zu]=imibala,imibala,iplani,ukugqama,imibala ye-Widget,Iplani Lombala
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/colors: colors.desktop.orig
+diff -bur kdebase.orig//kcontrol/componentchooser/componentchooser.desktop kdebase/kcontrol/componentchooser/componentchooser.desktop
+--- kdebase.orig//kcontrol/componentchooser/componentchooser.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/componentchooser/componentchooser.desktop	2011-07-19 11:42:22.753311334 +0100
+@@ -2,7 +2,7 @@
+ Exec=kcmshell componentchooser
+ Icon=misc
+ Type=Application
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=componentchooser
+ 
+Only in kdebase/kcontrol/componentchooser: componentchooser.desktop.orig
+diff -bur kdebase.orig//kcontrol/crypto/crypto.desktop kdebase/kcontrol/crypto/crypto.desktop
+--- kdebase.orig//kcontrol/crypto/crypto.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/crypto/crypto.desktop	2011-07-19 11:42:22.788311685 +0100
+@@ -227,3 +227,4 @@
+ Keywords[zu]=Crypto,Krypto,Ukuqaqa umbhalo ongaqondakali,SSL,https, izitifiketi,imibhalo yekhodi,TLS,vikela,ukuvikela
+ 
+ Categories=Qt;KDE;X-KDE-settings-security;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/crypto: crypto.desktop.orig
+diff -bur kdebase.orig//kcontrol/css/kcmcss.desktop kdebase/kcontrol/css/kcmcss.desktop
+--- kdebase.orig//kcontrol/css/kcmcss.desktop	2010-08-12 04:28:30.000000000 +0100
++++ kdebase/kcontrol/css/kcmcss.desktop	2011-07-19 11:42:22.782311869 +0100
+@@ -231,3 +231,4 @@
+ Keywords[zu]=CSS,HTML,isitayela,ikhasi lesitayela,ukungena
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/css: kcmcss.desktop.orig
+diff -bur kdebase.orig//kcontrol/display/display.desktop kdebase/kcontrol/display/display.desktop
+--- kdebase.orig//kcontrol/display/display.desktop	2010-08-12 04:28:24.000000000 +0100
++++ kdebase/kcontrol/display/display.desktop	2011-07-19 11:42:22.794311055 +0100
+@@ -152,3 +152,4 @@
+ Comment[zh_CN]=显示设置
+ Comment[zh_TW]=顯示設定
+ Categories=Qt;KDE;X-KDE-settings-hardware;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/display: display.desktop.orig
+diff -bur kdebase.orig//kcontrol/dnssd/kcm_kdnssd.desktop kdebase/kcontrol/dnssd/kcm_kdnssd.desktop
+--- kdebase.orig//kcontrol/dnssd/kcm_kdnssd.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/dnssd/kcm_kdnssd.desktop	2011-07-20 11:30:29.259385172 +0100
+@@ -153,3 +153,4 @@
+ #X-KDE-SubstituteUID=false 
+ #X-KDE-RootOnly=true
+ Categories=Qt;KDE;X-KDE-settings-network;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/dnssd: kcm_kdnssd.desktop.orig
+diff -bur kdebase.orig//kcontrol/ebrowsing/ebrowsing.desktop kdebase/kcontrol/ebrowsing/ebrowsing.desktop
+--- kdebase.orig//kcontrol/ebrowsing/ebrowsing.desktop	2010-08-12 04:28:28.000000000 +0100
++++ kdebase/kcontrol/ebrowsing/ebrowsing.desktop	2011-07-19 11:42:22.782311869 +0100
+@@ -235,3 +235,4 @@
+ Keywords[zu]=Ukucinga okujulile,Ukucinga,WWW,Internet,Amagama abalulekile e-Internet,Amahluzo,Uxhumano olusakazekile,Izinjini zokusesha, Izindlela ezimfushane
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/ebrowsing: ebrowsing.desktop.orig
+diff -bur kdebase.orig//kcontrol/filetypes/filetypes.desktop kdebase/kcontrol/filetypes/filetypes.desktop
+--- kdebase.orig//kcontrol/filetypes/filetypes.desktop	2010-08-12 04:28:31.000000000 +0100
++++ kdebase/kcontrol/filetypes/filetypes.desktop	2011-07-19 11:42:22.755311510 +0100
+@@ -4,7 +4,7 @@
+ Exec=kcmshell filetypes
+ DocPath=kcontrol/filetypes/index.html
+ Categories=Qt;KDE;X-KDE-settings-components;
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=filetypes
+ X-KDE-ParentApp=kcontrol
+Only in kdebase/kcontrol/filetypes: filetypes.desktop.orig
+diff -bur kdebase.orig//kcontrol/fonts/fonts.desktop kdebase/kcontrol/fonts/fonts.desktop
+--- kdebase.orig//kcontrol/fonts/fonts.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/fonts/fonts.desktop	2011-07-19 11:42:22.775311523 +0100
+@@ -237,3 +237,4 @@
+ Keywords[zu]=Izinhlobo zamagama,uhlobo lwamagama,izitayela,charsets, amaqoqo ezaimpawu,kicker,lawula,iwindi lemininingwane,ama-desktop,Imenenja yefayela,amabha amathuluzi,Imenu,Isihloko se-Window,Isihloko
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/fonts: fonts.desktop.orig
+diff -bur kdebase.orig//kcontrol/icons/icons.desktop kdebase/kcontrol/icons/icons.desktop
+--- kdebase.orig//kcontrol/icons/icons.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/icons/icons.desktop	2011-07-19 11:42:22.776311321 +0100
+@@ -247,3 +247,4 @@
+ Keywords[zu]=izimpawu,imiphumela,usayizi,umbala ophezulu,umbala ophansi
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/icons: icons.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/devices.desktop kdebase/kcontrol/info/devices.desktop
+--- kdebase.orig//kcontrol/info/devices.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/devices.desktop	2011-07-20 11:58:57.730775967 +0100
+@@ -3,8 +3,8 @@
+ Icon=kcmdevices
+ Type=Application
+ DocPath=kinfocenter/devices/index.html
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=devices
+Only in kdebase/kcontrol/info: devices.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/dma.desktop kdebase/kcontrol/info/dma.desktop
+--- kdebase.orig//kcontrol/info/dma.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/dma.desktop	2011-07-20 11:53:11.747776146 +0100
+@@ -3,8 +3,8 @@
+ Icon=kcmmemory
+ Type=Application
+ DocPath=kinfocenter/dma/index.html
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=dma
+Only in kdebase/kcontrol/info: dma.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/interrupts.desktop kdebase/kcontrol/info/interrupts.desktop
+--- kdebase.orig//kcontrol/info/interrupts.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/interrupts.desktop	2011-07-20 11:38:01.016776161 +0100
+@@ -3,8 +3,8 @@
+ Icon=kcmmemory
+ Type=Application
+ DocPath=kinfocenter/interrupts/index.html
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=irq
+Only in kdebase/kcontrol/info: interrupts.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/ioports.desktop kdebase/kcontrol/info/ioports.desktop
+--- kdebase.orig//kcontrol/info/ioports.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/ioports.desktop	2011-07-20 11:56:31.152776022 +0100
+@@ -3,8 +3,8 @@
+ Icon=kcmmemory
+ Type=Application
+ DocPath=kinfocenter/ioports/index.html
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=ioports
+Only in kdebase/kcontrol/info: ioports.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/memory.desktop kdebase/kcontrol/info/memory.desktop
+--- kdebase.orig//kcontrol/info/memory.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/memory.desktop	2011-07-20 11:57:09.165776825 +0100
+@@ -245,5 +245,5 @@
+ Keywords[zh_CN]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,内存,虚拟存储,物理存储,共享内存,交换,系统信息
+ Keywords[zh_TW]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,記憶體,虛擬記憶體,實體記憶體,共享記憶體,系統資訊
+ Keywords[zu]=Inkumbulo,RAM,Inkumbulo yamanga,Inkumbulo siqu,Inkumbulo yokwabelana,Shintshanisa,Ulwazi Lwesistimu
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: memory.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/opengl.desktop kdebase/kcontrol/info/opengl.desktop
+--- kdebase.orig//kcontrol/info/opengl.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/opengl.desktop	2011-07-20 11:57:49.145776471 +0100
+@@ -4,7 +4,7 @@
+ Icon=kcmopengl
+ Type=Application
+ DocPath=kinfocenter/opengl/index.html
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=opengl
+@@ -145,5 +145,4 @@
+ Keywords[zh_CN]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,显卡,硬件加速,图形,X 服务器,显示
+ Keywords[zh_TW]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,顯示卡,硬體加速,圖形,顯示
+ 
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
+Only in kdebase/kcontrol/info: opengl.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/partitions.desktop kdebase/kcontrol/info/partitions.desktop
+--- kdebase.orig//kcontrol/info/partitions.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/partitions.desktop	2011-07-20 11:58:27.781775989 +0100
+@@ -243,5 +243,5 @@
+ Keywords[zh_TW]=Partitions,Harddrive,HD,System Information,磁碟分割區,硬式磁碟機,硬碟,系統資訊
+ Keywords[zu]=Izahluko,Harddrive,HD,Ulwazi Lwesistimu
+ 
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: partitions.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/pci.desktop kdebase/kcontrol/info/pci.desktop
+--- kdebase.orig//kcontrol/info/pci.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/pci.desktop	2011-07-20 11:53:45.472776347 +0100
+@@ -3,7 +3,8 @@
+ Icon=kcmpci
+ Type=Application
+ DocPath=kinfocenter/pci/index.html
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=info
+ X-KDE-FactoryName=pci
+Only in kdebase/kcontrol/info: pci.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/processor.desktop kdebase/kcontrol/info/processor.desktop
+--- kdebase.orig//kcontrol/info/processor.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/processor.desktop	2011-07-20 11:45:22.863775969 +0100
+@@ -246,5 +246,5 @@
+ Keywords[zh_CN]=Processor,CPU,FPU,MHz,System Information,处理器,系统信息
+ Keywords[zh_TW]=Processor,CPU,FPU,MHz,System Information,處理器,中央處理器,浮點運算器,系統資訊
+ Keywords[zu]=Umqhubekisi,CPU,FPU,MHz,Ulwazi Lwesistimu
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: processor.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/scsi.desktop kdebase/kcontrol/info/scsi.desktop
+--- kdebase.orig//kcontrol/info/scsi.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/scsi.desktop	2011-07-20 11:39:04.898776053 +0100
+@@ -174,5 +174,5 @@
+ Keywords[zh_CN]=SCSI,SCSI-Bus,System Information,SCSI 总线,系统信息
+ Keywords[zh_TW]=SCSI,SCSI-Bus,System Information,系統資訊
+ Keywords[zu]=SCSI,Ibhasi-SCSI,Ulwazi Lwesistimu
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: scsi.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/sound.desktop kdebase/kcontrol/info/sound.desktop
+--- kdebase.orig//kcontrol/info/sound.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/info/sound.desktop	2011-07-20 11:55:55.443775844 +0100
+@@ -240,5 +240,5 @@
+ Keywords[wa]=Son,Audiocåte son,MIDI,OSS,informåcion do sistinme
+ Keywords[zh_CN]=Sound,Audio,Soundcard,MIDI,OSS,System Information,音频,音响,声卡,系统信息
+ Keywords[zh_TW]=Sound,Audio,Soundcard,Midi,OSS,系統資訊
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: sound.desktop.orig
+diff -bur kdebase.orig//kcontrol/info/xserver.desktop kdebase/kcontrol/info/xserver.desktop
+--- kdebase.orig//kcontrol/info/xserver.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/info/xserver.desktop	2011-07-20 11:54:31.067775792 +0100
+@@ -224,4 +224,5 @@
+ Keywords[zh_CN]=X,X-Server,XServer,XFree86,Display,VideoCard,System InformationX 服务器,显示器,显卡,系统信息
+ Keywords[zh_TW]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X 伺服器,X伺服器,顯示器,顯示卡,系統資訊
+ 
+-Categories=Qt;KDE;X-KDE-settings-hardware;
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/info: xserver.desktop.orig
+diff -bur kdebase.orig//kcontrol/input/mouse.desktop kdebase/kcontrol/input/mouse.desktop
+--- kdebase.orig//kcontrol/input/mouse.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/input/mouse.desktop	2011-07-19 11:42:22.787311214 +0100
+@@ -240,3 +240,4 @@
+ Keywords[zh_TW]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,滑鼠,滑鼠游標加速,滑鼠游標加速間距,滑鼠按鈕,選擇,指標外觀,輸入設備,按鍵對應,單擊,圖示,反饋,指標,拖放,雙擊,映射,習慣右手,習慣左手 
+ Keywords[zu]=i-Mouse,Ukugijimisa kwe-Mouse,i-Mouse threshold, Izinkinobho ze-Mouse,Ukhetho,Isimo senkomba,Amthuluzi Omphumela wangaphakathi,Ukuqondanisa Izinkinobho,Cofa,Izimpawu zezithombe, umphumela obuyayo,Izinkomba zendawo yokubhala,Hudula,Cofa-kabili, ukuqondanisa,okwesanadla sangakwesokudla,okwesandla sangakwesokunxele
+ Categories=Qt;KDE;X-KDE-settings-hardware;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/input: mouse.desktop.orig
+diff -bur kdebase.orig//kcontrol/ioslaveinfo/ioslaveinfo.desktop kdebase/kcontrol/ioslaveinfo/ioslaveinfo.desktop
+--- kdebase.orig//kcontrol/ioslaveinfo/ioslaveinfo.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/ioslaveinfo/ioslaveinfo.desktop	2011-07-19 11:47:56.506311337 +0100
+@@ -234,4 +234,5 @@
+ 
+ X-KDE-ParentApp=kinfocenter
+ 
+-Categories=Qt;KDE;X-KDE-settings-network;
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE
+Only in kdebase/kcontrol/ioslaveinfo: ioslaveinfo.desktop.orig
+diff -bur kdebase.orig//kcontrol/joystick/joystick.desktop kdebase/kcontrol/joystick/joystick.desktop
+--- kdebase.orig//kcontrol/joystick/joystick.desktop	2010-08-12 04:28:36.000000000 +0100
++++ kdebase/kcontrol/joystick/joystick.desktop	2011-07-19 11:42:22.800311582 +0100
+@@ -175,3 +175,4 @@
+ X-KDE-Test-Module=true
+ Icon=joystick
+ Categories=Qt;KDE;X-KDE-settings-hardware;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/joystick: joystick.desktop.orig
+diff -bur kdebase.orig//kcontrol/kcontrol/KControl.desktop kdebase/kcontrol/kcontrol/KControl.desktop
+--- kdebase.orig//kcontrol/kcontrol/KControl.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/kcontrol/KControl.desktop	2011-07-19 11:47:18.310311821 +0100
+@@ -90,6 +90,6 @@
+ Name[zu]=Indawo Yokulawula
+ 
+ X-DCOP-ServiceType=Unique
+-Categories=Qt;KDE;Core;
++Categories=Qt;KDE;Core;System;
+ OnlyShowIn=KDE;
+ NoDisplay=true
+Only in kdebase/kcontrol/kcontrol: KControl.desktop.orig
+Only in kdebase/kcontrol/kcontrol: kinfocenter.desktop.orig
+diff -bur kdebase.orig//kcontrol/kdm/kdm.desktop kdebase/kcontrol/kdm/kdm.desktop
+--- kdebase.orig//kcontrol/kdm/kdm.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/kdm/kdm.desktop	2011-07-19 11:42:22.794311055 +0100
+@@ -241,3 +241,4 @@
+ Keywords[zu]=kdm,Imenenja yokuveza,xdm,abasebenzisi,ukungena ngaphakathi,isibingelelo,Isiqubulo,izitayela,ulimi,izwe,izinhlobo zamagama, inkundla yangemuva,emaphepha ezindonga,iziqendu,vala,phinda uqale
+ 
+ Categories=Qt;KDE;X-KDE-settings-system;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kdm: kdm.desktop.orig
+diff -bur kdebase.orig//kcontrol/keys/keys.desktop kdebase/kcontrol/keys/keys.desktop
+--- kdebase.orig//kcontrol/keys/keys.desktop	2010-08-12 04:28:26.000000000 +0100
++++ kdebase/kcontrol/keys/keys.desktop	2011-07-19 11:42:22.809311579 +0100
+@@ -3,7 +3,7 @@
+ Icon=key_bindings
+ Type=Application
+ DocPath=kcontrol/keys/index.html
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=keys
+ X-KDE-Init=keys
+Only in kdebase/kcontrol/keys: keys.desktop.orig
+diff -bur kdebase.orig//kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop kdebase/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop
+--- kdebase.orig//kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop	2010-08-12 04:28:28.000000000 +0100
++++ kdebase/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop	2011-07-19 11:42:22.794311055 +0100
+@@ -233,3 +233,4 @@
+ Keywords[zh_TW]=font,fonts,installer,truetype,type1,speedo,bitmap,字型,安裝程式,點陣
+ 
+ Categories=Qt;KDE;X-KDE-settings-system;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kfontinst/kcmfontinst: kcmfontinst.desktop.orig
+diff -bur kdebase.orig//kcontrol/kfontinst/viewpart/kfontview.desktop kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
+--- kdebase.orig//kcontrol/kfontinst/viewpart/kfontview.desktop	2010-08-12 04:28:28.000000000 +0100
++++ kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop	2011-07-19 11:42:22.799312185 +0100
+@@ -98,3 +98,4 @@
+ Terminal=false
+ InitialPreference=1
+ Categories=Qt;KDE;Utility;X-KDE-More;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kfontinst/viewpart: kfontview.desktop.orig
+diff -bur kdebase.orig//kcontrol/kicker/panel.desktop kdebase/kcontrol/kicker/panel.desktop
+--- kdebase.orig//kcontrol/kicker/panel.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/kicker/panel.desktop	2011-07-19 11:42:22.758311147 +0100
+@@ -3,7 +3,7 @@
+ Type=Application
+ DocPath=kcontrol/panel/index.html
+ Exec=kcmshell panel
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=kicker
+ X-KDE-ParentApp=kcontrol
+Only in kdebase/kcontrol/kicker: panel.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/cache.desktop kdebase/kcontrol/kio/cache.desktop
+--- kdebase.orig//kcontrol/kio/cache.desktop	2010-08-12 04:28:30.000000000 +0100
++++ kdebase/kcontrol/kio/cache.desktop	2011-07-19 11:42:22.781311140 +0100
+@@ -218,3 +218,4 @@
+ Keywords[zu]=Cache,Umlando,Umlando wokucinga,Izikhumulo,Usayizi
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: cache.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/cookies.desktop kdebase/kcontrol/kio/cookies.desktop
+--- kdebase.orig//kcontrol/kio/cookies.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/kio/cookies.desktop	2011-07-19 11:42:22.781311140 +0100
+@@ -213,3 +213,4 @@
+ Keywords[zu]=Cookies,Cinga,Internet,WWW,Uxhumano olusakazekile,Umthetho, Izindawo
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: cookies.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/lanbrowser.desktop kdebase/kcontrol/kio/lanbrowser.desktop
+--- kdebase.orig//kcontrol/kio/lanbrowser.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/kio/lanbrowser.desktop	2011-07-19 11:42:22.780310871 +0100
+@@ -224,3 +224,4 @@
+ Keywords[zh_CN]=samba,smb,windows,network,网络
+ 
+ Categories=Qt;KDE;X-KDE-settings-network;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: lanbrowser.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/netpref.desktop kdebase/kcontrol/kio/netpref.desktop
+--- kdebase.orig//kcontrol/kio/netpref.desktop	2010-08-12 04:28:30.000000000 +0100
++++ kdebase/kcontrol/kio/netpref.desktop	2011-07-19 11:42:22.779311017 +0100
+@@ -203,3 +203,4 @@
+ X-KDE-ParentApp=kcontrol
+ 
+ Categories=Qt;KDE;X-KDE-settings-network;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: netpref.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/proxy.desktop kdebase/kcontrol/kio/proxy.desktop
+--- kdebase.orig//kcontrol/kio/proxy.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/kio/proxy.desktop	2011-07-19 11:42:22.779311017 +0100
+@@ -207,3 +207,4 @@
+ Keywords[zu]=Umlingani,Umlekeleli ongumlingana,Firewall,Squid,umlingani
+ 
+ Categories=Qt;KDE;X-KDE-settings-network;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: proxy.desktop.orig
+diff -bur kdebase.orig//kcontrol/kio/useragent.desktop kdebase/kcontrol/kio/useragent.desktop
+--- kdebase.orig//kcontrol/kio/useragent.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/kio/useragent.desktop	2011-07-19 11:42:22.786311382 +0100
+@@ -230,3 +230,4 @@
+ Keywords[zu]=Ummeli Womsebenzisi,Umcingi,Internet,WWW,Uxhumano olusakazekile, ummeli,izibongo,umlekeleli,ngena ngaphakathi
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kio: useragent.desktop.orig
+diff -bur kdebase.orig//kcontrol/knotify/kcmnotify.desktop kdebase/kcontrol/knotify/kcmnotify.desktop
+--- kdebase.orig//kcontrol/knotify/kcmnotify.desktop	2010-08-12 04:28:30.000000000 +0100
++++ kdebase/kcontrol/knotify/kcmnotify.desktop	2011-07-19 11:42:22.778310900 +0100
+@@ -241,3 +241,4 @@
+ Keywords[zu]=Imisindo yesistimu,Okuzwakalayo,Umsindo,Yazisa,Ukuqwashisa, Ukwazisa
+ 
+ Categories=Qt;KDE;X-KDE-settings-sound;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/knotify: kcmnotify.desktop.orig
+diff -bur kdebase.orig//kcontrol/konq/desktopbehavior.desktop kdebase/kcontrol/konq/desktopbehavior.desktop
+--- kdebase.orig//kcontrol/konq/desktopbehavior.desktop	2010-08-12 04:28:36.000000000 +0100
++++ kdebase/kcontrol/konq/desktopbehavior.desktop	2011-07-19 11:42:22.756311056 +0100
+@@ -3,7 +3,7 @@
+ DocPath=kcontrol/desktopbehavior/index.html
+ Icon=desktop
+ Exec=kcmshell desktopbehavior
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=konq
+ X-KDE-FactoryName=dbehavior
+Only in kdebase/kcontrol/konq: desktopbehavior.desktop.orig
+diff -bur kdebase.orig//kcontrol/konq/desktop.desktop kdebase/kcontrol/konq/desktop.desktop
+--- kdebase.orig//kcontrol/konq/desktop.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/konq/desktop.desktop	2011-07-19 11:42:22.757311606 +0100
+@@ -3,7 +3,7 @@
+ DocPath=kcontrol/desktop/index.html#desktop-number
+ Icon=desktop
+ Exec=kcmshell desktop
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=konq
+ X-KDE-FactoryName=ddesktop
+Only in kdebase/kcontrol/konq: desktop.desktop.orig
+diff -bur kdebase.orig//kcontrol/konq/desktoppath.desktop kdebase/kcontrol/konq/desktoppath.desktop
+--- kdebase.orig//kcontrol/konq/desktoppath.desktop	2010-08-12 04:28:36.000000000 +0100
++++ kdebase/kcontrol/konq/desktoppath.desktop	2011-07-19 11:42:22.789311587 +0100
+@@ -224,3 +224,4 @@
+ Keywords[zh_TW]=konqueror,filemanager,paths,desktop,directories,autostart,征服家,檔案管理程式,路徑,桌面,目錄,自動啟動
+ 
+ Categories=Qt;KDE;X-KDE-settings-system;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/konq: desktoppath.desktop.orig
+diff -bur kdebase.orig//kcontrol/konq/filebrowser.desktop kdebase/kcontrol/konq/filebrowser.desktop
+--- kdebase.orig//kcontrol/konq/filebrowser.desktop	2010-08-12 04:28:36.000000000 +0100
++++ kdebase/kcontrol/konq/filebrowser.desktop	2011-07-19 11:42:22.754311818 +0100
+@@ -3,7 +3,7 @@
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+ Exec=kcmshell filebrowser
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=konq
+ X-KDE-FactoryName=browser
+Only in kdebase/kcontrol/konq: filebrowser.desktop.orig
+diff -bur kdebase.orig//kcontrol/konqhtml/khtml_behavior.desktop kdebase/kcontrol/konqhtml/khtml_behavior.desktop
+--- kdebase.orig//kcontrol/konqhtml/khtml_behavior.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/konqhtml/khtml_behavior.desktop	2011-07-19 11:42:22.783311255 +0100
+@@ -229,3 +229,4 @@
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, imibala,imibala,java,javascripy,inkomba,izixhumanisi,izithombe,charsets, amaqoqo ezimpawu,ukubhala ngekhodi 
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/konqhtml: khtml_behavior.desktop.orig
+diff -bur kdebase.orig//kcontrol/konqhtml/khtml_filter.desktop kdebase/kcontrol/konqhtml/khtml_filter.desktop
+--- kdebase.orig//kcontrol/konqhtml/khtml_filter.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/konqhtml/khtml_filter.desktop	2011-07-19 11:42:22.785311231 +0100
+@@ -143,3 +143,4 @@
+ Comment[zh_TW]=設定 Konqueror AdBlocK 過濾器
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/konqhtml: khtml_filter.desktop.orig
+diff -bur kdebase.orig//kcontrol/konqhtml/khtml_fonts.desktop kdebase/kcontrol/konqhtml/khtml_fonts.desktop
+--- kdebase.orig//kcontrol/konqhtml/khtml_fonts.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/konqhtml/khtml_fonts.desktop	2011-07-19 11:42:22.784311468 +0100
+@@ -228,3 +228,4 @@
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,izinhlobo zamagama,charsets,amaqoqo ezimpawu,ukubhala ngekhodi
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/konqhtml: khtml_fonts.desktop.orig
+diff -bur kdebase.orig//kcontrol/konqhtml/khtml_java_js.desktop kdebase/kcontrol/konqhtml/khtml_java_js.desktop
+--- kdebase.orig//kcontrol/konqhtml/khtml_java_js.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/konqhtml/khtml_java_js.desktop	2011-07-19 11:42:22.784311468 +0100
+@@ -209,3 +209,4 @@
+ Keywords[zu]=konqueror,kfm,umcingi,html,web,www,java,javascript
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/konqhtml: khtml_java_js.desktop.orig
+diff -bur kdebase.orig//kcontrol/kthememanager/installktheme.desktop kdebase/kcontrol/kthememanager/installktheme.desktop
+--- kdebase.orig//kcontrol/kthememanager/installktheme.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/kthememanager/installktheme.desktop	2011-07-20 11:37:19.372776907 +0100
+@@ -76,3 +76,5 @@
+ Type=Application
+ NoDisplay=true
+ Exec=kdeinstallktheme %f
++Categories=Qt;KDE;X-KDE-settings-desktop;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kthememanager: installktheme.desktop.orig
+diff -bur kdebase.orig//kcontrol/kthememanager/kthememanager.desktop kdebase/kcontrol/kthememanager/kthememanager.desktop
+--- kdebase.orig//kcontrol/kthememanager/kthememanager.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/kthememanager/kthememanager.desktop	2011-07-19 11:42:22.800311582 +0100
+@@ -218,3 +218,4 @@
+ X-KDE-FactoryName=kthememanager
+ X-KDE-Library=kthememanager
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/kthememanager: kthememanager.desktop.orig
+diff -bur kdebase.orig//kcontrol/launch/kcmlaunch.desktop kdebase/kcontrol/launch/kcmlaunch.desktop
+--- kdebase.orig//kcontrol/launch/kcmlaunch.desktop	2010-08-12 04:28:26.000000000 +0100
++++ kdebase/kcontrol/launch/kcmlaunch.desktop	2011-07-19 11:42:22.776311321 +0100
+@@ -223,3 +223,4 @@
+ Keywords[zu]=umyaleli,qala,qalisa,kumatasatasa,inkomba,umphumela obuyayo,i-mouse,inkomba yendawo yokubhala,iyajikeleza,iyajikeleza,i-disk qalisa,uhlelo lwemisebenzi,umbiko
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/launch: kcmlaunch.desktop.orig
+diff -bur kdebase.orig//kcontrol/locale/language.desktop kdebase/kcontrol/locale/language.desktop
+--- kdebase.orig//kcontrol/locale/language.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/locale/language.desktop	2011-07-19 11:42:22.753311334 +0100
+@@ -3,7 +3,7 @@
+ Icon=locale
+ Type=Application
+ DocPath=kcontrol/language/index.html
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=locale
+ X-KDE-FactoryName=locale
+Only in kdebase/kcontrol/locale: language.desktop.orig
+diff -bur kdebase.orig//kcontrol/nics/nic.desktop kdebase/kcontrol/nics/nic.desktop
+--- kdebase.orig//kcontrol/nics/nic.desktop	2010-08-12 04:28:32.000000000 +0100
++++ kdebase/kcontrol/nics/nic.desktop	2011-07-19 11:50:06.149311714 +0100
+@@ -170,5 +170,5 @@
+ Comment[zh_TW]=網路界面資訊
+ Comment[zu]=Ulwazi lomxhumanisi woxhumano olusakazekile
+ 
+-Categories=Qt;KDE;X-KDE-settings-network;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/nics: nic.desktop.orig
+diff -bur kdebase.orig//kcontrol/performance/kcmperformance.desktop kdebase/kcontrol/performance/kcmperformance.desktop
+--- kdebase.orig//kcontrol/performance/kcmperformance.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/performance/kcmperformance.desktop	2011-07-19 11:42:22.797311749 +0100
+@@ -213,3 +213,4 @@
+ Keywords[zh_TW]=performance,speed,memory,improve,效能,速度,記憶體,增進
+ 
+ Categories=Qt;KDE;X-KDE-settings-components;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/performance: kcmperformance.desktop.orig
+diff -bur kdebase.orig//kcontrol/privacy/privacy.desktop kdebase/kcontrol/privacy/privacy.desktop
+--- kdebase.orig//kcontrol/privacy/privacy.desktop	2010-08-12 04:28:39.000000000 +0100
++++ kdebase/kcontrol/privacy/privacy.desktop	2011-07-19 11:42:22.805311429 +0100
+@@ -202,3 +202,4 @@
+ X-KDE-FactoryName=privacy
+ X-KDE-Library=privacy
+ Categories=Qt;KDE;X-KDE-settings-security;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/privacy: privacy.desktop.orig
+diff -bur kdebase.orig//kcontrol/randr/krandrtray.desktop kdebase/kcontrol/randr/krandrtray.desktop
+--- kdebase.orig//kcontrol/randr/krandrtray.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/randr/krandrtray.desktop	2011-07-19 11:42:22.751311963 +0100
+@@ -138,4 +138,4 @@
+ Icon=randr
+ Type=Application
+ OnlyShowIn=KDE;
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;System;Settings;HardwareSettings;
+Only in kdebase/kcontrol/randr: krandrtray.desktop.orig
+diff -bur kdebase.orig//kcontrol/samba/smbstatus.desktop kdebase/kcontrol/samba/smbstatus.desktop
+--- kdebase.orig//kcontrol/samba/smbstatus.desktop	2010-08-12 04:28:34.000000000 +0100
++++ kdebase/kcontrol/samba/smbstatus.desktop	2011-07-20 11:35:50.277776622 +0100
+@@ -239,4 +239,4 @@
+ Keywords[zh_TW]=SMB,SAMBA,Windows network,LAN,System Information,Windows 網路,區域網路,系統資訊
+ Keywords[zu]=SMB,SAMBA,Uxhumano olusakazekile lwama-windows,LAN,Ulwazi lwesistimu
+ Categories=Qt;KDE;X-KDE-settings-network;
+-
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/samba: smbstatus.desktop.orig
+diff -bur kdebase.orig//kcontrol/screensaver/screensaver.desktop kdebase/kcontrol/screensaver/screensaver.desktop
+--- kdebase.orig//kcontrol/screensaver/screensaver.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/screensaver/screensaver.desktop	2011-07-19 11:42:22.777310968 +0100
+@@ -238,3 +238,4 @@
+ Keywords[zu]=abagcini zikrini,Ukubaluleka
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/screensaver: screensaver.desktop.orig
+diff -bur kdebase.orig//kcontrol/smserver/kcmsmserver.desktop kdebase/kcontrol/smserver/kcmsmserver.desktop
+--- kdebase.orig//kcontrol/smserver/kcmsmserver.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/smserver/kcmsmserver.desktop	2011-07-19 11:42:22.755311510 +0100
+@@ -3,7 +3,7 @@
+ Type=Application
+ DocPath=kcontrol/kcmsmserver/index.html
+ Exec=kcmshell kcmsmserver
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=smserver
+ X-KDE-FactoryName=smserver
+Only in kdebase/kcontrol/smserver: kcmsmserver.desktop.orig
+diff -bur kdebase.orig//kcontrol/spellchecking/spellchecking.desktop kdebase/kcontrol/spellchecking/spellchecking.desktop
+--- kdebase.orig//kcontrol/spellchecking/spellchecking.desktop	2010-08-12 04:28:33.000000000 +0100
++++ kdebase/kcontrol/spellchecking/spellchecking.desktop	2011-07-19 11:42:22.756311056 +0100
+@@ -3,7 +3,7 @@
+ Icon=spellcheck
+ Type=Application
+ DocPath=kcontrol/spellchecking/index.html
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=spellchecking
+ X-KDE-ParentApp=kcontrol
+Only in kdebase/kcontrol/spellchecking: spellchecking.desktop.orig
+diff -bur kdebase.orig//kcontrol/style/style.desktop kdebase/kcontrol/style/style.desktop
+--- kdebase.orig//kcontrol/style/style.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/style/style.desktop	2011-07-19 11:42:22.778310900 +0100
+@@ -232,3 +232,4 @@
+ Keywords[zu]=isitayela,izitayela,ukubukeka,widget,izimpawu zezithombe,amabha amathuluzi,umbhalo,ukugqamisa,apps,abayaleli be-KDE
+ 
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/style: style.desktop.orig
+diff -bur kdebase.orig//kcontrol/taskbar/kcmtaskbar.desktop kdebase/kcontrol/taskbar/kcmtaskbar.desktop
+--- kdebase.orig//kcontrol/taskbar/kcmtaskbar.desktop	2010-08-12 04:28:25.000000000 +0100
++++ kdebase/kcontrol/taskbar/kcmtaskbar.desktop	2011-07-19 11:42:22.757311606 +0100
+@@ -3,7 +3,7 @@
+ Type=Application
+ DocPath=kcontrol/kcmtaskbar/index.html
+ Exec=kcmshell kcmtaskbar
+-
++OnlyShowIn=KDE;
+ 
+ X-KDE-Library=taskbar
+ X-KDE-FactoryName=taskbar
+Only in kdebase/kcontrol/taskbar: kcmtaskbar.desktop.orig
+diff -bur kdebase.orig//kcontrol/usbview/kcmusb.desktop kdebase/kcontrol/usbview/kcmusb.desktop
+--- kdebase.orig//kcontrol/usbview/kcmusb.desktop	2010-08-12 04:28:29.000000000 +0100
++++ kdebase/kcontrol/usbview/kcmusb.desktop	2011-07-19 11:51:42.541311620 +0100
+@@ -237,4 +237,5 @@
+ Keywords[zh_TW]=USB,devices,viewer,control,裝置,檢視器,控制
+ Keywords[zu]=USB,amathukuzi ananjongo,umbukisi,lawula
+ 
+-Categories=Qt;KDE;X-KDE-settings-hardware;
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/usbview: kcmusb.desktop.orig
+diff -bur kdebase.orig//kcontrol/view1394/kcmview1394.desktop kdebase/kcontrol/view1394/kcmview1394.desktop
+--- kdebase.orig//kcontrol/view1394/kcmview1394.desktop	2010-08-12 04:28:35.000000000 +0100
++++ kdebase/kcontrol/view1394/kcmview1394.desktop	2011-07-19 11:51:05.546312167 +0100
+@@ -216,5 +216,5 @@
+ Keywords[zh_CN]=1394,Firewire,devices,viewer,control,设备,查看器,控制,火线
+ Keywords[zh_TW]=1394,Firewire,devices,viewer,control,裝置,檢視器,控制
+ 
+-Categories=Qt;KDE;X-KDE-settings-hardware;
+-
++Categories=Qt;KDE;X-KDE-information;
++OnlyShowIn=KDE;
+Only in kdebase/kcontrol/view1394: kcmview1394.desktop.orig
+diff -bur kdebase.orig//kdepasswd/kcm/kcm_useraccount.desktop kdebase/kdepasswd/kcm/kcm_useraccount.desktop
+--- kdebase.orig//kdepasswd/kcm/kcm_useraccount.desktop	2010-08-12 04:29:37.000000000 +0100
++++ kdebase/kdepasswd/kcm/kcm_useraccount.desktop	2011-07-19 11:46:33.778311383 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Icon=personal
+ Categories=Qt;KDE;X-KDE-settings-security;
++OnlyShowIn=KDE;
+ X-KDE-ParentApp=kcontrol
+ X-KDE-Library=useraccount
+ Type=Application
+Only in kdebase/kdepasswd/kcm: kcm_useraccount.desktop.orig
+diff -bur kdebase.orig//kdepasswd/kdepasswd.desktop kdebase/kdepasswd/kdepasswd.desktop
+--- kdebase.orig//kdepasswd/kdepasswd.desktop	2010-08-12 04:29:37.000000000 +0100
++++ kdebase/kdepasswd/kdepasswd.desktop	2011-07-19 11:42:22.802311548 +0100
+@@ -3,6 +3,7 @@
+ Icon=password
+ Type=Application
+ Categories=Qt;KDE;Settings;
++OnlyShowIn=KDE;
+ NoDisplay=true
+ X-DCOP-ServiceType=Unique
+ Name=Change Password
+Only in kdebase/kdepasswd: kdepasswd.desktop.orig
+Only in kdebase/kdeprint/kdeprintfax: kdeprintfax.desktop.orig
+diff -bur kdebase.orig//kdeprint/kjobviewer/kjobviewer.desktop kdebase/kdeprint/kjobviewer/kjobviewer.desktop
+--- kdebase.orig//kdeprint/kjobviewer/kjobviewer.desktop	2010-08-12 04:29:41.000000000 +0100
++++ kdebase/kdeprint/kjobviewer/kjobviewer.desktop	2011-07-19 11:42:22.752311329 +0100
+@@ -89,4 +89,5 @@
+ GenericName[zh_TW]=列印工作
+ 
+ X-DCOP-ServiceType=Unique
+-Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
++Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;System;
++OnlyShowIn=KDE;
+Only in kdebase/kdeprint/kjobviewer: kjobviewer.desktop.orig
+diff -bur kdebase.orig//kdeprint/printmgr/printers.desktop kdebase/kdeprint/printmgr/printers.desktop
+--- kdebase.orig//kdeprint/printmgr/printers.desktop	2010-08-12 04:29:41.000000000 +0100
++++ kdebase/kdeprint/printmgr/printers.desktop	2011-07-19 11:42:22.787311214 +0100
+@@ -233,3 +233,4 @@
+ Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
+ 
+ Categories=Qt;KDE;X-KDE-settings-hardware;Settings;
++OnlyShowIn=KDE;
+Only in kdebase/kdeprint/printmgr: printers.desktop.orig
+diff -bur kdebase.orig//khelpcenter/Help.desktop kdebase/khelpcenter/Help.desktop
+--- kdebase.orig//khelpcenter/Help.desktop	2010-08-12 04:28:42.000000000 +0100
++++ kdebase/khelpcenter/Help.desktop	2011-07-19 11:42:37.774311301 +0100
+@@ -82,5 +82,5 @@
+ Name[zh_CN]=帮助
+ Name[zh_TW]=求助
+ Name[zu]=Usizo
+-Categories=Qt;KDE;Core;
++Categories=Qt;KDE;Core;Documentation;
+ OnlyShowIn=KDE;
+Only in kdebase/khelpcenter: Help.desktop.orig
+diff -bur kdebase.orig//khotkeys/kcontrol/khotkeys.desktop kdebase/khotkeys/kcontrol/khotkeys.desktop
+--- kdebase.orig//khotkeys/kcontrol/khotkeys.desktop	2010-08-12 04:30:07.000000000 +0100
++++ kdebase/khotkeys/kcontrol/khotkeys.desktop	2011-07-20 11:59:36.959776269 +0100
+@@ -206,3 +206,4 @@
+ Keywords[zh_TW]=Keys,Global key bindings,Key bindings,Gestures,Mouse gestures,按鍵,全域按建連結,按鍵連結,手勢,滑鼠手勢
+ 
+ Categories=Qt;KDE;X-KDE-settings-accessibility;
++OnlyShowIn=KDE;
+Only in kdebase/khotkeys/kcontrol: khotkeys.desktop.orig
+diff -bur kdebase.orig//kicker/kicker/kcmkicker.desktop kdebase/kicker/kicker/kcmkicker.desktop
+--- kdebase.orig//kicker/kicker/kcmkicker.desktop	2010-08-12 04:30:06.000000000 +0100
++++ kdebase/kicker/kicker/kcmkicker.desktop	2011-07-19 11:42:37.774311301 +0100
+@@ -77,4 +77,4 @@
+ Name[zh_TW]=設定面板
+ X-KDE-StartupNotify=true
+ OnlyShowIn=KDE;
+-Categories=Qt;KDE;Settings;
++Categories=Qt;KDE;
+Only in kdebase/kicker/kicker: kcmkicker.desktop.orig
+diff -bur kdebase.orig//kioslave/cgi/kcmcgi/kcmcgi.desktop kdebase/kioslave/cgi/kcmcgi/kcmcgi.desktop
+--- kdebase.orig//kioslave/cgi/kcmcgi/kcmcgi.desktop	2010-08-12 04:29:31.000000000 +0100
++++ kdebase/kioslave/cgi/kcmcgi/kcmcgi.desktop	2011-07-19 11:45:38.206311478 +0100
+@@ -229,3 +229,4 @@
+ Keywords[zh_TW]=CGI,KIO,Slave,Paths,路徑
+ Keywords[zu]=CGI,KIO,Slave,Izindlela
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/kioslave/cgi/kcmcgi: kcmcgi.desktop.orig
+diff -bur kdebase.orig//kioslave/media/kcmodule/media.desktop kdebase/kioslave/media/kcmodule/media.desktop
+--- kdebase.orig//kioslave/media/kcmodule/media.desktop	2010-08-12 04:29:33.000000000 +0100
++++ kdebase/kioslave/media/kcmodule/media.desktop	2011-07-19 11:42:22.803311681 +0100
+@@ -195,3 +195,4 @@
+ Keywords[zh_TW]=storage,media,usb,cdrom,device,儲存,媒體,光碟機,裝置
+ 
+ Categories=Qt;KDE;X-KDE-settings-peripherals;
++OnlyShowIn=KDE;
+Only in kdebase/kioslave/media/kcmodule: media.desktop.orig
+Only in kdebase/kmenuedit: kmenuedit.desktop.orig
+diff -bur kdebase.orig//knetattach/knetattach.desktop kdebase/knetattach/knetattach.desktop
+--- kdebase.orig//knetattach/knetattach.desktop	2010-08-12 04:29:19.000000000 +0100
++++ kdebase/knetattach/knetattach.desktop	2011-07-19 11:42:22.799312185 +0100
+@@ -78,5 +78,6 @@
+ Type=Application
+ Terminal=false
+ X-KDE-StartupNotify=true
+-Categories=Qt;KDE;Network;
++Categories=Qt;KDE;Network;X-MandrivaLinux-.hidden;
++OnlyShowIn=KDE;
+ DocPath=knetattach/index.html
+Only in kdebase/knetattach: knetattach.desktop.orig
+diff -bur kdebase.orig//konqueror/Home.desktop kdebase/konqueror/Home.desktop
+--- kdebase.orig//konqueror/Home.desktop	2010-08-12 04:29:15.000000000 +0100
++++ kdebase/konqueror/Home.desktop	2011-07-19 11:42:37.775311319 +0100
+@@ -166,5 +166,5 @@
+ GenericName[zh_CN]=个人文件
+ GenericName[zh_TW]=個人檔案
+ GenericName[zu]=Amafayela Omuntu siqu
+-Categories=Qt;KDE;Core;
++Categories=Qt;KDE;Core;X-MandrivaLinux-.hidden;
+ OnlyShowIn=KDE;
+Only in kdebase/konqueror: Home.desktop.orig
+diff -bur kdebase.orig//konqueror/kfmclient.desktop kdebase/konqueror/kfmclient.desktop
+--- kdebase.orig//konqueror/kfmclient.desktop	2010-08-12 04:29:17.000000000 +0100
++++ kdebase/konqueror/kfmclient.desktop	2011-07-19 11:42:22.804311362 +0100
+@@ -18,5 +18,5 @@
+ Name[te]=కాంకెరర్
+ Name[th]=คอนเควอร์เรอร์
+ X-DCOP-ServiceType=None
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;System;X-MandrivaLinux-.hidden;
+ X-KDE-HasTempFileOption=true
+Only in kdebase/konqueror: kfmclient.desktop.orig
+diff -bur kdebase.orig//konqueror/kfmclient_dir.desktop kdebase/konqueror/kfmclient_dir.desktop
+--- kdebase.orig//konqueror/kfmclient_dir.desktop	2010-08-12 04:29:18.000000000 +0100
++++ kdebase/konqueror/kfmclient_dir.desktop	2011-07-19 11:42:22.804311362 +0100
+@@ -17,4 +17,4 @@
+ Name[ta]=கான்கொரர்
+ Name[te]=కాంకెరర్
+ Name[th]=คอนเควอร์เรอร์
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;System;X-MandrivaLinux-.hidden;
+Only in kdebase/konqueror: kfmclient_dir.desktop.orig
+diff -bur kdebase.orig//konqueror/kfmclient_html.desktop kdebase/konqueror/kfmclient_html.desktop
+--- kdebase.orig//konqueror/kfmclient_html.desktop	2010-08-12 04:29:17.000000000 +0100
++++ kdebase/konqueror/kfmclient_html.desktop	2011-07-19 11:42:22.808311482 +0100
+@@ -17,5 +17,6 @@
+ Name[ta]=கான்கொரர்
+ Name[te]=కాంకెరర్
+ Name[th]=คอนเควอร์เรอร์
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;Network;WebBrowser;
+ X-KDE-HasTempFileOption=true
++OnlyShowIn=KDE;
+Only in kdebase/konqueror: kfmclient_html.desktop.orig
+diff -bur kdebase.orig//konqueror/kfmclient_war.desktop kdebase/konqueror/kfmclient_war.desktop
+--- kdebase.orig//konqueror/kfmclient_war.desktop	2010-08-12 04:29:18.000000000 +0100
++++ kdebase/konqueror/kfmclient_war.desktop	2011-07-19 11:42:22.808311482 +0100
+@@ -17,5 +17,6 @@
+ Name[ta]=கான்கொரர்
+ Name[te]=కాంకెరర్
+ Name[th]=คอนเควอร์เรอร์
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;Network;WebBrowser;
+ X-KDE-HasTempFileOption=true
++OnlyShowIn=KDE;
+Only in kdebase/konqueror: kfmclient_war.desktop.orig
+diff -bur kdebase.orig//konqueror/konqbrowser.desktop kdebase/konqueror/konqbrowser.desktop
+--- kdebase.orig//konqueror/konqbrowser.desktop	2010-08-12 04:29:17.000000000 +0100
++++ kdebase/konqueror/konqbrowser.desktop	2011-07-19 11:42:22.750311447 +0100
+@@ -95,4 +95,5 @@
+ GenericName[zh_CN]=Web 浏览器
+ GenericName[zh_TW]=網頁瀏覽器
+ GenericName[zu]=Umcingi we-Web
+-Categories=Qt;KDE;Network;
++Categories=Qt;KDE;Network;WebBrowser;
++
+diff -bur kdebase.orig//konqueror/sidebar/trees/history_module/kcmhistory.desktop kdebase/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+--- kdebase.orig//konqueror/sidebar/trees/history_module/kcmhistory.desktop	2010-08-12 04:29:16.000000000 +0100
++++ kdebase/konqueror/sidebar/trees/history_module/kcmhistory.desktop	2011-07-19 11:42:22.783311255 +0100
+@@ -231,3 +231,4 @@
+ Keywords[zh_TW]=history,expire,歷史紀錄,過期
+ Keywords[zu]=umlando,ukuphelelwa isikhathi
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/konqueror/sidebar/trees/history_module: kcmhistory.desktop.orig
+diff -bur kdebase.orig//konsole/konsole.desktop kdebase/konsole/konsole.desktop
+--- kdebase.orig//konsole/konsole.desktop	2010-08-12 04:29:11.000000000 +0100
++++ kdebase/konsole/konsole.desktop	2011-07-19 11:42:22.808311482 +0100
+@@ -125,4 +125,5 @@
+ GenericName[zu]=Uhlelo lwemisebenzi lwangaohandle
+ X-DCOP-ServiceType=Multi
+ X-KDE-AuthorizeAction=shell_access
+-Categories=Qt;KDE;System;TerminalEmulator;
++Categories=Qt;KDE;TerminalEmulator;Utility;
++OnlyShowIn=KDE;
+Only in kdebase/konsole: konsole.desktop.orig
+diff -bur kdebase.orig//kpager/kpager.desktop kdebase/kpager/kpager.desktop
+--- kdebase.orig//kpager/kpager.desktop	2010-08-12 04:29:20.000000000 +0100
++++ kdebase/kpager/kpager.desktop	2011-07-19 11:42:22.810310934 +0100
+@@ -104,3 +104,4 @@
+ X-KDE-StartupNotify=false
+ X-DCOP-ServiceType=Unique
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
++NoDisplay=true
+Only in kdebase/kpager: kpager.desktop.orig
+diff -bur kdebase.orig//kpersonalizer/kpersonalizer.desktop kdebase/kpersonalizer/kpersonalizer.desktop
+--- kdebase.orig//kpersonalizer/kpersonalizer.desktop	2010-08-12 04:29:23.000000000 +0100
++++ kdebase/kpersonalizer/kpersonalizer.desktop	2011-07-19 11:42:30.190312126 +0100
+@@ -85,4 +85,5 @@
+ X-KDE-autostart-condition=kpersonalizerrc:General:FirstLogin:true
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Settings;
++NoDisplay=true
+ OnlyShowIn=KDE;
+Only in kdebase/kpersonalizer: kpersonalizer.desktop.orig
+diff -bur kdebase.orig//ksplashml/kcmksplash/ksplashthememgr.desktop kdebase/ksplashml/kcmksplash/ksplashthememgr.desktop
+--- kdebase.orig//ksplashml/kcmksplash/ksplashthememgr.desktop	2010-08-12 04:29:36.000000000 +0100
++++ kdebase/ksplashml/kcmksplash/ksplashthememgr.desktop	2011-07-19 11:42:22.806311169 +0100
+@@ -214,3 +214,4 @@
+ Keywords[zh_CN]=splash screen,splash theme,startup,飞溅屏幕,飞溅主题,启动
+ Keywords[zh_TW]=splash screen,splash theme,startup,啟動
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/ksplashml/kcmksplash: ksplashthememgr.desktop.orig
+diff -bur kdebase.orig//ksysguard/gui/ksysguard.desktop kdebase/ksysguard/gui/ksysguard.desktop
+--- kdebase.orig//ksysguard/gui/ksysguard.desktop	2010-08-12 04:29:39.000000000 +0100
++++ kdebase/ksysguard/gui/ksysguard.desktop	2011-07-19 11:42:22.751311963 +0100
+@@ -99,4 +99,5 @@
+ Path=
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;System;Monitor;
++OnlyShowIn=KDE;
+Only in kdebase/ksysguard/gui: ksysguard.desktop.orig
+diff -bur kdebase.orig//ktip/ktip.desktop kdebase/ktip/ktip.desktop
+--- kdebase.orig//ktip/ktip.desktop	2010-08-12 04:30:07.000000000 +0100
++++ kdebase/ktip/ktip.desktop	2011-07-19 11:42:37.775311319 +0100
+@@ -89,5 +89,5 @@
+ X-KDE-autostart-phase=2
+ X-KDE-autostart-condition=ktiprc:TipOfDay:RunOnStart:true
+ X-DCOP-ServiceType=Unique
+-Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
++Categories=Qt;KDE;X-KDE-Utilities-Desktop;
+ OnlyShowIn=KDE;
+Only in kdebase/ktip: ktip.desktop.orig
+diff -bur kdebase.orig//kwin/kcmkwin/kwindecoration/kwindecoration.desktop kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
+--- kdebase.orig//kwin/kcmkwin/kwindecoration/kwindecoration.desktop	2010-08-12 04:30:14.000000000 +0100
++++ kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.desktop	2011-07-19 11:42:22.777310968 +0100
+@@ -229,3 +229,4 @@
+ Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
+ Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
+ Categories=Qt;KDE;X-KDE-settings-looknfeel;
++OnlyShowIn=KDE;
+Only in kdebase/kwin/kcmkwin/kwindecoration: kwindecoration.desktop.orig
+diff -bur kdebase.orig//kwin/kcmkwin/kwinoptions/kwinoptions.desktop kdebase/kwin/kcmkwin/kwinoptions/kwinoptions.desktop
+--- kdebase.orig//kwin/kcmkwin/kwinoptions/kwinoptions.desktop	2010-08-12 04:30:13.000000000 +0100
++++ kdebase/kwin/kcmkwin/kwinoptions/kwinoptions.desktop	2011-07-19 11:42:22.758311147 +0100
+@@ -3,6 +3,7 @@
+ Type=Application
+ Exec=kcmshell kwinoptions
+ DocPath=kcontrol/windowmanagement/index.html
++OnlyShowIn=KDE;
+ 
+ X-KDE-ModuleType=Library
+ X-KDE-Library=kwinoptions
+Only in kdebase/kwin/kcmkwin/kwinoptions: kwinoptions.desktop.orig
+diff -bur kdebase.orig//kwin/kcmkwin/kwinrules/kwinrules.desktop kdebase/kwin/kcmkwin/kwinrules/kwinrules.desktop
+--- kdebase.orig//kwin/kcmkwin/kwinrules/kwinrules.desktop	2010-08-12 04:30:14.000000000 +0100
++++ kdebase/kwin/kcmkwin/kwinrules/kwinrules.desktop	2011-07-19 11:42:22.802311548 +0100
+@@ -207,3 +207,4 @@
+ Keywords[zh_CN]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,大小,位置,状态,窗口行为,窗口,特定,工作区,记住,规则
+ Keywords[zh_TW]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,大小,位置,狀態,視窗行為,視窗,指定,記憶,規則
+ Categories=Qt;KDE;X-KDE-settings-desktop;
++OnlyShowIn=KDE;
+Only in kdebase/kwin/kcmkwin/kwinrules: kwinrules.desktop.orig
+diff -bur kdebase.orig//kxkb/keyboard.desktop kdebase/kxkb/keyboard.desktop
+--- kdebase.orig//kxkb/keyboard.desktop	2010-08-12 04:29:19.000000000 +0100
++++ kdebase/kxkb/keyboard.desktop	2011-07-19 11:42:22.786311382 +0100
+@@ -241,3 +241,4 @@
+ Keywords[zu]=Ibhodi lokhiye,ukuphindwa kwebhodi lokhiye,Cofa izinga lomsindo, Amathuluzi anenjongo omphumela wangaphakathi,phinda,izina lomsindo
+ 
+ Categories=Qt;KDE;X-KDE-settings-hardware;
++OnlyShowIn=KDE;
+Only in kdebase/kxkb: keyboard.desktop.orig
+diff -bur kdebase.orig//kxkb/keyboard_layout.desktop kdebase/kxkb/keyboard_layout.desktop
+--- kdebase.orig//kxkb/keyboard_layout.desktop	2010-08-12 04:29:19.000000000 +0100
++++ kdebase/kxkb/keyboard_layout.desktop	2011-07-19 11:42:22.810310934 +0100
+@@ -237,3 +237,4 @@
+ Keywords[zu]=Ibhodi lokhiye,Isendlalelo,Okwaphakathi kwezizwe
+ 
+ Categories=Qt;KDE;X-KDE-settings-accessibility;
++OnlyShowIn=KDE;
+Only in kdebase/kxkb: keyboard_layout.desktop.orig
+diff -bur kdebase.orig//nsplugins/khtml_plugins.desktop kdebase/nsplugins/khtml_plugins.desktop
+--- kdebase.orig//nsplugins/khtml_plugins.desktop	2010-08-12 04:29:14.000000000 +0100
++++ kdebase/nsplugins/khtml_plugins.desktop	2011-07-19 11:42:22.785311231 +0100
+@@ -231,3 +231,4 @@
+ Keywords[zu]=komqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, ama-plugin
+ 
+ Categories=Qt;KDE;X-KDE-settings-webbrowsing;
++OnlyShowIn=KDE;
+Only in kdebase/nsplugins: khtml_plugins.desktop.orig
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-move-xdg-menu-dir.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-move-xdg-menu-dir.patch
new file mode 100644
index 000000000..1deb924c0
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-move-xdg-menu-dir.patch
@@ -0,0 +1,11 @@
+--- admin/acinclude.m4.in.orig	2010-08-12 23:39:22.000000000 +0100
++++ admin/acinclude.m4.in	2011-07-19 13:40:17.619311049 +0100
+@@ -527,7 +527,7 @@
+     xdg_appsdir='\${datadir}/applications/kde'
+   fi
+   if test -z "$xdg_menudir"; then
+-    xdg_menudir='\${sysconfdir}/xdg/menus'
++    xdg_menudir='\${sysconfdir}/xdg/kde/menus'
+   fi
+   if test -z "$xdg_directorydir"; then
+     xdg_directorydir='\${datadir}/desktop-directories'
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.12-startkde.patch b/mandriva/2010.2/kdebase/kdebase-3.5.12-startkde.patch
new file mode 100644
index 000000000..eb126afd4
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.12-startkde.patch
@@ -0,0 +1,22 @@
+--- startkde.orig	2011-07-19 11:58:41.267311384 +0100
++++ startkde	2011-07-19 12:02:56.119311786 +0100
+@@ -16,6 +16,11 @@
+ 	exit 1
+ fi
+ 
++if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
++        XDG_MENU_PREFIX=kde-
++        export  XDG_MENU_PREFIX=kde-
++fi
++
+ # Set the background color.
+ # The standard X background is nasty, causing moire effects and exploding
+ # people's heads. We use colours from the standard KDE palette for those with
+@@ -163,6 +168,7 @@
+ # Allow interested applications, such as the Plasma control wrapper,
+ # to know that this is a Trinity desktop and not a KDE one.
+ export DESKTOP_SESSION=kde3
++export DESKTOP="kde"
+ 
+ # Please see kstartupconfig source for usage.
+ mkdir -m 700 -p $kdehome
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.3-fix-media-fuser.patch b/mandriva/2010.2/kdebase/kdebase-3.5.3-fix-media-fuser.patch
new file mode 100644
index 000000000..909419489
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.3-fix-media-fuser.patch
@@ -0,0 +1,11 @@
+--- kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp--	2007-02-05 09:05:15.000000000 +0100
++++ kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp	2007-02-05 09:05:22.000000000 +0100
+@@ -1008,7 +1008,7 @@
+ TQString HALBackend::listUsingProcesses(const Medium* medium)
+ {
+     TQString proclist, fullmsg;
+-    TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
++    TQString cmdline = TQString("/usr/bin/env /sbin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+     FILE *fuser = popen(cmdline.latin1(), "r");
+ 
+     uint counter = 0;
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.3-logout-without-confirmation.patch b/mandriva/2010.2/kdebase/kdebase-3.5.3-logout-without-confirmation.patch
new file mode 100644
index 000000000..bc11026f1
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.3-logout-without-confirmation.patch
@@ -0,0 +1,34 @@
+--- kdebase-3.5.3/kdesktop/desktop.cc.orig	2006-06-22 21:14:19.000000000 -0300
++++ kdebase-3.5.3/kdesktop/desktop.cc	2006-07-12 15:10:12.000000000 -0300
+@@ -861,6 +861,11 @@
+             KApplication::ShutdownTypeNone );
+ }
+ 
++void KDesktop::logoutWithoutConfirmation()
++{
++ slotLogoutNoCnf();
++}
++
+ void KDesktop::logout( KApplication::ShutdownConfirm confirm,
+                        KApplication::ShutdownType sdtype )
+ {
+--- kdebase-3.5.3/kdesktop/desktop.h.orig	2006-04-27 15:06:09.000000000 -0300
++++ kdebase-3.5.3/kdesktop/desktop.h	2006-07-12 15:11:14.000000000 -0300
+@@ -84,6 +84,7 @@
+   virtual void logout();
+   virtual void clearCommandHistory();
+   virtual void runAutoStart();
++  virtual void logoutWithoutConfirmation();
+ 
+   virtual void switchDesktops( int delta );
+ 
+--- kdebase-3.5.3/kdesktop/KDesktopIface.h.orig	2006-04-27 15:06:09.000000000 -0300
++++ kdebase-3.5.3/kdesktop/KDesktopIface.h	2006-07-12 15:10:12.000000000 -0300
+@@ -75,6 +75,7 @@
+      * Bye bye
+      */
+     virtual void logout() = 0;
++	virtual void logoutWithoutConfirmation() = 0;
+     /**
+      * Returns whether KDesktop uses a virtual root.
+      */
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.4-fix-gtk-style.patch b/mandriva/2010.2/kdebase/kdebase-3.5.4-fix-gtk-style.patch
new file mode 100644
index 000000000..2926d86df
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.4-fix-gtk-style.patch
@@ -0,0 +1,24 @@
+--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp--	2006-09-14 08:38:52.000000000 +0200
++++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp	2006-09-14 08:48:18.000000000 +0200
+@@ -75,13 +75,20 @@
+ // -----------------------------------------------------------------------------
+ static void applyGtkStyles(bool active, int version)
+ {
++   TQString userFile = TQDir::homeDirPath()+userGtkrc(version);
++   KConfig kglobalsStyle("kdeglobals", true, false);
++   kglobalsStyle.setGroup("General");
++   TQString styleName = kglobalsStyle.readEntry("widgetStyle");
++   if(!TQDir(userFile).exists() && styleName =="ia_ora")
++	   return;
++
+    TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
+    TQCString gtkrc = getenv(gtkEnvVar(version));
+    TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
+    if (list.count() == 0)
+    {
+       list.append(TQString::fromLatin1(sysGtkrc(version)));
+-      list.append(TQDir::homeDirPath()+userGtkrc(version));
++      list.append(userFile);
+    }
+    list.remove(gtkkde);
+    list.append(gtkkde);
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-clock-drakclock.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-clock-drakclock.patch
new file mode 100644
index 000000000..943f865b1
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-clock-drakclock.patch
@@ -0,0 +1,15 @@
+--- kdebase-3.5.7/kicker/applets/clock/clock.cpp.orig	2007-09-04 01:18:10.000000000 -0300
++++ kdebase-3.5.7/kicker/applets/clock/clock.cpp	2007-09-04 01:19:41.000000000 -0300
+@@ -1464,11 +1464,7 @@
+             preferences();
+             break;
+         case 103:
+-            proc << locate("exe", "kdesu");
+-            proc << "--nonewdcop";
+-            proc << TQString("%1 kde-clock.desktop --lang %2")
+-                .arg(locate("exe", "kcmshell"))
+-                .arg(KGlobal::locale()->language());
++            proc << locate("exe", "drakclock");
+             proc.start(KProcess::DontCare);
+             break;
+         case 104:
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-kdesktop_firstrun.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-kdesktop_firstrun.patch
new file mode 100644
index 000000000..52ed43b0c
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-kdesktop_firstrun.patch
@@ -0,0 +1,27 @@
+--- kdebase-3.5.7/kdesktop/init.cc.kdesktop_firstrun	2007-09-26 10:15:58.000000000 -0300
++++ kdebase-3.5.7/kdesktop/init.cc	2007-09-26 09:32:43.000000000 -0300
+@@ -87,7 +87,9 @@ static bool testDir( const TQString &_nam
+   else // exists already
+   {
+     closedir( dp );
+-    return false;
++	KConfig cfg("kdesktoprc");
++	cfg.setGroup("General");
++	return cfg.readBoolEntry("FirstRun", true);
+   }
+ }
+ 
+@@ -202,7 +204,12 @@ void testLocalInstallation()
+     copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
+ 
+     if (emptyDesktop)
+-	copyDesktopLinks();
++	{
++		copyDesktopLinks();
++		KConfig cfg("kdesktoprc");
++		cfg.setGroup("General");
++		cfg.writeEntry("FirstRun", false);
++	}
+ 
+     // Take care of creating or updating trash.desktop
+     const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-khelpcenter-htdigsearch-path.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-khelpcenter-htdigsearch-path.patch
new file mode 100644
index 000000000..88bb0e8d8
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-khelpcenter-htdigsearch-path.patch
@@ -0,0 +1,11 @@
+--- kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl.orig	2011-02-04 15:29:41.658473919 +0000
++++ kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl	2011-02-04 15:29:57.738474105 +0000
+@@ -8,7 +8,7 @@
+ use open IO => ':utf8';
+ use open ':std';
+ 
+-my $htsearchpath="/usr/lib/cgi-bin/htsearch";
++my $htsearchpath="/usr/bin/htsearch";
+ 
+ my $config;
+ my $format;
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-lzma_support.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-lzma_support.patch
new file mode 100644
index 000000000..3bb8bbb88
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-lzma_support.patch
@@ -0,0 +1,180 @@
+diff -purN kdebase-3.5.7.orig/doc/kioslave/index.docbook kdebase-3.5.7/doc/kioslave/index.docbook
+--- kdebase-3.5.7.orig/doc/kioslave/index.docbook	2007-09-13 18:41:54.000000000 +0200
++++ kdebase-3.5.7/doc/kioslave/index.docbook	2007-09-13 18:46:13.000000000 +0200
+@@ -20,6 +20,7 @@
+ <!ENTITY kio-info SYSTEM "info.docbook">
+ <!ENTITY kio-lan SYSTEM "lan.docbook">
+ <!ENTITY kio-ldap SYSTEM "ldap.docbook">
++<!ENTITY kio-lzma SYSTEM "lzma.docbook">
+ <!ENTITY kio-mailto SYSTEM "mailto.docbook">
+ <!ENTITY kio-mac SYSTEM "mac.docbook">
+ <!ENTITY kio-man SYSTEM "man.docbook">
+@@ -68,6 +69,7 @@
+ &kio-info;
+ &kio-lan;
+ &kio-ldap;
++&kio-lzma;
+ &kio-mailto;
+ &kio-mac;
+ &kio-man;
+diff -purN kdebase-3.5.7.orig/doc/kioslave/lzma.docbook kdebase-3.5.7/doc/kioslave/lzma.docbook
+--- kdebase-3.5.7.orig/doc/kioslave/lzma.docbook	1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.7/doc/kioslave/lzma.docbook	2007-09-13 18:46:13.000000000 +0200
+@@ -0,0 +1,30 @@
++<article lang="&language;" id="lzma">
++<title>lzma</title>
++<articleinfo>
++<authorgroup>
++<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
++<!-- TRANS:ROLES_OF_TRANSLATORS -->
++</authorgroup>
++</articleinfo>
++
++<para><command>lzma</command> is a compression program</para>
++
++<para>The lzma kioslave is not directly usable, and is intended for use
++as a filter.  For example, the tar kioslave can filter a file through
++the lzma kioslave, in order to display the contents of a <literal
++role="extension">tar.lzma</literal> file directly in a &konqueror;
++window.</para>
++
++<para>If you click on a file compressed with a <literal
++role="extension">lzma</literal> extension in &konqueror;, this kioslave is
++used to uncompress it and display it as a normal (uncompressed)
++file.</para>
++
++<para>If you are a developer, and would like to use the lzma filter, you
++can find documentation on using kioslaves at <ulink
++url="http://developer.kde.org">http://developer.kde.org</ulink></para>
++
++<para> See the manual: <ulink url="man:/lzma">lzma</ulink>.
++</para>
++
++</article>
+diff -purN kdebase-3.5.7.orig/kioslave/filter/lzma.protocol kdebase-3.5.7/kioslave/filter/lzma.protocol
+--- kdebase-3.5.7.orig/kioslave/filter/lzma.protocol	1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.7/kioslave/filter/lzma.protocol	2007-09-13 18:46:13.000000000 +0200
+@@ -0,0 +1,10 @@
++[Protocol]
++exec=kio_filter
++protocol=lzma
++mimetype=application/lzma
++input=stream
++output=stream
++reading=true
++source=false
++DocPath=kioslave/lzma.html
++Icon=ark
+diff -purN kdebase-3.5.7.orig/kioslave/filter/Makefile.am kdebase-3.5.7/kioslave/filter/Makefile.am
+--- kdebase-3.5.7.orig/kioslave/filter/Makefile.am	2007-09-13 18:41:35.000000000 +0200
++++ kdebase-3.5.7/kioslave/filter/Makefile.am	2007-09-13 18:47:03.000000000 +0200
+@@ -17,5 +17,5 @@ if include_BZIP2
+ BZIP2FILES=bzip.protocol bzip2.protocol
+ endif
+ 
+-protocol_DATA = gzip.protocol $(BZIP2FILES)
++protocol_DATA = gzip.protocol $(BZIP2FILES) lzma.protocol
+ 
+diff -purN kdebase-3.5.7.orig/kioslave/info/kde-info2html kdebase-3.5.7/kioslave/info/kde-info2html
+--- kdebase-3.5.7.orig/kioslave/info/kde-info2html	2007-09-13 18:41:35.000000000 +0200
++++ kdebase-3.5.7/kioslave/info/kde-info2html	2007-09-13 18:46:13.000000000 +0200
+@@ -39,6 +39,8 @@
+ #   March 9 2003      Add support for browsing by file. by Luis Pedro Coelho
+ #   June  11 2003     Update the layout of the sides to the new infopageslayout.
+ #                     by Sven Leiber <s.leiber@web.de>
++#   August 30 2007    Add lzma support.
++#                     by Per Øyvind Karlsen <peroyvind@mandriva.org>                  
+ #
+ #-------------------------------------------------------
+ 
+@@ -143,6 +145,9 @@ sub FileNotFound {
+ 	elsif ($DirFileName =~ m/.info.gz$/ ) {
+ 		open DIR, "-|", "gzip", "-dc", $DirFileName;
+ 	}
++	elsif ($DirFileName =~ m/.info.lzma$/ ) {
++		open DIR, "-|", "lzma", "-dc", $DirFileName;
++	}
+ 	else {
+ 		open DIR, $DirFileName;
+ 	}
+@@ -252,6 +257,9 @@ sub infocat {
+ 			elsif ($infofile =~ m/.info.gz$/ ) {
+ 				open INFOFILE, "-|", "gzip", "-dc", "$dir/$infofile";
+ 			}
++			elsif ($infofile =~ m/.info.lzma$/ ) {
++ 				open INFOFILE, "-|", "lzma", "-dc", "$dir/$infofile";
++			}
+ 			elsif ($infofile =~ m/.info$/) {
+ 				open INFOFILE, "-|", "$dir/$infofile";
+ 			}
+@@ -427,6 +435,9 @@ sub ReadIndirectTable {
+     open FH1, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
+   } elsif ($FileName =~ /\.bz2$/) {
+     open FH1, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
++  } elsif ($FileName =~ /\.lzma$/) {
++    open FH1, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
++
+   } else {
+     open(FH1, $FileName) || &DieFileNotFound($FileName);
+   }
+@@ -473,6 +484,8 @@ sub ReadTagTable {
+     open FH, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
+   } elsif ($FileName =~ /\.bz2$/) {
+     open FH, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
++  } elsif ($FileName =~ /\.lzma$/) {
++    open FH, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
+   } else {
+     open FH, $FileName || &DieFileNotFound($FileName);
+   }
+@@ -756,6 +769,8 @@ sub InfoNode2HTML {
+     open FH2, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
+   } elsif ($FileName =~ /\.bz2$/) {
+     open FH2, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
++  } elsif ($FileName =~ /\.lzma$/) {
++    open FH2, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
+   } else {
+     open FH2, $FileName || &DieFileNotFound($FileName);
+   }
+@@ -985,17 +1000,21 @@ sub FindFile {
+     foreach my $Name ($File, $Alt) {
+         my $gzName  = $Name . '.gz';
+         my $bz2Name = $Name . '.bz2';
++	my $lzmaName = $Name . '.lzma';
+ 
+         foreach (@info2html::config::INFODIR) {
+             return "$_/$Name"    if -e "$_/$Name";
+             return "$_/$gzName"  if -e "$_/$gzName";
+             return "$_/$bz2Name" if -e "$_/$bz2Name";
++	    return "$_/$lzmaName" if -e "$_/$lzmaName";
++	    
+         }
+         next unless $ENV{INFOPATH};
+         foreach my $i (split(/:/, $ENV{INFOPATH})) {
+             return "$i/$Name"    if -e "$i/$Name";
+             return "$i/$gzName"  if -e "$i/$gzName";
+             return "$i/$bz2Name" if -e "$i/$bz2Name";
++	    return "$i/$lzmaName" if -e "$i/$lzmaName";
+         }
+     }
+     return "";
+diff -purN kdebase-3.5.7.orig/kioslave/man/kio_man.cpp kdebase-3.5.7/kioslave/man/kio_man.cpp
+--- kdebase-3.5.7.orig/kioslave/man/kio_man.cpp	2007-09-13 18:41:35.000000000 +0200
++++ kdebase-3.5.7/kioslave/man/kio_man.cpp	2007-09-13 18:46:13.000000000 +0200
+@@ -68,6 +68,8 @@ void stripExtension( QString *name )
+         pos -= 4;
+     else if ( name->find(".bz", -3) != -1 )
+         pos -= 3;
++    else if ( name->find(".lzma", -5) != -1 )
++ 	pos -= 5;
+ 
+     if ( pos > 0 )
+         pos = name->findRev('.', pos-1);
+@@ -1311,6 +1313,8 @@ void MANProtocol::showIndex(const QStrin
+ 	    end -= 2;
+ 	else if ( len >= 4 && strcmp( end-3, ".bz2" ) == 0 )
+ 	    end -= 4;
++	else if ( len >= 5 && strcmp( end-4, ".lzma" ) == 0 )
++  	    end -= 5;
+ 
+ 	while ( end >= begin && *end != '.' )
+ 	    end--;
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch b/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch
new file mode 100644
index 000000000..06848904d
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch
@@ -0,0 +1,26 @@
+--- kdebase-3.5.7/kdm/kfrontend/kdm_greet.c.fixlang	2007-10-02 16:56:25.000000000 -0300
++++ kdebase-3.5.7/kdm/kfrontend/kdm_greet.c	2007-10-02 15:07:58.000000000 -0300
+@@ -779,7 +779,10 @@ main( int argc ATTR_UNUSED, char **argv 
+ 		LogPanic( "Cannot save $HOME\n" );
+ 	atexit( cleanup );
+ 
+-	setenv( "LC_ALL", _language, 1 );
++    if (  getenv( "LANG" ) == NULL )
++	    setenv( "LC_ALL", _language, 1 );
++    else
++        setenv( "LC_ALL", getenv( "LANG" ), 1 );
+ 
+ 	kg_main( argv[0] );
+ 
+--- kdebase-3.5.7/kdm/backend/session.c.fixlang	2007-10-02 16:56:58.000000000 -0300
++++ kdebase-3.5.7/kdm/backend/session.c	2007-10-02 16:18:21.000000000 -0300
+@@ -802,6 +802,9 @@ systemEnv( const char *user )
+ 	env = baseEnv( user );
+ 	if (td->authFile)
+ 		env = setEnv( env, "XAUTHORITY", td->authFile );
++	char *lang = getenv("LANG");
++    if (lang != NULL)
++	    env = setEnv( env, "LANG", lang );	
+ 	env = setEnv( env, "PATH", td->systemPath );
+ 	env = setEnv( env, "SHELL", td->systemShell );
+ 	return env;
diff --git a/mandriva/2010.2/kdebase/kdebase-3.5.9-update-usb.ids.patch b/mandriva/2010.2/kdebase/kdebase-3.5.9-update-usb.ids.patch
new file mode 100644
index 000000000..d19a57e09
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-3.5.9-update-usb.ids.patch
@@ -0,0 +1,4389 @@
+--- kcontrol/usbview/usb.ids~	2007-10-08 11:51:11.000000000 +0200
++++ kcontrol/usbview/usb.ids	2008-02-11 10:01:28.000000000 +0100
+@@ -7,7 +7,7 @@
+ #	The latest version can be obtained from
+ #		http://www.linux-usb.org/usb.ids
+ #
+-# $Id: usb.ids 703013 2007-08-21 19:01:47Z deller $
++# $Id: usb.ids,v 1.330 2008/02/10 20:12:26 gowdy Exp $
+ #
+ 
+ # Vendors, devices and interfaces. Please keep sorted.
+@@ -21,14 +21,19 @@
+ 0002  Ingram
+ 0003  Club Mac
+ 0004  Nebraska Furniture Mart
++0145  Unknown
++	0112  Card Reader
+ 0204  Chipsbank Microelectronics Co., Ltd
+ 	6025  CBM2080 Flash drive controller
+ 	6026  CBM1180 Flash drive controller
++02ad  HUMAX Co., Ltd.
++	138c  PVR Mass Storage
+ 0386  LTS
+ 	0001  PSX for USB Converter
+ 03e8  EndPoints, Inc.
+ 	0004  SE401 WebCam
+ 	0008  101 Ethernet [klsi]
++	0015  USB ATAPI Enclosure
+ 	2123  SiPix StyleCam Deluxe
+ 03e9  Thesys Microelectronics
+ 03ea  Data Broadcasting Corp.
+@@ -55,6 +60,8 @@
+ 	7605  at76c503a 802.11b Adapter
+ 	7606  at76c505 802.11b Adapter
+ 	7611  at76c510 rfmd2948 802.11b Access Point
++	7613  WL-1130 USB
++	7614  AT76c505a Wireless Adapter
+ 03ec  Iwatsu America, Inc.
+ 03ed  Mitel Corp.
+ 03ee  Mitsumi
+@@ -64,6 +71,7 @@
+ 	6901  SmartDisk FDD
+ 03f0  Hewlett-Packard
+ 	0004  DeskJet 895c
++	0024  KU-0316 Keyboard
+ 	0101  ScanJet 4100c
+ 	0102  PhotoSmart S20
+ 	0104  DeskJet 880c/970c
+@@ -72,6 +80,7 @@
+ 	010c  Multimedia Keyboard Hub
+ 	0111  G55xi Printer/Scanner/Copier
+ 	011c  hn210w 802.11b Adapter
++	011d  Integrated Bluetooth Module
+ 	0121  HP49g+ Calculator
+ 	0201  ScanJet 6200c
+ 	0202  PhotoSmart S20
+@@ -79,8 +88,10 @@
+ 	0205  ScanJet 3300c
+ 	0207  CD-Writer Plus 8200e
+ 	020c  Multimedia Keyboard
++	0212  DeskJet 1220C
+ 	0304  DeskJet 810c/812c
+ 	0305  ScanJet 4300c
++	0307  CD-Writer+ CD-4e
+ 	0311  OfficeJet G85xi
+ 	0317  LaserJet 1200
+ 	0401  ScanJet 5200c
+@@ -100,16 +111,22 @@
+ 	0712  DeskJet 1180c
+ 	0801  ScanJet 7400c
+ 	0804  DeskJet 816c
++	0805  HP4470C
+ 	0901  ScanJet 2300c
+ 	0904  DeskJet 845c
++	0a01  ScanJet 2400c
++	0b01  Scanjet 82x0C
++	0b17  Laserjet 2300d
++	1001  Photo Scanner 1000
+ 	1004  DeskJet 970c/970cse
+ 	1005  ScanJet 5400c
+-	1016  Jornada 548 / iPAQ HW6515 Pocket PC 
++	1016  Jornada 548 / iPAQ HW6515 Pocket PC
+ 	1104  DeskJet 959c
+ 	1105  ScanJet 5470c
+ 	1116  Jornada 568 Pocket PC
+-	1151  750xi Printer/Scanner/Copier
++	1151  PSC-750xi Printer/Scanner/Copier
+ 	1204  DeskJet 930c
++	1205  ScanJet 4500C/5550C
+ 	1305  ScanJet 4570c
+ 	1312  Deskjet 460
+ 	1317  LaserJet 1005
+@@ -117,9 +134,16 @@
+ 	1424  f2105 Monitor Hub
+ 	1504  DeskJet 920c
+ 	1604  DeskJet 940c
++	1605  ScanJet 5530C Photosmart
+ 	1617  LaserJet 3015
++	1705  ScanJet 5590
++	171d  USB Wireless (Bluetooth + WLAN) Interface [HP Integrated Module]
++	1801  Inkjet P-2000U
++	1805  ScanJet 7650
+ 	1904  DeskJet 3820
++	1b05  ScanJet 4850C/4890C
+ 	1c17  Color LaserJet 2550l
++	1d17  LaserJet 1320
+ 	1e11  PSC-950
+ 	2002  Hub
+ 	2004  DeskJet 640c
+@@ -128,24 +152,37 @@
+ 	2205  ScanJet 3500c
+ 	2304  DeskJet 656c
+ 	2305  ScanJet 3970c
++	2405  ScanJet 4070 Photosmart
++	2505  ScanJet 3770
++	2524  LP3065 30" Monitor Hub
++	2605  ScanJet 3800c
+ 	2811  PSC-2100
++	2b17  LaserJet 1020
+ 	2d11  OfficeJet 6110
++	3005  ScanJet 4670v
+ 	3102  PhotoSmart P1100 Printer w/ Card Reader
+ 	3104  DeskJet 960c
+ 	3304  DeskJet 990c
+ 	3404  DeskJet 6122
+ 	3504  DeskJet 6127c
++	3611  PSC 2410 Photosmart
+ 	3817  LaserJet P2015 Series
++	3a11  OfficeJet 5500 series
+ 	3c02  PhotoSmart 7350
+ 	3d11  OfficeJet 4215
+ 	3f11  PSC-1315/PSC-1317
+ 	4002  PhotoSmart 720 / PhotoSmart 935 (storage)
+ 	4102  PhotoSmart 618
++	4105  ScanJet 4370
+ 	4202  PhotoSmart 812
+ 	4302  PhotoSmart 850 (ptp)
+ 	4402  PhotoSmart 935 (ptp)
+ 	4502  PhotoSmart 945 (PTP mode)
++	4505  ScanJet G4010
+ 	5004  DeskJet 995c
++	5511  Deskjet F300 series
++	5611  PhotoSmart C3180
++	5911  PhotoSmart C6180
+ 	6004  DeskJet 5550
+ 	6104  DeskJet 5650c
+ 	6202  PhotoSmart 215
+@@ -165,9 +202,11 @@
+ 	7204  DeskJet 36xx
+ 	7302  PhotoSmart M307 (PTP mode)
+ 	7304  DeskJet 35xx
++	7604  Deskjet 3940
+ 	7702  PhotoSmart R817 (PTP mode)
+ 	7a02  PhotoSmart M415 (PTP mode)
+ 	7b02  PhotoSmart M23 (PTP mode)
++	811c  Ethernet HN210E
+ 	8604  Deskjet 5440
+ 	a004  DeskJet 5850c
+ 	bef4  NEC Picty760
+@@ -177,6 +216,8 @@
+ 03f1  Genoa Technology
+ 03f2  Oak Technology, Inc.
+ 03f3  Adaptec, Inc.
++	0020  AWN-8020 WLAN
++	009b  AVC-1410 GameBridge TV NTSC
+ 03f4  Diebold, Inc.
+ 03f5  Siemens Electromechanical
+ 03f8  Epson Imaging Technology Center
+@@ -195,13 +236,15 @@
+ 	5602  Video Camera Controller
+ 	5603  USB 2.0 Q-tec Webcam 300
+ 	5621  USB 2.0 Storage Device
++	5627  Welland ME-740PS USB2 3.5" Power Saving Enclosure
+ 	5632  USB 2.0 Host-to-Host Link
+ 	5635  USB 2.0 Flash Card Reader
+ 	5636  USB 2.0 Storage Device
+ 	5637  M5637 IDE Controller
+ 0403  Future Technology Devices International, Ltd
+ 	0000  H4SMK 7 Port Hub
+-	6001  8-bit FIFO
++	6001  FT232 USB-Serial (UART) IC
++	6010  FT2232C Dual USB-UART/FIFO IC
+ 	8040  4 Port Hub
+ 	8070  7 Port Hub
+ 	8370  7 Port Hub
+@@ -209,25 +252,45 @@
+ 	8372  FT8U100AX Serial Port
+ 	c630  lcd2usb interface
+ 	c7d0  RR-CirKits LocoBuffer-USB
++	cc48  product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi
++	cc49  product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru
++	cc4a  product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal
++	e700  Elster Unicom III Optical Probe
++	e888  Expert ISDN Control USB
++	e889  USB-RS232 OptoBridge
++	e88a  Expert mouseCLOCK USB II
++	e88b  Precision Clock MSF USB
++	e88c  Expert mouseCLOCK USB II HBG
+ 	ea90  Eclo 1-Wire Adapter
+ 	f208  Papenmeier Braille-Display
++	f918  Ant8 Logic Probe
++	fa00  Matrix Orbital USB Serial
++	fa01  Matrix Orbital MX2 or MX3
++	fa02  Matrix Orbital MX4 or MX5
++	fa03  Matrix Orbital VK/LK202 Family
++	fa04  Matrix Orbital VK/LK204 Family
++	fc08  Crystalfontz CFA-632 USB LCD
++	fc09  Crystalfontz CFA-634 USB LCD
++	fc0b  Crystalfontz CFA-633 USB LCD
++	fc0c  Crystalfontz CFA-631 USB LCD
++	fc0d  Crystalfontz CFA-635 USB LCD
+ 	fc82  SEMC DSS-20 SyncStation
+ 	fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
+ 	ff08  ToolHouse LoopBack Adapter
+ 0404  NCR Corp.
+-	0310 K590 Printer, Self-Service
+-	0311 7167 Printer, Receipt/Slip
+-	0312 7197 Printer Receipt
+-	0320 5932-USB Keyboard
+-	0321 5953-USB Dynakey
+-	0322 5932-USB Enhanced Keyboard
+-	0323 5932-USB Enhanced Keyboard, Flash-Recovery/Download
+-	0324 5953-USB Enhanced Dynakey
+-	0325 5953-USB Enhanced Dynakey Flash-Recovery/Download
+-	0328 K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages)
+-	0329 K018: USB-MSR JIS 2-Track MSR: POS Standard
+-	032a K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode
+-	032b K016/K018: USB-MSR Flash-Recovery/Download
++	0310  K590 Printer, Self-Service
++	0311  7167 Printer, Receipt/Slip
++	0312  7197 Printer Receipt
++	0320  5932-USB Keyboard
++	0321  5953-USB Dynakey
++	0322  5932-USB Enhanced Keyboard
++	0323  5932-USB Enhanced Keyboard, Flash-Recovery/Download
++	0324  5953-USB Enhanced Dynakey
++	0325  5953-USB Enhanced Dynakey Flash-Recovery/Download
++	0328  K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages)
++	0329  K018: USB-MSR JIS 2-Track MSR: POS Standard
++	032a  K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode
++	032b  K016/K018: USB-MSR Flash-Recovery/Download
+ 0405  Synopsys, Inc.
+ 0406  Fujitsu-ICL Computers
+ 0407  Fujitsu Personal Systems, Inc.
+@@ -238,6 +301,7 @@
+ 	0027  MultiSync Monitor
+ 	0058  HighSpeed Hub
+ 	0059  HighSpeed Hub
++	005a  HighSpeed Hub
+ 	006a  Conceptronic USB Harddisk Box
+ 	011d  e228 Mobile Phone
+ 	55aa  Hub
+@@ -301,7 +365,14 @@
+ 	058d  C340
+ 	058e  V530
+ 	058f  V550
++	05b3  EasyShare Z710 Camera
++	410d  EasyShare G600 Printer Dock
+ 	5010  Wireless Adapter
++	6001  i30
++	6002  i40
++	6003  i50
++	6004  i60
++	6005  i80
+ 040b  Weltrend Semiconductor
+ 	6510  Weltrend Bar Code Reader
+ 	6520  XBOX Xploder
+@@ -312,8 +383,22 @@
+ 040f  Echo Speech Corp.
+ 0411  MelCo., Inc.
+ 	0001  LUA-TX Ethernet [pegasus]
++	0005  LUA-TX Ethernet
++	0009  LUA2-TX Ethernet
++	0012  LUA-KTX Ethernet
+ 	0016  WLI-USB-S11 802.11b Adapter
++	001c  USB-IDE Bridge: DUB-PxxG
+ 	0027  WLI-USB-KS11G 802.11b Adapter
++	003d  LUA-U2-KTX Ethernet
++	005e  WLI-U2-KG54-YB WLAN
++	0066  WLI-U2-KG54 WLAN
++	0067  WLI-U2-KG54-AI WLAN
++	008b  Nintendo Wi-Fi
++	00b3  PC-OP-RS1 RemoteStation
++	00cb  WLI-U2-G300N 802.11n Adapter
++	00d8  WLI-U2-SG54HP
++	00d9  WLI-U2-G54HP
++	00da  WLI-U2-KG54L
+ 0412  Award Software International
+ 0413  Leadtek Research, Inc.
+ 	6025  WinFast DTV Dongle (cold state)
+@@ -330,8 +415,8 @@
+ 	551e  Keyboard
+ 	551f  Keyboard w/ Sys and Media
+ 	5521  Keyboard
+-	7723  SD Card Reader
+ 	6481  16-bit Scanner
++	7723  SD Card Reader
+ 0417  Symbios Logic
+ 0418  AST Research
+ 0419  Samsung Info. Systems America, Inc.
+@@ -345,8 +430,11 @@
+ 	1002  Nomad II
+ 	1003  Blaster GamePad Cobra
+ 	1050  GamePad Cobra
++	3000  SoundBlaster Extigy
+ 	3010  SoundBlaster MP3+
+ 	3020  SoundBlaster Audigy 2 NX
++	3040  SoundBlaster Live! 24-bit External SB0490
++	3061  SoundBlaster Audigy 2 ZS Video Editor
+ 	4003  VideoBlaster WebCam Go Plus [W9967CF]
+ 	4004  Nomad II MG
+ 	4005  WebCam Blaster Go ES
+@@ -371,6 +459,8 @@
+ 	403a  WebCam NX Pro 2
+ 	403c  WebCam Live! Ultra
+ 	403d  WebCam Notebook Ultra
++	4041  WebCam Live! Motion
++	4068  WebCam Live! Notebook
+ 	4100  Nomad Jukebox 2
+ 	4101  Nomad Jukebox 3
+ 	4106  Nomad MuVo
+@@ -383,11 +473,13 @@
+ 	4116  MuVo^2
+ 	4117  Nomad MuVo TX
+ 	411b  Zen Touch
++	411c  Nomad MuVo USB 2.0
+ 	411d  Zen
+ 	411e  Zen Micro
+ 	4123  Zen Portable Media Center
+ 	4126  Dell DJ (2nd gen)
+ 	4127  Dell DJ
++	4128  NOMAD Jukebox Zen Xtra (mtp)
+ 	412b  MuVo N200 with FM radio
+ 	4130  Zen Micro (mtp)
+ 	4131  Zen Touch (mtp)
+@@ -396,9 +488,16 @@
+ 	4137  Zen Sleek (mtp)
+ 	4139  Zen Nano Plus
+ 	413c  Zen MicroPhoto
++	4151  Zen Vision:M (mtp)
++	4155  Zen Stone plus
+ 041f  LCS Telegraphics
+ 0420  Chips and Technologies
++	1307  Celly SIM Card Reader
+ 0421  Nokia Mobile Phones
++	0018  6288 GSM Smartphone
++	0019  6288 GSM Smartphone (imaging mode)
++	001a  6288 GSM Smartphone (file transfer mode)
++	0105  E-61 (Firmware update mode)
+ 	0401  6650 GSM Phone
+ 	0405  9500 GSM Communicator
+ 	040b  N-Gage GSM Phone
+@@ -406,13 +505,22 @@
+ 	0410  6630 Imaging Smartphone
+ 	0415  9300 GSM Smartphone
+ 	0418  E-70 (PC-Suite mode)
++	0419  E-60 (PC-Suite mode)
+ 	041a  9500 GSM Communicator (RNDIS)
+ 	041b  9300 GSM Smartphone (RNDIS)
+-	041e  Nokia 6680
+-	0429  6230i Camera Phone
++	041e  6680
++	0428  6230i Modem
++	0429  6230i MultiMedia Card
+ 	0431  770 Internet Tablet
+ 	0435  E-70 (IP Passthrough/RNDIS mode)
+-	043a  Nokia N70 USB Phone Parent
++	0436  E-60 (IP Passthrough/RNDIS mode)
++	043a  N70 USB Phone Parent
++	044d  E-61 (PC Suite mode)
++	044e  E-61 (Data Exchange mode)
++	044f  E-61 (IP Passthrough/RNDIS mode)
++	046e  6110 Navigator
++	04c3  N800 Internet Tablet
++	04f9  Nokia 6300 (PC-Suite mode)
+ 	0800  Connectivity Cable DKU-5
+ 0422  ADI Systems, Inc.
+ 0423  Computer Access Technology Corp.
+@@ -421,8 +529,12 @@
+ 	000d  USB Chief Analyzer
+ 	1237  Andromeda Hub
+ 0424  Standard Microsystems Corp.
++	2020  USB Hub
+ 	20fc  6-in-1 Card Reader
++	2228  9-in-2 Card Reader
+ 	223a  8-in-1 Card Reader
++	2503  USB 2.0 Hub
++	2504  USB 2.0 Hub
+ 	2524  USB MultiSwitch Hub
+ 0425  Motorola Semiconductors HK, Ltd
+ 	0101  G-Tech Wireless Mouse & Keyboard
+@@ -448,6 +560,7 @@
+ 0434  Samsung Info. Systems America, Inc.
+ 0435  Hyundai Electronics America
+ 0436  Taugagreining HF
++	0005  CameraMate (DPCM_USB)
+ 0437  Framatome Connectors USA
+ 0438  Advanced Micro Devices, Inc.
+ 0439  Voice Technologies Group
+@@ -467,9 +580,16 @@
+ 	0057  Z35 Printer
+ 	0060  X74/X75 Scanner
+ 	0061  X74 Hub
++	0065  X5130
+ 	0069  X74/X75 Printer
+ 	0072  X6170 Printer
++	007c  Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185
++	007d  Photo 3150
++	0093  X5250
+ 	0095  E220 Printer
++	0097  P6250
++	00bb  2300 Series
++	4303  Xerox WorkCentre Pro 412
+ 043e  LG Electronics USA, Inc.
+ 	42bd  Flatron 795FT Plus Monitor
+ 	4a4d  Flatron 915FT Plus Monitor
+@@ -492,6 +612,7 @@
+ 044e  Alps Electric Co., Ltd
+ 	2002  MD-5500 Printer
+ 	3001  UGTZ4 Bluetooth
++	3007  GlidePoint PS/2 TouchPad
+ 044f  ThrustMaster, Inc.
+ 	0400  HOTAS Cougar
+ 	a0a3  Fusion Digital GamePad
+@@ -506,6 +627,7 @@
+ 	2046  TUSB2046 Hub
+ 	2077  TUSB2077 Hub
+ 	3410  TUSB3410 Microcontroller
++	3f02  SMC WSKP100 Wi-Fi Phone
+ 	5409  Frontier Labs NEX IA+ Digital Audio Player
+ 	6000  AU5 ADSL Modem (pre-reenum)
+ 	6001  AU5 ADSL Modem
+@@ -531,27 +653,56 @@
+ 	000e  VideoCAM Web
+ 	001a  Genius WebScroll+
+ 	004c  Slimstar Pro Keyboard
++	0056  Ergo 300 Mouse
+ 	0100  EasyPen Tablet
+ 	0101  CueCat
+ 	1003  Genius VideoCam
+ 	1004  Flight2000 F-23 Joystick
+ 	100a  Aashima Technology Trust Sight Fighter Vibration Feedback Joystick
+ 	2001  ColorPage-Vivid Pro Scanner
++	2004  ColorPage-HR6 V1 Scanner
+ 	2007  ColorPage-HR6 V2 Scanner
+ 	2008  ColorPage-HR6 V2 Scanner
+ 	2009  ColorPage-HR6A Scanner
+ 	2011  ColorPage-Vivid3x Scanner
+ 	2013  ColorPage-HR7 Scanner
++	2014  ColorPage-Vivid4
+ 	2015  ColorPage-HR7LE Scanner
+ 	2016  ColorPage-HR6X Scanner
++	2017  ColorPage-Vivid3xe
++	2018  ColorPage-HR7X
++	2019  ColorPage-HR6X Slim
++	201a  ColorPage-Vivid4xe
++	201b  ColorPage-Vivid4x
++	201c  ColorPage-HR8
++	201d  ColorPage-Vivid 1200 X
++	201e  ColorPage-Slim 1200
++	201f  ColorPage-Vivid 1200 XE
++	2020  ColorPage-Slim 1200 USB2
++	2021  ColorPage-SF600
+ 	301d  Genius MaxFire MiniPad
+ 	7004  VideoCAM Express
+ 	7007  VideoCAM Web
+ 	7012  WebCAM USB2.0
+ 0459  Adobe Systems, Inc.
+ 045a  SONICblue, Inc.
++	07da  Supra Express 56K modem
+ 	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
+ 	0b68  SupraMax 56K Modem
++	5001  Rio 600 MP3 Player
++	5002  Rio 800 MP3 Player
++	5003  Nike Psa/Play MP3 Player
++	5005  Rio S10 MP3 Player
++	5006  Rio S50 MP3 Player
++	5007  Rio S35 MP3 Player
++	5008  Rio 900 MP3 Player
++	5009  Rio S30 MP3 Player
++	500d  Fuse MP3 Player
++	500e  Chiba MP3 Player
++	500f  Cali MP3 Player
++	5010  Rio S11 MP3 Player
++	503f  Cali256 MP3 Player
++	5202  Rio Riot MP3 Player
+ 	5210  Rio Karma Music Player
+ 	5220  Rio Nitrus MP3 Player
+ 045b  Hitachi, Ltd
+@@ -564,6 +715,7 @@
+ 	0014  Digital Sound System 80
+ 	001a  SideWinder Precision Racing Wheel
+ 	001b  SideWinder Force Feedback 2 Joystick
++	001c  Internet Keyboard Pro
+ 	001d  Natural Keyboard Pro
+ 	001e  IntelliMouse Explorer
+ 	0023  Trackball Optical
+@@ -582,12 +734,16 @@
+ 	003c  SideWinder Joystick
+ 	0040  Wheel Mouse Optical
+ 	0047  IntelliMouse Explorer 3.0
++	0048  Office Keyboard 1.0A
++	0053  Optical Mouse
+ 	0059  Wireless IntelliMouse Explorer
+ 	006e  MN510 802.11b Adapter
++	007a  10/100 USB NIC
+ 	007d  Notebook Optical Mouse
+ 	007e  Wireless Transceiver for Bluetooth
+ 	0080  Digital Media Pro Keyboard
+ 	0083  Basic Optical Mouse
++	0084  Basic Optical Mouse
+ 	008a  Wireless Keyboard and Mouse
+ 	008c  Wireless Intellimouse Explorer 2.0
+ 	00b9  Wireless Optical Mouse 3.0
+@@ -609,6 +765,7 @@
+ 	029c  Xbox360 HD-DVD Drive
+ 	029d  Xbox360 HD-DVD Drive
+ 	029e  Xbox360 HD-DVD Memory Unit
++	043d  Becker Traffic Assist Highspeed 7934
+ 0460  Ace Cad Enterprise Co., Ltd
+ 0461  Primax Electronics, Ltd
+ 	0300  G2-300 Scanner
+@@ -624,12 +781,17 @@
+ 	0361  Colorado 1200u Scanner
+ 	0364  LG Electronics Scanworks 600U Scanner
+ 	0371  Visioneer Onetouch 8920 Scanner
++	0374  UMAX Astra 2500
+ 	0377  Medion MD 5345 Scanner
+ 	037b  Medion MD 6190 Scanner
+ 	0380  G2-600 Scanner
+ 	0381  ReadyScan 636i Scanner
+ 	0382  G2-600 #2 Scanner
+ 	0383  G2E-600 Scanner
++	038a  UMAX Astra 3000/3600
++	038b  Xerox 2400 Onetouch
++	038c  UMAX Astra 4100
++	0392  Medion/Lifetec/Tevion/Cytron MD 6190
+ 	0813  IBM UltraPort Camera
+ 	0815  Micro Innovations WebCam
+ 	0819  Fujifilm IX-30 Camera [webcam mode]
+@@ -649,11 +811,16 @@
+ 046a  Cherry GmbH
+ 	0001  My3000 Keyboard
+ 	0003  My3000 Hub
++	0004  CyBoard Keyboard
+ 	0005  XX33 SmartCard Reader Keyboard
+ 	0023  Cymotion Master Linux Keyboard
+ 046b  American Megatrends, Inc.
++	0101  PS/2 Keyboard, Mouse & Joystick Ports
++	0301  USB 1.0 Hub
++	0500  Serial & Parallel Ports
+ 046c  Toshiba Corp., Digital Media Equipment
+ 046d  Logitech, Inc.
++	0082  Acer Aspire 5672 Webcam
+ 	0203  M2452 Keyboard
+ 	0301  M4848 Mouse
+ 	0401  HP PageScan
+@@ -666,16 +833,32 @@
+ 	0870  QuickCam Express
+ 	0890  QuickCam Traveler
+ 	08a0  QuickCam IM
++	08a1  QuickCam IM with sound
+ 	08a2  Labtec WebCam Pro
++	08a3  QuickCam QuickCam Chat
++	08a7  QuickCam Image
++	08a9  Notebook Deluxe
++	08aa  Labtec Notebooks
++	08ac  QuickCam Cool
++	08ad  QuickCam Communicate STX
++	08ae  Quickcam for Notebooks
+ 	08b0  QuickCam 3000 Pro [pwc]
+ 	08b1  QuickCam Notebook Pro
+ 	08b2  QuickCam Pro 4000
+ 	08b3  QuickCam Zoom
+ 	08b4  QuickCam Zoom
+ 	08b5  QuickCam Sphere
+-	08d9  QuickCam Connect
++	08b9  QuickCam IM
++	08c5  QuickCam Pro 5000
++	08c6  QuickCam for DELL Notebooks
++	08ce  QuickCam Pro 5000
++	08d7  QuickCam Communicate STX
++	08d8  QuickCam for Notebook Deluxe
++	08d9  QuickCam IM/Connect
+ 	08da  QuickCam Messanger
+ 	08f0  QuickCam Messenger
++	08f5  QuickCam Messenger Communicate
++	08f6  Quickcam Messenger Plus
+ 	0900  ClickSmart 310
+ 	0901  ClickSmart 510
+ 	0903  ClickSmart 820
+@@ -683,12 +866,20 @@
+ 	0920  QuickCam Express
+ 	0921  Labtec WebCam
+ 	0928  Quickcam Express
++	0929  Labtec WebCam Pro
+ 	092a  QuickCam for Notebooks
+-	092f  QuickCam express Plus
++	092b  Labtec WebCam Plus
++	092c  QuickCam Chat
++	092f  QuickCam Express Plus
+ 	0950  Pocket Camera
+ 	0960  ClickSmart 420
+ 	0970  Pocket750
+-	0a01  Logitech USB Headset
++	0990  QuickCam Pro 9000
++	09c1  QuickCam Deluxe for Notebooks
++	0a01  USB Headset
++	0a02  Premium Stereo USB Headset 350
++	0a03  Logitech USB Microphone
++	0a04  V20 portable speakers (USB powered)
+ 	0b02  BT Mini-Receiver (HID proxy mode)
+ 	bfe4  Premium Optical Wheel Mouse
+ 	c000  N43 [Pilot Mouse]
+@@ -697,16 +888,21 @@
+ 	c004  WingMan Gaming Mouse
+ 	c00b  MouseMan Wheel
+ 	c00c  Optical Wheel Mouse
+-	c00e  M-BJ69 Optical Wheel Mouse
+-	c012  Optical Mouse
+-	c016  M-UV69a Optical Wheel Mouse
++	c00e  M-BJ58/M-BJ69 Optical Wheel Mouse
++	c012  Mouseman Dual Optical
++	c016  M-UV69a/HP M-UV96 Optical Wheel Mouse
++	c01a  M-BQ85 Optical Wheel Mouse
+ 	c01b  MX310 Optical Mouse
+ 	c01d  MX510 Optical Mouse
+ 	c01e  MX518 Optical Mouse
+ 	c025  MX500 Optical Mouse
+ 	c030  iFeel Mouse
+ 	c032  MouseMan iFeel
++	c03d  M-BT69a Pilot Optical Mouse
+ 	c03e  Premium Optical Wheel Mouse
++	c03f  UltraX Optical Mouse
++	c050  RX 250 Optical Mouse
++	c101  UltraX Media Remote
+ 	c202  WingMan Formula
+ 	c207  WingMan Extreme Digital 3D
+ 	c208  WingMan Gamepad Extreme
+@@ -715,8 +911,13 @@
+ 	c20c  WingMan Precision
+ 	c20d  WingMan Attack 2
+ 	c211  iTouch Cordless Reciever
++	c214  ATK3 (Attack III Joystick)
++	c215  Extreme 3D Pro
+ 	c216  Dual Action Gamepad
+ 	c218  Logitech RumblePad 2 USB
++	c221  G15 Keyboard / Keyboard
++	c222  G15 Keyboard / LCD
++	c223  G15 Keyboard / USB Hub
+ 	c281  WingMan Force
+ 	c283  WingMan Force 3D
+ 	c285  WingMan Strike Force 3D
+@@ -727,6 +928,7 @@
+ 	c303  iTouch Keyboard
+ 	c308  Internet Navigator Keyboard
+ 	c309  Internet Keyboard
++	c315  Classic New Touch Keyboard
+ 	c401  TrackMan Marble Wheel
+ 	c402  Marble Mouse (2-button)
+ 	c404  TrackMan Wheel
+@@ -738,8 +940,16 @@
+ 	c506  MX-700 Cordless Mouse Receiver
+ 	c50b  Cordless Desktop Optical
+ 	c50e  MX-1000 Cordless Mouse Receiver
++	c512  LX-700 Cordless Desktop Receiver
++	c513  MX3000 Cordless Desktop Receiver
+ 	c517  LX710 Cordless Desktop Laser
+ 	c518  MX610 Laser Cordless Mouse
++	c51a  MX Revolution/G7 Cordless Mouse
++	c521  MX620 Laser Cordless Mouse
++	c625  3Dconnexion Space Pilot 3D Mouse
++	c626  3DConnexion Space Navigator 3D Mouse
++	c627  3DConnexion Space Explorer 3D Mouse
++	c703  Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)
+ 	c709  BT Mini-Receiver (HCI mode)
+ 	c70b  BT Mini-Receiver (HID proxy mode)
+ 	c70c  BT Mini-Receiver (HID proxy mode)
+@@ -762,12 +972,18 @@
+ 	0310  PCVC730K WebCam [pwc]
+ 	0311  PCVC740K ToUcam Pro [pwc]
+ 	0312  PCVC750K WebCam [pwc]
+-	0327  WEBc am SPC 6000 NC (WebCam w/ mic)
++	0327  WebCam SPC 6000 NC (WebCam w/ mic)
+ 	0471  Digital Speaker System
+ 	0601  OVU1020 IR Dongle (Kbd+Mouse)
++	060a  TSU9600 Remote Control
++	060e  RF Dongle
++	0619  TSU9400 Remote Control
+ 	0701  150P1 TFT Display
+ 	0811  JR24 CDRW
+ 	1120  Creative Rhomba MP3 player
++	1137  HDD065 MP3 player
++	1236  SNU5600
++	1552  ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
+ 	1801  Diva MP3 player
+ 0472  Chicony Electronics Co., Ltd
+ 	0065  PFU-65 Keyboard
+@@ -780,6 +996,9 @@
+ 	0231  C5 Digital Media Camera (PC control mode)
+ 	0701  SCP-4900 Cellphone
+ 0475  Relisys/Teco Information System
++	0100  NEC Petiscan
++	0103  Eclipse 1200U/Episode
++	0210  Scorpio Ultra 3
+ 0476  AESP
+ 0477  Seagate Technology, Inc.
+ 0478  Connectix Corp.
+@@ -787,10 +1006,12 @@
+ 	0002  QuickClip
+ 0479  Advanced Peripheral Laboratories
+ 047a  Semtech Corp.
++	0004  ScreenCoder UR7HCTS2-USB
+ 047b  Silitek Corp.
+ 	0002  Keyboard and Mouse
+ 	0101  BlueTooth Keyboard and Mouse
+ 	020b  SK-3105 SmartCard Reader
++	1000  Trust Office Scan USB 19200
+ 	1002  HP ScanJet 4300c Parallel Port
+ 047c  Dell Computer Corp.
+ 047d  Kensington
+@@ -798,6 +1019,7 @@
+ 	1005  TurboBall
+ 	1009  Orbit TrackBall for Mac
+ 	101f  PocketMouse Pro
++	1020  Expert Mouse Trackball
+ 	2010  Wireless Presentation Remote
+ 	4005  Gravis Eliminator GamePad Pro
+ 	4006  Gravis Eliminator AfterShock
+@@ -808,12 +1030,18 @@
+ 	1001  USS720 Parallel Port
+ 	f101  Atlas Modem
+ 047f  Plantronics, Inc.
++	0ca1  USB DSP v4 Audio Interface
+ 0480  Toshiba America Info. Systems, Inc.
+ 0481  Zenith Data Systems
+ 0482  Kyocera Corp.
+ 	000e  FS-1020D Printer
++	0100  Finecam S3x
++	0101  Finecam S4
+ 	0103  Finecam S5
++	0105  Finecam L3
++	0203  AH-K3001V
+ 0483  SGS Thomson Microelectronics
++	0137  BeWAN ADSL USB ST (blue or green)
+ 	1307  Cytronix 6in1 card reader
+ 	163d  Cool Icam Digi-MP3
+ 	2016  Fingerprint Reader
+@@ -840,6 +1068,13 @@
+ 0497  Smile International
+ 0498  Capetronic (Kaohsiung) Corp.
+ 0499  Yamaha Corp.
++	1000  UX256 MIDI I/F
++	1008  UX96 MIDI I/F
++	3001  YST-MS55D USB Speaker
++	4000  NetVolante RTA54i Broadband&ISDN Router
++	4001  NetVolante RTW65b Broadband Wireless Router
++	4002  NetVolante RTW65i Broadband&ISDN Wireless Router
++	4004  NetVolante RTA55i Broadband VoIP Router
+ 	6001  CRW2200UX Lightspeed 2 External CD-RW Drive
+ 049a  Gandalf Technologies, Ltd
+ 049b  Curtis Computer Products
+@@ -855,6 +1090,7 @@
+ 	0032  802.11b Adapter [ipaq h5400]
+ 	0033  802.11b Adapter [orinoco]
+ 	0051  KU-0133 Easy Access Interner Keyboard
++	504a  Personal Jukebox PJB100
+ 	505a  Linux-USB "CDC Subset" Device, or Itsy (experimental)
+ 	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
+ 04a0  Digital Equipment Corp.
+@@ -862,6 +1098,8 @@
+ 04a2  FirePower Systems
+ 04a3  Trident Microsystems, Inc.
+ 04a4  Hitachi, Ltd
++	0004  DVD-CAM DZ-MV100A Camcorder
++	001e  DVDCAM USB HS Interface
+ 04a5  Acer Peripherals Inc. (now BenQ Corp.)
+ 	0001  Keyboard
+ 	12a6  AcerScan C310U
+@@ -875,13 +1113,19 @@
+ 	20be  Prisa 640BT
+ 	20c0  Prisa 1240UT
+ 	20de  S2W 4300U+
++	20f8  Benq 5000
+ 	20fc  Benq 5000
+ 	20fe  SW2 5300U
++	2137  Benq 5150/5250
++	2202  Benq 7400UT
+ 	3003  Benq WebCam
+ 	3008  Benq 1500
+ 	300a  Benq 3410
+ 	300c  Benq 1016
+ 	3019  Benq DC C40
++	6003  ATA/ATAPI Adapter
++	9000  AWL300 Wireless Adapter
++	9001  AWL400 Wireless Adapter
+ 	9213  Kbd Hub
+ 04a6  Nokia Display Products
+ 04a7  Visioneer
+@@ -889,10 +1133,24 @@
+ 	0221  OneTouch 5300 Scanner
+ 	0224  OneTouch 4800 USB/Microtek Scanport 3000
+ 	0226  OneTouch 5300 USB
++	0229  OneTouch 7100
++	022a  OneTouch 6600
++	022c  OneTouch 9000/9020
+ 	0231  6100 Scanner
+ 	0311  6200 EPP/USB Scanner
+ 	0321  OneTouch 8100 EPP/USB Scanner
+ 	0331  OneTouch 8600 EPP/USB Scanner
++	0362  OneTouch 9320
++	0371  OneTouch 8700/8920
++	03a0  Xerox 4800 One Touch
++	0410  OneTouch Pro 8800/8820
++	0421  9450 USB
++	0427  Strobe XP 100
++	0444  OneTouch 7300
++	0446  Xerox DocuMate 510
++	0449  Xerox DocuMate 252
++	044c  Xerox DocuMate 262
++	0475  Xerox DocuMate 272
+ 04a8  Multivideo Labs, Inc.
+ 04a9  Canon, Inc.
+ 	1051  BJC-3000 Color Printer
+@@ -909,7 +1167,22 @@
+ 	1074  S330 Printer
+ 	1090  i9900 Photo Printer
+ 	1094  PIXMA iP3000x Printer
++	10a0  PIXMA iP1600 Printer
+ 	10b6  PIXMA iP4300 Printer
++	1601  DR-2080C Scanner
++	1607  DR-6080 Scanner
++	1700  PIXMA MP110 Scanner
++	1701  PIXMA MP130 Scanner
++	1706  PIXMA MP750 Scanner
++	1707  PIXMA MP780 Scanner
++	1708  PIXMA MP760 Scanner
++	1709  PIXMA MP150 Scanner
++	170a  PIXMA MP170 Scanner
++	170b  PIXMA MP450 Scanner
++	170c  PIXMA MP500 Scanner
++	170d  PIXMA MP800 Scanner
++	1713  PIXMA MP830 Scanner
++	2200  CanoScan LiDE 25
+ 	2201  CanoScan FB320U
+ 	2202  CanoScan FB620U
+ 	2204  CanoScan FB630U
+@@ -925,14 +1198,23 @@
+ 	220f  CanoScan 8000F
+ 	2210  CanoScan 9900F
+ 	2212  CanoScan 5000F
+-	2213  LiDE 50/LiDE 35
++	2213  CanoScan LiDE 50/LiDE 35/LiDE 40
++	2214  CanoScan LiDE 80
+ 	2215  CanoScan 3000/3000F/3000ex
+ 	2216  CanoScan 3200F
+ 	2217  CanoScan 5200F
++	2219  CanoScan 9950F
++	221b  CanoScan 4200F
++	221c  CanoScan LiDE 60
+ 	221e  CanoScan 8400F
++	221f  CanoScan LiDE 500F
++	2220  CanoScan LIDE 25
+ 	2225  CanoScan LiDE 70
+ 	2611  SmartBase MPC400
+ 	262b  LaserShot LBP-1120 Printer
++	262f  MultiPASS MP730
++	2630  MultiPASS MP700
++	263c  Smartbase MP360
+ 	3041  PowerShot S10
+ 	3042  CanoScan FS4000US Film Scanner
+ 	3043  PowerShot S20
+@@ -972,7 +1254,7 @@
+ 	306f  PowerShot G3 (ptp)
+ 	3070  PowerShot S230
+ 	3071  PowerShot S230 (ptp)
+-	3072  PowerShot SD100 / Digital IXUS 2 (ptp)
++	3072  PowerShot SD100 / Digital IXUS II (ptp)
+ 	3073  PowerShot A70 (ptp)
+ 	3074  PowerShot A60 (ptp)
+ 	3075  IXUS 400 Camera
+@@ -1024,6 +1306,7 @@
+ 	30ef  EOS 350D (ptp)
+ 	30f0  PowerShot S2 IS (PTP mode)
+ 	30f2  Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode)
++	30f8  Powershot A430
+ 	30f9  PowerShot A410 (PTP mode)
+ 	30fc  PowerShot A620 (PTP mode)
+ 	30fd  PowerShot A610 (normal mode)/PowerShot A610 (PTP mode)
+@@ -1032,6 +1315,7 @@
+ 	3116  Digital IXUS 750 (PTP mode)
+ 	3117  PowerShot A700
+ 	3138  PowerShot A710 IS
++	315a  PowerShot G9
+ 	31ff  Digital IXUS 55
+ 04aa  DaeWoo Telecom, Ltd
+ 04ab  Chromatic Research
+@@ -1069,9 +1353,11 @@
+ 	012e  Coolpix 5600 (ptp)
+ 	0130  Coolpix 4600 (ptp)
+ 	0135  Coolpix 5900 (ptp)
+-	0142  Coolpix P2 (ptp)
+ 	0136  Coolpix 7900 (storage)
+ 	0137  Coolpix 7900 (ptp)
++	0142  Coolpix P2 (ptp)
++	0163  Coolpix P5100 (ptp)
++	0169  Coolpix P50 (ptp)
+ 	0202  Coolpix SQ (ptp)
+ 	0203  Coolpix 4200 (mass storage mode)
+ 	0204  Coolpix 4200 (ptp)
+@@ -1089,7 +1375,10 @@
+ 	040a  D50 (ptp)
+ 	040c  D2Hs
+ 	040e  DSC D70s (ptp)
++	0413  D40 (mass storage mode)
+ 	4000  Coolscan LS 40 ED
++	4001  LS 50 ED/Coolscan V ED
++	4002  Super Coolscan LS-5000 ED
+ 04b1  Pan International
+ 04b3  IBM Corp.
+ 	3004  Media Access Pro Keyboard
+@@ -1114,7 +1403,10 @@
+ 	0000  Dacal DC-101 CD Library
+ 	0001  Mouse
+ 	0002  CY7C63x0x Thermometer
++	0101  Keyboard/Hub
++	0bad  MetaGeek Wi-Spy
+ 	1002  CY7C63001 R100 FM Radio
++	4381  SCAPS USC-1 Scanner Controller
+ 	5500  HID->COM RS232 Adapter
+ 	6560  CY7C65640 USB-2.0 "TetraHub"
+ 	6830  USB-2.0 IDE Adapter
+@@ -1131,7 +1423,7 @@
+ 	0001  Stylus Color 740 / Photo 750
+ 	0002  ISD Smart Cable for Mac
+ 	0003  ISD Smart Cable
+-	0005  Stylus Printer
++	0005  Stylus D88+
+ 	0101  Perfection 636
+ 	0102  GT-2200
+ 	0103  Perfection 610
+@@ -1148,21 +1440,64 @@
+ 	0110  Perfection 1650
+ 	0112  Perfection 2450
+ 	0114  Perfection 660
++	0116  Perfection 3170 (GT-9400)
++	0118  Perfection 4180 (GF-F600)
++	0119  Perfection 4490 Photo
+ 	011b  Perfection 2400 Photo
+ 	011c  Perfection 3200
+ 	011d  Perfection 1260 Photo
+ 	011e  Perfection 1660 Photo
+ 	011f  Perfection 1670
++	0120  Perfection 1270 scanner
+ 	0121  Perfection 2480 Photo
++	0122  Perfection 3590 scanner
++	0126  GT-15000 (ES-7000)
++	0128  Perfection 4870 (GT-X700)
++	0129  Expression 10000XL (ES-10000G)
++	012a  Perfection 4990 Photo scanner
++	012b  GT-2500 (ES-H300)
++	012c  Perfection V350 (GT-F700)
++	012d  Perfection V10/V100 (GT-S600/F650)
++	012f  Perfection V350 (GT-F700)
+ 	0202  Receipt Printer M129C
+ 	0402  PhotoPC 850z
+ 	0403  PhotoPC 3000z
+ 	0601  Stylus Photo 875DC Card Reader
+ 	0602  Stylus Photo 895 Card Reader
+-	0801  Stylus CX5200
++	0801  Stylus CX5200/CX5400/CX6600
+ 	0802  Stylus CX3200
++	0805  Stylus CX6400
++	0806  Stylus Photo RX600/610
++	0807  Stylus Photo RX500/510
++	0808  Stylus CX5200
+ 	080c  ME100
++	080d  Stylus CX4500/4600
++	080e  CX-3500/3600/3650 MFP
++	080f  Stylus Photo RX425 scanner
++	0810  Stylus Photo RX700 (PM-A900)
+ 	0811  Stylus Photo RX620 all-in-one
++	0813  Stylus CX6500/6600
++	0814  (PM-A700)
++	0815  AcuLaser CX11 (LP-A500)
++	0817  (LP-M5500)
++	0818  Stylus CX3700/CX3800/DX3800
++	0819  Stylus CX4700/CX4800/DX4800 (PX-A750)
++	081a  Stylus Photo RX520/RX530 (PM-A750)
++	081c  Stylus Photo RX640/RX650 (PM-A890)
++	081d  (PM-A950)
++	081f  Stylus CX7700/7800
++	0820  CX4200 MP scanner
++	0827  Stylus Photo RX560/580/590 (PM-A820)
++	0828  (PM-A970)
++	0829  (PM-T990)
++	082a  (PM-A920)
++	082b  Stylus DX5050
++	082e  0x082e  DX-60x0 MFP scanner
++	082f  Stylus DX4050
++	0830  Stylus CX2800/CX2900/ME200
++	0833  (LP-M5600)
++	0835  AcuLaser CX21
++	083f  Stylus DX4450
+ 04b9  Rainbow Technologies, Inc.
+ 	0300  SafeNet USB SuperPro/UltraPro
+ 	1000  iKey 1000 Token
+@@ -1172,13 +1507,26 @@
+ 	1300  iKey 3000 Token
+ 04ba  Toucan Systems, Ltd
+ 04bb  I-O Data Device, Inc.
++	0204  DVD Multi-plus unit iU-CD2
++	0206  DVD Multi-plus unit DVR-UEH8
++	0314  USB-SSMRW SD-card
++	031e  USB-SDRW SD-card
++	0901  USB ETT
+ 	0904  ET/TX Ethernet [pegasus]
+ 	0913  ET/TX-S Ethernet [pegasus2]
++	0919  USB WN-B11
+ 	0922  IOData AirPort WN-B11/USBS 802.11b
++	0930  ETG-US2
++	0a03  Serial USB-RSAQ1
+ 04bd  Toshiba Electronics Taiwan Corp.
+ 04be  Telia Research AB
+ 04bf  TDK Corp.
+ 	0100  MediaReader CF
++	0115  USB-PDC Adapter UPA9664
++	0116  USB-cdmaOne Adapter UCA1464
++	0117  USB-PHS Adapter UHA6400
++	0118  USB-PHS Adapter UPA6400
++	0309  Bluetooth USB dongle
+ 	0320  Bluetooth Adapter
+ 04c1  U.S. Robotics (3Com)
+ 	0082  OfficeConnect Analog Modem
+@@ -1190,9 +1538,18 @@
+ 04c4  Lockheed Martin Energy Research
+ 04c5  Fujitsu, Ltd
+ 	1029  fi-4010c Scanner
++	1033  fi-4110CU
+ 	1041  fi-4120c Scanner
+ 	1042  fi-4220c Scanner
++	105b  AH-F401U Air H device
++	1096  fi-5110EOX
++	1097  fi-5110C
++	10ae  fi-4120C2
++	10af  fi-4220C2
+ 	10e0  fi-5120c Scanner
++	10e1  fi-5220C
++	10e7  fi-5900C
++	10fe  S500
+ 04c6  Toshiba America Electronic Components
+ 04c7  Micro Macro Technologies
+ 04c8  Konica Corp.
+@@ -1205,31 +1562,80 @@
+ 	072d  Revio KD410Z
+ 04ca  Lite-On Technology Corp.
+ 04cb  Fuji Photo Film Co., Ltd
+-	0100  FinePix 1300 / 1400 / 4700 Zoom digital camera
+-	0103  FinePix NX-700 printer
+-	0104  FinePix A101/2600 Zoom (PC-Cam Mode)
+-	0108  FinePix F601 Zoom (Disk mode)
+-	0109  FinePix F601 Zoom (PC-Cam mode)
+-	010a  FinePix S602 Zoom (Disk mode)
+-	010b  FinePix S602 Zoom (PC-Cam mode)
+-	0110  FinePix M603 (mass storage mode)
+-	0114  FinePix F401 Zoom (Disk mode)
+-	0115  FinePix F401 Zoom (PC-Cam mode)
+-	0116  FinePix A203 (Disk mode)
+-	0117  FinePix A203 (PC-Cam mode)
+-	011a  FinePix S304/3800 (Disk mode)
+-	011b  FinePix S304/3800 (PC-Cam mode)
+-	011c  FinePix 2650 (Disk mode)
+-	012c  FinePix S7000 Zoom (Disk mode)
+-	012d  FinePix S7000 Zoom (PC-Cam mode)
+-	0130  Finepix S5000 Camera (Disk mode)
+-	0131  Finepix S5000 Camera (PC-Cam mode)
+-	0142  FinePix S7000 Zoom (PTP mode)/(PictBridge mode) / FinePix A330 (PictBridge mode)
+-	0148  FinePix A330 (mass storage mode)
+-	0168  FinePix E500
+-	0177  Finepix F10 Camera (Disk mode)
+-	0179  Finepix F10 Camera (PTP mode)
+-	0192  FinePix E900
++	0100  FinePix 30/40/50i, A101/201, 1300/1400/2200/2400/2600/2800/4500/4700/4800/4900/6800 Zoom
++	0103  FinePix NX-500/NX-700 printer
++	0104  FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM)
++	0108  FinePix F601 Zoom (DSC)
++	0109  FinePix F601 Zoom (PC CAM)
++	010a  FinePix S602/Pro Zoom (DSC)
++	010b  FinePix S602/Pro Zoom (PC CAM)
++	010e  FinePix F402 Zoom (DSC)
++	010f  FinePix F402 Zoom (PC CAM)
++	0110  FinePix M603 Zoom (DSC)
++	0111  FinePix M603 Zoom (PC CAM)
++	0112  FinePix A202/A200 Zoom (DSC)
++	0113  FinePix A202/A200 Zoom (PC CAM)
++	0114  FinePix F401 Zoom (DSC)
++	0115  FinePix F401 Zoom (PC CAM)
++	0116  FinePix A203 Zoom (DSC)
++	0117  FinePix A203 Zoom (PC CAM)
++	0118  FinePix A303 Zoom (DSC)
++	0119  FinePix A303 Zoom (PC CAM)
++	011a  FinePix S304/3800 Zoom (DSC)
++	011b  FinePix S304/3800 Zoom (PC CAM)
++	011c  FinePix A204/2650 Zoom (DSC)
++	011d  FinePix A204/2650 Zoom (PC CAM)
++	0120  FinePix F700 Zoom (DSC)
++	0121  FinePix F700 Zoom (PC CAM)
++	0122  FinePix F410 Zoom (DSC)
++	0123  FinePix F410 Zoom (PC CAM)
++	0124  FinePix A310 Zoom (DSC)
++	0125  FinePix A310 Zoom (PC CAM)
++	0126  FinePix A210 Zoom (DSC)
++	0127  FinePix A210 Zoom (PC CAM)
++	0128  FinePix A205/S Zoom (DSC)
++	0129  FinePix A205/S Zoom (PC CAM)
++	012a  FinePix F610 Zoom (DSC)
++	012c  FinePix S7000 Zoom (DSC)
++	012d  FinePix S7000 Zoom (PC CAM)
++	0130  FinePix S5000 Zoom (DSC)
++	0131  FinePix S5000 Zoom (PC CAM)
++	013c  FinePix S3000 Zoom (DSC)
++	013d  FinePix S3000 Zoom (PC CAM)
++	013e  FinePix F420 Zoom (DSC)
++	013f  FinePix F420 Zoom (PC CAM)
++	0142  FinePix S7000 Zoom (PTP)
++	0148  FinePix A330 Zoom (DSC)
++	0149  FinePix A330 Zoom (UVC)
++	014a  FinePix A330 Zoom (PTP)
++	014b  FinePix A340 Zoom (DSC)
++	0159  FinePix F710 Zoom (DSC)
++	0165  FinePix S3500 Zoom (DSC)
++	0168  FinePix E500 Zoom (DSC)
++	0169  FinePix E500 Zoom (UVC)
++	016b  FinePix E510 Zoom (DSC)
++	016c  FinePix E510 Zoom (PC CAM)
++	016e  FinePix S5500 Zoom (DSC)
++	016f  FinePix S5500 Zoom (UVC)
++	0171  FinePix E550 Zoom (DSC)
++	0172  FinePix E550 Zoom (PTP)
++	0177  FinePix F10 Zoom (DSC)
++	0179  Finepix F10 Zoom (PTP)
++	0186  FinePix S5200/S5600 Zoom (DSC)
++	0188  FinePix S5200/S5600 Zoom (PTP)
++	018e  FinePix S9500 Zoom (DSC)
++	018f  FinePix S9500 Zoom (PTP)
++	0192  FinePix E900 Zoom (DSC)
++	0193  FinePix E900 Zoom (PTP)
++	019b  FinePix F30 Zoom (PTP)
++	01bf  FinePix F6000fd/S6500fd Zoom (PTP)
++	01c0  FinePix F20 Zoom (PTP)
++	01c1  FinePix F31fd Zoom (PTP)
++	01c4  FinePix S5700 Zoom (PTP)
++	01c5  FinePix F40fd Zoom (PTP)
++	01c6  FinePix A820 Zoom (PTP)
++	01d2  FinePix A800 Zoom (PTP)
++	01d5  FinePix F47 Zoom (PTP)
+ 04cc  Philips Semiconductors
+ 	1122  Hub
+ 	1521  USB 2.0 Hub
+@@ -1237,11 +1643,13 @@
+ 04cd  Tatung Co. Of America
+ 04ce  ScanLogic Corp.
+ 	0002  SL11R-IDE IDE Bridge
++	0300  Phantom 336CX - C3 scanner
+ 04cf  Myson Century, Inc.
+-	8818  USB2.0 to ATAPI Bridge Controller 
++	8818  USB2.0 to ATAPI Bridge Controller
+ 04d0  Digi International
+ 04d1  ITT Canon
+ 04d2  Altec Lansing Technologies
++	0070  ADA70 Speakers
+ 	0311  ADA-310 Speakers
+ 	ff05  ADA-305 Speakers
+ 04d3  VidUS, Inc.
+@@ -1250,9 +1658,18 @@
+ 04d6  Mentor Graphics
+ 04d7  Oki Semiconductor
+ 04d8  Microchip Technology, Inc.
++	0002  USB-LCD 2x20
+ 	8000  In-Circuit Debugger
++	8001  ICD2 in-circuit debugger
+ 04d9  Holtek Semiconductor, Inc.
++	1203  MC Industries Keyboard
+ 04da  Panasonic (Matsushita)
++	0901  LS-120 Camera
++	0d01  CD-R Drive KXL-840AN
++	0d09  CD-R Drive KXL-RW32AN
++	0d0a  CD-R Drive KXL-CB20AN
++	0d0e  DVD-ROM & CD-R/RW
++	1b00  MultiMediaCard
+ 	2121  EB-VS6
+ 	2319  NV-GS15 (webcam mode)
+ 	2372  Lumix DMC-FZ10 Camera
+@@ -1273,6 +1690,7 @@
+ 	9050  Zaurus C-860 PDA
+ 	9056  Viewcam Z
+ 	90f2  Sharp 3G GSM USB Control
++	9123  W-ZERO3 ES Smartphone
+ 04de  MindShare, Inc.
+ 04df  Interlink Electronics
+ 04e1  Iiyama North America, Inc.
+@@ -1288,6 +1706,10 @@
+ 	0005  eUSB SmartMedia/CompactFlash Card Reader
+ 	0006  eUSB SmartMedia Card Reader
+ 	0007  Hifd
++	0009  eUSB ATA/ATAPI Adapter
++	000a  eUSB CompactFlash Adapter
++	000b  eUSCSI Bridge
++	000c  eUSCSI Bridge
+ 	0101  eUSB ATA Bridge
+ 	0325  eUSB ORCA Quad Reader
+ 	0500  Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard
+@@ -1304,11 +1726,20 @@
+ 	0110  Connect3D Flash Drive
+ 	0111  Connect3D Flash Drive
+ 	1003  MP3 Player and Recorder
++	3008  ML-6060 laser printer
+ 	300c  ML-1210 Printer
+ 	323a  ML-1710 Printer
+ 	324c  ML-1740 Printer
+ 	3260  CLP-510 Color Laser Printer
+ 	3268  ML-1610 Mono Laser Printer
++	326c  ML-2010P Mono Laser Printer
++	3409  SCX-4216F Scanner
++	3413  SCX-4100 Scanner
++	3903  Xerox WorkCentre XK50cx
++	503b  YP-U1 MP3 Player
++	5050  YP-U2 MP3 Player
++	507d  YP-U3 MP3 Player
++	508b  YP-S5 MP3 Player
+ 	5a03  Yepp MP3 Player
+ 	6601  Z100 Mobile Phone
+ 	663f  SGH-E720
+@@ -1325,14 +1756,18 @@
+ 	0008  GZ-MG30AA/MC500E Digital Video Camera
+ 	0009  GR-DX25EK Digital Video Camera
+ 	000a  GR-D72 Digital Video Camera
++	3008  MP-PRX1 Ethernet
+ 04f2  Chicony Electronics Co., Ltd
+ 	0001  KU-8933 Keyboard
+ 	0002  NT68P81 Keyboard
+ 	0110  KU-2971 Keyboard
++	0111  KU-9908 Keyboard
+ 	0112  KU-8933 Keyboard with PS/2 Mouse port
+ 	0116  KU-2971 German Keyboard
+ 	a209  Labtec DC-2320
++	b012  1.3 MPixel UVC webcam
+ 04f3  Elan Microelectronics Corp.
++	0210  AM-400 Hama Optical Mouse
+ 04f4  Harting Elektronik, Inc.
+ 04f5  Fujitsu-ICL Systems, Inc.
+ 04f6  Norand Corp.
+@@ -1357,8 +1792,10 @@
+ 	0561  Flexcam 100
+ 	504a  SPCA504a Digital Camera
+ 	504b  Aiptek, 1.3 mega PockerCam
++	5330  Digitrex 2110
+ 	5331  Vivitar Vivicam 10
+ 	7333  Finet Technology Palmpix DC-85
++	757a  Aiptek, MP315 MP3 Player
+ 	ffff  PureDigital Ritz Disposable
+ 04fd  Soliton Systems, K.K.
+ 04fe  PFU, Ltd
+@@ -1366,14 +1803,19 @@
+ 0500  Siam United Hi-Tech
+ 0501  Fujikura DDK, Ltd
+ 0502  Acer, Inc.
++	15b1  PDA n311
+ 	d001  Divio NW801/DVC-V6+ Digital Camera
+ 0503  Hitachi America, Ltd
+ 0504  Hayes Microcomputer Products
+ 0506  3Com Corp.
++	009d  HomeConnect Camera
+ 	00a0  3CREB96 Bluetooth Adapter
++	00df  3Com Home Connect lite
+ 	03e8  3C19250 Ethernet [klsi]
++	0a01  3CRSHEW696 Wireless Adapter
+ 	0a11  3CRWE254G72 802.11g Adapter
+-	00df  3Com Home Connect lite
++	11f8  HomeConnect 3C460
++	3021  U.S.Robotics 56000 Voice FaxModem Pro
+ 	4601  3C460B 10/100 Ethernet Adapter
+ 	f002  3CP4218 ADSL Modem (pre-init)
+ 	f003  3CP4218 ADSL Modem
+@@ -1386,22 +1828,41 @@
+ 050b  Cable System International
+ 050c  InnoMedia, Inc.
+ 050d  Belkin Components
+-	0012  Bluetooth USB Adapter F8T012
++	0012  F8T012 Bluetooth Adapter
++	0013  F8T013 Bluetooth Adapter
++	0050  F5D6050 802.11b Wireless Adapter
++	0081  FBT001v2 Bluetooth
++	0084  FBT003v2 Bluetooth
+ 	0102  Flip KVM
+ 	0103  F5U103 Serial Adapter [etek]
+ 	0108  F1DE108B KVM
+ 	0109  F5U109/F5U409 PDA Adapter
+ 	0115  SCSI Adapter
++	0119  F5U120-PC Dual PS/2 Ports
+ 	0121  F5D5050 100Mbps Ethernet
+ 	0208  USBView II Video Adapter [nt1004]
++	0210  F5U228 Hi-Speed USB 2.0 DVD Creator
++	0211  F5U211 USB 2.0 15-in-1 Media Reader & Writer
+ 	0224  F5U224 USB 2.0 4-Port Hub
+ 	0234  F5U234 USB 2.0 4-Port Hub
++	0237  F5U237 USB 2.0 7-Port Hub
++	0240  F5U240 USB 2.0 CF Card Reader
++	0257  F5U257 Serial
++	0409  F5U409 Serial
++	0551  F6C550-AVR UPS
+ 	0803  Nostromo 1745 GamePad
+ 	0805  Nostromo N50 GamePad
++	1202  F5U120-PC Parallel Printer Port
+ 	1203  F5U120-PC Serial Port
+-	3101  F1DF102U Flip Hub
+-	3201  F1DF102U Flip KVM
++	3101  F1DF102U/F1DG102U Flip Hub
++	3201  F1DF102U/F1DG102U Flip KVM
++	4050  ZD1211B
++	5055  F5D5055
+ 	7050  F5D7050 ver 1000 WiFi
++	7051  F5D7051 54g USB Network Adapter
++	705a  F5D7050A Wireless Adapter
++	705c  F5D7050 v4000 Wireless Adapter
++	905b  F5D9050 ver 3 Wireless Adapter
+ 050e  Neon Technology, Inc.
+ 050f  KC Technology, Inc.
+ 	0003  KC82C160S Hub
+@@ -1417,13 +1878,14 @@
+ 0517  Butterfly Communications
+ 0518  EzKEY Corp.
+ 	0001  USB to PS2 Adaptor v1.09
++	0002  EZ-9900C Keyboard
+ 0519  Star Micronics Co., Ltd
+ 	c002  Xlive Bluetooth XBM-100S MP3 Player
+ 051a  WYSE Technology
+ 051b  Silicon Graphics
+ 051c  Shuttle, Inc.
+ 051d  American Power Conversion
+-	0002  Uninterruptible Power Supply 
++	0002  Uninterruptible Power Supply
+ 051e  Scientific Atlanta, Inc.
+ 051f  IO Systems (Elite Electronics), Inc.
+ 0520  Taiwan Semiconductor Manufacturing Co.
+@@ -1433,6 +1895,7 @@
+ 0524  Sola Electronics
+ 0525  Netchip Technology, Inc.
+ 	1080  NET1080 USB-USB Bridge
++	a140  USB Clik! 40
+ 	a4a0  Linux-USB "Gadget Zero"
+ 	a4a1  Linux-USB Ethernet Gadget
+ 	a4a2  Linux-USB Ethernet/RNDIS Gadget
+@@ -1458,6 +1921,7 @@
+ 	042a  eToken R2 v2.5.4.x
+ 	050c  eToken Pro v4.1.5.x
+ 	0514  eToken Pro v4.2.5.4
++	0600  eToken Pro 64k (4.2)
+ 052a  Crescent Heart Software
+ 052b  Tekom Technologies, Inc.
+ 	0801  Yakumo MegaImage 37
+@@ -1517,10 +1981,11 @@
+ 054a  Fujitsu Microelectronics, Inc.
+ 054b  New Media Corp.
+ 054c  Sony Corp.
+-	0010  DSC-S30/S70/S75/F505V/F505/FD92 Cybershot/Mavica Digital Camera
++	0010  DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera
+ 	0023  CD Writer
+ 	0024  Mavica CD-1000 Camera
+ 	0025  NW-MS7 Walkman MemoryStick Reader
++	002b  Portable USB Harddrive V2
+ 	002c  USB Floppy Disk Drive
+ 	002d  MSAC-US1 MemoryStick Reader
+ 	002e  Sony HandyCam MemoryStick Reader
+@@ -1532,12 +1997,14 @@
+ 	0069  Memorystick MSC-U03 Reader
+ 	006d  Clie PEG-T425 PDA Mass Storage
+ 	008b  Micro Vault 64M Mass Storage
++	0095  Sony Clie s360
+ 	0099  Clie NR70 PDA Mass Storage
+ 	009a  Clie NR70 PDA Serial
+ 	00c0  Handycam DCR-30
+ 	00c8  MZ-N710 Minidisc Walkman
+ 	00ca  MZ-DN430 Minidisc Walkman
+ 	00cb  MSAC-US20 Memory Stick Reader
++	00da  Sony Clie nx60
+ 	0105  Micro Vault Hub
+ 	0107  VCC-U01 Visual Communication Camera
+ 	0144  Clie PEG-TH55 PDA
+@@ -1546,11 +2013,19 @@
+ 	0169  Clie PEG-TJ35 PDA Serial
+ 	016a  Clie PEG-TJ35 PDA Mass Storage
+ 	019e  Micro Vault 1.0G Mass Storage
++	01bd  MRW62E Multi-Card Reader/Writer
+ 	01c3  NW-E55 Network Walkman
+ 	01d0  DVD+RW External Drive DRU-700A
+ 	01fa  Sony IC Recorder (P)
+ 	01fb  NW-E405 Network Walkman
+ 	023b  DVD+RW External Drive DRU-800UL
++	0243  MicroVault Flash Drive
++	0257  IFU-WLM2 USB Wireless LAN Module (Wireless Mode)
++	0258  IFU-WLM2 USB Wireless LAN Module (Memory Mode)
++	029b  PRS-500 eBook reader
++	02ae  PlayStation 3 Memory Card Adaptor
++	02af  Handycam DCR-DVD306E
++	02d2  PSP
+ 054d  Try Corp.
+ 054e  Proside Corp.
+ 054f  WYSE Technology Taiwan
+@@ -1573,6 +2048,7 @@
+ 	2006  UC-1284B Printer Port
+ 	2007  UC-110T 100Mbps Ethernet [pegasus]
+ 	2008  UC-232A Serial Port [pl2303]
++	2009  UC-210T Ethernet
+ 	2202  CS124U Miniview II KVM Switch
+ 	2600  IDE Bridge
+ 	4000  DSB-650 10Mbps Ethernet [klsi]
+@@ -1603,6 +2079,7 @@
+ 	021e  BearPaw 1200 TA/CS
+ 	0400  BearPaw 2400 TA Pro
+ 	0401  P 3600 A3 Pro
++	0408  BearPaw 2448 CU Pro
+ 	0873  ScanExpress 600 USB
+ 	1000  BearPaw 4800 TA Pro
+ 	a350  gSmart 350
+@@ -1630,6 +2107,7 @@
+ 	0003  @Home Networks Ethernet [klsi]
+ 	0005  Enet2 Ethernet [klsi]
+ 0566  Monterey International Corp.
++	2802  Kbd Hub
+ 0567  Xyratex International, Ltd
+ 0568  Quartz Ingenierie
+ 0569  SegaSoft
+@@ -1637,6 +2115,7 @@
+ 	0000  PenPartner
+ 	0010  Graphire
+ 	0011  Graphire 2
++	0013  Graphire 3 4x5
+ 	0020  Intuos 4x5
+ 	0021  Intuos 6x8
+ 	0022  Intuos 9x12
+@@ -1654,7 +2133,14 @@
+ 	0001  Monitor
+ 056e  Elecom Co., Ltd
+ 	0002  29UO Mouse
++	200c  LD-USB/TX
+ 	4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
++	4005  LD-USBL/TX
++	400b  LD-USB/TX
++	4010  LD-USB20
++	5003  UC-SGT
++	5004  UC-SGT
++	abc1  LD-USB/TX
+ 056f  Korea Data Systems Co., Ltd
+ 	cd00  CDM-751 CD organizer
+ 0570  Epson America
+@@ -1665,6 +2151,7 @@
+ 	0002  Ezcam II WebCam
+ 	0040  Wondereye CP-115 WebCam
+ 	1232  V.90 modem
++	1234  Typhoon Redfun Modem V90 56k
+ 	cafe  AccessRunner ADSL Modem
+ 	cb00  E-Tech ADSL Modem v2
+ 	cb01  GeekADSL Promax Q31 ADSL Modem
+@@ -1720,9 +2207,12 @@
+ 	2800  ISDN-Connector TA
+ 	3800  BlueFRITZ! Bluetooth Stick
+ 	3d00  Fritz!Box
++	6201  WLAN USB v1.1
++	62ff  WLAN USB v1.1 [no firmware]
+ 057d  Shark Multimedia, Inc.
+ 057e  Nintendo Co., Ltd
+ 057f  QuickShot, Ltd
++	6238  USB StrikePad
+ 0580  Denron, Inc.
+ 0581  Racal Data Group
+ 0582  Roland Corp.
+@@ -1731,6 +2221,8 @@
+ 	0005  Edirol UM-2 MIDI Adapter
+ 	0009  Edirol UM-1SX MIDI Adapter
+ 	0011  Edirol UA-5 Sound Capture
++	0014  EDIROL UM-880 MIDI I/F (native)
++	0015  EDIROL UM-880 MIDI I/F (generic)
+ 	002d  VX-2020 Synthesizer
+ 0583  Padix Co., Ltd (Rockfire)
+ 	2030  RM-203 USB Nest [mode 1]
+@@ -1742,11 +2234,18 @@
+ 	688f  QF-688uv Windstorm Pro Joystick
+ 	7070  QF-707u Bazooka Joystick
+ 0584  RATOC System, Inc.
++	b000  REX-USB60
+ 0585  FlashPoint Technology, Inc.
+ 0586  ZyXEL Communications Corp.
+ 	1000  Omni NET Modem / ISDN TA
++	1500  Omni 56K Plus
++	2011  Scorpion-980N keyboard
+ 	330e  USB Broadband ADSL Modem Rev 1.10
+ 	3401  ZyAIR G-220
++	3407  G-200 v2
++	3409  AG-225H
++	340a  M-202
++	340f  G-220 v2
+ 0587  America Kotobuki Electronics Industries, Inc.
+ 0588  Sapien Design
+ 0589  Victron
+@@ -1759,7 +2258,10 @@
+ 	2802  Monterey Keyboard
+ 	5492  Hub
+ 	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
+-	6362  Hi-Speed Internal Multi-Card Reader/Writer
++	6362  Hi-Speed 21-in-1 Flash Card Reader/Writer (Internal/External)
++	6386  Memory Card
++	6387  Transcend JetFlash Flash Drive
++	6390  USB 2.0-IDE bridge
+ 	9213  MacAlly Kbd Hub
+ 	9215  AU9814 Hub
+ 	9254  Hub
+@@ -1777,7 +2279,8 @@
+ 0593  Incite
+ 0594  Princeton Graphic Systems
+ 0595  Zoran Microelectronics, Ltd
+-	1001 Digitrex DSC-1300/DSC-2100 (mass storage mode)
++	1001  Digitrex DSC-1300/DSC-2100 (mass storage mode)
++	4343  Digital Camera EX-20 DSC
+ 0596  MicroTouch Systems, Inc.
+ 	0001  Touchscreen
+ 0597  Trisignal Communications
+@@ -1794,6 +2297,7 @@
+ 	0050  Zip CD 650 Writer
+ 	0053  CDRW55292EXT CD-RW External Drive
+ 	006d  HipZip MP3 Player
++	007c  Ultra Max USB/1394
+ 	015d  Super DVD Writer
+ 	1052  DVD+RW External Drive
+ 059c  A-Trend Technology Co., Ltd
+@@ -1805,12 +2309,13 @@
+ 	0323  LaCie d2 Drive USB2
+ 	0641  Mobile Hard drvie
+ 	a601  HardDrive
++	a602  CD R/W
+ 05a0  Vetronix Corp.
+ 05a1  USC Corp.
+ 05a2  Fuji Film Microdevices Co., Ltd
+ 05a3  ARC International
+ 05a4  Ortek Technology, Inc.
+-	9731  MCK-600W Keyboard
++	9731  MCK-600W/MCK-800USB Keyboard
+ 05a5  Sampo Technology Corp.
+ 05a6  Cisco Systems, Inc.
+ 05a7  Bose Corp.
+@@ -1818,7 +2323,10 @@
+ 05a9  OmniVision Technologies, Inc.
+ 	0511  OV511 WebCam
+ 	0518  OV518 WebCam
++	1550  VEHO Filmscanner
++	8519  OV519 WebCam
+ 	a511  OV511+ WebCam
++	a518  D-Link DSB-C310 WebCam
+ 05aa  Utilux South China, Ltd
+ 05ab  In-System Design
+ 	0002  Parallel Port
+@@ -1828,32 +2336,57 @@
+ 	0202  ATA Bridge
+ 	081a  ATA Bridge
+ 	0cda  ATA Bridge for CD-R/RW
+-05ac  Apple Computer, Inc.
+-	0201  Apple USB Keyboard [Alps or Logitech, M2452]
+-	0202  Apple Keyboard [ALPS]
+-	0205  Apple Extended Keyboard [Mitsumi]
+-	0206  Apple Extended Keyboard [Mitsumi]
+-	020b  Apple Pro Keyboard [Mitsumi, A1048/US layout]
+-	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS layout]
+-	020e  Apple Internal Keyboard/Trackpad
+-	020f  Apple Internal Keyboard/Trackpad
+-	0301  Apple USB Mouse [Mitsumi, M4848]
+-	0302  Apple Optical Mouse [Fujitsu]
+-	0304  Apple Optical USB Mouse [Mitsumi]
+-	0306  Apple Optical USB Mouse [Fujitsu]
+-	1001  Apple Keyboard Hub [ALPS]
+-	1002  Apple Extended Keyboard Hub [Mitsumi]
+-	1003  Hub in Apple Pro Keyboard [Mitsumi, A1048]
++	5701  USB Storage Adapter V2
++05ac  Apple, Inc.
++	0201  USB Keyboard [Alps or Logitech, M2452]
++	0202  Keyboard [ALPS]
++	0205  Extended Keyboard [Mitsumi]
++	0206  Extended Keyboard [Mitsumi]
++	020b  Pro Keyboard [Mitsumi, A1048/US layout]
++	020c  Extended Keyboard [Mitsumi]
++	020d  Pro Keyboard [Mitsumi, A1048/JIS layout]
++	020e  Internal Keyboard/Trackpad
++	020f  Internal Keyboard/Trackpad
++	021b  Internal Keyboard/Trackpad
++	0220  Aluminum Keyboard
++	0221  Keyboard (Aluminium) (ISO)
++	0229  Internal Keyboard/Trackpad (MacBook Pro) (ANSI)
++	022a  Internal Keyboard/Trackpad (MacBook Pro) (ISO)
++	022b  Internal Keyboard/Trackpad (MacBook Pro) (JIS)
++	0301  USB Mouse [Mitsumi, M4848]
++	0302  Optical Mouse [Fujitsu]
++	0304  Optical USB Mouse [Mitsumi]
++	0306  Optical USB Mouse [Fujitsu]
++	1000  Bluetooth HCI MacBookPro (HID mode)
++	1001  Keyboard Hub [ALPS]
++	1002  Extended Keyboard Hub [Mitsumi]
++	1003  Hub in Pro Keyboard [Mitsumi, A1048]
++	1006  Hub in Aluminum Keyboard
+ 	1101  Speakers
+ 	1201  3G iPod
++	1202  iPod 2G
++	1203  iPod 4.Gen Grayscale 40G
+ 	1204  iPod [Photo]
+-	120A  iPod Nano
++	1205  iPod Mini 1.Gen/2.Gen
++	1206  iPod '06'
++	1207  iPod '07'
++	1208  iPod '08'
++	1209  iPod Video
++	120a  iPod Nano
++	1260  iPod Nano 2.Gen
++	1261  iPod Classic
+ 	1300  iPod Shuffle
++	1301  iPod Shuffle 2.Gen
+ 	8202  HCF V.90 Data/Fax Modem
+ 	8203  Bluetooth HCI
+ 	8204  Bluetooth HCI [Bluetooth 2.0 + EDR, build-in]
++	8205  Bluetooth HCI MacBookPro
++	8206  Bluetooth USB Host Controller
+ 	8240  IR Receiver [build-in]
++	8300  Built-in iSight (no firmware loaded)
+ 	8501  Built-in iSight [Micron]
++	912f  Hub in 30" Cinema Display
++	9221  30" Cinema Display
+ 05ad  Y.C. Cable U.S.A., Inc.
+ 05ae  Synopsys, Inc.
+ 05af  Jing-Mold Enterprise Co., Ltd
+@@ -1879,6 +2412,9 @@
+ 05c1  Kawasaki Microelectronics, Inc.
+ 05c2  Media Phonics (Suisse) S.A.
+ 05c5  Digi International, Inc.
++	0002  AccelePort USB 2
++	0004  AccelePort USB 4
++	0008  AccelePort USB 8
+ 05c6  Qualcomm, Inc.
+ 	3100  CDMA Wireless Modem/Phone
+ 	3196  CDMA Wireless Modem
+@@ -1932,7 +2468,7 @@
+ 	0099  10Mbps Ethernet [klsi]
+ 05d8  Ultima Electronics Corp.
+ 	4001  Artec Ultima 2000
+-	4002  Artec Ultima 2000 (GT6801 based)/Lifetec LT9385 Scanner
++	4002  Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner
+ 	4003  Artec E+ 48U
+ 	4004  Artec E+ Pro
+ 	4008  Trust Easy Webscan 19200
+@@ -1949,6 +2485,7 @@
+ 	0099  ScanMaker X6/X6U
+ 	009a  Phantom C6
+ 	00a0  Phantom 336CX/C3 (#2)
++	00a3  ScanMaker V6USL
+ 	00b6  ScanMaker V6UPL
+ 	1006  Jenoptik JD350 entrance
+ 	1011  NHJ Che-ez! Kiss Digital Camera
+@@ -1962,15 +2499,27 @@
+ 	80a3  ScanMaker V6USL (#2)
+ 	80ac  ScanMaker V6UL/SpicyU
+ 05db  Sun Corp. (Suntac?)
++	0003  SUNTAC U-Cable type D2
++	0005  SUNTAC U-Cable type P1
++	0009  SUNTAC Slipper U
++	000a  SUNTAC Ir-Trinity
++	000b  SUNTAC U-Cable type A3
++	0011  SUNTAC U-Cable type A4
+ 05dc  Lexar Media, Inc.
++	0001  jumpSHOT CompactFlash Reader
+ 	0080  Jumpdrive Secure 64MB
+ 	0200  JumpDrive 2.0 Pro
+ 	0300  Jumpdrive Geysr
+ 	a410  JumpDrive 128MB/256MB
++	b002  USB CF Reader
+ 	b018  Multi-Card Reader
+ 05dd  Delta Electronics, Inc.
++	ff31  AWU-120
+ 05df  Silicon Vision, Inc.
+ 05e0  Symbol Technologies
++	1200  DS6608 Bar Code Scanner
++	2000  MC3090 Rugged Mobile Computer
++	200d  MC70 Rugged Mobile Computer
+ 05e1  Syntek Semiconductor Co., Ltd
+ 05e2  ElecVision, Inc.
+ 05e3  Genesys Logic, Inc.
+@@ -1980,10 +2529,12 @@
+ 	0120  Pacific Image Electronics PrimeFilm 1800u slide/negative scanner
+ 	0300  GLUSB98PT Parallel Port
+ 	0406  Hub
++	0501  GL620USB Host-Host interface
+ 	0502  GL620USB GeneLink USB-USB Bridge
+ 	0604  USB 1.1 Hub
+ 	0605  USB 2.0 Hub [ednet]
+-	0606  D-Link DUB-H4 USB 2.0 Hub
++	0606  USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub
++	0608  USB-2.0 4-Port HUB
+ 	0660  USB 2.0 Hub
+ 	0700  SIIG US2256 CompactFlash Card Reader
+ 	0701  USB 2.0 IDE Adapter
+@@ -1993,8 +2544,9 @@
+ 	0710  USB 2.0 33-in-1 Card Reader
+ 	0715  USB 2.0 microSD Reader
+ 	0760  USB 2.0 Card Reader/Writer
+-	07A0  Pen Flash
++	07a0  Pen Flash
+ 	1205  Afilias Optical Mouse H3003
++	fd21  3M TL20 Temperature Logger
+ 05e4  Red Wing Corp.
+ 05e5  Fuji Electric Co., Ltd
+ 05e6  Keithley Instruments
+@@ -2033,6 +2585,7 @@
+ 	daae  Game Shark
+ 05fe  Chic Technology Corp.
+ 	0001  Mouse
++	0003  Cypress USB Mouse
+ 	0005  Viewmaster 4D Browser Mouse
+ 	0007  Twinhead Mouse
+ 	0009  Inland Pro 4500/5000 Mouse
+@@ -2056,6 +2609,8 @@
+ 	0001  MacAlly Keyboard
+ 	2101  Keyboard
+ 	5811  ACK-571U Wireless Keyboard
++	6001  SolidTek USB 2p HUB
++	6002  SolidTek USB Keyboard
+ 	a001  Maxwell Compact Pc PM3
+ 060c  EEH Datalink GmbH
+ 060d  Auctor Corp.
+@@ -2092,6 +2647,8 @@
+ 0629  Zida Technologies, Ltd
+ 062a  Creative Labs
+ 	0001  Notebook Optical Mouse
++	0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
++	9003  VoIP Conference Hub (A16GH)
+ 	9004  USR9602 USB Internet Mini Phone
+ 062b  Greatlink Electronics Taiwan, Ltd
+ 062c  Institute for Information Industry
+@@ -2103,6 +2660,7 @@
+ 0634  Micron Technology, Inc.
+ 0635  Methode Electronics, Inc.
+ 0636  Sierra Imaging, Inc.
++	0003  Vivicam 35Xx
+ 0638  Avision, Inc.
+ 	0268  iVina 1200U Scanner
+ 	026a  Minolta Dimage Scan Dual II
+@@ -2120,7 +2678,7 @@
+ 0642  VIA Medical Corp.
+ 0644  TEAC Corp.
+ 	0000  Floppy
+-	800D  TASCAM Portastudio DP-01FX
++	800d  TASCAM Portastudio DP-01FX
+ 0645  Who? Vision Systems, Inc.
+ 0646  UMAX
+ 0647  Acton Research Corp.
+@@ -2167,6 +2725,7 @@
+ 066b  Linksys, Inc.
+ 	0105  SCM eUSB SmartMedia Card Reader
+ 	010a  Melco MCR-U2 SmartMedia / CompactFlash Reader
++	200c  USB10TX
+ 	2202  USB10TX Ethernet [pegasus]
+ 	2203  USB100TX Ethernet [pegasus]
+ 	2204  USB100TX HomePNA Ethernet [pegasus]
+@@ -2174,6 +2733,7 @@
+ 	2211  WUSB11 802.11b Adapter
+ 	2212  WUSB11v2.5 802.11b Adapter
+ 	2213  WUSB12v1.1 802.11b Adapter
++	400b  USB10TX
+ 066d  Entrega, Inc.
+ 066e  Acer Semiconductor America, Inc.
+ 066f  SigmaTel, Inc.
+@@ -2182,7 +2742,9 @@
+ 	3410  STMP3410 D-Major MP3 Player
+ 	4200  STIr4200 IrDA Bridge
+ 	4210  STIr4210 IrDA Bridge
++	8000  MSCN MP3 Player
+ 	8004  MSCNMMC MP3 Player
++	8008  i-Bead 100 MP3 Player
+ 	8202  Jens of Sweden / I-BEAD 150M/150H MP3 player
+ 	8206  Digital MP3 Music Player
+ 0672  Labtec, Inc.
+@@ -2193,6 +2755,7 @@
+ 0674  Key Mouse Electronic Enterprise Co., Ltd
+ 0675  Draytech
+ 	0110  Vigor 128 ISDN TA
++	0550  Vigor550
+ 0676  Teles AG
+ 0677  Aiwa Co., Ltd
+ 	0fa1  TD-U8000 Tape Drive
+@@ -2200,6 +2763,7 @@
+ 067b  Prolific Technology, Inc.
+ 	0000  PL2301 USB-USB Bridge
+ 	0001  PL2302 USB-USB Bridge
++	04bb  PL2303 Serial (IODATA USB-RSAQ2)
+ 	2303  PL2303 Serial Port
+ 	2305  PL2305 Parallel Port
+ 	2307  PL2307 USB-ATAPI4 Bridge
+@@ -2210,7 +2774,9 @@
+ 	2507  PL2507 Hi-speed USB to IDE bridge controller
+ 	2515  Flash Disk Embedded Hub
+ 	2517  Flash Disk Mass Storage Device
+-	3507  PL3507 ATAPI6 Bridge 
++	3507  PL3507 ATAPI6 Bridge
++	aaa0  Prolific Pharos
++	aaa2  PL2303 Serial Adapter (IODATA USB-RSAQ3)
+ 067c  Efficient Networks, Inc.
+ 	1001  Siemens SpeedStream 100MBps Ethernet
+ 	1022  Siemens SpeedStream 1022 802.11b Adapter
+@@ -2224,10 +2790,15 @@
+ 	0002  Gigaset 3075 Passive ISDN
+ 	0005  ID-Mouse with Fingerprint Reader
+ 	0012  I-Gate 802.11b Adapter
++	001b  WLL013
++	0022  Gigaset SX353 ISDN
+ 	002b  A-100-I ADSL Modem
++	0034  GSM module MC35/ES75 USB Modem
++	3c06  54g USB Network Adapter
+ 0682  Victor Company of Japan, Ltd
+ 0684  Actiontec Electronics, Inc.
+ 0686  Minolta Co., Ltd
++	4001  Dimage 2300
+ 	4003  Dimage 2330 Zoom Camera
+ 	4004  Scan Elite II
+ 	4006  Dimage 7 Camera
+@@ -2238,6 +2809,7 @@
+ 	400b  Dimage 7i Camera
+ 	400c  Dimage F100 Camera
+ 	400d  Scan Dual III
++	400e  Dimage 5400
+ 	400f  Dimage 7Hi Camera
+ 	4010  Dimage Xi Camera
+ 	4011  Dimage F300 Camera
+@@ -2245,6 +2817,7 @@
+ 	4014  Dimage S414 Camera
+ 	4015  Dimage XT Camera [storage]
+ 	4016  Dimage XT Camera [remote mode]
++	4017  Dimage E223
+ 	4018  Dimage Z1  Camera
+ 	401a  Dimage A1 Camera
+ 	401c  Dimage X20 Camera
+@@ -2253,7 +2826,9 @@
+ 068b  Potrans International, Inc.
+ 068e  CH Products, Inc.
+ 	00e2  HFX OEM Joystick
++	00f1  Pro Throttle
+ 	00f2  Flight Sim Pedals
++	00f3  Fighterstick
+ 	00ff  Flight Sim Yoke
+ 	0500  GameStick 3D
+ 	0501  CH Pro Pedals
+@@ -2293,11 +2868,13 @@
+ 	0200  Xbox Adrenalin Hub
+ 	0241  Xbox Adrenalin Gamepad
+ 	0422  ST90 Joystick
++	0460  ST290 Pro Flight Stick
+ 	052d  P750 Gamepad
+ 	053f  X36F Flightstick
+ 	100a  SP550 Pad and Joystick Combo
+ 	100b  SP550 Pad
+ 	3509  P3000 RF GamePad
++	8021  Eclipse II Keyboard
+ 	ff0c  Cyborg Force Rumble Pad
+ 	ffb5  Cyborg Evo Force Joystick
+ 06a4  Xiamen Doowell Electron Co., Ltd
+@@ -2385,18 +2962,24 @@
+ 	010a  USA-49W serial adapter
+ 	010b  USA-19Qi serial adapter [no firmware]
+ 	010c  USA-19Qi serial adapter
++	010d  USA-19Q serial Adapter (no firmware)
++	010e  USA-19Q serial Adapter
+ 	010f  USA-28 PDA
+ 	0110  USA-28Xb PDA
++	0111  USA-18 serial Adapter
+ 	0112  USA-18X PDA
+ 	0113  USA-28Xb PDA [no firmware]
+ 	0114  USA-28Xa PDA [no firmware]
+ 	0115  USA-28Xa PDA
++	0116  USA-18XA serial Adapter (no firmware)
++	0117  USA-18XA serial Adapter
+ 	0118  USA-19QW PDA [no firmware]
+ 	0119  USA-19QW PDA
+ 	011a  USA-49Wlc serial adapter [no firmware]
+-	012a  USA-49Wlc serial adapter
+ 	0121  USA-19hs serial adapter
++	012a  USA-49Wlc serial adapter
+ 	0201  Digital Media Remote
++	0202  UIA-11 remote control
+ 06cf  SpheronVR AG
+ 	1010  PanoCam 10
+ 	1012  PanoCam 12/12X
+@@ -2426,6 +3009,7 @@
+ 	f107  MT5634ZBA-USB-V92 MultiModemUSB
+ 06e1  ADS Technologies, Inc.
+ 	0008  UBS-10BT Ethernet [klsi]
++	0009  UBS-10BT Ethernet
+ 	a190  Instand VCD Usb Capture
+ 06e4  Alcatel Microelectronics
+ 06e6  Tiger Jet Network, Inc.
+@@ -2438,9 +3022,14 @@
+ 06f1  Opcode Systems, Inc.
+ 06f2  Emine Technology Co.
+ 06f6  Wintrend Technology Co., Ltd
++06f7  Wailly Technology Ltd
++	0003  USB->Din 4 Adaptor
+ 06f8  Guillemot Corp.
+ 	a300  Dual Analog Leader GamePad
+ 	c000  Hercules Muse Pocket
++	e000  HWGUSB2-54 WLAN
++	e010  HWGUSB2-54-LB
++	e020  HWGUSB2-54V2-AP
+ 06fa  HSD S.r.L
+ 06fc  Motorola Semiconductor Products Sector
+ 06fd  Boston Acoustics
+@@ -2452,9 +3041,11 @@
+ 0707  Standard Microsystems Corp.
+ 	0100  2202 Ethernet [klsi]
+ 	0200  2202 Ethernet [pegasus]
++	0201  EZ Connect USB Ethernet
+ 	ee06  EZ-Connect 802.11g Adapter
+ 	ee13  EZ-Connect 802.11g Adapter
+ 0708  Putercom Co., Ltd
++	047e  USB-1284 BRIDGE
+ 0709  Silicon Systems, Ltd (SSL)
+ 070a  Oki Electric Industry Co., Ltd
+ 070d  Comoss Electronic Co., Ltd
+@@ -2477,6 +3068,8 @@
+ 	0003  ADB to USB convertor
+ 0717  ZNK Corp.
+ 0718  Imation Corp.
++	0063  Swivel Flash Drive
++	0084  USB Flash Drive Mini
+ 0719  Tremon Enterprises Co., Ltd
+ 071b  Domain Technologies, Inc.
+ 	0002  DTI-56362-USB Digital Interface Unit
+@@ -2501,21 +3094,21 @@
+ 0732  Goldfull Electronics & Telecommunications Corp.
+ 0733  ViewQuest Technologies, Inc.
+ 	0110  VQ110
+-	1311  Digital Dream Epsilon 1.3
+-	2211  Jenoptik
+ 	0401  CS330 WebCam
+ 	0402  M-318B WebCam
+ 	0430  Intel Pro Share WebCam
+ 	0631  Hercules Dualpix
+ 	1310  Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470
++	1311  Digital Dream Epsilon 1.3
++	2211  Jenoptik
+ 0734  Lasat Communications A/S
+ 	0001  560V Modem
+ 0735  Asuscom Network
+ 	c541  ISDN TA 280
+ 0736  Lorom Industrial Co., Ltd
+ 0738  Mad Catz, Inc.
+-073b  Suncom Technologies
+ 073a  Chaplet Systems, Inc.
++073b  Suncom Technologies
+ 073d  Eutron S.p.a.
+ 	0005  Crypto Token
+ 073e  NEC, Inc.
+@@ -2543,12 +3136,15 @@
+ 	1030  Midisport 8x8
+ 0764  Cyber Power System, Inc.
+ 	0005  Cyber Power UPS
++	0501  CP1500 AVR UPS
+ 0765  X-Rite, Inc.
+ 0766  Jess-Link Products Co., Ltd
+ 0767  Tokheim Corp.
+ 0768  Camtel Technology Corp.
+-	0006 Camtel Technology USB TV Genie Pro FM Model TVB330
++	0006  Camtel Technology USB TV Genie Pro FM Model TVB330
+ 0769  Surecom Technology Corp.
++	11f3  RT2570
++	31f3  RT2573
+ 076a  Smart Technology Enablers, Inc.
+ 076b  OmniKey AG
+ 	0596  CardMan 2020
+@@ -2558,6 +3154,7 @@
+ 076d  Denso Corp.
+ 076e  Kuan Tech Enterprise Co., Ltd
+ 076f  Jhen Vei Electronic Co., Ltd
++0770  Welch Allyn, Inc - Medical Division
+ 0774  AmTRAN Technology Co., Ltd
+ 0775  Longshine Electronics Corp.
+ 0776  Inalways Corp.
+@@ -2571,28 +3168,41 @@
+ 077c  Forward Electronics Co., Ltd
+ 	0005  NEC Keyboard
+ 077d  Griffin Technology
++	0223  IMic Audio In/Out
++	0405  iMate, ADB Adapter
+ 	0410  PowerMate
+ 	041a  PowerWave
+-	0223  IMic Audio In/Out
+ 077f  Well Excellent & Most Corp.
+ 0781  SanDisk Corp.
+ 	0001  SDDR-05a ImageMate CompactFlash Reader
+ 	0002  SDDR-31 ImageMate II CompactFlash Reader
+ 	0005  SDDR-05b (CF II) ImageMate CompactFlash Reader
++	0100  ImageMate SDDR-12
+ 	0200  SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb]
+ 	0400  SecureMate SD/MMC Reader
+ 	0621  SDDR-86 Imagemate 6-in-1 Reader
++	0720  Sansa C200 series in recovery mode
++	0729  Sansa E200 series in recovery mode
+ 	0810  SDDR-75 ImageMate CF-SM Reader
+ 	0830  ImageMate CF/MMC/SD Reader
+ 	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
+ 	5151  Cruzer Micro 256/512MB Flash Drive
++	5406  Cruzer Micro 1/4GB Flash Drive
++	5408  Cruzer Titanium U3
+ 	7104  Cruzer Micro Mini 256MB Flash Drive
+ 	7112  Cruzer Micro 128MB Flash Drive
+ 	7113  Cruzer Micro 256MB Flash Drive
++	7420  Sansa E200 series (mtp)
++	7421  Sansa E200 series
++	7432  Sansa Clip (mtp)
++	7433  Sansa Clip (msc)
++	7450  Sansa C250
++	7451  Sansa C240
+ 	8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
+ 	8889  SDDR-88 Imagemate 8-in-1 Reader
+ 	8989  ImageMate 12-in-1 Reader
+ 	9999  SDDR-99 5-in-1 Reader
++	b2b3  SDDR-103 MobileMate SD+ Reader
+ 0782  Trackerball
+ 0783  C3PO
+ 	0003  LTC31 SmartCard Reader
+@@ -2611,6 +3221,8 @@
+ 	0001  MN128mini-V ISDN TA
+ 	0003  MN128mini-J ISDN TA
+ 0789  Logitec Corp.
++	0033  DVD Multi-plus unit LDR-H443SU2
++	00b3  DVD Multi-plus unit LDR-H443U2
+ 078b  Happ Controls, Inc.
+ 	0010  Driving UGCI
+ 	0020  Flying UGCI
+@@ -2632,7 +3244,12 @@
+ 	8901  ScanHex SX-35a
+ 	8909  ScanHex SX-35b
+ 	8911  ScanHex SX-35c
++0798  Optelec
++	0001  Braille Voyager
+ 079b  Sagem
++	0027  USB-Serial Controller
++	004a  XG-760A
++	0062  XG-76NA
+ 079d  Alfadata Computer Corp.
+ 	0201  GamePort Adapter
+ 07a1  Digicom S.p.A.
+@@ -2641,13 +3258,21 @@
+ 07a3  Onnto Corp.
+ 07a4  Be, Inc.
+ 07a6  ADMtek, Inc.
++	07c2  AN986A Ethernet
+ 	0986  AN986 Pegasus Ethernet
+ 	8511  ADM8511 Pegasus II Ethernet
++	8513  AN8513 Ethernet
++	8515  AN8515 Ethernet
+ 07aa  Corega K.K.
+ 	0001  Ether USB-T Ethernet [klsi]
+ 	0004  FEther USB-TX Ethernet [pegasus]
++	000c  WirelessLAN USB-11
++	000d  FEther USB-TXS
+ 	0012  Stick-11 802.11b Adapter
++	0017  FEther USB2-TX
++	001a  ULUSB-11 Key
+ 	7613  Stick-11 V2 802.11b Adapter
++	9601  FEther USB-TXC
+ 07ab  Freecom Technologies
+ 	fc01  IDE bridge
+ 	fc03  USB2-IDE IDE bridge
+@@ -2655,6 +3280,7 @@
+ 	0004  SCSI-DB25 SCSI Bridge [shuttle]
+ 	0005  SCSI-HD50 SCSI Bridge [shuttle]
+ 	0006  CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle]
++	fc01  Freecom USB-IDE
+ 07b0  Trust Technologies
+ 	0001  ISDN TA
+ 07b1  IMP, Inc.
+@@ -2674,15 +3300,17 @@
+ 	0400  OpticPro 1248U Scanner
+ 	0401  OpticPro 1248U Scanner #2
+ 	0403  OpticPro U16B Scanner
++	0800  OpticPro ST48 Scanner
++	0c03  OpticPro ST64+ Scanner
+ 07b4  Olympus Optical Co., Ltd
+ 	0100  Camedia C-2100/C-3000 Ultra Zoom Camera
+ 	0102  Camedia E-10/C-220/C-50 Camera
+ 	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera
+ 	0109  C-370Z/D-535Z/X-450
+ 	0112  MAUSB-100 xD Card Reader
+-	0113  mju 500
++	0113  Mju 500
+ 	0114  C-350Z Camera
+-	0118  Mju Digital 500
++	0118  Mju Mini Digital/Mju Digital 500 Camera
+ 	0203  Digital Voice Recorder DW-90
+ 	0206  Digital Voice Recorder DS-330
+ 	0207  Digital Voice Recorder & Camera W-10
+@@ -2694,10 +3322,27 @@
+ 07b6  Marubun Corp.
+ 07b7  TIME Interconnect, Ltd
+ 07b8  D-Link Corp.
++	110c  XX1
++	200c  XX2
+ 	4000  DU-E10 Ethernet [klsi]
+ 	4002  DU-E100 Ethernet [pegasus]
++	4003  1/10/100 Ethernet Adapter
++	4004  XX4
++	4007  XX5
++	400b  XX6
++	400c  XX7
++	401a  RTL8151
+ 	4102  USB 1.1 10/100M Fast Ethernet Adapter
++	4104  XX9
++	420a  UF200 Ethernet
++	6001  WL54
+ 	abc1  DU-E10 Ethernet [pegasus]
++	b000  BWU613
++	b21b  HWU54DM
++	b21c  RT2573
++	b21d  RT2573
++	b21e  RT2573
++	b21f  WUG2700
+ 	f101  DSB-560 Modem [atlas]
+ 07bc  Canon Computer Systems, Inc.
+ 07bd  Webgear, Inc.
+@@ -2708,12 +3353,16 @@
+ 	1501  IO-Warrior 24
+ 	1502  IO-Warrior 48
+ 	1503  IO-Warrior 28
++07c1  Keisokugiken
++	0068  HKS-0200 USBDAQ
+ 07c4  Datafab Systems, Inc.
+ 	a000  CompactFlash Card Reader
+ 	a001  CompactFlash & SmartMedia Card Reader [eusb]
+ 	a002  Disk Drive
++	a003  Datafab-based Reader
+ 	a005  CompactFlash & SmartMedia Card Reader
+ 	a006  SmartMedia Card Reader
++	a103  MDSM-B reader
+ 	a109  LC1 CompactFlash & SmartMedia Card Reader
+ 	a200  DF-UT-06 Hama MMC/SD Reader
+ 	a400  CompactFlash & Microdrive Reader
+@@ -2723,6 +3372,7 @@
+ 07c7  Powertech Industrial Co., Ltd
+ 07c8  B.U.G., Inc.
+ 07c9  Allied Telesyn International
++	b100  AT-USB100
+ 07ca  AVerMedia Technologies, Inc.
+ 07cb  Kingmax Technology, Inc.
+ 07cc  Carry Computer Eng., Co., Ltd
+@@ -2733,11 +3383,14 @@
+ 	000c  SM/CF Card Reader
+ 	000d  SM/CF Card Reader
+ 	0200  6-in-1 Card Reader
++	0300  6-in-1 Card Reader
+ 	0301  6-in-1 Card Reader
++	0330  WINTERREADER Reader
++	0350  9-in-1 Card Reader
+ 07cd  Elektor
+ 	0001  USBuart Serial Port
+ 07cf  Casio Computer Co., Ltd
+-	1001  QV-8000SX/5700/3000EX Digicam
++	1001  QV-8000SX/5700/3000EX Digicam; Exilim EX-M20
+ 	1003  Exilim EX-S500
+ 	1004  Exilim EX-Z120
+ 	2002  E-125 Cassiopeia Pocket PC
+@@ -2750,6 +3403,10 @@
+ 	0003  Fusion Model DVC-50 Rev 1 (NTSC)
+ 	0004  DVC-800 (PAL) Grabber
+ 07d1  D-Link System
++	3c03  DWL-G122 802.11g Adapter [ralink rt73]
++	3c04  WUA-1340
++	3c09  DWA-140 802.11n Adapter [ralink rt2870]
++	f101  DBT-122 Bluetooth
+ 07d2  Aptio Products, Inc.
+ 07d3  Cyberdata Corp.
+ 07d7  GCC Technologies, Inc.
+@@ -2770,11 +3427,15 @@
+ 07ec  Taiyo Electric Wire & Cable Co., Ltd
+ 07ee  Torex Retail (formerly Logware)
+ 	0002  Cash Drawer I/F
++07ef  STSN
++	0001  Internet Access Device
+ 07f6  Circuit Assembly Corp.
+ 07f7  Century Corp.
++	011e  Century USB Disk Enclosure
+ 07f9  Dotop Technology, Inc.
+ 07fa  Draytek
+ 	0778  miniVigor 128 ISDN TA
++	1012  BeWAN ADSL USB ST (grey)
+ 07fd  Mark of the Unicorn
+ 	0000  FastLane MIDI Interface
+ 0801  Mag-Tek
+@@ -2807,22 +3468,30 @@
+ 0829  DirecTV Broadband, Inc. (Telocity)
+ 082d  Handspring
+ 	0100  Visor
++	0200  Handspring Treo
+ 	0300  Treo 600
+ 0830  Palm, Inc.
+-	0002  Palm M505
+-	0003  Palm M515
+-	0020  Palm I705
+-	0040  Palm M125
+-	0050  Palm M130
+-	0060  Palm Tungsten T / Zire 71
++	0001  Palm m500
++	0002  Palm m505
++	0003  Palm m515
++	0020  Palm i705
++	0031  Palm Tungsten W/Z
++	0040  Palm m125
++	0050  Palm m130
++	0060  Palm Tungsten C/E/T/T2/T3 / Zire 71
++	0061  Palm Lifedrive / Treo 650/680 / Tunsten E2/T5/Tx/Z22 / Zire 21/31/72
++	0070  Palm Zire
+ 	0080  USB Serial Adapter [for Palm III series to sync via USB]
+ 0832  Kouwell Electronics Corp.
+ 0833  Sourcenext Corp.
++	012e  KeikaiDenwa 8 with charger
++	039f  KeikaiDenwa 8
+ 0835  Action Star Enterprise Co., Ltd
+ 0839  Samsung Techwin Co., Ltd
+ 	0005  Digimax Camera
+ 	0008  Digimax 230 Camera
+ 	0009  Digimax 340
++	000a  Digimax 410
+ 	000e  Digimax 360
+ 	0010  Digimax 300
+ 	1003  Digimax 210SE
+@@ -2831,7 +3500,11 @@
+ 	3000  Digimax 35 MP3
+ 083a  Accton Technology Corp.
+ 	1046  10/100 Ethernet [pegasus]
++	3501  2664W
++	3503  T-Sinus 111 Wireless Adapter
++	4505  SMCWUSB-G
+ 	5046  SpeedStream 10/100 Ethernet [pegasus]
++	e501  ZD1211B
+ 083f  Global Village
+ 	b100  TelePort V.90 Fax/Modem
+ 0840  Argosy Research, Inc.
+@@ -2840,18 +3513,26 @@
+ 0844  Welland Industrial Co., Ltd
+ 0846  NetGear, Inc.
+ 	1001  EA101 Ethernet [klsi]
++	1002  Ethernet
++	1020  Ethernet 10/100, USB1.1
++	1040  USB 2.0 Ethernet
+ 	4110  MA111 WiFi (v1)
+ 	4200  WG121 WiFi (v1)
+ 	4210  WG121 WiFi (v2)
+ 	4220  WG111 WiFi (v1)
+-	4230  MA111 WiFi
++	4230  MA111 WiFi (v2)
+ 	4240  WG111 WiFi (v2)
++	4260  WG111v3 802.11g Adapter [realtek RTL8187B]
++	4300  WG111U
++	4301  WG111U (no firmware)
+ 	6a00  WG111 WiFi (v2)
+ 084d  Minton Optic Industry Co., Inc.
+ 	0001  Jenoptik JD800i
+ 	0003  S-Cam F5 Digital Camera
+ 	0011  Argus DC3500 Digital Camera
+ 	0014  Praktica DC 32
++	0019  Praktica DPix3000
++	0025  Praktica DC 60
+ 	1001  ScanHex SX-35d
+ 084e  KB Gear
+ 	0001  KBGear JamCam
+@@ -2863,16 +3544,20 @@
+ 	1542  SiPix Blink
+ 	1543  Maxell WS30 Slim Digital Camera
+ 0852  CSEM
++0853  Topre Corporation
++	0100  HHKB Professional
+ 0854  ActiveWire, Inc.
+ 	0100  I/O Board
+ 	0101  I/O Board, rev1
+ 0856  B&B Electronics
+-	AC01  uLinks USOTL4 RS422/485 Adapter
++	ac01  uLinks USOTL4 RS422/485 Adapter
+ 0858  Hitachi Maxell, Ltd
+ 0859  Minolta Systems Laboratory, Inc.
+ 085a  Xircom
+ 	0001  Portstation Dual Serial Port
+ 	0003  Portstation Paraller Port
++	0008  Ethernet
++	0009  Ethernet
+ 	000b  Portstation Dual PS/2 Port
+ 	0299  Colorvision, Inc. Monitor Spyder
+ 	8027  PGSDB9 Serial Port
+@@ -2885,14 +3570,18 @@
+ 	4102  MA101 802.11b Adapter
+ 0867  Data Translation, Inc.
+ 	9812  ECON Data acquisition unit
++	9816  DT9816 ECON data acquisition module
++	9836  DT9836 data acquisition card
+ 086a  Emagic Soft-und Hardware GmbH
+ 086c  DeTeWe - Deutsche Telephonwerke AG & Co.
+ 	1001  Eumex 504PC ISDN TA
+ 	1003  TA33 ISDN TA
+ 	1055  Eumex 220 ISDN TA
+ 086e  System TALKS, Inc.
++	1920  SGC-X2UL
+ 086f  MEC IMEX, Inc.
+ 0870  Metricom
++	0001  Ricochet GS
+ 0871  SanDisk, Inc.
+ 	0001  SDDR-01 Compact Flash Reader
+ 	0002  SDDR-31 Compact Flash Reader
+@@ -2902,6 +3591,7 @@
+ 0879  Comtrol Corp.
+ 087c  Adesso/Kbtek America, Inc.
+ 087d  Jaton Corp.
++	5704  Ethernet
+ 087e  Fujitsu Computer Products of America
+ 087f  Virtual IP Group, Inc.
+ 0880  APT Technologies, Inc.
+@@ -2929,7 +3619,8 @@
+ 	2904  PCM2904 Audio Codec
+ 08bd  Citizen Watch Co., Ltd
+ 08c3  Precise Biometrics
+-	0101  Precise 100 MC FingerPrint and SmartCard Reader
++	0101  100 MC FingerPrint and SmartCard Reader
++	0402  200 MC FingerPrint and SmartCard Reader
+ 08c4  Proxim, Inc.
+ 08c7  Key Nice Enterprise Co., Ltd
+ 08c8  2Wire, Inc.
+@@ -2957,6 +3648,7 @@
+ 08cf  Productivity Enhancement Products
+ 08d1  smartBridges, Inc.
+ 	0001  smartNIC Ethernet [catc]
++	0003  smartNIC 2 PnP Ethernet
+ 08d3  Virtual Ink
+ 08d4  Fujitsu Siemens Computers
+ 	0009  SCR SmartCard Reader
+@@ -2966,6 +3658,7 @@
+ 	0987  USBLP-100 HomePNA Ethernet [pegasus]
+ 	0988  USBEL-100 Ethernet [pegasus]
+ 	8511  USBE-100 Ethernet [pegasus2]
++	90ff  USB2AR Ethernet
+ 08de  ???
+ 	7a01  802.11b Adapter
+ 08df  Spyrus, Inc.
+@@ -2988,6 +3681,9 @@
+ 	abba  USB Driver for Bluetooth Wireless Technology
+ 08ec  M-Systems Flash Disk Pioneers
+ 	0010  DiskOnKey
++	0011  DiskOnKey
++	0015  Kingston DataTraveler ELITE
++	0016  Kingston DataTraveler U3
+ 08ee  CCSI/Hesso
+ 08f0  Corex Technologies
+ 08f1  CTI Electronics Corp.
+@@ -3003,15 +3699,20 @@
+ 08fc  Sicon Cable Technology Co., Ltd
+ 08fd  Digianswer A/S
+ 08ff  AuthenTec, Inc.
++	2580  Fingerprint Sensor
+ 0900  Pinnacle Systems, Inc.
+ 0901  VST Technologies
+ 0906  Faraday Technology Corp.
+ 0909  Audio-Technica Corp.
+ 090a  Trumpion Microelectronics, Inc.
++	1001  T33520 USB Flash Card Controller
++	1100  Comotron C3310 MP3 player
++	1200  MP3 player
+ 	1540  Digitex Container Flash Disk
+ 090b  Neurosmith
+ 090c  Feiya Technology Corp.
+ 	1000  Memory Bar
++	1132  5-in-1 Card Reader
+ 090d  Multiport Computer Vertriebs GmbH
+ 090e  Shining Technology, Inc.
+ 090f  Fujitsu Devices, Inc.
+@@ -3020,6 +3721,7 @@
+ 0912  Voquette, Inc.
+ 0915  GlobeSpan, Inc.
+ 0917  SmartDisk Corp.
++	0206  FireFly 20G HDD
+ 0919  Tiger Electronics
+ 	0100  Fast Flicks Digital Camera
+ 091e  Garmin International
+@@ -3027,12 +3729,14 @@
+ 	0004  Garmin iQue 3600
+ 0920  Echelon Co.
+ 0921  GoHubs, Inc.
++	1001  GoCOM232 Serial
+ 0922  Dymo-CoStar Corp.
+ 	0007  LabelWriter 330
+ 	0009  LabelWriter 310
+ 0923  IC Media Corp.
+ 	010f  SIIG MobileCam
+ 0924  Xerox
++	ffef  WorkCenter M15
+ 0925  Lakeview Research
+ 	8101  Phidgets, Inc., 1-Motor PhidgetServo v2.0
+ 	8104  Phidgets, Inc., 4-Motor PhidgetServo v2.0
+@@ -3043,10 +3747,21 @@
+ 0929  American Biometric Co.
+ 092a  Toshiba Information & Industrial Sys. And Services
+ 092b  Sena Technologies, Inc.
++092f  Northern Embedded Science/CAVNEX
++	0004  JTAG-4
++	0005  JTAG-5
+ 0930  Toshiba Corp.
+-	0009  Toshiba Gigabeat (HDD audio player)
++	0009  Gigabeat F/X (HDD audio player)
++	000c  Gigabeat F (mtp)
++	0010  Gigabeat S (mtp)
++	0508  Integrated Bluetooth HCI
++	0706  PocketPC e740
+ 	6519  Kingston DataTraveler 2.0 USB Stick
++	6532  256M USB Stick
+ 	6533  512M USB Stick
++	653c  Kingston DataTraveler 2.0 USB Stick (512M)
++	653d  Kingston DataTraveler 2.0 USB Stick (1GB)
++	6540  TransMemory USB Flash Memory
+ 0931  Harmonic Data Systems, Ltd
+ 0932  Crescentec Corp.
+ 0933  Quantum Corp.
+@@ -3055,12 +3770,16 @@
+ 093a  Pixart Imaging, Inc.
+ 	010e  Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A
+ 	010f  Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55
+-	2468  Easy Snap Snake Eye WebCam
++	2468  Cammaestro 2.5DU/X-EYE/Orite SC-120/ICGear TravelCam/Easy Snap Snake Eye WebCam
+ 	2500  USB Optical Mouse
++	2600  Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508
+ 093b  Plextor Corp.
++	0011  PlexWriter 40/12/40U
+ 	0042  PX-712UF DVD RW
++	a104  ConvertX PX-TV402U/NA
+ 093c  Intrepid Control Systems, Inc.
+ 	0601  ValueCAN
++	0701  NeoVI Blue vehicle bus interface
+ 093d  InnoSync, Inc.
+ 093e  J.S.T. Mfg. Co., Ltd
+ 093f  Olympia Telecom Vertriebs GmbH
+@@ -3078,9 +3797,16 @@
+ 	1105  USB One
+ 094b  Linkup Systems Corp.
+ 094d  Cable Television Laboratories
++094f  Yano
++	0101  U640MO-03
++	05fc  METALWEAR-HDD
+ 0951  Kingston Technology
++	0008  Ethernet
+ 	000a  KNU101TX 100baseTX Ethernet
+ 	1600  Data Traveler II Pen Drive
++	1601  Data Traveler II+ Pen Drive
++	1602  Data Traveler Mini
++	1603  Data Traveler 1GB/2GB Pen Drive
+ 0954  RPM Systems Corp.
+ 0955  NVidia Corp.
+ 0956  BSquare Corp.
+@@ -3088,12 +3814,15 @@
+ 0958  CompuLink Research, Inc.
+ 0959  Cologne Chip AG
+ 095a  Portsmith
++	3003  Express Ethernet
+ 095b  Medialogic Corp.
+ 095c  K-Tec Electronics
+ 095d  Polycom, Inc.
+ 0967  Acer (??)
+ 	0204  WarpLink 802.11b Adapter
+ 0968  Catalyst Enterprises, Inc.
++096e  Feitian Technologies, Inc.
++	0802  ePass2000 (G&D STARCOS SPK 2.4)
+ 0971  Gretag-Macbeth AG
+ 0973  Schlumberger
+ 0974  Datagraphix, a business unit of Anacomp
+@@ -3103,6 +3832,7 @@
+ 0978  Beckhoff GmbH
+ 0979  Jeilin Technology Corp., Ltd
+ 097a  Minds At Work LLC
++	0001  Digital Wallet
+ 097b  Knudsen Engineering, Ltd
+ 097c  Marunix Co., Ltd
+ 097d  Rosun Technologies, Inc.
+@@ -3111,6 +3841,7 @@
+ 0984  Apricorn
+ 0985  cab Produkttechnik GmbH & Co KG
+ 	00a3  A3/200 or A3/300 Label Printer
++0986  Matsushita Electric Works, Ltd.
+ 098c  Vitana Corp.
+ 098d  INDesign
+ 098e  Integrated Intellectual Property, Inc.
+@@ -3130,6 +3861,7 @@
+ 09aa  Intersil Corp.
+ 	1000  Prism GT 802.11b/g Adapter
+ 	3642  Prism 2.x 802.11b Adapter
++09ab  Japan Cash Machine Co., Ltd.
+ 09ae  Tripp Lite
+ 09b2  Franklin Electronic Publishers, Inc.
+ 	0001  eBookman Palm Computer
+@@ -3159,6 +3891,8 @@
+ 09d2  Vreelin Engineering, Inc.
+ 09d3  Com One
+ 	0001  ISDN TA
++09d7  Novatel Wireless
++	0100  NovAtel FlexPack GPS receiver
+ 09d9  KRF Tech, Ltd
+ 09da  A4 Tech Co., Ltd
+ 	0006  Optical Mouse WOP-35 / Trust 450L Optical Mouse
+@@ -3167,7 +3901,9 @@
+ 09db  Measurement Computing Corp.
+ 	0075  MiniLab 1008
+ 	0076  PMD-1024
+-	007A  PMD-1208LS
++	007a  PMD-1208LS
++	0081  USB-1616FS
++	0088  USB-1616FS internal hub
+ 09dc  Aimex Corp.
+ 09dd  Fellowes, Inc.
+ 09df  Addonics Technologies Corp.
+@@ -3200,10 +3936,13 @@
+ 0a12  Cambridge Silicon Radio, Ltd
+ 	0001  Bluetooth Dongle (HCI mode)
+ 	1000  Bluetooth Dongle (HID proxy mode)
++	ffff  USB Bluetooth Device in DFU State
+ 0a13  Telebyte, Inc.
+ 0a14  Spacelabs Medical, Inc.
+ 0a15  Scalar Corp.
+ 0a16  Trek Technology (S) PTE, Ltd
++	1111  ThumbDrive
++	8888  IBM USB Memory Key
+ 	9988  Trek2000 TD-G2
+ 0a17  Pentax Corp.
+ 	0004  Pentax Optio 330
+@@ -3218,12 +3957,16 @@
+ 	003d  Pentax Optio S55
+ 	0043  Pentax *ist DL
+ 	0047  Pentax Optio S60
++	006e  Pentax K10D
++	0070  Pentax K100D
+ 0a18  Heidelberger Druckmaschinen AG
+ 0a19  Hua Geng Technologies, Inc.
+ 0a21  Medtronic Physio Control Corp.
+ 0a22  Century Semiconductor USA, Inc.
+ 0a2c  AK-Modul-Bus Computer GmbH
+ 	0008  GPIO Ports
++0a34  TG3 Electronics, Inc.
++	0110  Deck 82-key backlit keyboard
+ 0a39  Gilat Satellite Networks, Ltd
+ 0a3a  PentaMedia Co., Ltd
+ 0a3c  NTT DoCoMo, Inc.
+@@ -3231,6 +3974,7 @@
+ 0a3f  Swissonic AG
+ 0a43  Boca Systems, Inc.
+ 0a46  Davicom Semiconductor, Inc.
++	0268  ST268
+ 0a47  Hirose Electric
+ 0a48  I/O Interconnect
+ 	3258  Dane Elec zMate SD Reader
+@@ -3253,6 +3997,8 @@
+ 	200a  Bluetooth dongle
+ 	2033  BCM2033 Bluetooth
+ 	2035  BCM2035 Bluetooth
++	2101  A-Link BlueUsbA2 Bluetooth
++	2121  BCM2210 Bluetooth
+ 0a5d  Diatrend Corp.
+ 0a5f  Zebra
+ 	0009  LP2844 Printer
+@@ -3297,14 +4043,30 @@
+ 0aa5  First International Digital
+ 0aa6  Perception Digital, Ltd
+ 	0101  Hercules Jukebox
+-0aa7  Wincor Nixdorf GmbH & Co KG
+-	0200  POS Display BA63
+-	0201  POS Display BA66
+-	0300  POS Printer TH210
+-	0302  POS Printer TH220
+-	0305  Lottery Printer XiPrintPlus
+-	0306  POS Printer TH320
+-	0308  POS Printer TH420
++0aa7  Wincor Nixdorf International GmbH
++	0100  POS Keyboard, TA58P-USB
++	0101  POS Keyboard, TA85P-USB
++	0102  POS Keyboard, TA59-USB
++	0103  POS Keyboard, TA60-USB
++	0104  SNIkey Keyboard, SNIKey-KB-USB
++	0200  Operator Display, BA63-USB
++	0201  Operator Display, BA66-USB
++	0202  Operator Display & Scanner, XiCheck-BA63
++	0203  Operator Display & Scanner, XiCheck-BA66
++	0204  Graphics Operator Display, BA63GV
++	0300  POS Printer (printer class mode), TH210
++	0301  POS Printer (native mode), TH210
++	0302  POS Printer (printer class mode), TH220
++	0303  POS Printer (native mode), TH220
++	0304  POS Printer, TH230
++	0305  Lottery Printer, XiPrintPlus
++	0306  POS Printer (printer class mode), TH320
++	0307  POS Printer (native mode), TH320
++	0308  POS Printer (printer class mode), TH420
++	0309  POS Printer (native mode), TH420
++	030a  POS Printer, TH200B
++	0400  Lottery Scanner, Xiscan S
++	0401  Lottery Scanner, Xiscan 3
+ 	4304  Banking Printer TP07
+ 0aa8  TriGem Computer, Inc.
+ 0aa9  Baromtec Co.
+@@ -3328,9 +4090,11 @@
+ 0ac8  Z-Star Microelectronics Corp.
+ 	0302  ZC0302 WebCam
+ 	0321  USB 2.0 Webcam
++	0323  Luxya WC-1200 USB 2.0 Webcam
+ 	301b  ZC0301 WebCam
+ 	303b  ZC0303 WebCam
+ 	305b  ZC0305 WebCam
++	307b  USB 1.1 WebCam
+ 0ac9  Micro Solutions, Inc.
+ 	0000  Backpack CD-ReWriter
+ 	0011  Backpack 40GB Hard Drive
+@@ -3339,8 +4103,10 @@
+ 0acc  Koga Electronics Co.
+ 0acd  ID Tech
+ 0ace  ZyDAS
+-	1201 802.11b WiFi
+-	1211 802.11b/g USB2 WiFi
++	1201  802.11b WiFi
++	1211  802.11b/g USB2 WiFi
++	1215  WLA-54L WiFi
++	1608  ONMI FAXMODEM 56K UNO (ZyXEL)
+ 0acf  Intoto, Inc.
+ 0ad0  Intellix Corp.
+ 0ad1  Remotec Technology, Ltd
+@@ -3358,7 +4124,9 @@
+ 	5010  ND5010 Card Reader
+ 0af0  Option
+ 	5000  UMTS Card
++	6000  GlobeTrotter 3G datacard
+ 	6300  GT 3G Quad UMTS/GPRS Card
++	6600  GlobeTrotter 3G+ datacard
+ 0af6  Silver I Co., Ltd
+ 0af7  B2C2, Inc.
+ 	0101  Digital TV USB Receiver (DVB-S/T/C / ATSC)
+@@ -3369,10 +4137,18 @@
+ 0afd  Tateno Dennou, Inc.
+ 0afe  Cummins Engine Co.
+ 0aff  Jump Zone Network Products, Inc.
++0b00  INGENICO
+ 0b05  ASUSTek Computer, Inc.
+ 	1706  WL-167G 802.11g Adapter [ralink]
++	1707  WL-167g Wireless Adapter
++	170c  WL-159g
++	1712  BT-183 Bluetooth 2.0+EDR adapter
++	171b  A9T wireless
++	1723  WL-167G v2 802.11g Adapter [ralink]
++	1724  RT2573
++	1726  Laptop OLED Display
+ 0b0c  Todos Data System AB
+-	0009 Todos Argos Mini II Smart Card Reader
++	0009  Todos Argos Mini II Smart Card Reader
+ 0b0e  GN Netcom
+ 0b0f  AVID Technology
+ 0b10  Pcally
+@@ -3390,18 +4166,25 @@
+ 0b30  PNY Technologies, Inc.
+ 	0006  SM Media-Shuttle Card Reader
+ 0b33  Contour Design, Inc.
++	0020  ShuttleXpress
+ 0b37  Hitachi ULSI Systems Co., Ltd
+ 0b39  Omnidirectional Control Technology, Inc.
++	0109  USB TO Ethernet
++	0421  Serial
+ 0b3a  IPaxess
+ 0b3b  Tekram Technology Co., Ltd
+ 	1601  Allnet 0193 802.11b Adapter
+ 	1602  ZyXEL ZyAIR B200 802.11b Adapter
+ 	1612  AIR.Mate 2@net 802.11b Adapter
+ 	1620  Allnet USB 2.0 Wireless Network Adapter
++	1630  QuickWLAN
++	5630  ZD1211
++	6630  ZD1211
+ 0b3c  Olivetti Techcenter
+ 	a010  Simple_Way Printer/Scanner/Copier
+ 0b3e  Kikusui Electronics Corp.
+ 0b41  Hal Corp.
++	0011  Crossam2+USB IR commander
+ 0b43  Play.com, Inc.
+ 	0003  PS2 Controller Converter
+ 0b47  Sportbug.com, Inc.
+@@ -3415,6 +4198,8 @@
+ 	064f  Trance Vibrator
+ 0b4b  Pine Corp. Ltd.
+ 	0100  D'music MP3 Player
++0b4d  Graphtec America, Inc.
++	110a  Graphtec CC200-20
+ 0b4e  Musical Electronics, Ltd
+ 0b50  Dumpries Co., Ltd
+ 0b51  Comfort Keyboard Co.
+@@ -3437,6 +4222,7 @@
+ 0b6a  Maxim Integrated Products
+ 0b6f  Nagano Japan Radio Co., Ltd
+ 0b70  PortalPlayer, Inc.
++	00ba  iRiver H10 20GB
+ 0b71  SHIN-EI Sangyo Co., Ltd
+ 0b72  Embedded Wireless Technology Co., Ltd
+ 0b73  Computone Corp.
+@@ -3453,8 +4239,12 @@
+ 0b88  Sigma Koki Co., Ltd, Technology Center
+ 0b89  Advanced Digital Broadcast, Ltd
+ 0b95  ASIX Electronics Corp.
++	1720  10/100 Ethernet
++	1780  AX88178
++	7720  AX88772
+ 0b96  Sewon Telecom
+ 0b97  O2 Micro, Inc.
++	7761  Oz776 1.1 Hub
+ 	7762  Oz776 SmartCard Reader
+ 0b98  Playmates Toys, Inc.
+ 0b99  Audio International, Inc.
+@@ -3465,18 +4255,25 @@
+ 0baf  U.S. Robotics
+ 	00eb  USR1120 802.11b Adapter
+ 	0118  U5 802.11g Adapter
++	0121  USR5423 WLAN
+ 	6112  FaxModem Model 5633
+ 0bb0  Concord Camera Corp.
+ 	5007  3340z/Rollei DC3100
+ 0bb1  Infinilink Corp.
+ 0bb2  Ambit Microsystems Corp.
++	0302  WLAN
+ 	6098  USB Cable Modem
+ 0bb3  Ofuji Technology
+ 0bb4  High Tech Computer Corp.
+ 	00ce  mmO2 XDA GSM/GPRS Pocket PC
+ 	00cf  SPV C500 Smart Phone
+ 	0a02  Himalaya GSM/GPRS Pocket PC
++	0a07  Magician PocketPC SmartPhone / O2 XDA
+ 	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
++	0b04  Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion
++	0b06  Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO
++	0b0c  Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1
++	0bce  Vario MDA
+ 0bb5  Murata Manufacturing Co., Ltd
+ 0bb6  Network Alchemy
+ 0bb7  Joytech Computer Co., Ltd
+@@ -3502,8 +4299,11 @@
+ 0bd7  Andrew Pargeter & Associates
+ 	a021  Amptek DP4 multichannel signal analyzer
+ 0bda  Realtek Semiconductor Corp.
++	0103  USB 2.0 Card Reader
++	0111  Card Reader
+ 	8150  RTL8150 Fast Ethernet Adapter
+ 	8151  RTL8151 Adapteon Business Mobile Networks BV
++	8187  RTL8187 Wireless Adapter
+ 0bdb  Ericsson Business Mobile Networks BV
+ 0bdc  Y Media Corp.
+ 0bdd  Orange PCS
+@@ -3518,6 +4318,7 @@
+ 0bf1  Intracom S.A.
+ 0bf2  Konexx
+ 0bf6  Addonics Technologies, Inc.
++	a001  Cable 205
+ 	a002  IDE Bridge
+ 0bf7  Sunny Giken, Inc.
+ 0bf8  Fujitsu Siemens Computers
+@@ -3567,11 +4368,15 @@
+ 0c44  Motorola iDEN
+ 0c45  Microdia
+ 	1060  iFlash SM-Direct Card Reader
++	184c  VoIP Phone
+ 	6001  Genius VideoCAM NB
+ 	6005  Sweex Mini WebCam
++	600d  TwinkleCam USB camera
++	6028  Typhoon Easycam USB 330K (older)
+ 	6029  Triplex i-mini PC Camera
+ 	602a  Meade ETX-105EC Camera
+ 	602c  Clas Ohlson TWC-30XOP WebCam
++	60b0  Genius VideoCam Look
+ 	6270  U-CAM PC Camera NE878
+ 	8000  DC31VC
+ 	800a  Vivitar Vivicam3350B
+@@ -3583,7 +4388,7 @@
+ 0c53  ViewPLUS, Inc.
+ 0c54  Glory, Ltd
+ 0c55  Spectrum Digital, Inc.
+-	0510 Spectrum Digital XDS510 JTAG Debugger
++	0510  Spectrum Digital XDS510 JTAG Debugger
+ 0c56  Billion Bright, Ltd
+ 0c57  Imaginative Design Operation Co., Ltd
+ 0c58  Vidar Systems Corp.
+@@ -3615,6 +4420,7 @@
+ 0c7a  Wing-Span Enterprise Co., Ltd
+ 0c86  NDA Technologies, Inc.
+ 0c88  Kyocera Wireless Corp.
++	17da  Qualcomm Kyocera CDMA Technologies MSM
+ 0c89  Honda Tsushin Kogyo Co., Ltd
+ 0c8a  Pathway Connectivity, Inc.
+ 0c8b  Wavefly Corp.
+@@ -3622,6 +4428,8 @@
+ 0c8d  Tempo
+ 0c8e  Cesscom Co., Ltd
+ 0c8f  Applied Microsystems
++0c98  Berkshire Products, Inc.
++	1140  USB PC Watchdog
+ 0c99  Innochips Co., Ltd
+ 0c9a  Hanwool Robotics Corp.
+ 0c9b  Jobin Yvon, Inc.
+@@ -3666,18 +4474,32 @@
+ 0ccc  Domex Technology Corp.
+ 0ccd  TerraTec Electronic GmbH
+ 	0038  Cinergy T^2 DVB-T Receiver
++	0069  Cinergy T XE DVB-T Receiver
+ 0cd4  Bang Olufsen
+ 	0101  BeolinkPC2
+ 0cd7  NewChip S.r.l.
+ 0cd8  JS Digitech, Inc.
+ 0cd9  Hitachi Shin Din Cable, Ltd
+ 0cde  Z-Com
++	0001  M4Y-750
+ 	0002  XI-725/726 Prism2.5 802.11b Adapter
+ 	0005  XI-735 Prism3 802.11b Adapter
+ 	0006  Medion 40900 802.11b Adapter
++	0011  ZD1211
++	0012  AR5523
++	0013  AR5523 driver (no firmware)
++	001a  ZD1211B
++0ce9  pico Technology
++	1001  PicoScope3204
+ 0cf1  e-Conn Electronic Co., Ltd
+ 0cf2  ENE Technology, Inc.
+ 0cf3  Atheros Communications, Inc.
++	0001  AR5523
++	0002  AR5523 (no firmware)
++	0003  AR5523
++	0004  AR5523 (no firmware)
++	0005  AR5523
++	0006  AR5523 (no firmware)
+ 0cf4  Fomtex Corp.
+ 0cf5  Cellink Co., Ltd
+ 0cf6  Compucable Corp.
+@@ -3689,6 +4511,9 @@
+ 0cff  SAFA MEDIA Co., Ltd.
+ 	0320  SR-380N
+ 0d06  telos EDV Systementwicklung GmbH
++0d08  UTStarcom
++	0602  DV007 [serial]
++	0603  DV007 [storage]
+ 0d0b  Contemporary Controls
+ 0d0c  Astron Electronics Co., Ltd
+ 0d0d  MKNet Corp.
+@@ -3708,6 +4533,7 @@
+ 0d33  AirSpeak, Inc.
+ 0d34  Rearden Steel Technologies
+ 0d35  Dah Kun Co., Ltd
++0d3a  Posiflex Technologies, Inc.
+ 0d3c  Sri Cable Technology, Ltd
+ 0d3d  Tangtop Technology Co., Ltd
+ 0d3e  Fitcom, inc.
+@@ -3716,6 +4542,7 @@
+ 0d41  Ta Yun Terminals Industrial Co., Ltd
+ 0d42  Full Der Co., Ltd
+ 0d46  Kobil Systems GmbH
++	2012  KAAN Standard Plus (Smartcard reader)
+ 	3003  mIDentity Light / KAAN SIM III
+ 	4000  mIDentity (mass storage)
+ 	4001  mIDentity Basic/Classic (composite device)
+@@ -3769,12 +4596,14 @@
+ 0d7d  Phison Electronics Corp.
+ 	0100  PS1001/1011/1006/1026 Flash Disk
+ 	0110  Gigabyte FlexDrive
++	0120  Disk Pro 64MB
+ 	0240  I/O-Magic/Transcend 6-in-1 Card Reader
+-	110E  NEC uPD720121/130 USB-ATA/ATAPI Bridge
++	110e  NEC uPD720121/130 USB-ATA/ATAPI Bridge
+ 	1240  Apacer 6-in-1 Card Reader 2.0
+ 	1270  Wolverine SixPac 6000
+ 	1300  Flash Disk
+ 	1320  PS2031 Flash Disk
++	1400  Attache 256MB USB 2.0 Flash Drive
+ 	1420  PS2044 Pen Drive
+ 	1470  Vosonic X's-Drive II+ VP2160
+ 	1900  USB Thumb Drive
+@@ -3787,13 +4616,19 @@
+ 0d8a  King Jim Co., Ltd
+ 0d8b  Ascom Telecommunications, Ltd
+ 0d8c  C-Media Electronics, Inc.
++	0006  Storm HP-USB500 5.1 Headset
+ 	000c  Audio Adapter
+-	000e  Audio Adapter (Planet UP-100 USB Phone)
++	000e  Audio Adapter (Planet UP-100, Genius G-Talk)
+ 	0103  Turtle Beach Audio Advantage Micro
+ 	b213  USB Phone CM109 (aka CT2000,VPT1000)
+ 0d8d  Promotion & Display Technology, Ltd
+ 0d8e  Global Sun Technology, Inc.
+ 	7100  802.11b Adapter
++	7110  WL-210
++	7801  AR5523
++	7802  AR5523 (no firmware)
++	7811  AR5523
++	7812  AR5523 (no firmware)
+ 	7a01  PRISM25 802.11b Adapter
+ 0d8f  Pitney Bowes
+ 0d90  Sure-Fire Electrical Corp.
+@@ -3830,15 +4665,27 @@
+ 0db0  Micro Star International
+ 	1967  Bluetooth Dongle
+ 	4011  Medion Flash XL V2.0 Card Reader
++	6823  UB11B/MS-6823 802.11b Wi-Fi adapter
++	6861  MSI-6861 802.11g WiFi adapter
++	6865  RT2570
++	6869  RT2570
++	6874  RT2573
++	6877  RT2573
++	6970  Bluetooth adapter
+ 	697a  Bluetooth Dongle
+-	6982  Medion Flash XL V2.7A Card Reader
++	6982  Medion Flash XL Card Reader
++	a861  RT2573
++	a874  RT2573
+ 	a970  Bluetooth dongle
+ 0db1  Wen Te Electronics Co., Ltd
+ 0db2  Shian Hwi Plug Parts, Plastic Factory
+ 0db3  Tekram Technology Co., Ltd
+ 0db4  Chung Fu Chen Yeh Enterprise Corp.
++0db7  ELCON Systemtechnik
++	0002  Goldpfeil P-LAN
+ 0dbe  Jiuh Shiuh Precision Industry Co., Ltd
+ 0dbf  Quik Tech Solutions
++	021b  USB-2.0 IDE Adapter
+ 0dc0  Great Notions
+ 0dc1  Tamagawa Seiki Co., Ltd
+ 0dc3  Athena Smartcard Solutions, Inc.
+@@ -3858,23 +4705,32 @@
+ 0dd5  California Micro Devices
+ 0dd7  Kocom Co., Ltd
+ 0dd8  Netac Technology Co., Ltd
++	1060  USB-CF-Card
+ 	e007  OnlyDisk U222 Pendrive
+ 0dd9  HighSpeed Surfing
+ 0dda  Integrated Circuit Solution, Inc.
++	2005  Datalux DLX-1611 16in1 Card Reader
+ 	2026  USB2.0 Card Reader
+ 	2027  USB 2.0 Card Reader
+ 0ddb  Tamarack, Inc.
+ 0ddd  Datelink Technology Co., Ltd
+ 0dde  Ubicom, Inc.
+ 0de0  BD Consumer Healthcare
++0dea  UTECH Electronic (D.G.) Co., Ltd.
+ 0ded  Novasonics
+ 0dee  Lifetime Memory Products
+ 0def  Full Rise Electronic Co., Ltd
+ 0df6  Sitecom Europe B.V.
++	0017  WL-182
++	061c  LN-028
+ 	9071  zd1211 802.11g Adapter
++	9075  ZD1211B
++	90ac  WL-172
++	9712  WL-113 rev 2
+ 0df7  Mobile Action Technology, Inc.
+ 	0620  MA-620 Infrared Adapter
+ 	0700  MA-700 Bluetooth Adapter
++	0720  MA-720 Bluetooth Adapter
+ 0dfa  Toyo Communication Equipment Co., Ltd
+ 0dfc  GeneralTouch Technology Co., Ltd
+ 	0001  Touchscreen
+@@ -3888,7 +4744,10 @@
+ 0e21  Cowon Systems, Inc.
+ 	0300  iAudio CW200
+ 	0510  iAudio X5
++	0513  iAudio X5, side USB port
++	0520  iAudio M5
+ 	0700  iAudio U3
++0e22  Symbian Ltd.
+ 0e23  Liou Yuane Enterprise Co., Ltd
+ 0e25  VinChip Systems, Inc.
+ 0e26  J-Phone East Co., Ltd
+@@ -3920,13 +4779,16 @@
+ 	4750  GuitarPort
+ 	5044  PODxt
+ 	5050  PODxt Pro
+-	534D  SeaMonkey
++	534d  SeaMonkey
++0e44  Sun-Riseful Technology Co., Ltd.
+ 0e48  Julia Corp., Ltd
+ 	0100  CardPro SmartCard Reader
+ 0e4a  Shenzhen Bao Hing Electric Wire & Cable Mfr. Co.
+ 0e4c  Radica Games, Ltd
+ 0e55  Speed Dragon Multimedia, Ltd
+ 	110b  MS3303H USB-to-Serial Bridge
++0e56  Kingston Technology Company, Inc.
++	6021  K-PEX 100
+ 0e5a  Active Co., Ltd
+ 0e5b  Union Power Information Industrial Co., Ltd
+ 0e5c  Bitland Information Technology Co., Ltd
+@@ -3939,11 +4801,18 @@
+ 0e70  Tokyo Electronic Industry Co., Ltd
+ 0e72  Hsi-Chin Electronics Co., Ltd
+ 0e75  TVS Electronics, Ltd
++0e79  Archos, Inc.
++	1106  Pocket Medai Assistant - PMA400
+ 0e7b  On-Tech Industry Co., Ltd
+ 0e7e  Gmate, Inc.
+ 	0001  Yopy 3000 PDA
++	1001  YP3X00 PDA
+ 0e82  Ching Tai Electric Wire & Cable Co., Ltd
++0e83  Shin An Wire & Cable Co.
+ 0e8c  Well Force Electronic Co., Ltd
++0e8d  MediaTek Inc.
++0e8f  GreenAsia Inc.
++	0012  Joystick
+ 0e90  WiebeTech, LLC
+ 0e91  VTech Engineering Canada, Ltd
+ 0e92  C's Glory Enterprise Co., Ltd
+@@ -3968,6 +4837,9 @@
+ 0ea7  MSL Enterprises Corp.
+ 0ea8  CenDyne, Inc.
+ 0ead  Humax Co., Ltd
++0eb0  NovaTech
++	9020  NovaTech NV-902W
++	9021  RT2573
+ 0eb1  WIS Technologies, Inc.
+ 0eb2  Y-S Electronic Co., Ltd
+ 0eb3  Saint Technology Corp.
+@@ -3991,6 +4863,10 @@
+ 	6680  USB Flash Disk 64M-B
+ 0ed2  Kyoto Micro Computer Co., Ltd
+ 0ed3  Wing-Tech Enterprise Co., Ltd
++0ed5  Fiberbyte
++	e000  USB-inSync Device
++	f000  Fiberbyte USB-inSync Device
++	f201  Fiberbyte USB-inSync DAQ-2500X
+ 0eda  Noriake Itron Corp.
+ 0edf  e-MDT Co., Ltd
+ 0ee0  Shima Seiki Mfg., Ltd
+@@ -4009,10 +4885,11 @@
+ 0ef4  DSI Datotech
+ 0ef5  PointChips
+ 	2202  Flash Disk
++	2366  Flash Disk
+ 0ef6  Yield Microelectronics Corp.
+ 0ef7  SM Tech Co., Ltd (Tulip)
+-0efe  Wem Technology, Inc.
+ 0efd  Oasis Semiconductor
++0efe  Wem Technology, Inc.
+ 0f06  Visual Frontier Enterprise Co., Ltd
+ 0f08  CSL Wire & Plug (Shen Zhen) Co.
+ 0f0c  CAS Corp.
+@@ -4032,6 +4909,8 @@
+ 0f2e  Geniality Maple Technology Co., Ltd
+ 0f2f  Priva Design Services
+ 0f30  Jess Technology Co., Ltd
++	001c  PS3 Guitar Controller Dongle
++	0110  10-Button Joypad
+ 0f31  Chrysalis Development
+ 0f32  YFC-BonEagle Electric Co., Ltd
+ 0f37  Kokuyo Co., Ltd
+@@ -4040,6 +4919,11 @@
+ 	0112  CDMA 1xEVDO PC Card, PC 5220
+ 0f41  RDC Semiconductor Co., Ltd
+ 0f42  Nital Consulting Services, Inc.
++0f44  Polhemus
++	ef11  Patriot (firmware not loaded)
++	ef12  Patriot
++	ff11  Liberty (firmware not loaded)
++	ff12  Liberty
+ 0f4b  St. John Technology Co., Ltd
+ 0f4c  WorldWide Cable Opto Corp.
+ 0f4d  Microtune, Inc.
+@@ -4055,6 +4939,7 @@
+ 0f60  NTK, Ltd
+ 0f61  Varian, Inc.
+ 0f62  Acrox Technologies Co., Ltd
++	1001  Targus Mini Trackball Optical Mouse
+ 0f68  Kobe Steel, Ltd
+ 0f69  Dionex Corp.
+ 0f6a  Vibren Technologies, Inc.
+@@ -4073,6 +4958,8 @@
+ 0f7d  NetBotz, Inc.
+ 0f7e  Fluke Corp.
+ 0f88  VTech Holdings, Ltd
++	3012  RT2570
++	3014  ZD1211B
+ 0f8b  Yazaki Corp.
+ 0f8c  Young Generation International Corp.
+ 0f8d  Uniwill Computer Corp.
+@@ -4105,9 +4992,15 @@
+ 0fca  Research In Motion, Ltd.
+ 	0001  Blackberry Handheld
+ 0fce  Sony Ericsson Mobile Communications AB
++	d016  K750i Phone
+ 	d017  K608i Phone
++	d038  W850i Phone
++	d041  K510i Phone
++	d042  W810i Phone
++	d046  K610i Phone
+ 0fcf  Dynastream Innovations, Inc.
+ 0fd0  Tulip Computers B.V.
++0fd1  Giant Electronics Ltd.
+ 0fd4  Tenovis GmbH & Co., KG
+ 0fd5  Direct Access Technology, Inc.
+ 0fdc  Micro Plus
+@@ -4137,9 +5030,12 @@
+ 	6005  T5100
+ 	6800  CDMA Modem
+ 1005  Apacer Technology, Inc.
+-	b113  Handy Steno 2.0 (256MB)
++	b113  Handy Steno 2.0/HT203
+ 1006  iRiver, Ltd.
+-	3002  iHP-100/120/140 MP3 Player
++	3001  iHP-100
++	3002  iHP-120/140 MP3 Player
++	3003  H320/H340
++	3004  H340 (mtp)
+ 1009  Emuzed, Inc.
+ 100a  AV Chaseway, Ltd
+ 100b  Chou Chin Industrial Co., Ltd
+@@ -4169,6 +5065,7 @@
+ 102a  Ramos Technology Co., Ltd
+ 102b  Infotronic America, Inc.
+ 102c  Etoms Electronics Corp.
++	6251  Q-Cam
+ 102d  Winic Corp.
+ 1031  Comax Technology, Inc.
+ 1032  C-One Technology Corp.
+@@ -4180,8 +5077,15 @@
+ 1043  iCreate Technologies Corp.
+ 	8006  Flash Disk 32-256 MB
+ 1044  Chu Yuen Enterprise Co., Ltd
++	8001  GN-54G
++	8002  GN-BR402W
++	8003  GN-WLBM101
++	8007  GN-WBKG
++	8008  GN-WB01GS
++	800a  GN-WI05GS
+ 1046  Winbond Electronics Corp. [hex]
+ 	9967  W9967CF/W9968CF WebCam IC
++1048  Targus Group International
+ 104c  AMCO TEC International, Inc.
+ 1053  Immanuel Electronics Co., Ltd
+ 1054  BMS International Beheer N.V.
+@@ -4189,6 +5093,11 @@
+ 1056  Hsin Chen Ent Co., Ltd
+ 1057  ON Semiconductor
+ 1058  Western Digital Technologies, Inc.
++	0200  Firewire USB Combo
++	0400  External HDD
++	0500  USB HUB
++	0901  MyBook External HDD
++	1001  External Hard Disk
+ 1059  Giesecke & Devrient GmbH
+ 105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
+ 105d  Delkin Devices, Inc.
+@@ -4197,11 +5106,15 @@
+ 1060  Easthome Industrial Co., Ltd
+ 1063  Motorola Electronics Taiwan, Ltd [hex]
+ 	1555  MC141555 Hub
++	4100  SB4100 USB Cable Modem
+ 1065  CCYU Technology
+ 	2136  EasyDisk ED1064
+ 106a  Loyal Legend, Ltd
+ 106c  Curitel Communications, Inc.
++	1101  CDMA 2000 1xRTT USB modem (HX-550C)
+ 	2101  AudioVox 8900 Cell Phone
++	3701  Broadband Wireless modem
++	3702  Pantech PX-500
+ 106d  San Chieh Manufacturing, Ltd
+ 106e  ConectL
+ 106f  Money Controls
+@@ -4215,6 +5128,7 @@
+ 108a  Chloride Power Protection
+ 108b  Grand-tek Technology Co., Ltd
+ 108c  Robert Bosch GmbH
++108e  Lotes Co., Ltd.
+ 1099  Surface Optics Corp.
+ 109a  DATASOFT Systems GmbH
+ 109f  eSOL Co., Ltd
+@@ -4226,6 +5140,16 @@
+ 	10c5  Sony-Ericsson / Samsung DataCable
+ 10ac  Honeywell, Inc.
+ 10ae  Princeton Technology Corp.
++10af  Liebert Corp.
++	0000  UPS
++	0001  PowerSure PSA UPS
++	0002  PowerSure PST UPS
++	0003  PowerSure PSP UPS
++	0004  PowerSure PSI UPS
++	0005  UPStation GXT 2U UPS
++	0006  UPStation GXT UPS
++	0007  Nfinity Power Systems UPS
++	0008  PowerSure Interactive UPS
+ 10b5  Comodo (PLX?)
+ 	9060  Test Board
+ 10b8  DiBcom
+@@ -4236,6 +5160,7 @@
+ 10bb  TM Technology, Inc.
+ 10bc  Dinging Technology Co., Ltd
+ 10bd  TMT Technology, Inc.
++	1427  Ethernet
+ 10bf  SmartHome
+ 	0001  SmartHome PowerLinc
+ 10c4  Cygnal Integrated Products, Inc.
+@@ -4244,15 +5169,17 @@
+ 10cb  Eratech
+ 10cc  GBM Connector Co., Ltd
+ 10cd  Kycon, Inc.
++10ce  Silicon Labs
++	ea6a  MobiData EDGE USB Modem
+ 10cf  Velleman Components, Inc.
+-	5500 8055 Experiment Interface Board (address=0)
+-	5501 8055 Experiment Interface Board (address=1)
+-	5502 8055 Experiment Interface Board (address=2)
+-	5503 8055 Experiment Interface Board (address=3)
++	5500  8055 Experiment Interface Board (address=0)
++	5501  8055 Experiment Interface Board (address=1)
++	5502  8055 Experiment Interface Board (address=2)
++	5503  8055 Experiment Interface Board (address=3)
+ 10d1  Hottinger Baldwin Measurement
+-	0101 USB-Module for Spider8, CP32
+-	0202 CP22 - Communication Processor
+-	0301 CP42 - Communication Processor
++	0101  USB-Module for Spider8, CP32
++	0202  CP22 - Communication Processor
++	0301  CP42 - Communication Processor
+ 10d4  Man Boon Manufactory, Ltd
+ 10d5  Uni Class Technology Co., Ltd
+ 10d6  Actions Semiconductor Co., Ltd
+@@ -4267,8 +5194,6 @@
+ 10fb  Pictos Technologies, Inc.
+ 10fd  Anubis Electronics, Ltd
+ 	804d  Typhoon Webshot II Webcam [zc0301]
+-1a0a  ...
+-	badd  USB OTG Compliance test device
+ 1100  VirTouch, Ltd
+ 	0001  VTPlayer VTP-1 Braille Mouse
+ 1101  EasyPass Industrial Co., Ltd
+@@ -4276,6 +5201,7 @@
+ 1108  Brightcom Technologies, Ltd
+ 1110  Analog Devices Canada, Ltd (Allied Telesyn)
+ 	900f  AT-AR215 DSL Modem
++	9010  AT-AR215 DSL Modem
+ 1111  Pandora International Ltd.
+ 	8888  Evolution Device
+ 1112  YM ELECTRIC CO., Ltd
+@@ -4284,6 +5210,7 @@
+ 112e  Master Hill Electric Wire and Cable Co., Ltd
+ 112f  Cellon International, Inc.
+ 1130  Tenx Technology, Inc.
++	f211  USB audio headset
+ 1131  Integrated System Solution Corp.
+ 	1001  KY-BT100 Bluetooth Adapter
+ 1132  Toshiba Corp., Digital Media Equipment [hex]
+@@ -4298,13 +5225,18 @@
+ 113d  Mapower Electronics Co., Ltd
+ 1141  V One Multimedia, Pte., Ltd
+ 1142  CyberScan Technologies, Inc.
++1145  Japan Radio Company
++	0001  AirH PHONE AH-J3001V/J3002V
++1146  Shimane SANYO Electric Co., Ltd.
+ 1147  Ever Great Electric Wire and Cable Co., Ltd
+ 114b  Sphairon Access Systems GmbH
+ 	0110  Turbolink UB801R WLAN USB Adapter
+ 114c  Tinius Olsen Testing Machine Co., Inc.
+ 114d  Alpha Imaging Technology Corp.
++115b  Salix Technology Co., Ltd.
+ 1162  Secugen Corp.
+ 1163  DeLorme Publishing, Inc.
++	0100  Earthmate GPS
+ 1164  YUAN High-Tech Development Co., Ltd
+ 1165  Telson Electronics Co., Ltd
+ 1166  Bantam Interactive Technologies
+@@ -4322,29 +5254,42 @@
+ 	4008  56k FaxModem
+ 	504a  PJB-100 Personal Jukebox
+ 1184  Kyocera Elco Corp.
++1188  Bloomberg L.P.
++1189  Acer Communications & Multimedia
++	0893  EP-1427X-2 Ethernet Adapter
+ 118f  You Yang Technology Co., Ltd
+ 1190  Tripace
+ 1191  Loyalty Founder Enterprise Co., Ltd
+ 1196  Yankee Robotics, LLC
+-	0010 Trifid Camera without code
+-	0011 Trifid Camera
++	0010  Trifid Camera without code
++	0011  Trifid Camera
+ 1197  Technoimagia Co., Ltd
+ 1198  StarShine Technology Corp.
+ 1199  Sierra Wireless, Inc.
++	0019  AC595U
++	0021  AC597E
+ 	0112  CDMA 1xEVDO PC Card, AirCard 580
++	0120  AC595U
++	0218  MC5720 Wireless Modem
+ 119a  ZHAN QI Technology Co., Ltd
+ 119b  ruwido austria GmbH
+ 	0400  Infrared Keyboard V2.01
+ 11a0  Chipcon AS
+-	eb11 CC2400EB 2.0 ZigBee Sniffer
++	eb11  CC2400EB 2.0 ZigBee Sniffer
+ 11a3  Technovas Co., Ltd
+ 11aa  GlobalMedia Group, LLC
+ 11ab  Exito Electronics Co., Ltd
++11b0  ATECH FLASH TECHNOLOGY
+ 11db  Topfield Co., Ltd.
+ 	1000  PVR
+ 	1100  PVR
++11e6  K.I. Technology Co. Ltd.
+ 11f5  Siemens AG (?)
++	0001  SX1
+ 	0003  Mobile phone USB cable
++	0004  X75
++11f6  Prolific
++	2001  Willcom WSIM
+ 11f7  Alcatel (?)
+ 	02df  TD10 Mobile phone USB cable
+ 1209  InterBiometrics
+@@ -4356,21 +5301,32 @@
+ 120e  Hudson Soft Co., Ltd
+ 121e  Jungsoft Co., Ltd
+ 	3403  Muzio JM250 Audio Player
++1223  SKYCABLE ENTERPRISE. CO., LTD.
++1230  Chipidea-Microelectronica, S.A.
+ 1241  Belkin
+ 	1111  Mouse
+-	1166  optical mouse w/ scrollwheel
++	1122  Typhoon Stream Optical Mouse USB+PS/2
++	1166  MI-2150 Trust Mouse
+ 	1177  F8E842-DL Mouse
++	1503  Keyboard
+ 124a  AirVast
+ 	4017  PC-Chips 802.11b Adapter
+ 124b  Nyko (Honey Bee)
+ 	4d01  Airflo EX Joystick
++125f  A-DATA Technology Co., Ltd.
++1264  Covidien Energy-based Devices
+ 1267  Logic3 / SpectraVideo plc
++	0103  G-720 Keyboard
+ 	0201  A4Tech SWOP-3 Mouse
+ 	a001  JP260 PC Game Pad
++	c002  Wireless Optical Mouse
++126c  Aristocrat Technologies
++126d  Bel Stewart
+ 126e  Strobe Data, Inc.
+ 126f  TwinMOS
+ 	1325  Mobile Disk
+ 	2168  Mobile Disk III
++	a006  G240
+ 1275  Xaxero Marine Software Engineering, Ltd.
+ 	0002  WeatherFax 2000 Demodulator
+ 	0080  SkyEye Weather Satellite Receiver
+@@ -4381,11 +5337,29 @@
+ 1293  Belkin Components [hex]
+ 	0002  F5U002 Parallel Port [uss720]
+ 	2101  104-key keyboard
++1294  RISO KAGAKU CORP.
++129b  CyberTAN Technology
++	1666  TG54USB
++12a7  Trendchip Technologies Corp.
++12ab  Honey Bee Electronic International Ltd.
++12ba  Licensed by Sony Computer Entertainment America
++	0200  Harmonix Guitar for PlayStation(R)3
++	0210  Harmonix Drum Kit for PlayStation(R)3
++12d1  Huawei Technologies Co., Ltd.
++	1001  E620 USB Modem
++	1003  E220 HSDPA Modem
++12d2  LINE TECH INDUSTRIAL CO., LTD.
++12d7  BETTER WIRE FACTORY CO., LTD.
+ 12ef  Tapwave, Inc.
+ 	0100  Tapwave Handheld [Tapwave Zodiac]
++12f5  Dynamic System Electronics Corp.
++12f7  Memorex Products, Inc.
++	1a00  TD Classic 003B
++	1e23  TravelDrive 2007 Flash Drive
+ 12fd  AIN Comm. Technology Co., Ltd
+ 	1001  AWU2000b 802.11b Stick
+ 1307  Transcend Information, Inc.
++	0163  512MB USB Flash Drive
+ 	1169  TS2GJF210 JetFlash 210 2GB
+ 1310  Roper
+ 	0001  Class 1 Bluetooth Dongle
+@@ -4417,66 +5391,228 @@
+ 	0201  EasiDock 200 Keyboard and Mouse Port
+ 	0202  EasiDock 200 Serial Port
+ 	0203  EasiDock 200 Printer Port
++	0204  Ethernet
++	0304  EasiDock Ethernet
++1348  Katsuragawa Electric Co., Ltd.
+ 134e  Digby's Bitpile, Inc. DBA D Bit
++136b  STEC
+ 1370  Swissbit
+ 	6828  Victorinox Flash Drive
++1371  Dick Smith Electronics
++	9022  RT2573
++	9032  C-Net CWD-854 rev F
++1376  Vimtron Electronics Co., Ltd.
++1385  Netgear, Inc
++	4250  WG111T
++	4251  WG111T (no firmware)
++	5f00  WPN111 RangeMax(TM) Wireless USB 2.0 Adapter
++	5f01  WPN111 (no firmware)
++1390  TOMTOM B.V.
++1395  Sennheiser Communications
++	3556  USB Headset
+ 1398  Q-tec
+ 	2103  USB 2.0 Storage Device
+-13b0  Alesis
+-	000a  Photon X25 MIDI Controller
++13ad  Baltech
++	9999  Card reader
++13b0  PerkinElmer Optoelectronics
++	000a  Alesis Photon X25 MIDI Controller
+ 13b1  Linksys
+ 	000b  WUSB11 v4.0 802.11b Adapter
++	000d  WUSB54G Wireless Adapter
+ 	0011  WUSB54GP v4.0 802.11g Adapter
+ 	0018  USB200M 10/100 Ethernet Adapter
++	001a  HU200TS Wireless Adapter
++	0020  WUSB54GC 802.11g Adapter [ralink rt73]
++	0023  WUSB54GR
++	0024  WUSBF54G v1.1 802.11g Adapter w/ Wi-Fi Finder
++13b3  Nippon Dics Co., Ltd.
++13be  Ricoh Printing Systems, Ltd.
++13ca  JyeTai Precision Industrial Co., Ltd.
++13cf  Wisair Ltd.
++13d1  A-Max Technology Macao Commercial Offshore Co. Ltd.
+ 13d2  Shark Multimedia
+ 	0400  Pocket Ethernet [klsi]
+ 13d3  IMC Networks
+ 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
+ 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
++13dc  ALEREON, INC.
++13dd  i.Tech Dynamic Limited
++13e1  Kaibo Wire & Cable (Shenzhen) Co., Ltd.
++13e6  TechnoScope Co., Ltd.
++13fd  Initio Corporation
+ 13fe  Kingston Technology Company Inc.
+-	1d00  DataTraveler 2.0 1GB Flash Drive
++	1a00  512MB/1GB Flash Drive
++	1a23  512MB Flash Drive
++	1d00  DataTraveler 2.0 1GB/4GB Flash Drive
++1400  Axxion Group Corp.
++1402  Bowe Bell & Howell
++1403  Sitronix
++	0001  Digital Photo Frame
++140e  Telechips, Inc.
++1410  Novatel Wireless
++	1110  Merlin S620
++	1120  Merlin EX720
++	1130  Merlin S720
++	1400  Merlin U740
++	2110  Ovation U720
++	4100  U727
++1415  Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc.
++	0000  Sony SingStar USBMIC
++	2000  Sony Playstation Eye
++1419  ABILITY ENTERPRISE CO., LTD.
++1429  Vega Technologies Industrial (Austria) Co.
++1430  RedOctane
++1431  Pertech Resources, Inc.
++1435  Wistron NeWeb
++	0711  UR055G
++	0826  AR5523
++	0827  AR5523 (no firmware)
++	0828  AR5523
++	0829  AR5523 (no firmware)
++1436  Denali Software, Inc.
++143c  Altek Corporation
+ 1453  Radio Shack
+ 	4026  26-183 Serial Cable
++1456  Extending Wire & Cable Co., Ltd.
++1457  First International Computer, Inc.
++	5117  OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode
++	5118  OpenMoko Neo1973 Debug board (V2+)
++	5119  OpenMoko Neo1973 u-boot cdc_acm serial port
++	5120  OpenMoko Neo1973 u-boot usbtty generic serial
++	5121  OpenMoko Neo1973 kernel mass storage (g_storage) mode
++	5122  OpenMoko Neo1973 kernel cdc_ether USB network
++	5123  OpenMoko Neo1973 internal USB CSR4 module
++	5124  OpenMoko Neo1973 Bluetooth Device ID service
++1461  Staccato Communications
+ 1462  Micro Star International
+ 	5512  MegaStick-1 Flash Stick
++1472  Huawei-3Com
++	0009  Aolynk WUB320g
+ 147a  Formosa Industrial Computing, Inc.
++147f  Hama GmbH & Co., KG
+ 1484  Elsa AG [hex]
+ 	1746  Ecomo 19H99 Monitor
+ 	7616  Elsa Hub
++1485  Silicom
++	0001  U2E
++	0002  Psion Gold Port Ethernet
++1487  DSP Group, Ltd.
++148e  EVATRONIX SA
+ 148f  Ralink Technology, Corp.
++	1706  RT2500USB Wireless Adapter
+ 	2570  802.11g WiFi
++	2573  RT2501USB Wireless Adapter
++	2671  RT2601USB Wireless Adapter
++	9020  RT2500USB Wireless Adapter
++	9021  RT2501USB Wireless Adapter
++1497  Panstrong Company Ltd.
++149a  Imagination Technologies
++	2107  DBX1 DSP core
+ 14aa  AVerMedia (again) or C&E
+ 	0001  Avermedia AverTV DVBT USB1.1 (cold)
+ 	0002  Avermedia AverTV DVBT USB1.1 (warm)
+ 	0201  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold)
+ 	0221  AVermedia DVBT Tuner Dongle
+ 	0301  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm)
++14ad  CTK Corporation
++14ae  Printronix Inc.
++14af  ATP Electronics Inc.
++14b0  StarTech.com Ltd.
+ 14b2  Atheros Communications Inc
+ 	3a93  USB WLAN Device
++	3c02  C54RU WLAN
++	3c22  C54RU
++14c0  Rockwell Automation, Inc.
+ 14c2  Gemlight Computer, Ltd
++14cd  Super Top
++	6600  USB 2.0 IDE DEVICE
++14d8  JAMER INDUSTRIES CO., LTD.
++14dd  Raritan Computer, Inc.
++14e5  SAIN Information & Communications Co., Ltd.
++14ea  Planex Communications
++	ab10  GW-US54GZ
++	ab11  GU-1000T
++	ab13  GW-US54Mini
++14ed  Shure Inc.
++1500  Ellisys
++1501  Pine-Tum Enterprise Co., Ltd.
++1513  Hypercom
++1516  CompUSA
++	8628  128M Pen Drive
+ 1518  Cheshire Engineering Corp.
+ 	0001  HDReye High Dynamic Range Camera
+ 	0002  HDReye (before firmware loads)
+ 1520  Bitwire Corp.
+-152d  ???
+-	2338  USB to (S)ATA/ATAPI Bridge
++1524  ENE Technology Inc
++	6680  UTS 6680
++1527  Silicon Portals
++	0200  YAP Phone (no firmware)
++	0201  YAP Phone
++1529  UBIQUAM Co., Ltd.
++	3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
++152d  JMicron Technology Corp. / JMicron USA Technology Corp.
++	2338  JM20337 Hi-Speed USB to SATA & PATA Combo Bridge
+ 152e  LG (HLDS)
+ 	e001  GSA-5120D DVD-RW
++1532  Razer USA, Ltd
++	0003  Krait Mouse
++	0007  DeathAdder Mouse
+ 1546  U-Blox AG
++154b  PNY
++	0010  USB 2.0 Flash Drive
++154d  ConnectCounty Holdings Berhad
++154e  D&M Holdings, Inc. (Denon/Marantz)
++	3000  Marantz RC9001 Remote Control
+ 1554  Prolink Microsystems Corp.
++1557  OQO
++	0002  model 01 WiFi interface
++	0003  model 01 Bluetooth interface
++	7720  model 01+ Ethernet
++	8150  model 01 Ethernet interface
+ 1568  Sunf Pu Technology Co., Ltd
++156f  Quantum Corporation
++1570  ALLTOP TECHNOLOGY CO., LTD.
++157b  Ketron SRL
++157e  TRENDnet
++	3006  TEW-444UB EU
++	3007  TEW-444UB EU (no firmware)
++	300a  TEW-429UB 802.11g Adapter with HotSpot Detector
++	300b  TEW-429UB
++	300d  TEW-429UB C1
++	3204  ALL0298 v2
++	3205  AR5523
++	3206  AR5523 (no firmware)
++1582  Fiberline
++	6003  WL-430U
++1587  SMA Technologie AG
++158d  Oakley Inc.
++1598  Kunshan Guoji Electronics Co., Ltd.
++15a2  Freescale Semiconductor, Inc.
++15a8  Teams Power Limited
++15aa  Gearway Electronics (Dong Guan) Co., Ltd.
++15ba  Olimex Ltd.
++	0003  OpenOCD JTAG
++	0004  OpenOCD JTAG TINY
+ 15c2  SoundGraph Inc.
+ 	ffdc  iMON PAD Remote Controller
+ 15c6  Laboratoires MXM
+-	1000 DigistimSP (cold)
+-	1001 DigistimSP (warm)
+-	1002 DigimapSP USB (cold)
+-	1003 DigimapSP USB (warm)
++	1000  DigistimSP (cold)
++	1001  DigistimSP (warm)
++	1002  DigimapSP USB (cold)
++	1003  DigimapSP USB (warm)
++15c9  D-Box Technologies
++15ca  Textech International Ltd.
++	00c3  Mini Optical Mouse
++15d5  Coulomb Electronics Ltd.
++15dc  Hynix Semiconductor Inc.
++15e0  Seong Ji Industrial Co., Ltd.
+ 15e1  RSA
+ 	2007  RSA SecurID (R) Authenticator
+ 15e8  SohoWare
+ 	9100  NUB100 Ethernet [pegasus]
++	9110  10/100 USB Ethernet
+ 15e9  Pacific Digital Corp.
++15ec  Belcarra Technologies Corp.
+ 15f4  HanfTek
+ 	0001  HanfTek UMT-010 USB2.0 DVB-T (cold)
+ 	0025  HanfTek UMT-010 USB2.0 DVB-T (warm)
+@@ -4488,6 +5624,7 @@
+ 	8006  US-122 Audio/Midi Interface (without fw)
+ 	8007  US-122 Audio/Midi Interface
+ 1606  Umax [hex]
++	0002  Astra 1236U Scanner
+ 	0010  Astra 1220U
+ 	0030  Astra 2000U
+ 	0060  Astra 3400U
+@@ -4498,6 +5635,14 @@
+ 1608  Inside Out Networks [hex]
+ 	0001  EdgePort/4 Serial Port
+ 	1403  MultiTech Systems MT4X56 Modem
++1619  L & K Precision Technology Co., Ltd.
++1621  Wionics Research
++1628  Stonestreet One, Inc.
++162a  Airgo Networks Inc.
++162f  WiQuest Communications, Inc.
++1631  Good Way Technology
++	6200  GWUSB2E
++	c019  RT2573
+ 1645  Entrega [hex]
+ 	0001  1S Serial Port
+ 	0002  2S Serial Port
+@@ -4506,100 +5651,514 @@
+ 	0005  E45 Ethernet [klsi]
+ 	0006  Parallel Port
+ 	0007  U1-SC25 SCSI
++	0008  Ethernet
+ 	0093  1S9 Serial Port
+ 	8000  EZ-USB
+ 	8002  2x Serial Port
++	8004  2U4S serial/usb hub
++	8005  Ethernet
+ 	8093  PortGear Serial Port
++164a  ChipX
+ 1657  Struck Innovative Systeme GmbH
+ 	3150  SIS3150 USB2.0 to VME interface
++1660  Creatix Polymedia GmbH
+ 1668  Actiontec Electronics, Inc. [hex]
+ 	0333  Modem
+ 	0408  Prism2.5 802.11b Adapter
+ 	0421  Prism2.5 802.11b Adapter
++	0441  IBM Integrated Bluetooth II
+ 	0500  BTM200B BlueTooth Adapter
++	2441  BMDC-2 IBM Bluetooth III w.56k
++	6106  ROPEX FreeLan 802.11b
++	7605  UAT1 Wireless Ethernet Adapter
++1669  PiKRON Ltd. [hex]
++	1001  uLan2USB Converter - PS1 protocol
++1679  Total Phase
++	2001  Beagle USB 12 Protocol Analyzer
++1682  Maxwise Production Enterprise Ltd.
++1684  Godspeed Computer Corp.
++1686  ZOOM Corporation
++	0045  H4 Digital Recorder
++1687  Kingmax Digital Inc.
++168c  Atheros Communications
++	0001  AR5523
++	0002  AR5523 (no firmware)
+ 1690  Askey Computer Corp. [hex]
+ 	0101  Creative Modem Blaster DE5670
+ 	0103  Askey 1456 VQE-R3 Modem [conexant]
+ 	0109  Askey MagicXpress V.90 Pocket Modem [conexant]
++	0701  WLAN
++	0710  SMCWUSBT-G
++	0711  SMCWUSBT-G (no firmware)
++	0712  AR5523
++	0713  AR5523 (no firmware)
++	0722  RT2573
+ 1696  Hitachi Video and Information System, Inc.
+ 1697  VTec Test, Inc.
++16a5  Shenzhen Zhengerya Cable Co., Ltd.
++16ab  Global Sun Technology
++	7801  AR5523
++	7802  AR5523 (no firmware)
++	7811  AR5523
++	7812  AR5523 (no firmware)
++16ac  Dongguan ChingLung Wire & Cable Co., Ltd.
++16c0  VOTI
++	03e8  free for internal lab use 1000
++	03e9  free for internal lab use 1001
++	03ea  free for internal lab use 1002
++	03eb  free for internal lab use 1003
++	03ec  free for internal lab use 1004
++	03ed  free for internal lab use 1005
++	03ee  free for internal lab use 1006
++	03ef  free for internal lab use 1007
++	03f0  free for internal lab use 1008
++	03f1  free for internal lab use 1009
++	076b  OpenPCD 13.56MHz RFID Reader
++	076c  OpenPICC 13.56MHz RFID Simulator (native)
++	08ac  OpenBeacon USB stick
++16cc  silex technology, Inc.
++16d3  Frontline Test Equipment, Inc.
++16d5  AnyDATA Corporation
++	6501  CDMA 2000 1xRTT/EV-DO USB Modem
++16d8  CMOTECH Co., Ltd.
++	5141  CMOTECH CDMA Technologies USB modem
++	5543  CDMA 2000 1xRTT/1xEVDO USB modem
++	6280  CMOTECH CDMA Technologies USB modem
++16df  King Billion Electronics Co., Ltd.
++16f5  Futurelogic Inc.
+ 1706  BlueView Technologies, Inc.
++1707  ARTIMI
++170d  Avnera
+ 1733  Cellink Technology Co., Ltd
+ 	0101  RF Wireless Optical Mouse OP-701
+-1781  MetaGeek
+-	083e  Wi-Spy
++1736  CANON IMAGING SYSTEM TECHNOLOGIES INC.
++1737  Linksys
++	0039  USB1000
++1740  Senao
++	2000  NUB-8301
++1743  General Atomics
++174c  ASMedia Technology Inc.
++1759  LucidPort Technology, Inc.
++1772  System Level Solutions, Inc.
++1781  Multiple Vendors
++	083e  MetaGeek Wi-Spy
++	0938  Iguanaworks USB IR Transceiver
++1782  Spreadtrum Communications Inc.
++1784  TopSeed Technology Corp.
++1788  ShenZhen Litkconn Technology Co., Ltd.
++1796  Printrex, Inc.
++1797  JALCO CO., LTD.
++17a5  Advanced Connection Technology Inc.
++17a7  MICOMSOFT CO., LTD.
+ 17b3  Grey Innovation
+ 	0004  Linux-USB Midi Gadget
++17c3  Singim International Corp.
++17cf  Hip Hing Cable & Plug Mfy. Ltd.
++17d0  Sanford L.P.
++17d3  Korea Techtron Co., Ltd.
++17e9  Newnham Research
++	0051  USB VGA Adaptor
+ 17eb  Cornice, Inc.
++17ef  Lenovo
++	3815  ChipsBnk 2GB USB Stick
++17f5  K.K. Rocky
++17f6  Unicomp, Inc
+ 1822  Twinhan
+ 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
+ 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
++1831  Gwo Jinn Industries Co., Ltd.
++1832  Huizhou Shenghua Industrial Co., Ltd.
++1854  Memory Devices Ltd.
+ 185b  Compro
+ 	d000  Compro Videomate DVB-U2000 - DVB-T USB cold
+ 	d001  Compro Videomate DVB-U2000 - DVB-T USB warm
++1861  Tech Technology Industrial Company
++1862  Teridian Semiconductor Corp.
++1871  Aveo Technology Corp.
+ 1894  Topseed
+ 	5632  Atek Tote Remote
+ 	5641  TSAM-004 Presentation Remote
++1897  Evertop Wire Cable Co.
++18b6  Mikkon Technology Limited
++18b7  Zotek Electronic Co., Ltd.
++18c5  AMIT
++	0002  CG-WLUSB2GO
++18d5  Starline International Group Limited
+ 18d9  Kaba
+ 	01xy  LEGIC advant desktop reader
++18e3  Fitipower Integrated Technology Inc
++18e8  Qcom
++	6196  RT2573
++	6229  RT2573
++18ea  Matrox Graphics, Inc.
++	0002  DualHead2Go [Analog Edition]
++	0004  TripleHead2Go [Digital Edition]
++18fd  FineArch Inc.
++190d  Motorola GSG
++1914  Alco Digital Devices Limited
++1915  Linksys
++	2233  WUSB11 v2.8 802.11b Adapter
++	2234  WUSB54G 802.11g Adapter
++192f  Avago Technologies, Pte.
++1930  Shenzhen Xianhe Technology Co., Ltd.
++1931  Ningbo Broad Telecommunication Co., Ltd.
++1949  Lab126
++1951  Hyperstone AG
++1953  Ironkey Inc.
++1954  Radiient Technologies
++195d  Itron Technology iONE
++	7006  Libra-Q26 / 1.0 Remote
++1967  CASIO HITACHI Mobile Communications Co., Ltd.
++196b  Wispro Technology Inc.
++1970  Dane-Elec Corp. USA
++1975  Dongguan Guneetal Wire & Cable Co., Ltd.
++1976  Chipsbrand Microelectronics (HK) Co., Ltd.
+ 1977  T-Logic
+ 	0111  TL203 MP3 Player and Voice Recorder
++1989  Nuconn Technology Corp.
++198f  Beceem Communications Inc.
++1990  Acron Precision Industrial Co., Ltd.
+ 1995  Trillium Technology Pty. Ltd.
+ 	3202  REC-ADPT-USB (recorder)
+ 	3203  REC-A-ADPT-USB (recorder)
++199e  The Imaging Source Europe GmbH
++199f  Benica Corporation
++19a8  Biforst Technology Inc.
++19af  S Life
++	6611  Celestia VoIP Phone
++19b5  B & W Group
++19b6  Infotech Logistic, LLC
++19ca  Mindtribe
++	0001  Sandio 3D HID Mouse
++19cf  Parrot SA
++19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
++19e8  Industrial Technology Research Institute
++19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
++19ff  Best Buy
++	0201  Rocketfish Wireless 2.4G Laser Mouse
++1a08  Bellwood International, Inc.
++1a0a  USB-IF non-workshop
++	badd  USB OTG Compliance test device
++1a12  KES Co., Ltd.
++1a25  Amphenol East Asia Ltd.
++1a2a  Seagate Branded Solutions
++1a36  Biwin Technology Ltd.
++1a40  TERMINUS TECHNOLOGY INC.
++1a41  Action Electronics Co., Ltd.
++1a4a  Silicon Image
++1a4b  SafeBoot International B.V.
++1a61  Abbott Diabetes Care
++1a6a  Spansion Inc.
++1a6d  SamYoung Electronics Co., Ltd
++1a6e  Global Unichip Corp.
++1a6f  Sagem Orga GmbH
++1a79  Bayer Health Care LLC
++1a7b  Lumberg Connect  GmbH & Co. KG
++1a89  Dynalith Systems Co., Ltd.
++1a8b  SGS Taiwan Ltd.
++1a98  Leica Camera AG
++1aa4  Data Drive Thru, Inc.
++1aa5  UBeacon Technologies, Inc.
++1aa6  eFortune Technology Corp.
++1acb  Salcomp Plc
++1ad1  Desay Wire Co., Ltd.
++1ae4  ic-design Reinhard Gottinger GmbH
++1aed  High Top Precision Electronic Co., Ltd.
++1aef  Conntech Electronic (Suzhou) Corporation
++1b04  Meilhaus Electronic GmBH
++	1000  ME-1000
++	100A  ME-1000
++	100B  ME-1000
++	1400  ME-1400
++	140e  ME-1400E
++	140a  ME-1400A
++	14ea  ME-1400EA
++	140b  ME-1400B
++	14eb  ME-1400EB
++	140c  ME-1400C
++	140d  ME-1400D
++	1604  ME-1600/4U
++	1608  ME-1600/8U
++	160c  ME-1600/12U
++	160f  ME-1600/16U
++	168f  ME-1600/16U8I
++	4610  ME-4610
++	4650  ME-4650
++	4660  ME-4660
++	4661  ME-4660I
++	4662  ME-4660
++	4663  ME-4660I
++	4670  ME-4670
++	4671  ME-4670I
++	4672  ME-4670S
++	4673  ME-4670IS
++	4680  ME-4680
++	4681  ME-4680I
++	4682  ME-4680S
++	4683  ME-4680IS
++	6004  ME-6000/4
++	6008  ME-6000/8
++	600f  ME-6000/16
++	6014  ME-6000I/4
++	6018  ME-6000I/8
++	601f  ME-6000I/16
++	6034  ME-6000ISLE/4
++	6038  ME-6000ISLE/8
++	603f  ME-6000ISLE/16
++	6104  ME-6100/4
++	6108  ME-6100/8
++	610f  ME-6100/16
++	6114  ME-6100I/4
++	6118  ME-6100I/8
++	611f  ME-6100I/16
++	6134  ME-6100ISLE/4
++	6138  ME-6100ISLE/8
++	613f  ME-6100ISLE/16
++	6044  ME-6000/4/DIO
++	6048  ME-6000/8/DIO
++	604f  ME-6000/16/DIO
++	6054  ME-6000I/4/DIO
++	6058  ME-6000I/8/DIO
++	605f  ME-6000I/16/DIO
++	6074  ME-6000ISLE/4/DIO
++	6078  ME-6000ISLE/8/DIO
++	607f  ME-6000ISLE/16/DIO
++	6144  ME-6100/4/DIO
++	6148  ME-6100/8/DIO
++	614f  ME-6100/16/DIO
++	6154  ME-6100I/4/DIO
++	6158  ME-6100I/8/DIO
++	615f  ME-6100I/16/DIO
++	6174  ME-6100ISLE/4/DIO
++	6178  ME-6100ISLE/8/DIO
++	617f  ME-6100ISLE/16/DIO
++	6259  ME-6200I/9/DIO
++	6359  ME-6300I/9/DIO
++	0630  ME-630
++	810a  ME-8100A
++	810b  ME-8100B
++	820a  ME-8200A
++	820b  ME-8200B
++	0940  ME-94
++	0950  ME-95
++	0960  ME-96
++1b20  MStar Semiconductor, Inc.
++1b22  WiLinx Corp.
++1b26  Cellex Power Products, Inc.
++1b27  Current Electronics Inc.
++1b28  NAVIsis Inc.
++1b32  Ugobe Life Forms, Inc.
++1b36  ViXS Systems, Inc.
++1b3f  Generalplus Technology Inc.
++1b47  Energizer Holdings, Inc.
++	0001  CHUSB Duo Charger (NiMH AA/AAA USB smart charger)
++1b48  Plastron Precision Co., Ltd.
++1b59  K.S. Terminals Inc.
++1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
++1b65  The Hong Kong Standards and Testing Centre Ltd.
++1b72  ATERGI TECHNOLOGY CO., LTD.
++1b76  Legend Silicon Corp.
++1b86  Dongguan Guanshang Electronics Co., Ltd.
++1b88  ShenMing Electron (Dong Guan) Co., Ltd.
++1b8c  Altium Limited
++1b8d  e-MOVE Technology Co., Ltd.
++1b8e  Amlogic, Inc.
++1b8f  MA LABS, Inc.
++1b98  YMax Communications Corp.
++1b99  Shenzhen Yuanchuan Electronic
++1ba1  JINQ CHERN ENTERPRISE CO., LTD.
++1ba2  Lite Metals & Plastic (Shenzhen) Co., Ltd.
++1ba4  Ember Corporation
++	0001  InSight USB Link
++1ba8  China Telecommunication Technology Labs
++1bad  Harmonix Music
++	0002  Harmonix Guitar for Xbox 360
++	0003  Harmonix Drum Kit for Xbox 360
++1bbb  T & A Mobile Phones
++1bc4  Ford Motor Co.
++1bc5  AVIXE Technology (China) Ltd.
++1bce  Contac Cable Industrial Limited
++1bcf  Sunplus Innovation Technology Inc.
++1bd0  Hangzhou Riyue Electronic Co., Ltd.
++1bde  P-TWO INDUSTRIES, INC.
++1bef  Shenzhen Tongyuan Network-Communication Cables Co., Ltd
++1bf0  RealVision Inc.
++1bf5  Extranet Systems Inc.
++1bf6  Orient Semiconductor Electronics, Ltd.
++1c02  Kreton Corporation
++1c04  QNAP System Inc.
++1c0d  Relm Wireless
++1c10  Lanterra Industrial Co., Ltd.
++1c13  ALECTRONIC LIMITED
++1c1a  Datel Electronics Ltd.
++1c1b  Volkswagen of America, Inc.
++1c1f  Goldvish S.A.
++1c20  Fuji Electric Device Technology Co., Ltd.
++1c21  ADDMM LLC
++1c22  ZHONGSHAN CHIANG YU ELECTRIC CO., LTD.
++1c26  Shanghai Haiying Electronics Co., Ltd.
++1c27  HuiYang D & S Cable Co., Ltd.
++1c31  LS Cable Ltd.
++1c37  Authorizer Technologies, Inc.
++1c3d  NONIN MEDICAL INC.
++1c3e  Wep Peripherals
++1c49  Cherng Weei Technology Corp.
++1c6b  Philips & Lite-ON Digital Solutions Corporation
++1c6c  Skydigital Inc.
++1c77  Kaetat Industrial Co., Ltd.
++1c78  Datascope Corp.
++1c79  Unigen Corporation
++1c7a  LighTuning Technology Inc.
++1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
+ 1c87  2N TELEKOMUNIKACE a.s.
++1c88  Somagic, Inc.
++1c89  HONGKONG WEIDIDA ELECTRON LIMITED
++1c8e  ASTRON INTERNATIONAL CORP.
++1c98  ALPINE ELECTRONICS, INC.
++1ca0  ACCARIO Inc.
++1cb3  Aces Electronic Co., Ltd.
++1cb4  OPEX CORPORATION
++1cbe  Luminary Micro Inc.
++1cbf  FORTAT SKYMARK INDUSTRIAL COMPANY
++1cc0  PlantSense
++1cca  NextWave Broadband Inc.
++1ccd  Bodatong Technology (Shenzhen) Co., Ltd.
++1cd4  adp corporation
++1cd5  Firecomms Ltd.
++1cd6  Antonio Precise Products Manufactory Ltd.
++1cde  Telecommunications Technology Association (TTA)
++1cdf  WonTen Technology Co., Ltd.
++1ce0  EDIMAX TECHNOLOGY CO., LTD.
++1ce1  Amphenol KAE
++1cfc  ANDES TECHNOLOGY CORPORATION
++1cfd  Flextronics Digital Design Japan, LTD.
++1d08  NINGBO HENTEK DRAGON ELECTRONICS CO., LTD.
++1d09  TechFaith Wireless Technology Limited
++1d0a  Johnson Controls, Inc. The Automotive Business Unit
++1d0b  HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD.
++1d14  ALPHA-SAT TECHNOLOGY LIMITED
++1d1f  Diostech Co., Ltd.
++1d20  SAMTACK INC.
++1d50  OpenMoko, Inc.
++1d6b  Linux Foundation
++	0001  1.1 root hub
++	0002  2.0 root hub
++	0003  3.0 root hub
+ 1ebb  NuCORE Technology, Inc.
+ 2001  D-Link Corp. [hex]
++	1a00  10/100 Ethernet
++	200c  10/100 Ethernet
+ 	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
+ 	3700  DWL-122 802.11b
+ 	3701  DWL-G120 Spinnaker 802.11b
++	3702  DWL-120 rev F
+ 	3703  DWL-122 802.11b
+ 	3704  DWL-G122 802.11g rev. A2
++	3a00  DWL-AG132
++	3a01  DWL-AG132 (no firmware)
++	3a02  DWL-G132
++	3a03  DWL-G132 (no firmware)
++	3a04  DWL-AG122
++	3a05  DWL-AG122 (no firmware)
+ 	3c00  DWL-G122 802.11g rev. B1 [ralink]
++	3c05  DUB-E100 Fast Ethernet [asix]
+ 	4000  DSB-650C Ethernet [klsi]
+ 	4001  DSB-650TX Ethernet [pegasus]
+ 	4002  DSB-650TX Ethernet [pegasus]
+ 	4003  DSB-650TX-PNA Ethernet [pegasus]
++	400b  10/100 Ethernet
++	4102  10/100 Ethernet
+ 	abc1  DSB-650 Ethernet [pegasus]
+ 	f013  DLink 7 port USB2.0 Hub
+ 	f10d  Accent Communications Modem
+ 	f111  DBT-122 Bluetooth adapter
++2019  PLANEX
++	3220  GW-US11S WLAN
++	5303  GW-US54GXS
++	ab01  GW-US54HP
++	ab50  GW-US54Mini2
++	c002  GW-US54SG
++	c007  GW-US54GZL
++	ed02  GW-USMM
+ 2040  Hauppauge
+-	7050  Hauppauge Nova-T Stick
+-	9300  Hauppauge WinTV NOVA-T USB2 (cold)
+-	9301  Hauppauge WinTV NOVA-T USB2 (warm)
++	6503  WinTV HVR-930
++	7050  Nova-T Stick
++	9300  WinTV NOVA-T USB2 (cold)
++	9301  WinTV NOVA-T USB2 (warm)
+ 2101  ActionStar
+ 	0201  SIIG 4-to-2 Printer Switch
+ 2162  Creative (?)
+ 	500c  DE5771 Modem Blaster
+ 2222  MacAlly
+ 	0004  iWebKey Keyboard
++	4050  AirStick joystick
+ 2233  RadioShack Corporation
+ 	6323  USB Electronic Scale
+ 22b8  Motorola PCS
++	0001  Wally 2.2 chipset
++	0002  Wally 2.4 chipset
+ 	0005  V.60c/V.60i GSM Phone
++	1001  Patriot 1.0 (GSM) chipset
++	1002  Patriot 2.0 chipset
+ 	1005  T280e GSM/GPRS Phone
++	1101  Patriot 1.0 (TDMA) chipset
++	1801  Rainbow chipset flash
+ 	2821  T720 GSM Phone
+ 	2822  V.120e GSM Phone
++	2a01  MSM6050 chipset
++	2a03  MSM6050 chipset flash
+ 	2a21  V710 GSM Phone (P2K)
+ 	2a22  V710 GSM Phone (AT)
++	2a23  MSM6100 chipset flash
++	2a41  MSM6300 chipset
++	2a43  MSM6300 chipset flash
+ 	2a61  E815 GSM Phone (P2K)
+ 	2a62  E815 GSM Phone (AT)
++	2a63  MSM6500 chipset flash
++	2a81  MSM6025 chipset
++	2a83  MSM6025 chipset flash
++	2ac1  MSM6100 chipset
++	2ac3  MSM6100 chipset flash
+ 	3001  A835/E1000 GSM Phone (P2K)
+ 	3002  A835/E1000 GSM Phone (AT)
+ 	3801  C350L/C450 (P2K)
+ 	3802  C330/C350L/C450/EZX GSM Phone (AT)
++	3803  Neptune LT chipset flash
++	4001  OMAP 1.0 chipset
+ 	4002  A920/A925 UMTS Phone
++	4003  OMAP 1.0 chipset flash
++	4008  OMAP 1.0 chipset RDL
++	4801  Neptune LTS chipset
++	4803  Neptune LTS chipset flash
+ 	4810  Triplet GSM Phone (storage)
+ 	4901  Triplet GSM Phone (P2K)
+ 	4902  Triplet GSM Phone (AT)
++	4903  Neptune LTE chipset flash
++	4a01  Neptune LTX chipset
++	4a03  Neptune LTX chipset flash
+ 	4a32  L6-imode Phone
++	5801  Neptune ULS chipset
++	5803  Neptune ULS chipset flash
++	5901  Neptune VLT chipset
++	5903  Neptune VLT chipset flash
++	6001  Dalhart EZX
++	6003  Dalhart flash
+ 	6004  EZX GSM Phone (CDC Net)
++	6008  Dalhart RDL
+ 	6009  EZX GSM Phone (P2K)
++	600a  Dalhart EZX config 17
++	600b  Dalhart EZX config 18
+ 	600c  EZX GSM Phone (USBLAN)
++	6021  JUIX chipset
++	6023  JUIX chipset flash
++	6026  Flash RAM Downloader/miniOS
++	6027  USBLAN
+ 	604c  EZX GSM Phone (Storage)
+-	6631  CDC Modem
++	6101  Talon integrated chipset
++	6401  Argon chipset
++	6403  Argon chipset flash
+ 	6604  Washington CDMA Phone
++	6631  CDC Modem
+ 22b9  eTurboTouch Technology, Inc.
+ 22ba  Technology Innovation Holdings, Ltd
+ 2304  Pinnacle Systems, Inc. [hex]
+@@ -4611,6 +6170,7 @@
+ 	0210  Pinnacle Studio PCTV USB (PAL) with FM radio
+ 	0212  Pinnacle Studio PCTV USB (NTSC)
+ 	0214  Pinnacle Studio PCTV USB (PAL) with FM radio
++	0227  Pinnacle TV for Mac, HD Stick
+ 	0300  Pinnacle Studio Linx Video input cable (NTSC)
+ 	0301  Pinnacle Studio Linx Video input cable (PAL)
+ 	0419  Pinnacle PCTV Bungee USB (PAL) with FM radio
+@@ -4625,18 +6185,30 @@
+ 2632  TwinMOS
+ 	3209  7-in-1 Card Reader
+ 2650  Electronics For Imaging, Inc. [hex]
++2730  Citizen
++	200f  CT-S310 Label printer
++2735  DigitalWay
++	0003  MPIO 1.5GB Hard Disc Drive
+ 2770  NHJ, Ltd
+ 	905c  Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35
+ 	9120  Che-ez! Snap / iClick Tiny VGA Digital Camera
+ 	913c  Argus DC-1730
+ 	9153  iClick 5X
+ 2899  Toptronic Industrial Co., Ltd
++2c02  Planex Communications
++	14ea  GW-US11H WLAN
+ 2fb2  Fujitsu, Ltd
+ 3125  Eagletron
+ 	0001  TrackerPod Camera Stand
+ 3176  Whanam Electronics Co., Ltd
++3275  VidzMedia Pte Ltd
++	4fb1  MonsterTV P2H
++3334  AEI
++	1701  Fast Ethernet
+ 3340  Yakumo
++	043a  Mio A701 DigiWalker PPCPhone
+ 	0e3a  Pocket PC 300 GPS SL / Typhoon MyGuide 3500
++	a0a3  deltaX 5 BT (D) PDA
+ 3504  Micro Star
+ 	f110  Security Key
+ 3538  Power Quotient International Co., Ltd
+@@ -4649,46 +6221,71 @@
+ 	0001  5-in-1 Card Reader
+ 3923  National Instruments Corp.
+ 	703c  USB-485 RS485 Cable
++	7254  NI MIO (data acquisition card) firmware updater
++	729e  USB-6251 (OEM) data acquisition card
++40bb  I-O Data
++	0a09  USB2.0-SCSI Bridge USB2-SC
++4101  i-rocks
++	1301  IR-2510 usb phone
+ 4102  iRiver, Ltd.
+ 	1001  iFP-100 series mp3 player
+ 	1003  iFP-300 series mp3 player
+ 	1005  iFP-500 series mp3 player
+ 	1007  iFP-700 series mp3/ogg vorbis player
+ 	1008  iFP-800 series mp3/ogg vorbis player
+-	100A  iFP-1000 series mp3/ogg vorbis player
++	100a  iFP-1000 series mp3/ogg vorbis player
++	1014  T20 series mp3/ogg vorbis player (ums firmware)
+ 	1101  iFP-100 series mp3 player (ums firmware)
+ 	1103  iFP-300 series mp3 player (ums firmware)
+ 	1105  iFP-500 series mp3 player (ums firmware)
+ 	1113  T10 (alternate)
+ 	1117  T10
+ 	1119  T30 series mp3/ogg/wma player
++	2002  H10 6GB
++	2101  H10 20GB (mtp)
++	2102  H10 5GB (mtp)
++	2105  H10 5/6GB (mtp)
+ 413c  Dell Computer Corp.
++	0058  Port Replicator
+ 	1002  Keyboard Hub
+ 	2002  SK-8125 Keyboard
++	2003  Keyboard
+ 	2005  RT7D50 Keyboard
+ 	2100  SK-3106 Keyboard
+ 	2101  SmartCard Reader Keyboard
+ 	2500  DRAC4 Remote Access Card
+ 	3010  Optical Wheel Mouse
++	3200  Mouse
+ 	4001  Axim X5
+ 	4002  Axim X3
+ 	4003  Axim X30
++	8000  BC02 Bluetooth USB Adapter
+ 	8100  TrueMobile 1180 802.11b Adapter
+ 	8103  Wireless 350 Bluetooth
++	8126  Wireless 355 Bluetooth
++	8140  Wireless 360 Bluetooth
+ 	a001  Hub
++	a005  Internal 2.0 Hub
+ 	a700  Hub (in 1905FP LCD Monitor)
+-4242  USB Design by Example
+-	4201  Buttons and Lights HID device
+-	4220  Echo 1 Camera
+ 4146  USBest Technology
+ 	9281  Iomega Micro Mini 128MB Flash Drive
+ 	ba01  Intuix Flash Drive
++4242  USB Design by Example
++	4201  Buttons and Lights HID device
++	4220  Echo 1 Camera
++4348  WinChipHead
++	5523  USB->RS 232 adapter with Prolifec PL 2303 chipset
++	5584  CH34x printer adapter cable
+ 4572  Shuttle, Inc.
+ 	4572  Shuttle PN31 Remote
+ 4586  Panram
+ 	1026  Crystal Bar Flash Drive
+ 4670  EMS Production
+ 	9394  Game Cube USB Memory Adaptor 64M
++4766  Aceeca
++	0001  MEZ1000 RDA
++4855  Memorex
++	7288  Ultra Traveldrive 160G 2.5" HDD
+ 5032  Grandtec
+ 	0bb8  Grandtec USB1.1 DVB-T (cold)
+ 	0bb9  Grandtec USB1.1 DVB-T (warm)
+@@ -4696,20 +6293,42 @@
+ 	0fa1  Grandtec USB1.1 DVB-T (warm)
+ 5041  Linksys (?)
+ 	2234  WUSB54G 802.11g Adapter
++5173  Sweex
++	1809  ZD1211
++5345  Owon
++	1234  PDS6062T Oscilloscope
+ 544d  Transmeta Corp.
+ 5543  UC-Logic Technology Corp.
+ 	0002  SuperPen WP3325U Tablet
++	0003  Genius MousePen 4x3 Tablet/Aquila L1 Tablet
+ 	0004  Genius MousePen 5x4 Tablet
++	0005  Genius MousePen 8x6 Tablet
++	0041  Genius PenSketch 6x8 Tablet
++	0042  Genius PenSketch 12x9 Tablet
+ 55aa  OnSpec Electronic, Inc.
+ 	1234  ATAPI Bridge
+ 	a103  Sandisk SDDR-55 SmartMedia Card Reader
+ 	b012  Mitsumi FA402M 8-in-2 Card Reader
++5a57  Zinwell
++	0260  RT2570
++6189  Sitecom
++	182d  USB 2.0 Ethernet
++	2068  USB to serial cable (v2)
++6253  TwinHan Technology Co., Ltd
++	0100  Ir reciver f. remote control
+ 636c  CoreLogic, Inc.
++6547  Arkmicro Technologies Inc.
++	0232  ARK3116 Serial
+ 6666  Prototype product Vendor ID
+-	0667  Smart Joy PSX, PS-PC Smart JoyPad
++	0667  WiseGroup Smart Joy PSX, PS-PC Smart JoyPad
++	8804  WiseGroup SuperJoy Box 5
++6891  3Com
++	a727  3CRUSB10075
+ 6993  Freshtel
+ 	b001  FT-102 VoIP USB Phone
+ 6a75  Shanghai Jujo Electronics Co., Ltd
++7104  CME (Central Music Co.)
++	2202  UF5/UF6/UF7/UF8 MIDI Master Keyboard
+ 8086  Intel Corp.
+ 	0110  Easy PC Camera
+ 	0431  Intel Pro Video PC Camera
+@@ -4719,12 +6338,21 @@
+ 	1111  PRO/Wireless 2011B 802.11b Adapter
+ 	9890  82930 Test Board
+ 	c013  Wireless HID Station
++	f001  XScale PXA27x Bulverde flash
+ 8341  EGO Systems, Inc.
+ 	2000  Flashdisk
++9016  Sitecom
++	182d  WL-022
+ 9710  MosChip Semiconductor
++	7703  MCS7703 Serial Port Adapter
+ 	7705  Printer cable
+ 	7715  Printer cable
+ 	7780  MS7780 4Mbps Fast IRDA Adapter
++	7830  MCS7830 Ethernet
++a727  3Com
++	6893  AR5523
++	6895  AR5523
++	6897  AR5523
+ c251  Keil Software, Inc.
+ 	2710  ULink
+ eb1a  eMPIA Technology, Inc.
+@@ -4734,6 +6362,8 @@
+ 	2750  ECS Elitegroup G220 integrated webcam
+ 	2800  Terratec Cinergy 200
+ 	2801  GrabBeeX+ Video Encoder
++f003  Hewlett Packard
++	6002  PhotoSmart C500
+ 
+ # List of known device classes, subclasses and protocols
+ 
+@@ -4770,7 +6400,7 @@
+ 	0b  OBEX
+ 	0c  Ethernet Emulation
+ 		07  Ethernet Emulation (EEM)
+-C 03  Human Interface Devices
++C 03  Human Interface Device
+ 	00  No Subclass
+ 		00  None
+ 		01  Keyboard
+@@ -4779,9 +6409,10 @@
+ 		00  None
+ 		01  Keyboard
+ 		02  Mouse
++C 05  Physical Interface Device
+ C 06  Imaging
+ 	01  Still Image Capture
+-		01 Picture Transfer Protocol (PIMA 15470)
++		01  Picture Transfer Protocol (PIMA 15470)
+ C 07  Printer
+ 	01  Printer
+ 		00  Reserved/Undefined
+@@ -4848,7 +6479,7 @@
+ 	01  ?
+ 		01  Microsoft ActiveSync
+ 		02  Palm Sync
+-	02  Common Class
++	02  ?
+ 		01  Interface Association
+ 		02  Wire Adapter Multifunction Peripheral
+ 	03  ?
+@@ -6427,4 +8058,3 @@
+ VT 0401  Composite Video
+ VT 0402  S-Video
+ VT 0403  Component Video
+-
diff --git a/mandriva/2010.2/kdebase/kdebase-konsole-fixed-font.conf b/mandriva/2010.2/kdebase/kdebase-konsole-fixed-font.conf
new file mode 100644
index 000000000..d154995d2
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-konsole-fixed-font.conf
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- Font directory list -->
+  <dir>/opt/kde3/share/apps/konsole/fonts</dir>
+</fontconfig>
diff --git a/mandriva/2010.2/kdebase/kdebase-kscreensaver-pamd.patch b/mandriva/2010.2/kdebase/kdebase-kscreensaver-pamd.patch
new file mode 100644
index 000000000..81d34876a
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-kscreensaver-pamd.patch
@@ -0,0 +1,11 @@
+--- kdebase-3.5.4/kscreensaver.pamd--	2006-08-02 09:20:53.000000000 +0200
++++ kdebase-3.5.4/kscreensaver.pamd	2006-08-02 09:21:36.000000000 +0200
+@@ -1,4 +1,5 @@
+ #%PAM-1.0
+-auth       sufficient  /lib/security/pam_linux_afs.so ignore_root
+-#auth       sufficient /lib/security/pam_linux_afs.so no_unlog ignore_root
+-auth       required    /lib/security/pam_pwdb.so shadow nullok
++#auth       sufficient pam_linux_afs.so ignore_root
++#auth       sufficient pam_linux_afs.so no_unlog ignore_root
++#auth       required   pam_pwdb.so shadow nullok
++auth        include    system-auth
diff --git a/mandriva/2010.2/kdebase/kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch b/mandriva/2010.2/kdebase/kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch
new file mode 100644
index 000000000..d52dafd69
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch
@@ -0,0 +1,14 @@
+--- kcontrol/componentchooser/componentchooser.cpp.nopatch	2011-07-19 13:15:03.679312055 +0100
++++ kcontrol/componentchooser/componentchooser.cpp	2011-07-19 13:15:55.218311443 +0100
+@@ -367,10 +367,7 @@
+ 	KURL::List urlList;
+ 	KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), TQString::null, this);
+ 	if (dlg.exec() != TQDialog::Accepted) return;
+-	m_browserService = dlg.service();
+-	if (m_browserService)
+-	   m_browserExec = m_browserService->desktopEntryName();
+-	else
++
+ 	   m_browserExec = dlg.text();
+ 
+ 	lineExec->setText(m_browserExec);
diff --git a/mandriva/2010.2/kdebase/kdebase-post-3.5.8-add-change-session-icon.patch b/mandriva/2010.2/kdebase/kdebase-post-3.5.8-add-change-session-icon.patch
new file mode 100644
index 000000000..01c0f4ee4
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-post-3.5.8-add-change-session-icon.patch
@@ -0,0 +1,11 @@
+--- ./kicker/kicker/ui/k_mnu.cpp~	2007-05-14 09:55:40.000000000 +0200
++++ ./kicker/kicker/ui/k_mnu.cpp	2007-09-28 07:41:27.000000000 +0200
+@@ -361,7 +361,7 @@
+     if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+     {
+         if (kapp->authorize("lock_screen"))
+-	  sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
++	  sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Lock Current && Start New Session"), 100 );
+         sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
+         if (!p) {
+             sessionsMenu->setItemEnabled( 100, false );
diff --git a/mandriva/2010.2/kdebase/kdebase-post-3.5.9-Fix-kcontrol-menu-entry.patch b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-Fix-kcontrol-menu-entry.patch
new file mode 100644
index 000000000..b48b7eb20
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-Fix-kcontrol-menu-entry.patch
@@ -0,0 +1,11 @@
+--- kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop	2008-08-19 14:16:46.000000000 -0400
++++ kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop.new	2008-08-26 12:30:06.000000000 -0400
+@@ -5,7 +5,7 @@
+ DocPath=kcontrol/index.html
+ X-KDE-StartupNotify=true
+ 
+-Name=Control Center
++Name=KDE3 Control Center
+ Name[af]=Beheer Sentrum
+ Name[ar]=مركز التحكم
+ Name[az]=İdarə Mərkəzi
diff --git a/mandriva/2010.2/kdebase/kdebase-post-3.5.9-bookmark-global-copy.patch b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-bookmark-global-copy.patch
new file mode 100644
index 000000000..ef7d8daf1
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-bookmark-global-copy.patch
@@ -0,0 +1,27 @@
+--- kdebase-3.5.9/libkonq/konqbookmarkmanager.h.orig	2008-03-07 14:56:36.000000000 -0300
++++ kdebase-3.5.9/libkonq/konqbookmarkmanager.h	2008-03-07 16:36:04.000000000 -0300
+@@ -3,6 +3,8 @@
+ 
+ #include <kbookmarkmanager.h>
+ #include <kstandarddirs.h>
++#include <kurl.h>
++#include <kio/job.h>
+ #include <libkonq_export.h>
+ 
+ class LIBKONQ_EXPORT KonqBookmarkManager
+@@ -11,7 +13,14 @@
+     static KBookmarkManager * self() {
+         if ( !s_bookmarkManager )
+         {
+-            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
++			TQString globalBookmarkFile = locate( "data",  TQString::fromLatin1( "konqueror/bookmarks.xml" ) );
++            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"), true);
++			if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null )
++				KIO::file_copy( 
++						KURL::fromPathOrURL( globalBookmarkFile ), 
++						KURL::fromPathOrURL( bookmarksFile ), -1, false, false
++						 );
++
+             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
+         }
+         return s_bookmarkManager;
diff --git a/mandriva/2010.2/kdebase/kdebase-post-3.5.9-screensaver-onlyshowin-kde.patch b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-screensaver-onlyshowin-kde.patch
new file mode 100644
index 000000000..c32201ea1
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdebase-post-3.5.9-screensaver-onlyshowin-kde.patch
@@ -0,0 +1,30 @@
+--- kscreensaver/KRandom.desktop~	2008-02-13 10:40:44.000000000 +0100
++++ kscreensaver/KRandom.desktop	2008-02-16 17:07:11.000000000 +0100
+@@ -5,6 +5,7 @@
+ Type=Application
+ Actions=Setup;InWindow;Root;
+ OnlyShowIn=KDE;
++NoDisplay=true
+ Name=Random
+ Name[af]=Lukrake
+ Name[ar]=عشوائي
+@@ -311,4 +312,3 @@
+ Name[wa]=Håyner e purnea raecene (li fond do scribanne)
+ Name[zh_CN]=在 Root 窗口中显示
+ Name[zh_TW]=在 Root 視窗中顯示
+-NoDisplay=true
+--- kscreensaver/KBlankscreen.desktop~	2008-02-13 10:40:44.000000000 +0100
++++ kscreensaver/KBlankscreen.desktop	2008-02-16 17:08:14.000000000 +0100
+@@ -5,6 +5,7 @@
+ Type=Application
+ Actions=Setup;InWindow;Root;
+ OnlyShowIn=KDE;
++NoDisplay=true
+ Name=Blank Screen
+ Name[af]=Leë Skerm
+ Name[ar]=شاشة فارغة
+@@ -313,4 +314,3 @@
+ Name[wa]=Håyner e purnea raecene (li fond do scribanne)
+ Name[zh_CN]=在 Root 窗口中显示
+ Name[zh_TW]=在 Root 視窗中顯示
+-NoDisplay=true
diff --git a/mandriva/2010.2/kdebase/kdeeject b/mandriva/2010.2/kdebase/kdeeject
new file mode 100644
index 000000000..557b0179f
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdeeject
@@ -0,0 +1,77 @@
+#!/bin/sh
+# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
+# Relies on the 'eject' program, 'cdcontrol' on *BSD
+#
+# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+#
+quiet=0
+if test "$1" = "-q"; then
+  quiet=1
+  shift
+fi
+
+if test "$1" = "--help"; then
+   echo "Usage: $0 <name> where name is a device or a mountpoint."
+   exit 0
+fi
+
+if test -z "$1"; then
+  for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
+     if test -e $dev; then
+        lp=`readlink $dev`
+	if test -n "$lp"; then
+	    device=/dev/$lp
+	else
+	    device=$dev
+        fi
+        break
+    fi
+  done
+else
+  device=$1
+fi
+
+udi=`dcop kded mediamanager properties $device 2>/dev/null | head -n 1 `
+if test -n "$udi"; then
+    dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
+
+	block_udi=`hal-get-property --udi $udi --key block.storage_device`
+
+	if test -n "$block_udi"; then
+		need_eject=`hal-get-property --udi $block_udi --key storage.requires_eject`
+		if test "$need_eject" = "false"; then
+			exit 0;
+		fi
+	fi
+fi
+
+  # Checking for stuff in the PATH is ugly with sh.
+  # I guess this is the reason for making this a kde app...
+  OS=`uname -s`
+  case "$OS" in
+    OpenBSD)
+      cdio -f $1 eject >/dev/null 2>&1
+      ;;
+    *BSD)
+      dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
+      cdcontrol -f $dev eject >/dev/null 2>&1
+      ;;
+    *)
+      # Warning, it has to be either eject 2.0.x or >=2.1.5
+      # Otherwise it doesn't work as expected (it requires a
+      # fstab entry for no reason).
+      eject_result=$(dbus-send --system --print-reply --dest=org.freedesktop.Hal $block_udi org.freedesktop.Hal.Device.Storage.Eject array:string:"" | grep int | cut -d\  -f5)
+      # fallback if not true
+      if [ "$eject_result" != "0"  ]; then
+          eject $1 >/dev/null 2>&1
+      fi
+      ;;
+  esac
+  if test $? -eq 0; then
+    dcop kdesktop default refreshIcons
+    exit 0
+  elif test $quiet -eq 0; then
+    kdialog --title "KDE Eject" --error "Eject $1 failed!"
+  fi
+
+exit 1
diff --git a/mandriva/2010.2/kdebase/kdm-migrate.pl b/mandriva/2010.2/kdebase/kdm-migrate.pl
new file mode 100755
index 000000000..89a20b395
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kdm-migrate.pl
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+# Copyright: MandrakeSoft, licensed under the GPL v2.
+# modified by Laurent Montel <lmontel@mandrakesoft.com>
+
+use strict;
+use MDK::Common;
+
+foreach my $file (@ARGV) {
+    my $no_theme;
+    # grep return 0 if a match is found
+    $no_theme = 1 if `grep -q -s '^UseTheme=' $file` ;		
+    substInFile {
+        if (/SystemPath=(.*)$/) {
+            my $result = $1;
+            s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
+        }
+        if (/UserPath=(.*)$/) {
+            my $result = $1;
+            s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
+        }
+        s!^(Setup)=.*!$1=/etc/X11/xdm/Xsetup_0!;
+        s!^(Startup)=.*!$1=/etc/X11/xdm/GiveConsole!;
+        s!^(Reset)=.*!$1=/etc/X11/xdm/TakeConsole!;
+		s!^(Xserver)=.*!$1=/etc/X11/xdm/Xservers\nServerVTs=-7\n!;
+		if ($no_theme) {
+			s!^(AuthComplain)=.*!$1=AuthComplain=false\nUseTheme=true\nTheme=/usr/share/mdk/dm!;
+		} else {
+			s!^(AuthComplain)=.*!AuthComplain=false!;
+		}
+		
+    } $file;
+}
+
+
diff --git a/mandriva/2010.2/kdebase/khotkeys-only_kde.patch b/mandriva/2010.2/kdebase/khotkeys-only_kde.patch
new file mode 100644
index 000000000..7d2192af6
--- /dev/null
+++ b/mandriva/2010.2/kdebase/khotkeys-only_kde.patch
@@ -0,0 +1,7 @@
+diff -p -up kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE kdebase-3.5.9/khotkeys/khotkeys.desktop
+--- kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE	2008-07-04 17:17:19.000000000 -0300
++++ kdebase-3.5.9/khotkeys/khotkeys.desktop	2008-07-04 17:21:39.000000000 -0300
+@@ -1,2 +1,3 @@
+ [Desktop Entry]
+ Hidden=true
++OnlyShowIn=KDE
diff --git a/mandriva/2010.2/kdebase/kickoff-mandriva-data.tar.bz2 b/mandriva/2010.2/kdebase/kickoff-mandriva-data.tar.bz2
new file mode 100644
index 000000000..c53a8b9ef
--- /dev/null
+++ b/mandriva/2010.2/kdebase/kickoff-mandriva-data.tar.bz2
diff --git a/mandriva/2010.2/kdebase/mandriva-gurpmi.desktop b/mandriva/2010.2/kdebase/mandriva-gurpmi.desktop
new file mode 100644
index 000000000..63d2a64a0
--- /dev/null
+++ b/mandriva/2010.2/kdebase/mandriva-gurpmi.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Software Installer
+Name[ar]=مثبِّت البرمجيَّات
+Name[bg]=Инсталатор на софтуер
+Name[bn]=সফ্টওয়্যার ইনস্টলকারী
+Name[br]=Stalier meziantoù
+Name[bs]=Instalacija softvera
+Name[ca]=Instal·lador de programari
+Name[cs]=Instalace software
+Name[cy]=Gosodwr Meddalwedd
+Name[da]=Programmel-installering
+Name[de]=Software Installation
+Name[el]=Εγκαταστάτης Λογισμικού
+Name[eo]=Programara Instalilo
+Name[es]=Instalador de software
+Name[et]=Tarkvara paigaldaja
+Name[eu]=Software Instalatzailea
+Name[fi]=Ohjelmien asennin
+Name[fr]=Installer des logiciels
+Name[gl]=Instalador de Software
+Name[he]=מתקין חבילות תוכנה
+Name[hi]=सॉफ़्टवेयर स्थापन-कर्ता
+Name[hu]=Szoftvertelepítő
+Name[id]=Penginstall perangkat lunak
+Name[is]=Hugbúnaðar-uppsetning
+Name[it]=Programma d'installazione
+Name[ja]=ソフトウェアインストーラ
+Name[ky]=Программа орноткуч
+Name[mk]=Инсталирање софтвер
+Name[ms]=Penginstal perisian
+Name[nb]=Programvareinstallatør
+Name[nl]=Software-installatie
+Name[nn]=Programinstallering
+Name[pl]=Instalator oprogramowania
+Name[pt]=Instalador de Software
+Name[pt_BR]=Instalador de Programas
+Name[ro]=Instalare Programe
+Name[ru]=Инсталлятор программ
+Name[sk]=Inštalátor softvéru
+Name[sl]=Program za nameščanje 
+Name[sr]=Инсталер софтвера
+Name[sv]=Programinstallerare
+Name[tr]=Yazılım Yükleyici
+Name[uk]=Встановлювач програм
+Name[uz]=Dastur oʻrnatuvchisi
+Name[uz@cyrillic]=Дастур ўрнатувчиси
+Name[vi]=Trình cài đặt phần mềm
+Name[wa]=Astaleu di programes
+Name[zh_CN]=软件安装程序
+Name[zh_TW]=軟體安裝程式
+Comment=Graphical front end to install RPM files
+Comment[ar]=واجهة رسوميَّة لتثبيت ملفات RPM
+Comment[az]=RPM paketlərini qurmaq üçün qrafiki ön üz
+Comment[bg]=Графичен инсталатор на пакети
+Comment[bn]=আর.পি.এম. ফাইল ইনস্টলের জন্য গ্রাফিকাল ফ্রন্ট-এন্ড
+Comment[bs]=Grafički interfejs za instaliranje RPM paketa
+Comment[ca]=Frontal gràfic per instal·lar fitxers RPM
+Comment[cs]=Grafické rozhraní pro instalaci balíčků RPM
+Comment[cy]=Blaen graffigol ar gyfer gosod ffeiliau RPM
+Comment[da]=Grafisk frontend til installation af rpm-filer
+Comment[de]=Grafisches Frontend zum Installieren vom RPM Dateien
+Comment[el]=Ένα γραφική πρόσοψη για την εγκατάσταση αρχείων RPM
+Comment[es]=Interfaz gráfica para instalar archivos RPM
+Comment[et]=Graafiline kasutajaliides pakettide paigaldamiseks
+Comment[eu]=RPM fitxategiak instalatzeko interfaze grafikoa
+Comment[fa]=ظاهر تصویری برای نصب پرونده‌های RPM
+Comment[fi]=Graafinen ohjelmien asennin
+Comment[fr]=Interface graphique pour l'installation de paquetages RPM
+Comment[gl]=Interface gráfica para instalar ficheiros RPM
+Comment[he]=ממשק גרפי להתקנת חבילות RPM
+Comment[hi]=आरपीएम संचिकाओं के संसाधित करने के लिए ग्रफ़िक्ल फ़्रन्ट एन्ड
+Comment[hr]=Grafičko sučelje za instaliranje RPM datoteka
+Comment[hu]=Grafikus felület RPM csomagok telepítéséhez
+Comment[id]=Tampilan grafis untuk menginstall file RPM
+Comment[is]=Grrafískt viðmót til aðstoðar við innsetningu RPM skráa
+Comment[it]=Interrfaccia grafica per l'installazione dei pacchetti RPM
+Comment[ja]=RPM インストール用グラフィカルフロントエンド
+Comment[ky]=RPM файлдарын орнотуу үчүн графикалык интерфейс
+Comment[mk]=Графички интерфејс за инсталирање на RPM датотеки
+Comment[mt]=Interfaċċja grafika biex tinstalla pakketti RPM
+Comment[nb]=Et grafisk grensesnitt for installering av RPM-filer
+Comment[nl]=Grafische schil voor het installeren van RPM bestanden
+Comment[nn]=Grafisk grensesnitt for installering av RPM-filer
+Comment[pl]=Graficzna nakładka dla instalatora plików RPM
+Comment[pt]=Um interface gráfico para instalar ficheiros RPM
+Comment[pt_BR]=Interface gráfica para instalar pacotes RPM
+Comment[ro]=O interfață grafică pentru instalarea fișierelor RPM
+Comment[ru]=Графический интерфейс для установки файлов RPM
+Comment[sc]=Bisori gràfigu po aposentai file RPM
+Comment[sk]=Grafický nástroj pre inštalovanie RPM balíkov
+Comment[sl]=Grafični vmesnik za nameščanje RPM datotek
+Comment[sq]=Interfac grafike dhe për instalimin e skedareve RPM
+Comment[sr]=Графички интерфејс за инсталацију RPM пакета
+Comment[sr@Latn]=Grafički interfejs za instalaciju RPM paketa
+Comment[sv]=Grafiskt gränssnitt för RPM-installation
+Comment[tg]=Пешохири графикӣ барои коргузории файлҳои RPM
+Comment[th]=ส่วนติดต่อผู้ใช้แบบ graphic ของโปรแกรมเพิ่มแพคเก็จ
+Comment[tl]=Graphical na front-end para mag-install ng mga RPM file (software package)
+Comment[tr]=RPM dosyaların kurulumu için bir grafik önyüz
+Comment[uk]=Графічний інтерфейс для встановлення файлів RPM
+Comment[uz]=RPM fayllarini oʻrnatish uchun grafik interfeys
+Comment[uz@cyrillic]=RPM файлларини ўрнатиш учун график интерфейс
+Comment[vi]=Một Frontend đồ họa để cài đặt các tập tin RPM
+Comment[wa]=Ene eterface grafike po-z astaler des pacaedjes RPM
+Comment[zh_CN]=图形化安装 RPM 软件包
+Comment[zh_TW]=RPM 檔案安裝的圖形化前端
+Exec=gurpmi %U
+Terminal=false
+Type=Application
+Icon=rpm
+MimeType=application/x-rpm;application/x-urpmi;
+NoDisplay=true
diff --git a/mandriva/2010.2/kdebase/mandriva-mdvonline.desktop b/mandriva/2010.2/kdebase/mandriva-mdvonline.desktop
new file mode 100644
index 000000000..c40bcc502
--- /dev/null
+++ b/mandriva/2010.2/kdebase/mandriva-mdvonline.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mandriva Online Applet
+Comment=Applet for Mandriva Online
+Exec=/usr/bin/mdkapplet
+Icon=mdkonline
+Type=Application
+StartupNotify=true
+Categories=X-MandrivaLinux-System-Configuration-Networking;Settings;Network;
+X-KDE-autostart-after=kdesktop
diff --git a/mandriva/2010.2/kdebase/mandriva-profile-chooser-2.0.tar.bz2 b/mandriva/2010.2/kdebase/mandriva-profile-chooser-2.0.tar.bz2
new file mode 100644
index 000000000..30902568a
--- /dev/null
+++ b/mandriva/2010.2/kdebase/mandriva-profile-chooser-2.0.tar.bz2
diff --git a/mandriva/2010.2/kdebase/mandriva-startkde b/mandriva/2010.2/kdebase/mandriva-startkde
new file mode 100644
index 000000000..37721f4bd
--- /dev/null
+++ b/mandriva/2010.2/kdebase/mandriva-startkde
@@ -0,0 +1,417 @@
+#!/bin/sh
+#
+#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.7 )
+#
+
+# We are running kde3 environment
+# Let's prepend PATH to allow execution of kde3 apps first
+PATH=/opt/kde3/bin:$PATH
+export PATH
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# Check if a KDE session already is running
+if kcheckrunning >/dev/null 2>&1; then
+	echo "KDE seems to be already running on this display."
+	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
+	exit 1
+fi
+
+if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
+        XDG_MENU_PREFIX=kde-
+        export  XDG_MENU_PREFIX=kde-
+fi
+
+# For 2008.1 and beyond, Qt4 will be the default environment to build applications and 
+# path will be pointing to qt4 bin dir as usual, so we're explicitly set QTDIR
+# for qt3 in kde3 environment
+# Remember that qt3 is in /usr/lib/qt3 even on 64 installs
+QTDIR=/usr/lib/qt3
+export QTDIR
+
+# Set the background to plain grey.
+# The standard X background is nasty, causing moire effects and exploding
+# people's heads. We use colours from the standard KDE palette for those with
+# palettised displays.
+#if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
+#  xsetroot -solid "#000000"
+#fi
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# in case we have been started with full pathname spec without being in PATH
+bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+if [ -n "$bindir" ]; then
+  case $PATH in
+    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+    *) PATH=$bindir:$PATH; export PATH;;
+  esac
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts the dcopserver and klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# The user's personal KDE directory is usually ~/.kde, but this setting
+# may be overridden by setting KDEHOME.
+
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+
+# see kstartupconfig source for usage
+mkdir -m 700 -p $kdehome
+mkdir -m 700 -p $kdehome/share
+mkdir -m 700 -p $kdehome/share/config
+cat >$kdehome/share/config/startupconfigkeys <<EOF
+kcminputrc Mouse cursorTheme ''
+kcminputrc Mouse cursorSize ''
+kpersonalizerrc General FirstLogin true
+ksplashrc KSplash Theme Default
+kcmrandrrc Display ApplyOnStartup false
+kcmrandrrc [Screen0]
+kcmrandrrc [Screen1]
+kcmrandrrc [Screen2]
+kcmrandrrc [Screen3]
+kcmfonts General forceFontDPI 0
+EOF
+kstartupconfig
+if test $? -ne 0; then
+    xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
+fi
+. $kdehome/share/config/startupconfig
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        export XCURSOR_THEME=default
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+    fi
+fi
+
+if test "$kcmrandrrc_display_applyonstartup" = "true"; then
+    # 4 screens is hopefully enough
+    for scrn in 0 1 2 3; do
+        args=
+        width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
+        height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
+        if test -n "${width}" -a -n "${height}"; then
+            args="$args -s ${width}x${height}"
+        fi
+        refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
+        if test -n "${refresh}"; then
+            args="$args -r ${refresh}"
+        fi
+        rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
+        if test -n "${rotation}"; then
+            case "${rotation}" in
+                0)
+                    args="$args -o 0"
+                    ;;
+                90)
+                    args="$args -o 1"
+                    ;;
+                180)
+                    args="$args -o 2"
+                    ;;
+                270)
+                    args="$args -o 3"
+                    ;;
+            esac
+        fi
+        reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
+        if test "${refrectx}" = "true"; then
+            args="$args -x"
+        fi
+        reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
+        if test "${refrecty}" = "true"; then
+            args="$args -y"
+        fi
+        if test -n "$args"; then
+            xrandr $args
+        fi
+    done
+fi
+
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
+# Launch splash that doesn't need any KDE libraries here, before
+# KDE libraries are loaded into memory (which may take some time
+# with cold caches). Makes the splash appear sooner.
+# If kpersonalizer needs to be run splash will be started only later.
+if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
+    case "$ksplashrc_ksplash_theme" in 
+      Simple)
+         ksplashsimple 
+         ;;
+      *)
+         ;;
+    esac
+fi
+
+if test "$kcmfonts_general_forcefontdpi" -eq 120; then
+    xrdb -quiet -merge -nocpp <<EOF
+Xft.dpi: 120
+EOF
+elif test "$kcmfonts_general_forcefontdpi" -eq 96; then
+    xrdb -quiet -merge -nocpp <<EOF
+Xft.dpi: 96
+EOF
+fi
+
+# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+exepath=`kde-config --path exe | tr : '\n'`
+
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
+  for file in "$prefix"*.sh; do
+    test -r "$file" && . "$file"
+  done
+done
+
+# Activate the kde font directories.
+#
+# There are 4 directories that may be used for supplying fonts for KDE.
+#
+# There are two system directories. These belong to the administrator.
+# There are two user directories, where the user may add her own fonts.
+#
+# The 'override' versions are for fonts that should come first in the list,
+# i.e. if you have a font in your 'override' directory, it will be used in
+# preference to any other.
+#
+# The preference order looks like this:
+# user override, system override, X, user, system
+#
+# Where X is the original font database that was set up before this script
+# runs.
+
+usr_odir=$HOME/.fonts/kde-override
+usr_fdir=$HOME/.fonts
+
+# Add any user-installed font directories to the X font path
+kde_fontpaths=$usr_fdir/fontpaths
+do_usr_fdir=1
+do_usr_odir=1
+if test -r "$kde_fontpaths" ; then
+    savifs=$IFS
+    IFS="
+"
+    for fpath in `grep -v '^[ 	]*#' < "$kde_fontpaths"` ; do
+        rfpath=`echo $fpath | sed "s:^~:$HOME:g"`
+        if test -s "$rfpath"/fonts.dir; then
+            xset fp+ "$rfpath"
+            if test "$rfpath" = "$usr_fdir"; then
+                do_usr_fdir=0
+            fi
+            if test "$rfpath" = "$usr_odir"; then
+                do_usr_odir=0
+            fi
+        fi
+    done
+    IFS=$savifs
+fi
+
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+# We run mkfontdir on the user's font dirs (if we have permission) to pick
+# up any new fonts they may have installed. If mkfontdir fails, we still
+# add the user's dirs to the font path, as they might simply have been made
+# read-only by the administrator, for whatever reason.
+
+# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
+test -d "$sys_odir" && xset +fp "$sys_odir"
+test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+test -d "$sys_fdir" && xset fp+ "$sys_fdir"
+
+# Ask X11 to rebuild its font list.
+xset fp rehash
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+xsetroot -cursor_name left_ptr
+
+if [ "$(whoami)" = root ]; then
+    echo
+    # Root interface will point to different profile, no more hardcoded
+fi
+
+if [ -e $kdehome/Autostart/alignment-icons.desktop  ]; then
+        rm -f $kdehome/Autostart/alignment-icons.desktop
+fi
+
+export DESKTOP="kde"
+
+# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+if test -n "$GS_LIB" ; then
+    GS_LIB=$usr_fdir:$GS_LIB
+    export GS_LIB
+else
+    GS_LIB=$usr_fdir
+    export GS_LIB
+fi
+
+# Link "tmp" "socket" and "cache" resources to directory in /tmp
+# Creates:
+# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
+# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
+# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
+# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
+# environment variables
+for resource in tmp cache socket; do
+    if ! lnusertemp $resource >/dev/null; then
+        echo 'startkde: Call to lnusertemp failed (temporary directories full?). Check your installation.'  1>&2
+        xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation."
+        exit 1
+    fi
+done
+
+# In case of dcop sockets left by a previous session, cleanup
+dcopserver_shutdown
+
+echo 'startkde: Starting up...'  1>&2
+
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_theme" in 
+    None)
+       ;; # nothing
+    Simple)
+       if test "$kpersonalizerrc_general_firstlogin" = "true"; then
+           ksplashsimple 
+       fi # otherwise started earlier
+       ;;
+    *)
+       ksplash --nodcop
+       ;;
+  esac
+fi
+
+# Mark that full KDE session is running (e.g. Konqueror preloading works only
+# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# any X client connected to the same X session, even if not launched
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# however guarantees that the application is launched in the same environment
+# like the KDE session and that e.g. KDE utilities/libraries are available.
+# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# The matching tests are:
+#   For $KDE_FULL_SESSION:
+#     if test -n "$KDE_FULL_SESSION"; then ... whatever
+#   For KDE_FULL_SESSION property:
+#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#     if test $? -eq 0; then ... whatever
+#
+# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# of the user running the KDE session. It should be rarely needed (e.g.
+# after sudo to prevent desktop-wide functionality in the new user's kded).
+#
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+KDE_SESSION_UID=$UID
+export KDE_SESSION_UID
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit. Check your installation.'  1>&2
+  xmessage -geometry 500x100 "Could not start kdeinit. Check your installation."
+fi
+
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+if test -n "$dl"; then
+  kwrapper kdesktop_lock --forcelock &
+  # Give it some time for starting up. This is somewhat unclean; some
+  # notification would be better.
+  sleep 1
+fi
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper is used to reduce startup time and memory usage
+# kwrapper does not return usefull error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be 
+# started, any problems thereafter, e.g. ksmserver failing to initialize, 
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+kwrapper ksmserver $KDEWM 
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+fi
+
+# wait if there's any crashhandler shown
+while dcop | grep -q ^drkonqi- ; do
+    sleep 5
+done
+
+echo 'startkde: Shutting down...'  1>&2
+
+# Clean up
+kdeinit_shutdown
+dcopserver_shutdown --wait
+artsshell -q terminate
+
+echo 'startkde: Running shutdown scripts...'  1>&2
+
+# Run scripts found in $KDEDIRS/shutdown
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+  for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+    test -x "$prefix$file" && "$prefix$file"
+  done
+done
+
+unset KDE_FULL_SESSION
+xprop -root -remove KDE_FULL_SESSION
+unset KDE_SESSION_UID
+
+echo 'startkde: Done.'  1>&2
diff --git a/mandriva/2010.2/kdebase/media_saferemove.patch b/mandriva/2010.2/kdebase/media_saferemove.patch
new file mode 100644
index 000000000..c3ca254c8
--- /dev/null
+++ b/mandriva/2010.2/kdebase/media_saferemove.patch
@@ -0,0 +1,10 @@
+diff -Naur kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop
+--- kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop	2008-08-19 21:16:59.000000000 +0300
++++ kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop	2009-12-22 00:51:57.122282682 +0200
+@@ -71,5 +71,5 @@
+ Name[wa]=Ositer e såvrité
+ Name[zh_CN]=安全删除
+ Name[zh_TW]=安全的移除
+-Exec=kio_media_mounthelper -s %u
++Exec=kio_media_mounthelper -u %u
+ 
diff --git a/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff b/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff
new file mode 100644
index 000000000..553ad464c
--- /dev/null
+++ b/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff
@@ -0,0 +1,11 @@
+--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig	2011-02-04 16:20:42.266474457 +0000
++++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp	2011-02-04 16:21:33.580473069 +0000
+@@ -520,7 +520,7 @@
+             medium->mountableState(
+                 libhal_volume_get_device_file(halVolume),		/* Device node */
+                 clearUdiString,
+-                libhal_volume_get_mount_point(halClearVolume),		/* Mount point */
++                TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)),          /* Mount point */
+                 libhal_volume_get_fstype(halClearVolume),		/* Filesystem type */
+                 libhal_volume_is_mounted(halClearVolume) );		/* Mounted ? */
+         else
diff --git a/mandriva/2010.2/kdebase/net_applet.desktop b/mandriva/2010.2/kdebase/net_applet.desktop
new file mode 100644
index 000000000..eece87476
--- /dev/null
+++ b/mandriva/2010.2/kdebase/net_applet.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NetApplet
+Comment=Network monitoring applet
+Exec=/usr/bin/net_applet
+Icon=/usr/share/libDrakX/pixmaps/connected.png
+Type=Application
+Categories=GTK;System;Monitor;X-MandrivaLinux-CrossDesktop;
+X-KDE-autostart-after=kdesktop
+StartupNotify=false
diff --git a/mandriva/2010.2/kdebase/turkish-preview.patch b/mandriva/2010.2/kdebase/turkish-preview.patch
new file mode 100644
index 000000000..1b0249798
--- /dev/null
+++ b/mandriva/2010.2/kdebase/turkish-preview.patch
@@ -0,0 +1,112 @@
+Index: kioslave/thumbnail/textcreator.cpp
+===================================================================
+--- kioslave/thumbnail/textcreator.cpp	(revision 664853)
++++ kioslave/thumbnail/textcreator.cpp	(working copy)
+@@ -25,6 +25,7 @@
+ #include <kstandarddirs.h>
+ #include <kpixmapsplitter.h>
+ #include <kmimetype.h>
++#include <qtextcodec.h>
+ 
+ #include "textcreator.h"
+ 
+@@ -112,11 +113,48 @@
+         int read = file.readBlock( m_data, bytesToRead );
+         if ( read > 0 )
+         {
+-            ok = true;
+             m_data[read] = '\0';
++            ok = false;
++            uint total=1000;
++
++            if (read < total) total = read;
++
++            for (uint i = 0; i < total - 1; i++)
++              {
++                switch (m_data[i]) {
++                case 195:
++                  if ((m_data[i+1] == -74) || (m_data[i+1] == -89) ||
++                      (m_data[i+1] == -68) || (m_data[i+1] == -106) ||
++                      (m_data[i+1] == -121) || (m_data[i+1] == -100)) {
++                    ok = true;
++                    break;
++                  }
++                case 196:
++                  if ((m_data[i+1] == -79) || (m_data[i+1] == -97) ||
++                      (m_data[i+1] == -80) || (m_data[i+1] == -98)) {
++                    ok = true;
++                    break;
++                  }
++
++                case 197:
++                  if ((m_data[i+1] == -97) || (m_data[i+1] == -98)) {
++                    ok = true;
++                    break;
++                  }
++                }
++                if (ok) break;
++              }
++            /* Finish of Encoding herustic. */
+             TQString text = TQString::fromLocal8Bit( m_data );
++            if (!ok)
++              {
++                TQTextCodec *codec = TQTextCodec::codecForName("ISO8859-9");
++                text = codec->toUnicode( m_data );
++              }
++            //						TQString text = TQString::fromUtf8( m_data );
+             // FIXME: maybe strip whitespace and read more?
+ 
++            ok = true;
+             m_pixmap.fill( TQColor( 245, 245, 245 ) ); // light-grey background
+ 
+             TQRect rect;
+@@ -171,6 +209,49 @@
+                     continue;
+                 }
+ 
++                // Turkish Conversions Begin
++
++                switch (ch.unicode()) {
++                case 305:
++                  ch = 224; // ı
++                  break;
++                case 351:
++                  ch = 229; // ş
++                  break;
++                case 246:
++                  ch = 227; // ö
++                  break;
++                case 231:
++                  ch = 228; // ç
++                  break;
++                case 252:
++                  ch = 226; // ü
++                  break;
++                case 287:
++                  ch = 225; // ğ
++                  break;
++                case 304:
++                  ch = 230; // İ
++                  break;
++                case 214:
++                  ch = 232; // Ö
++                  break;
++                case 199:
++                  ch = 233; // Ç
++                  break;
++                case 286:
++                  ch = 231; // Ğ
++                  break;
++                case 220:
++                  ch = 235; // Ü
++                  break;
++                case 350:
++                  ch = 234; // Ş
++                  break;
++                }
++
++                // Turkish Conversions End
++
+                 rect = m_splitter->coordinates( ch );
+                 if ( !rect.isEmpty() )
+                 {
diff --git a/mandriva/2010.2/kdebase/x-urpmi-media.desktop b/mandriva/2010.2/kdebase/x-urpmi-media.desktop
new file mode 100644
index 000000000..131cefb8e
--- /dev/null
+++ b/mandriva/2010.2/kdebase/x-urpmi-media.desktop
@@ -0,0 +1,44 @@
+[Desktop Entry]
+Type=MimeType
+Comment=Urpmi medium info
+Comment[ar]=معلومات وسيطة Urpmi
+Comment[bg]=Urpmi информация за източник
+Comment[br]=Titouroù diwar-benn ur medium urpmi
+Comment[cs]=Informace o zdroji urpmi
+Comment[cy]=Gwybodaeth cyfrwng urpmi
+Comment[da]=Info om urpmi medie
+Comment[de]=Urpmi Medien Info
+Comment[el]=Πληροφορίες μέσου Urpmi
+Comment[eo]=Informo pri urpmi-portilo
+Comment[es]=Información de soporte urpmi
+Comment[et]=Uprmi andmekandja teave
+Comment[eu]=Urpmi euskarriaren info
+Comment[fi]=Urpmi-lähdetiedot
+Comment[fr]=Information de medium urpmi
+Comment[gl]=Información de soporte de urpmi
+Comment[he]=מידע על מקור urpmi
+Comment[hu]=Információ az Urpmi-adatforrásról
+Comment[is]=Urpmi upplýsingar um miðil
+Comment[it]=Informazioni sulla fonte urpmi
+Comment[ja]=urpmi メディアの情報
+Comment[ky]=urpmi булактын маалыматы
+Comment[ltg]=Urpmi datu nesieja info
+Comment[ms]=Maklumat media urpmi
+Comment[nb]=Info om urpmi-media
+Comment[nl]=Info over Urpmi-medium
+Comment[nn]=Informasjon for urpmi-medium
+Comment[pl]=Informacje na temat nośnika dla urpmi
+Comment[pt]=Informação da média urpmi
+Comment[pt_BR]=Informação sobre mídia urpmi
+Comment[ro]=Informații mediu urpmi
+Comment[ru]=Сведения об источнике urpmi
+Comment[sl]=Podatki o viru urpmi
+Comment[sv]=Urpmi media info
+Comment[tr]=Urpmi yazılım kaynağı bilgisi
+Comment[uk]=Інформація про джерело urpmi
+Comment[uz]=Dasturlar toʻplami fayli
+Comment[uz@cyrillic]=Дастурлар тўплами файли
+Comment[zh_CN]=Urpmi 介质信息
+Comment[zh_TW]=Urpmi 媒體資訊
+MimeType=application/x-urpmi-media
+Patterns=*.urpmi-media;
diff --git a/mandriva/2010.2/kdebase/x-urpmi.desktop b/mandriva/2010.2/kdebase/x-urpmi.desktop
new file mode 100644
index 000000000..de2a93a61
--- /dev/null
+++ b/mandriva/2010.2/kdebase/x-urpmi.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=MimeType
+Comment=urpmi file
+MimeType=application/x-urpmi;
+Patterns=*.urpmi;
diff --git a/mandriva/2010.2/kdebase/xsettings-kde.desktop b/mandriva/2010.2/kdebase/xsettings-kde.desktop
new file mode 100644
index 000000000..f4c520c5c
--- /dev/null
+++ b/mandriva/2010.2/kdebase/xsettings-kde.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=xsettings-kde
+Name=XSettings-KDE
+X-KDE-autostart-after=kdesktop
+Type=Service
+OnlyShowIn=KDE;
diff --git a/mandriva/2010.2/kdelibs/kde3lib.filter b/mandriva/2010.2/kdelibs/kde3lib.filter
new file mode 100644
index 000000000..2e7e84cfc
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kde3lib.filter
@@ -0,0 +1 @@
+^.(/opt/kde3/lib/.*.so|/opt/kde3/lib/kde3/.*.so)
diff --git a/mandriva/2010.2/kdelibs/kde3lib.script b/mandriva/2010.2/kdelibs/kde3lib.script
new file mode 100755
index 000000000..a767838ca
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kde3lib.script
@@ -0,0 +1,2 @@
+#!/bin/sh
+ldconfig -X
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.3.2-fix-kurlbar-global.patch b/mandriva/2010.2/kdelibs/kdelibs-3.3.2-fix-kurlbar-global.patch
new file mode 100644
index 000000000..2041a87c4
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.3.2-fix-kurlbar-global.patch
@@ -0,0 +1,20 @@
+--- kdelibs-3.3.2/kio/kfile/kurlbar.cpp--	2004-12-29 16:50:52.814327086 +0100
++++ kdelibs-3.3.2/kio/kfile/kurlbar.cpp	2004-12-29 16:52:25.597617064 +0100
+@@ -90,7 +90,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
+       m_url( url ),
+       m_pixmap( 0L ),
+       m_parent( parent ),
+-      m_appLocal( true )
++      m_appLocal( false )
+ {
+     init( icon, group, description, persistent );
+ }
+@@ -102,7 +102,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
+       m_url( url ),
+       m_pixmap( 0L ),
+       m_parent( parent ),
+-      m_appLocal( true )
++      m_appLocal( false )
+ {
+     init( icon, group, description, true /*persistent*/ );
+ }
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch
new file mode 100644
index 000000000..25e9856f6
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch
@@ -0,0 +1,29 @@
+Submitted By: zippo zippo@oppiz.net
+Initial Package Version: kdelibs-3.5.8
+Date: 2007-12-29
+Upstream Status: Unknown
+Origin: zippo zippo@oppiz.net
+Description: Fixes a LDFLAGS and RPATH issued in locating the QT library.
+
+--- kdelibs-3.5.10/dcop/dcopidl/Makefile.am~	2008-08-19 21:18:18.000000000 +0300
++++ kdelibs-3.5.10/dcop/dcopidl/Makefile.am	2010-02-15 16:13:22.596733866 +0200
+@@ -11,7 +11,7 @@
+ noinst_HEADERS = yacc.cc.h
+ 
+ dcopidl_LDADD = $(LIB_QT)
+-dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
++dcopidl_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
+ 
+ ####### Build rules
+ 
+--- kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am~	2008-08-19 21:18:18.000000000 +0300
++++ kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am	2010-02-15 16:13:56.370163020 +0200
+@@ -10,7 +10,7 @@
+ noinst_HEADERS = main.h
+ 
+ dcopidl2cpp_LDADD = $(LIB_QT)
+-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
++dcopidl2cpp_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
+ 
+ dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
+ 	../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.10-ktip-on-kde4.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.10-ktip-on-kde4.patch
new file mode 100644
index 000000000..eba35c339
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.10-ktip-on-kde4.patch
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.12/kdeui/ktip.cpp.orig	2011-02-04 11:30:10.042474496 +0000
++++ kdelibs-3.5.12/kdeui/ktip.cpp	2011-02-04 11:30:30.506474344 +0000
+@@ -302,7 +302,7 @@
+     hbox2->addWidget(ok);
+ 
+     KConfigGroup config(kapp->config(), "TipOfDay");
+-    mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
++    mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", false));
+ 
+     connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip()));
+     connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip()));
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.2-move-xdg-menu-dir.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.2-move-xdg-menu-dir.patch
new file mode 100644
index 000000000..dbac52276
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.2-move-xdg-menu-dir.patch
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.2/admin/acinclude.m4.in--	2006-05-03 16:06:13.000000000 +0200
++++ kdelibs-3.5.2/admin/acinclude.m4.in	2006-05-03 16:06:22.000000000 +0200
+@@ -492,7 +492,7 @@
+     xdg_appsdir='\${datadir}/applications/kde'
+   fi
+   if test -z "$xdg_menudir"; then
+-    xdg_menudir='\${sysconfdir}/xdg/menus'
++    xdg_menudir='\${sysconfdir}/xdg/kde/menus'
+   fi
+   if test -z "$xdg_directorydir"; then
+     xdg_directorydir='\${datadir}/desktop-directories'
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.3-fix-enable-dialogbox.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.3-fix-enable-dialogbox.patch
new file mode 100644
index 000000000..afabd68a6
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.3-fix-enable-dialogbox.patch
@@ -0,0 +1,30 @@
+--- kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp.orig	2006-02-03 13:46:21.000000000 -0200
++++ kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp	2006-07-14 11:11:18.000000000 -0300
+@@ -2024,6 +2024,7 @@
+   }
+ 
+   // Draw Checkboxes
++  bool allDisable = true;
+   TQCheckBox *cba[3][4];
+   for (int row = 0; row < 3 ; ++row) {
+     for (int col = 0; col < 4; ++col) {
+@@ -2039,6 +2040,8 @@
+       else if (d->cbRecursive && d->cbRecursive->isChecked())
+ 	cb->setTristate();
+ 
++	  if( d->canChangePermissions)
++	  	allDisable = false;
+       cb->setEnabled( d->canChangePermissions );
+       gl->addWidget (cb, row+2, col+1);
+       switch(col) {
+@@ -2095,6 +2098,10 @@
+ 
+   }
+ #endif
++
++  if (  allDisable )
++     dlg.enableButtonOK( false );
++
+   if (dlg.exec() != KDialogBase::Accepted)
+     return;
+ 
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.7-add-extra-catalogs.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.7-add-extra-catalogs.patch
new file mode 100644
index 000000000..fe45a6c87
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.7-add-extra-catalogs.patch
@@ -0,0 +1,13 @@
+--- kdecore/klocale.cpp.orig	2011-02-04 10:59:25.234472351 +0000
++++ kdecore/klocale.cpp	2011-02-04 11:01:08.952473215 +0000
+@@ -138,7 +138,10 @@
+     if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
+       d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
+       d->catalogNames.append( "kio" );            // always include kio.mo
++      KGlobal::dirs()->addResourceDir("locale", "/usr/share/locale");
++      d->catalogNames.append( "kickoff" );
+       d->catalogNames.append( "xdg-user-dirs" );
++      d->catalogNames.append( "mandriva-kde-translation" );
+     }
+     updateCatalogues(); // evaluate this for all languages
+   }
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.7-cups-1.3-conf.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.7-cups-1.3-conf.patch
new file mode 100644
index 000000000..d07edcde0
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.7-cups-1.3-conf.patch
@@ -0,0 +1,134 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.orig	2007-08-23 14:53:00.000000000 -0300
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-08-23 17:40:02.000000000 -0300
+@@ -13,6 +13,9 @@
+ static char		pwdstring[33];
+ static int cups_local_auth(http_t *http);
+ 
++const char* cupsGetConf( void );
++int cupsPutConf( const char* );
++
+ const char *				/* O - Filename for PPD file */
+ cupsGetConf(void)
+ {
+@@ -29,6 +32,8 @@
+   char		prompt[1024];		/* Prompt string */
+   int		digest_tries;		/* Number of tries with Digest */
+   static char	filename[HTTP_MAX_URI];	/* Local filename */
++  char          fqdn[ HTTP_MAX_URI ];   /* Server name buffer */
++
+ 
+  /*
+   * Connect to the correct server as needed...
+@@ -108,15 +113,15 @@
+       * See if we should retry the current digest password...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++      if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
+           digest_tries > 1 || !pwdstring[0])
+       {
+        /*
+ 	* Nope - get a password from the user...
+ 	*/
++	httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
+ 
+-	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+-        	 cups_server->hostname);
++	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
+ 
+         if ((password = cupsGetPassword(prompt)) == NULL)
+ 	  break;
+@@ -135,7 +140,7 @@
+       * Got a password; encode it for the server...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++      if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
+       {
+        /*
+ 	* Basic authentication...
+@@ -210,7 +215,7 @@
+   * OK, we need to copy the file...
+   */
+ 
+-  while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
++  while ((bytes = httpRead2(cups_server, buffer, sizeof(buffer))) > 0)
+   {
+     write(fd, buffer, bytes);
+   }
+@@ -235,6 +240,7 @@
+   http_status_t	status;			/* HTTP status from server */
+   char		prompt[1024];		/* Prompt string */
+   int		digest_tries;		/* Number of tries with Digest */
++  char          fqdn[ HTTP_MAX_URI ];   /* Server name buffer */
+ 
+   if (name == NULL)
+     return 0;
+@@ -305,11 +311,11 @@
+ 	        break;
+ 	}
+ 	else
+-	    httpWrite(cups_server, buffer, bytes);
++	    httpWrite2(cups_server, buffer, bytes);
+ 
+     if (status == HTTP_CONTINUE)
+     {
+-        httpWrite(cups_server, buffer, 0);
++        httpWrite2(cups_server, buffer, 0);
+ 	while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
+     }
+ 
+@@ -334,15 +340,16 @@
+       * See if we should retry the current digest password...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++      if (strncmp( httpGetField ( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
+           digest_tries > 1 || !pwdstring[0])
+       {
+        /*
+ 	* Nope - get a password from the user...
+ 	*/
+ 
+-	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+-        	 cups_server->hostname);
++
++	httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
++	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
+ 
+         if ((password = cupsGetPassword(prompt)) == NULL)
+ 	  break;
+@@ -361,7 +368,7 @@
+       * Got a password; encode it for the server...
+       */
+ 
+-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++      if (strncmp(httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
+       {
+        /*
+ 	* Basic authentication...
+@@ -492,3 +499,4 @@
+ 
+   return (1);
+ }
++
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.orig	2007-08-23 17:56:12.000000000 -0300
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-08-23 17:57:53.000000000 -0300
+@@ -310,7 +310,7 @@
+ 	}
+ 
+ #ifdef HAVE_CUPS_NO_PWD_CACHE
+-	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
++   httpSetAuthString( HTTP, NULL, cups_authstring.data() );
+ #endif
+ 
+ 	if (dump_ > 0)
+@@ -320,7 +320,7 @@
+ 
+ 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+ #ifdef HAVE_CUPS_NO_PWD_CACHE
+-	cups_authstring = HTTP->authstring;
++	cups_authstring = httpGetAuthString( HTTP );
+ #endif
+ 	httpClose(HTTP);
+ 
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.8-add-bookmark-dialog.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.8-add-bookmark-dialog.patch
new file mode 100644
index 000000000..82e33a120
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.8-add-bookmark-dialog.patch
@@ -0,0 +1,11 @@
+--- kio/bookmarks/kbookmarkmanager.cc~	2007-10-06 16:11:19.000000000 +0200
++++ kio/bookmarks/kbookmarkmanager.cc	2007-10-06 16:11:19.000000000 +0200
+@@ -706,7 +706,7 @@
+    config.setGroup("Bookmarks");
+ 
+    // add bookmark dialog usage - no reparse
+-   s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", false);
++   s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", true);
+ 
+    // these three alter the menu, therefore all need a reparse
+    s_self->m_contextmenu = config.readBoolEntry("ContextMenuActions", true);
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.9-kio-kfile-grouplist.patch b/mandriva/2010.2/kdelibs/kdelibs-3.5.9-kio-kfile-grouplist.patch
new file mode 100644
index 000000000..9673f87e3
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.9-kio-kfile-grouplist.patch
@@ -0,0 +1,63 @@
+--- kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp.orig	2008-02-28 09:52:00.000000000 -0300
++++ kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp	2008-02-28 10:05:56.000000000 -0300
+@@ -1771,27 +1771,31 @@
+     strUser = user->pw_name;
+ 
+ #ifdef Q_OS_UNIX
+-  setgrent();
+-  for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
+-  {
+-    if (IamRoot)
+-      groupList += TQString::fromLatin1(ge->gr_name);
+-    else
+-    {
+-      /* pick the groups to which the user belongs */
+-      char ** members = ge->gr_mem;
+-      char * member;
+-      while ((member = *members) != 0L) {
+-        if (strUser == member) {
+-          groupList += TQString::fromLocal8Bit(ge->gr_name);
+-          break;
+-        }
+-        ++members;
+-      }
+-    }
+-  }
+-  endgrent();
+-#endif //Q_OS_UNIX
++
++  gid_t *groups = NULL;
++  int ng = 1;
++  struct group *mygroup;
++  gid_t *newgroups = NULL;
++  
++  groups = (gid_t *) malloc(ng * sizeof(gid_t));
++  
++  if (getgrouplist(strUser, user->pw_gid, groups, &ng) == -1) {
++	  newgroups = (gid_t *) malloc(ng * sizeof(gid_t));
++	  if (newgroups != NULL) {
++	          free(groups);
++		  groups = newgroups;
++		  getgrouplist(strUser, user->pw_gid, groups, &ng);
++	  } else ng = 1;
++  }
++
++  for (i = 0; i < ng; i++) {
++	  mygroup = getgrgid(groups[i]);
++	  if (mygroup != NULL) groupList += TQString::fromLocal8Bit(mygroup->gr_name);
++  }
++
++  free(groups);
++  
++#else //Q_OS_UNIX
+ 
+   /* add the effective Group to the list .. */
+   ge = getgrgid (getegid());
+@@ -1802,6 +1806,7 @@
+     if (groupList.find(name) == groupList.end())
+       groupList += name;
+   }
++#endif //Q_OS_UNIX
+ 
+   bool isMyGroup = groupList.contains(strGroup);
+ 
diff --git a/mandriva/2010.2/kdelibs/kdelibs-3.5.9-mandriva-mimetypes.tar.bz2 b/mandriva/2010.2/kdelibs/kdelibs-3.5.9-mandriva-mimetypes.tar.bz2
new file mode 100644
index 000000000..046d3af76
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-3.5.9-mandriva-mimetypes.tar.bz2
diff --git a/mandriva/2010.2/kdelibs/kdelibs-dcopobject-destruct-crash.patch b/mandriva/2010.2/kdelibs/kdelibs-dcopobject-destruct-crash.patch
new file mode 100644
index 000000000..8cf8e1ca1
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs-dcopobject-destruct-crash.patch
@@ -0,0 +1,52 @@
+there appeared some kind of leak or memory overwrite, or double destruct, can't
+track down where it came from, only thing done (to my knowledge) was to rebuild
+kde packages due newer dependencies in distro. maybe gcc overoptimizes, but
+rebuild with gcc 4.4.2 did not help.
+
+crash happens when kmail send mail window is destructed (you hit send mail
+button)
+
+Program received signal SIGSEGV, Segmentation fault.
+0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
+81          if ( d->m_signalConnections > 0 && client )
+(gdb) bt
+#0  0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
+#1  0x00007ffff77c6a6b in KMComposeWin::~KMComposeWin (this=0xdefd30, __in_chrg=<value optimized out>, __vtt_parm=<value optimized out>) at kmcomposewin.cpp:490
+#2  0x00007ffff66b911a in QObject::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
+#3  0x00007ffff66ee013 in QWidget::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
+#4  0x00007ffff665a865 in QApplication::internalNotify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
+#5  0x00007ffff665b96e in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
+#6  0x00007ffff70aaf28 in KApplication::notify (this=0x7fffffffda10, receiver=0xdefd30, event=0xe72500) at kapplication.cpp:550
+#7  0x00007ffff665c263 in QApplication::sendPostedEvents(QObject*, int) () from /usr/lib64/libqt-mt.so.3
+#8  0x00007ffff660acad in QEventLoop::processEvents(unsigned int) () from /usr/lib64/libqt-mt.so.3
+#9  0x00007ffff6670ba9 in QEventLoop::enterLoop() () from /usr/lib64/libqt-mt.so.3
+#10 0x00007ffff6670a32 in QEventLoop::exec() () from /usr/lib64/libqt-mt.so.3
+#11 0x00000000004028cc in main (argc=3, argv=<value optimized out>) at main.cpp:110
+(gdb) p d
+$1 = (DCOPObject::DCOPObjectPrivate *) 0x0
+(gdb) p client
+$2 = <value optimized out>
+(gdb) l
+76      }
+77
+78      DCOPObject::~DCOPObject()
+79      {
+80          DCOPClient *client = DCOPClient::mainClient();
+81          if ( d->m_signalConnections > 0 && client )
+82               client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
+83
+84          objMap()->remove(ident);
+85          delete d;
+(gdb)
+
+--- kdelibs-3.5.10/dcop/dcopobject.cpp~	2005-09-10 11:27:23.000000000 +0300
++++ kdelibs-3.5.10/dcop/dcopobject.cpp	2010-01-30 07:56:50.818689543 +0200
+@@ -78,7 +78,7 @@
+ DCOPObject::~DCOPObject()
+ {
+     DCOPClient *client = DCOPClient::mainClient();
+-    if ( d->m_signalConnections > 0 && client )
++    if (d && d->m_signalConnections > 0 && client )
+          client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
+ 
+     objMap()->remove(ident);
diff --git a/mandriva/2010.2/kdelibs/kdelibs3.spec b/mandriva/2010.2/kdelibs/kdelibs3.spec
new file mode 100644
index 000000000..9f38b5501
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/kdelibs3.spec
@@ -0,0 +1,1130 @@
+%define _requires_exceptions perl\(.*\)\\|devel\(linux-gate\)\\|devel\(libdns_sd\(.*\)\\|devel\(libdns_sd\)
+
+%define _disable_ld_no_undefined 1
+
+%define use_hspell_plugins 1
+
+%define compile_apidox 0
+%{?_no_apidox: %{expand: %%global compile_apidox 0}}
+
+%define use_kickoff_menu 1
+%{?_no_kickoff_menu: %{expand: %%global use_kickoff_menu 0}}
+
+%define lib_major 4
+%define lib_name_orig libkde3core
+%define lib_name %mklibname kde3core %{lib_major}
+%define libqt %mklibname qt 3
+
+%define lib_name_orig_kdepim %mklibname kdepim
+%define lib_major_kdepim 2
+%define lib_name_kdepim %lib_name_orig_kdepim%lib_major_kdepim
+
+%define lib_name_orig_kdebase libkdebase
+%define lib_major 4
+%define lib_name_kdebase %mklibname kdebase %lib_major
+
+%define epoch_kdelibs 30000000
+%define epoch_arts 30000001
+
+%define oname kdelibs
+
+Name: kdelibs3
+Summary: K Desktop Environment - Libraries
+Version: 3.5.12
+Release: %mkrel 4
+Epoch: %epoch_kdelibs
+Group: Graphical desktop/KDE
+License: LGPL_V2
+BuildRoot: %_tmppath/%name-%version-%release-root
+URL: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
+Source1: kdelibs-3.5.9-mandriva-mimetypes.tar.bz2
+Source2: verisign-class-3-secure-server-ca.pem
+Source3: kde3lib.filter
+Source4: kde3lib.script
+Patch2:	kdelibs-3.3.2-fix-kurlbar-global.patch
+Patch3:	kdelibs-3.5.3-fix-enable-dialogbox.patch
+Patch4: kdelibs-3.5.7-cups-1.3-conf.patch
+Patch10: kdelibs-3.5.2-move-xdg-menu-dir.patch
+Patch11: kdelibs-3.5.7-add-extra-catalogs.patch
+Patch15: kdelibs-3.5.9-kio-kfile-grouplist.patch
+Patch22: kdelibs-3.5.10-ktip-on-kde4.patch
+Patch26: kdelibs-3.5.10-LDFLAG_fix-1.patch
+Patch29: ac264.patch
+Patch30: kdelibs-dcopobject-destruct-crash.patch
+# Kickoff related patches 
+Patch204: kdelibs-3.5.8-add-bookmark-dialog.patch
+Obsoletes: kdelibs-static-devel
+Obsoletes: kdelibs3.0
+Obsoletes: kde3-kdelibs
+Requires: kde-l10n
+Conflicts: kdepim-korganizer <= 3.2.3-100mdk
+BuildRequires: kde3-macros
+BuildRequires: aspell-devel
+BuildRequires: lua-devel
+BuildRequires: avahi-compat-libdns_sd-devel 
+BuildRequires: avahi-qt3-devel 
+BuildRequires: avahi-client-devel
+BuildRequires: qt3-devel >= 3.3.6
+BuildRequires: libxslt-devel
+BuildRequires: libxml2 >= 2.4.11
+BuildRequires: openssl-devel
+BuildRequires: cups-devel >= 1.2
+BuildRequires: pcre-devel
+BuildRequires: fam-devel
+BuildRequires: libarts-devel
+BuildRequires: bzip2-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libsasl-devel
+BuildRequires: libtiff-devel
+BuildRequires: libvorbis-devel
+BuildRequires: pam-devel
+BuildRequires: X11-devel
+BuildRequires: libalsa-devel
+BuildRequires: libmad-devel
+BuildRequires: gdbm-devel
+BuildRequires: jasper-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: libacl-devel
+BuildRequires: krb5-devel
+BuildRequires: autoconf >= 1:2.59
+BuildRequires: automake > 1.5
+BuildRequires: libldap-devel
+BuildRequires: idn-devel
+BuildRequires: lzma-devel
+%if %use_hspell_plugins
+BuildRequires:	hspell-devel
+%endif
+BuildRequires:  liblzmadec-devel
+
+%description 
+Libraries for the K Desktop Environment.
+
+%files
+%defattr(-,root,root,-)
+
+#--------------------------------------------------------------
+
+%package -n %lib_name
+Group:      Development/KDE and Qt
+Summary:    Core libraries for KDE
+Obsoletes: kdetrayproxy 
+Obsoletes: kdelibs-arts
+Obsoletes: libkdecore4 < 4.0.0
+Provides: kdelibs = %{epoch_kdelibs}:%version-%release
+Provides: %lib_name_orig = %{epoch_kdelibs}:%version-%release
+Requires: kdelibs3-common = %{epoch_kdelibs}:%version-%release
+Requires: %{libqt} >= 3.2.2
+Requires: nss_mdns
+Conflicts: %lib_name < 3.1.91, libkdebase4 < 3.1.91
+Conflicts: kmplayer <= 0.8.4
+Conflicts: krusader <= 1.29-1mdk
+Conflicts: %lib_name_kdebase <= 1:3.3.2
+Conflicts: %lib_name_kdepim-korganizer <= 1:3.3.0-30mdk
+Obsoletes: kde3-kdepim-common < 3.5.12
+Requires: libtqtinterface >= 3.5.12-1
+
+%description -n %lib_name
+Libraries for the K Desktop Environment.
+
+%files -n %{lib_name}
+%defattr(-,root,root,-)
+%_sysconfdir/ld.so.conf.d/*
+%_kde3_libdir/libkdeinit_*
+%_kde3_libdir/libkdefakes_nonpic.a
+%_kde3_libdir/libDCOP.la
+%_kde3_libdir/libkdecore.la
+%_kde3_libdir/libkdefakes.la
+%_kde3_libdir/libkdefx.la
+%_kde3_libdir/libkdeprint.la
+%_kde3_libdir/libkdeprint_management.la
+%_kde3_libdir/libkdesu.la
+%_kde3_libdir/libkdeui.la
+%_kde3_libdir/libkhtml.la
+%_kde3_libdir/libkio.la
+%_kde3_libdir/libkjs.la
+%_kde3_libdir/libkmid.la
+%_kde3_libdir/libkparts.la
+%_kde3_libdir/libkscreensaver.la
+%_kde3_libdir/libkspell.la
+%_kde3_libdir/libktexteditor.la
+%_kde3_libdir/libkdesasl.la
+%_kde3_libdir/libkscript.la
+%_kde3_libdir/libkatepartinterfaces.la
+%_kde3_libdir/libkabc.la
+%_kde3_libdir/libartskde.la
+%_kde3_libdir/libkmediaplayer.la
+%_kde3_libdir/libkutils.la
+%_kde3_libdir/libkjava.la
+%_kde3_libdir/libkabc_dir.la
+%_kde3_libdir/libkabc_file.la
+%_kde3_libdir/libkabc_ldapkio.la
+%_kde3_libdir/libkmdi.la
+%_kde3_libdir/libkresources.la
+%_kde3_libdir/libkwalletbackend.la
+%_kde3_libdir/libkwalletclient.la
+%_kde3_libdir/libvcard.la
+%_kde3_libdir/libartskde.so.*
+%_kde3_libdir/libDCOP.so.*
+%_kde3_libdir/libkdecore.so.*
+%_kde3_libdir/libkdefakes.so.*
+%_kde3_libdir/libkdefx.so.*
+%_kde3_libdir/libkdeprint.so.*
+%_kde3_libdir/libkdeprint_management.so.*
+%_kde3_libdir/libkdesu.so.*
+%_kde3_libdir/libkdeui.so.*
+%_kde3_libdir/libkhtml.so.*
+%_kde3_libdir/libkio.so.*
+%_kde3_libdir/libkjs.so.*
+%_kde3_libdir/libkmid.so.*
+%_kde3_libdir/libkparts.so.*
+%_kde3_libdir/libkscreensaver.so.*
+%_kde3_libdir/libkspell.so.*
+%_kde3_libdir/libktexteditor.so.*
+%_kde3_libdir/libkdesasl.so.*
+%_kde3_libdir/libkscript.so.*
+%_kde3_libdir/libkatepartinterfaces.so.*
+%_kde3_libdir/libkabc.so.*
+%_kde3_libdir/libkmediaplayer.so.*
+%_kde3_libdir/libkutils.so.*
+%_kde3_libdir/libkjava.so.*
+%_kde3_libdir/libkabc_dir.so.*
+%_kde3_libdir/libkabc_file.so.*
+%_kde3_libdir/libkabc_ldapkio.so.*
+%_kde3_libdir/libkmdi.so.*
+%_kde3_libdir/libkresources.so.*
+%_kde3_libdir/libkwalletbackend.so.*
+%_kde3_libdir/libkwalletclient.so.*
+%_kde3_libdir/libvcard.so.*
+%_kde3_libdir/libkimproxy.la
+%_kde3_libdir/libkimproxy.so.*
+%_kde3_libdir/libknewstuff.la
+%_kde3_libdir/libknewstuff.so.*
+%_kde3_libdir/libkspell2.la
+%_kde3_libdir/libkspell2.so.*
+%_kde3_libdir/libkdnssd.la
+%_kde3_libdir/libkdnssd.so.*
+%_kde3_libdir/libkmdi2.la
+%_kde3_libdir/libkmdi2.so.*
+%_kde3_libdir/libkntlm.la
+%_kde3_libdir/libkntlm.so.*
+%_kde3_libdir/libkunittest.la
+%_kde3_libdir/libkunittest.so.*
+%_kde3_libdir/libconnectionmanager.la
+%_kde3_libdir/libconnectionmanager.so.*
+%_kde3_libdir/libkabc_net.la
+%_kde3_libdir/libkabc_net.so.*
+%_kde3_libdir/libkdefakes_pic.a
+%_kde3_libdir/libkrandr.la
+%_kde3_libdir/libkrandr.so.*
+%_kde3_libdir/libnetworkstatus.la
+%_kde3_libdir/libnetworkstatus.so.*
+%dir %_kde3_libdir/kde3
+%_kde3_libdir/kde3/*.la
+%_kde3_libdir/kde3/*.so
+%dir %_kde3_libdir/kde3/plugins/
+%dir %_kde3_libdir/kde3/plugins/designer/
+%_kde3_libdir/kde3/plugins/designer/*.so
+%_kde3_libdir/kde3/plugins/designer/*.la
+%dir %_kde3_libdir/kde3/plugins/styles/
+%_kde3_libdir/kde3/plugins/styles/*.la
+%_kde3_libdir/kde3/plugins/styles/*.so
+%{_var}/lib/rpm/filetriggers/kde3lib.*
+
+
+#--------------------------------------------------------------
+
+%package -n %lib_name-devel
+Group:		Development/KDE and Qt
+Summary:	Header files and documentation for compiling KDE applications
+Obsoletes:  kdelibs-devel
+Obsoletes: libkdecore4-devel < 4.0.0
+Provides:	kdelibs-devel = %{epoch_kdelibs}:%version-%release
+Provides:   kdelibs3-devel = %{epoch_kdelibs}:%version-%release
+Conflicts:	kdebase-devel <= 3.1.91mdk 
+Requires:	%lib_name = %{epoch_kdelibs}:%version-%release
+Requires:	acl-devel
+Requires:	qt3-devel >= 3.3.6
+Requires:   kde3-macros
+Requires:   libtqtinterface-devel >= 3.5.12-1
+Conflicts:  kmplayer <= 0.8.4
+Conflicts:  kdelibs-devel < 3.1.91
+Conflicts:  krusader <= 1.29-1mdk
+Conflicts:  %lib_name_kdepim-korganizer-devel <= 1:3.3.0-30mdk
+
+%description -n %lib_name-devel
+This package includes the header files you will need to compile applications 
+for KDE. Also included is the KDE API documentation in HTML format for easy 
+browsing.
+
+%files -n %lib_name-devel
+%defattr(-,root,root,-)
+%doc %_kde3_docdir/HTML/en/kspell
+%_kde3_includedir/*
+%_kde3_libdir/libartskde.so
+%_kde3_libdir/libDCOP.so
+%_kde3_libdir/libkabc_dir.so
+%_kde3_libdir/libkabc_file.so
+%_kde3_libdir/libkabc_ldapkio.so
+%_kde3_libdir/libkabc.so
+%_kde3_libdir/libkdecore.so
+%_kde3_libdir/libkdefakes.so
+%_kde3_libdir/libkdefx.so
+%_kde3_libdir/libkdeprint.so
+%_kde3_libdir/libkdeprint_management.so
+%_kde3_libdir/libkdesu.so
+%_kde3_libdir/libkdeui.so
+%_kde3_libdir/libkhtml.so
+%_kde3_libdir/libkio.so
+%_kde3_libdir/libkjs.so
+%_kde3_libdir/libkmid.so
+%_kde3_libdir/libkparts.so
+%_kde3_libdir/libkscreensaver.so
+%_kde3_libdir/libkspell.so
+%_kde3_libdir/libktexteditor.so
+%_kde3_libdir/libkdesasl.so
+%_kde3_libdir/libkscript.so
+%_kde3_libdir/libkatepartinterfaces.so
+%_kde3_libdir/libkmediaplayer.so
+%_kde3_libdir/libkutils.so
+%_kde3_libdir/libkjava.so
+%_kde3_libdir/libkresources.so
+%_kde3_libdir/libkwalletclient.so
+%_kde3_libdir/libkwalletbackend.so
+%_kde3_libdir/libkmdi.so
+%_kde3_libdir/libvcard.so
+%_kde3_libdir/libkimproxy.so
+%_kde3_libdir/libknewstuff.so
+%_kde3_libdir/libkspell2.so
+%_kde3_libdir/libkdnssd.so
+%_kde3_libdir/libkmdi2.so
+%_kde3_libdir/libkntlm.so
+%_kde3_libdir/libkunittest.so
+%_kde3_libdir/libconnectionmanager.so
+%_kde3_libdir/libkabc_net.so
+%_kde3_libdir/libkrandr.so
+%_kde3_libdir/libnetworkstatus.so
+
+#--------------------------------------------------------------
+
+%package    common
+Group:      Development/KDE and Qt
+Summary:    Config file and icons file for %name
+Requires(pre):   %lib_name = %{epoch_kdelibs}:%version-%release
+Requires: kde-config-file
+Conflicts:   kdelibs-common < 0.8.4-0.rc5.1mdk
+Conflicts:	kmplayer <= 0.8.4
+Conflicts:	krusader <= 1.29-1mdk
+Conflicts:      koffice <= 1.3-0.beta3.6mdk
+Conflicts:	kdesdk <= 3.1-9mdk
+Conflicts:  kdebase-progs <= 3.1.3-79mdk
+Conflicts:	%lib_name_kdepim-korganizer <= 1:3.3.0-30mdk
+Conflicts:	kjsembed <= 3.3.0
+Conflicts:	kmplayer <= 0.8.4
+Conflicts:	kdeadmin <= 2:3.3.2-6mdk 
+Conflicts:	kdevelop <= 3:3.2.2-3mdk
+Conflicts:	mandrake-mime <= 0.4
+Requires(post): 	kde-custom-icons
+Requires:	desktop-common-data
+Obsoletes:	mandrake-menu-directory
+Obsoletes:      kde3-kdelibs-common
+Obsoletes: kde3-kdepim-common < 3.5.12
+Requires:   hicolor-icon-theme
+Requires:  libxml2-utils
+Conflicts: kdepim =< 2.2.2-5
+Conflicts: kdeartwork =< 2.2.2-3mdk
+Conflicts: koffice =< 1.1.1-14mdk
+Conflicts: kdelibs-sound =< 2.2.2-48mdk
+Conflicts: kdebase =< 2.2.2-93mdk
+Conflicts: kdelibs < 3.1.91
+Conflicts: kdebase < 3.1.91
+Conflicts: k3b <= 0.9-15mdk
+Conflicts: kdesdk <= 3.1.3-9mdk
+Conflicts: koffice <= 1.3-0.beta3.6mdk
+Conflicts: %lib_name < 3.2.3-19mdk
+Conflicts: kdebase-progs <= 1:3.3.2
+Conflicts: kttsd <= 0.3.0
+Conflicts: kdeaddons <= 1:3.3.2
+Provides:  %oname-common = %{epoch_kdelibs}:%version-%release
+Requires: libtqtinterface >= 3.5.12-1
+
+%description common
+This packages contains all icons, config file etc...
+
+%files common
+%defattr(-,root,root,-)
+%doc %_kde3_docdir/HTML/en/common
+%dir %_kde3_configdir/
+%config(noreplace) %_kde3_configdir/kdebug.areas
+%config(noreplace) %_kde3_configdir/kdebugrc
+%config(noreplace) %_kde3_configdir/ksslcalist
+%config(noreplace) %_kde3_configdir/language.codes
+%config(noreplace) %_kde3_configdir/kthemestylerc
+%config(noreplace) %_kde3_configdir/khotnewstuffrc
+%config(noreplace) %_kde3_configdir/katefiletyperc
+%config(noreplace) %_kde3_configdir/ui/ui_standards.rc
+%config(noreplace) %_kde3_configdir/ui/kprintpreviewui.rc
+%config(noreplace) %_kde3_configdir/kdeprintrc
+%config(noreplace) %_kde3_configdir/katesyntaxhighlightingrc
+%config(noreplace) %_kde3_configdir/kio_isorc
+%dir %_kde3_configdir/colors/
+%dir %_kde3_configdir/ui/
+%_kde3_configdir/colors/*
+%_kde3_configdir/ipv6blacklist
+%doc %_kde3_appsdir/LICENSES
+%dir %_kde3_appsdir/kdewidgets
+%_kde3_appsdir/kdewidgets/*
+%dir %_kde3_appsdir/knewstuff
+%_kde3_appsdir/knewstuff/*
+%dir %_kde3_appsdir/ktexteditor_docwordcompletion/
+%_kde3_appsdir/ktexteditor_docwordcompletion/*
+%attr(0755,root,root) %_sysconfdir/profile.d/*
+%_kde3_bindir/lnusertemp
+%_kde3_bindir/start_kdeinit
+%_kde3_bindir/ktradertest
+%_kde3_bindir/kfmexec
+%_kde3_bindir/kioexec
+%_kde3_bindir/artsmessage
+%_kde3_bindir/checkXML
+%_kde3_bindir/cupsdconf
+%_kde3_bindir/cupsdoprint
+%_kde3_bindir/dcop
+%_kde3_bindir/dcopidl
+%_kde3_bindir/dcopidl2cpp
+%_kde3_bindir/dcopserver
+%_kde3_bindir/imagetops
+%_kde3_bindir/kbuildsycoca
+%_kde3_bindir/kconf_update
+%_kde3_bindir/kcookiejar
+%_kde3_bindir/kde-config
+%_kde3_bindir/kded
+%_kde3_bindir/kdeinit
+%_kde3_bindir/kdeinit_shutdown
+%_kde3_bindir/kdeinit_wrapper
+%_kde3_bindir/kdesu_stub
+%_kde3_bindir/kio_http_cache_cleaner
+%_kde3_bindir/kio_uiserver
+%_kde3_bindir/klauncher
+%_kde3_bindir/kmailservice
+%attr(4755, root, root) %_kde3_bindir/kpac_dhcp_helper
+%_kde3_bindir/ksendbugmail
+%_kde3_bindir/kshell
+%_kde3_bindir/kwrapper
+%_kde3_bindir/make_driver_db_cups
+%_kde3_bindir/meinproc
+%_kde3_bindir/preparetips
+%_kde3_bindir/kdontchangethehostname
+%_kde3_bindir/kfile
+%_kde3_bindir/kconfig_compiler
+%_kde3_bindir/kde-menu
+%_kde3_bindir/kcmshell
+%_kde3_bindir/dcopclient
+%_kde3_bindir/dcopfind
+%_kde3_bindir/dcopobject
+%_kde3_bindir/dcopref
+%_kde3_bindir/dcopserver_shutdown
+%_kde3_bindir/dcopstart
+%_kde3_bindir/kab2kabc
+%_kde3_bindir/kaddprinterwizard
+%_kde3_bindir/ktelnetservice
+%_kde3_bindir/make_driver_db_lpr
+%_kde3_bindir/kinstalltheme
+%_kde3_bindir/kioslave
+%_kde3_bindir/ksvgtopng
+%_kde3_bindir/dcopidlng
+%_kde3_bindir/dcopquit
+%attr(4755,root, root) %_kde3_bindir/kgrantpty
+%_kde3_bindir/kdostartupconfig
+%_kde3_bindir/kstartupconfig
+%_kde3_bindir/kunittestmodrunner
+%_kde3_bindir/khotnewstuff
+%_kde3_bindir/makekdewidgets
+%_kde3_bindir/start_kdeinit_wrapper
+%_kde3_bindir/kmimelist
+%_kde3_bindir/networkstatustestservice
+%dir %_kde3_datadir/applications/kde/
+%_kde3_datadir/applications/kde/kresources.desktop
+%dir %_kde3_appsdir/kabc/
+%_kde3_appsdir/kabc/*
+%dir %_kde3_appsdir/kconf_update/
+%_kde3_appsdir/kconf_update/*
+%dir %_kde3_appsdir/dcopidlng
+%_kde3_appsdir/dcopidlng/*
+%dir %_kde3_appsdir/kdeprint
+%_kde3_appsdir/kdeprint/*
+%dir %_kde3_appsdir/kdeui
+%_kde3_appsdir/kdeui/*
+%dir %_kde3_appsdir/khtml
+%_kde3_appsdir/khtml/*
+%dir %_kde3_appsdir/kio_uiserver
+%_kde3_appsdir/kio_uiserver/*
+%dir %_kde3_appsdir/proxyscout
+%_kde3_appsdir/proxyscout/*
+%dir %_kde3_appsdir/kjava/
+%_kde3_appsdir/kjava/*
+%dir %_kde3_appsdir/knotify
+%_kde3_appsdir/knotify/*
+%dir %_kde3_appsdir/ksgmltools2
+%_kde3_appsdir/ksgmltools2/*
+%dir %_kde3_appsdir/kssl
+%_kde3_appsdir/kssl/*
+%dir %_kde3_appsdir/kstyle
+%_kde3_appsdir/kstyle/*
+%dir %_kde3_appsdir/kcertpart
+%_kde3_appsdir/kcertpart/*
+%dir %_kde3_appsdir/katepart
+%_kde3_appsdir/katepart/*
+%dir %_kde3_appsdir/kcm_componentchooser
+%_kde3_appsdir/kcm_componentchooser/*
+%dir %_kde3_appsdir/ktexteditor_insertfile
+%_kde3_appsdir/ktexteditor_insertfile/*
+%dir %_kde3_appsdir/ktexteditor_isearch/
+%_kde3_appsdir/ktexteditor_isearch/*
+%dir %_kde3_appsdir/ktexteditor_kdatatool/
+%_kde3_appsdir/ktexteditor_kdatatool/*
+%dir %_kde3_autostart/
+%_kde3_autostart/*.desktop
+%_kde3_iconsdir/*
+%dir %_kde3_datadir/mimelnk
+%_kde3_datadir/mimelnk/*
+%dir %_kde3_datadir/emoticons
+%_kde3_datadir/emoticons/*
+%_kde3_datadir/locale/*
+%dir %_kde3_datadir/services/
+%_kde3_datadir/services/*
+%dir %_kde3_datadir/servicetypes/
+%_kde3_datadir/servicetypes/*
+%_sysconfdir/xdg/kde/menus/*
+%dir %_kde3_datadir/apps/konqueror/servicemenus/
+%_kde3_datadir/apps/konqueror/servicemenus/*
+%dir %_kde3_datadir/applnk/
+%_kde3_datadir/applnk/*
+# Not ship this files
+%exclude %_kde3_bindir/filesharelist
+%exclude %_kde3_bindir/fileshareset
+
+#--------------------------------------------------------------
+%if %compile_apidox
+%package devel-doc
+Group: Development/KDE and Qt
+Summary: Development documentation for %name
+Requires: qt3-doc
+BuildRequires:	doxygen
+BuildRequires:  graphviz
+BuildRequires:	qt3-doc
+
+%description devel-doc
+This packages contains all development documentation for kdelibs
+
+%files devel-doc
+%defattr(-,root,root,-)
+%doc %_kde3_docdir/HTML/en/kdelibs-apidocs
+%endif
+
+
+%prep
+%setup -q  -n %oname-%version
+%patch2 -p1 -b .add_kfile_item_in_global
+%patch3 -p1 -b .fix_disable_button
+%patch10 -p1 -b .move_xdg_menu_dir
+%patch11 -p0 -b .catalogs
+%patch15 -p1 -b .kio_kfile
+%patch22 -p1 -b .ktiponkde4
+%patch26 -p1 -b .ldflags
+%patch29 -p1 -b .ac
+%patch30 -p1 -b .dcopcrash
+%patch204 -p0 -b .post358
+
+# Cert
+cp %SOURCE2 kio/kssl/kssl
+echo "verisign-class-3-secure-server-ca.pem" >> kio/kssl/kssl/localcerts
+
+%build
+# This step is needed mostly because avahi patch
+# Until better solution is find, do not remove the build
+# regenerate step
+make -f admin/Makefile.common cvs
+
+QTDIR=%qt3dir ; export QTDIR;
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+
+%configure_kde3 \
+	--disable-arts-gsl \
+	--enable-cups \
+	--with-qt-libraries=%qt3lib \
+%if %use_hspell_plugins	
+	--with-hspell \
+%else
+	--without-hspell \
+%endif
+%if "%{_lib}" != "lib"
+	--enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \
+%endif
+	--with-extra-includes=/usr/include/avahi-compat-libdns_sd/:/opt/kde3/include/tqt \
+	
+make -C dnssd mocs
+
+%make
+
+%if %compile_apidox
+make apidox
+%endif
+
+
+%install
+rm -fr %buildroot
+
+make DESTDIR=%buildroot install
+
+# Lets push an stable mimlnk source tree, instead of dealing with patches
+pushd  %buildroot/%_kde3_datadir/
+    rm -rf mimelnk
+    tar xfj %SOURCE1
+popd
+
+%if %compile_apidox
+make install-apidox DESTDIR=%buildroot/
+%endif
+
+install -d %buildroot/%_sysconfdir/profile.d
+cat > %buildroot/%_sysconfdir/profile.d/91kde3.sh <<EOF
+
+if [ -z "\$PATH" ]; then
+    PATH=%{_bindir}:/bin:%{_kde3_bindir}
+else
+    if [ -z \$(echo \$PATH | grep %{_kde3_bindir}) ]; then
+    	PATH=\$PATH:%{_bindir}:%{_kde3_bindir}
+		export PATH
+	fi
+fi
+
+if [ -z "\$XDG_DATA_DIRS" ]; then
+    XDG_DATA_DIRS=%{_datadir}:%{_kde3_datadir}
+	export XDG_DATA_DIRS
+else
+    if [ -z \$(echo \$XDG_DATA_DIRS | grep %{_kde3_datadir}) ]; then
+		XDG_DATA_DIRS=\$XDG_DATA_DIRS:%{_datadir}:%{_kde3_datadir}
+		export XDG_DATA_DIRS
+	fi
+fi
+
+
+EOF
+
+install -d %buildroot/%_sysconfdir/ld.so.conf.d
+cat > %buildroot/%_sysconfdir/ld.so.conf.d/%lib_name.conf <<EOF
+%_kde3_libdir
+EOF
+
+mkdir %buildroot/var
+mkdir %buildroot/var/lib
+mkdir %buildroot/var/lib/rpm
+mkdir %buildroot/var/lib/rpm/filetriggers
+install -m 0644 %SOURCE3 %buildroot/var/lib/rpm/filetriggers
+install -m 0755 %SOURCE4 %buildroot/var/lib/rpm/filetriggers
+
+%clean
+rm -fr %buildroot
+
+
+
+%changelog
+* Mon Jul 26 2011 Tim Williams <tim@my-place.org.uk> 30000000:3.5.12-4mvf2010.2
++ Fix kde3-kdepim-common conflict
+
+* Mon Jul 26 2011 Tim Williams <tim@my-place.org.uk> 30000000:3.5.12-3mvf2010.2
++ Restore package name to libkde3core4 for main library
++ Add obsoletes libkdecore4 to libkde3core and libkde3core-devel package to solve upgrade conflit
+
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 30000000:3.5.12-2mdv2010.2
++ Add new filetrigger filters
+
+* Thu Feb 3 2011  Tim Williams <tim@my-place.org.uk> 30000000:3.5.12-1mdv2010.2
++ Added trinity KDE 3.5.12 sources
++ Added the following trinity patches
+  kdelibs-r1184225.diff
++ Fix the following patches which wouldn't apply due to code changes:
+  kdelibs-3.5.3-fix-enable-dialogbox.patch
+  kdelibs-3.5.7-add-extra-catalogs.patch
+  kdelibs-3.5.9-kio-kfile-grouplist.patch
+  kdelibs-3.5.10-ktip-on-kde4.patch
+- Removed the following patches which no longer seem to be necessary. In most cases the core code now contains the
+  necessary functionality:
+  kdelibs-3.5.7-speedbar-xdg-user-dirs.patch 
+  kdelibs-3.5.7-xdg-dirs-document-path.patch
+  kdelibs-3.5.4-dcop_wrong_reply.patch
+  kdelibs-3.5.8-smooth-scrolling.patch
+  kdelibs-3.5.0-rubberband-selection.patch
+  kdelibs-3.5.6-add-dnssd-avahi-support.patch
+  kdelibs-3.5.4-fix-translate-menu.patch
+  kdelibs-3.5.4-fix-translate-desktopfile.patch
+  kdelibs-3.5.5-ldap-kconfig.patch
+  kdelibs-3.5.10-kfile-beagle.patch
+  kdelibs-3.5.8-lzma_support.patch
+  kdelibs-3.5.8-cups_by_default.patch
+  kdelibs-3.5.10-glibc-inotify.patch
+  kdelibs-3.5.10-gcc44.patch
+  kdelibs-3.5.10-ossl-1.x.patch
+  kdelibs-3.5.10-gcc_4.4-2.patch
+  kde-am.patch
+  kickoff-drop-shadow.diff
+  clever-menu.diff
+  kdelibs-3.5.4-fix-https-loop.patch
++ Add unpackaged files to the files lists of the relevant packages
+  
+
+* Wed May 19 2010 Tim Williams <tim@my-place.org.uk> 30000000:3.5.10-13mdv2010.1
++ Added kdelibs-3.5.10-gcc_4.4-2.patch, kdelibs-3.5.10-LDFLAG_fix-1.patch, kdelibs-3.5.10-ossl-1.x.patch
+  kde-am.patch, ac264.patch, kdelibs-dcopobject-destruct-crash.patch
++ Rebuild for MDV 2010.1
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000000:3.5.10-12mdv2010.0
++ Rebuild for MDV 2010.0
++ Add kdelibs-3.5.10-gcc44.patch
+
+* Mon Mar 30 2009 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.10-11mdv2009.1
++ Revision: 362451
+- Rebuild to get rid of old libxcb references
+
+* Wed Mar 18 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.10-10mdv2009.1
++ Revision: 357134
+- Some Provides/Obsoletes Fixes
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.10-9mdv2009.1
++ Revision: 356571
+- Add provide on kdelibs-common
+
+* Mon Mar 16 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.10-8mdv2009.1
++ Revision: 355784
+- Fix Requires
+
+* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.10-7mdv2009.1
++ Revision: 355410
+- Do not build apidox for now
+- Fix BuildRequires
+- fix for new package  name
+- Change kdelibs to kdelibs3 ( kde3 reintroduction step 2 )
+
+* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000000:3.5.10-5mdv2009.1
++ Revision: 300983
+- rebuild for xcb changes
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add icon for powerpoint files
+
+* Sun Sep 28 2008 Anssi Hannula <anssi@mandriva.org> 30000000:3.5.10-4mdv2009.0
++ Revision: 289032
+- prefer the glibc header for inotify (fixes build with current
+  kernel-headers, r858854+859451 from KDE SVN)
+- rename /etc/ld.so.conf.d/kde3.conf to %%lib_name.conf to avoid conflicts
+  on biarch systems
+
+* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.10-3mdv2009.0
++ Revision: 278570
+- Ktip is not enabled on kde 3 and kde 4
+
+* Fri Aug 29 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.10-2mdv2009.0
++ Revision: 277335
+- ktip should not appears on kde4. This is an exception on kde3 autostart services
+
+* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.10-1mdv2009.0
++ Revision: 276217
+- Update for probably the last upstream kdelibs from kde3
+
+* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-25mdv2009.0
++ Revision: 266500
+- Fix expanding test issue
+
+* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-24mdv2009.0
++ Revision: 266223
+- Fix profile
+
+* Thu Jul 03 2008 Olivier Blin <oblin@mandriva.com> 30000000:3.5.9-23mdv2009.0
++ Revision: 230927
+- rebuild (the build system ate the previous package)
+
+* Wed Jul 02 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.9-22mdv2009.0
++ Revision: 230631
+- Fix  test on $PATH
+- Revert: misunderstanding
+- More fix on PATH :/
+
+* Wed Jul 02 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.9-21mdv2009.0
++ Revision: 230598
+- Fix $PATH
+
+* Sun Jun 29 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.9-20mdv2009.0
++ Revision: 230057
+- Add missing dir on 91kde3.sh
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Added new profile to solve issues of XDG
+
+  + Pixel <pixel@mandriva.com>
+    - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-19mdv2009.0
++ Revision: 213552
+- Configure was wrong during the transition...
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Revert XDG_DATA_DIRS workaround this breaks other DM (gnome fox ex
+
+* Tue May 27 2008 Funda Wang <fundawang@mandriva.org> 30000000:3.5.9-17mdv2009.0
++ Revision: 211521
+- rebuild for new qt3
+
+* Mon May 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-16mdv2009.0
++ Revision: 211426
+- Added recent branch patchs ( Description inlcuded in patches )
+- Added collin suggestion for XDG_DATA_DIR even not becoming final solution. will solve pontual issues users
+  are having with kde3 + modules
+
+* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.9-15mdv2009.0
++ Revision: 205309
+- Fix macros for cache image
+
+* Sun May 04 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-14mdv2009.0
++ Revision: 201205
+- Invalid requires for libarts giving us headaches
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add kde3-macros as Requires for kdelibs-devel
+
+* Sun May 04 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-12mdv2009.0
++ Revision: 200807
+- Branch patches are provided with full changelog now
+- kde 3 now seats under /opt
+
+* Thu Mar 20 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-10mdv2008.1
++ Revision: 189192
+- khtml fixes from kde branch
+
+* Mon Mar 17 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-9mdv2008.1
++ Revision: 188277
+- Patch from branch to fix skipped lat icon on set
+
+* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-8mdv2008.1
++ Revision: 187983
+- Dcopserver shutdown fix from kde branch
+
+* Thu Mar 13 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-7mdv2008.1
++ Revision: 187696
+- Closing bug https://qa.mandriva.com/show_bug.cgi?id=29797
+- Added latest branch post 3.5.9 bugfixes. ( kdeinit with --new-startup )
+
+* Thu Mar 06 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.9-6mdv2008.1
++ Revision: 180266
+- Add mandriva-kde-translation catalogs support (thanks Helio)
+- [BUGFIX] Fix mimetype for svg (Bug #35301)
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - kfilegroup info patch to redice pooling time under the network using proper glibc calls. Thanks to Andreas Hasenack
+
+* Wed Feb 20 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-4mdv2008.1
++ Revision: 173307
+- Proper fix of kate line position issue. We need wake up some packagers :-/
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Fix encoding of x-bzeps.desktop in french (Bug #32764)
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-2mdv2008.1
++ Revision: 168139
+- Revert the Makefile.am changes to allow header proper install
+- Revert the Makefile.am changes to allow header proper install
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.9-1mdv2008.1
++ Revision: 167794
+- Get away from branches. Last KDE 3 arriving !!
+- Removed post-3.5.8 patches intregrated
+- Fixed dnnsd patch and added a workaround on spec to not brask nrproc compilations
+
+  + Per Øyvind Karlsen <peroyvind@mandriva.org>
+    - fix breakage with tar.bz2 archives (modifies P18, fixes #37194)
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [FEATURE] Add back bookmark dialog (Bug #31933)
+
+* Wed Jan 16 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.8-9mdv2008.1
++ Revision: 153911
+- [BUGFIX] Fix embedding started from outside by reparenting inside to QXEmbed. (Bug #36478)
+
+* Wed Jan 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.8-8mdv2008.1
++ Revision: 146989
+- [BUGFIX] Fix tests on %%post (Bug #32974)
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Per Øyvind Karlsen <peroyvind@mandriva.org>
+    - regenerate lzma patch (P18)
+
+* Sat Dec 22 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.8-7mdv2008.1
++ Revision: 136741
+- Updated to branch, with officil qxembed/flash fixes
+- Fixed ldap patch
+- Disabled lzma for now since it's not applying with current base
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Mon Dec 17 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 30000000:3.5.8-6mdv2008.1
++ Revision: 122429
+- Add a patch to detect cups every time.
+  If user force the choice, autodetect will be stoped.
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fixed qxembed and flash novell patches to compile
+    - Added current qxembed patch from suse
+    - Fix smooth scrooling patch, based on suse current patch
+    - Remove old qxembed patch. not valid for current status and superseded by flash test patch
+    - Added Lubos kdelibs part test patch for flash plugin issues
+
+* Thu Dec 06 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 30000000:3.5.8-3mdv2008.1
++ Revision: 115892
+- Requires nss_mdns so that zeroconf works. (#21010)
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Fix Build as we have now qt4 as default
+
+  + Per Øyvind Karlsen <peroyvind@mandriva.org>
+    - fix lzma filter bug, fixes reading of >8KB man pages (fixes #34294)
+
+* Mon Nov 05 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.8-2mdv2008.1
++ Revision: 106219
+- [BUGFIX] Fix encoding of control panel and main menu (Bug #27478)
+
+* Wed Oct 24 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.8-1mdv2008.1
++ Revision: 101837
+- Fix File list
+- Remove patch 247 ( merged upstream )
+- Kde 3.5.8
+- Remove upstream merged patches
+- [BUGFIX] Fix avahi support (Bug #26154)
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix summary-ended-with-dot
+
+* Mon Oct 01 2007 Frederic Crozat <fcrozat@mandriva.com> 30000000:3.5.7-43mdv2008.0
++ Revision: 94112
+- Add conflicts on mandrake-mime for update from 2007.0
+
+* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 30000000:3.5.7-42mdv2008.0
++ Revision: 93438
+- Fix xdg-user-dir usage in KDE on non-utf8 locales (#33973)
+- Removed obsolete document path patch
+
+* Fri Sep 21 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-41mdv2008.0
++ Revision: 92016
+- Fixed pdf2ps on the fly conversion in kdeprint. Thanks to Ademar Reis to dig, catch and provide
+  the fix
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] Add mimetype for *.m2t files (Bug #27589)
+
+* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-40mdv2008.0
++ Revision: 85681
+- Latest updated on libltdl and khtml rendering
+
+* Thu Sep 13 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 30000000:3.5.7-39mdv2008.0
++ Revision: 85316
+- Add lzma support (#32877)
+
+* Wed Sep 12 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-38mdv2008.0
++ Revision: 84624
+- Updated cve-4224-4225-3820
+- kurl patches
+- xhtml fixes
+- Add pdf2ps converdion as a kprinter filter. Thanks to Ademar found the bug
+
+* Mon Sep 10 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-36mdv2008.0
++ Revision: 84149
+- Fixed latest cookie jar patches. Neoclust modified the flaw patch for kopete crash. Need be
+  remember that the change was done directly on old patch, instead of follow correct mandriva
+  procedure of add proper new patch branch revision. In the future, people that touch in kdelibs
+  should avoid enter same patch again.
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Make patches back as the one making kopete crash is fixed now
+
+* Thu Sep 06 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-35mdv2008.0
++ Revision: 81097
+- Application requesting mime from mdkonline without require the packge itselfr leas developers to make errors on fixing mimetypes
+
+* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-34mdv2008.0
++ Revision: 80379
+- Latest mimetypes
+- Disable http patches that breaks kopete msn http login
+
+* Mon Sep 03 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-32mdv2008.0
++ Revision: 78603
+- Added lates patches from branch
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Another mimetype fix for 32764
+    - [BUGFIX] -Fix french comment of image/x-bzeps.desktop (#32764)
+
+* Sat Sep 01 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-31mdv2008.0
++ Revision: 77709
+- Fix some mimetypes
+  		- Remove x-mdv-exec
+  		- add 2 pdf mimetypes
+
+* Thu Aug 30 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-30mdv2008.0
++ Revision: 76328
+- Boiko's patch to fix svn rendering and including embed images
+- More patches from upstream branch
+
+* Wed Aug 29 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-29mdv2008.0
++ Revision: 74689
+- Last mimetypes, m3u recursion fix
+- Cups 1.3 now fully functional
+- Mimetype tree is provided in a separate tarball instead of multiple patches.
+  The intention is to make easy to fix all missing ones, as reported by kbuildsyscoca.
+  Almost all video, audio and image mimetypes are solved now, some application/ still to be solved,
+  mostly due to gnome apps requires.
+- This patch is uselles, as problem happens before reach proper test
+- Start to fix the remaining mime issues
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - add upstream patch from BRANCH (patch 252)
+    - Add 2 upstream patches from 3.5.x BRANCH
+
+* Fri Aug 24 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-27mdv2008.0
++ Revision: 70874
+- Added remaining patches on branch tree
+- Fixed build with cups 1.3, updated with no advise :-/
+- Added last remaining patches for xdg user dirs
+- Added XDG USER DIRS spec.
+- Removed old invalid patchs
+- Removed support for legacy icons
+- Added XDG USER DIRS catalog as standard
+- Remove the recursive mimetype. Previous workaround to real fix. This not prevents happens in the
+  future in a new mime addition, but solves current 100%% cpu usage in mime calls. Need run
+  kbuildsyscoca again for be effective in already running installs
+
+* Wed Aug 15 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-23mdv2008.0
++ Revision: 63782
+- On the fly per-app language change....
+
+* Wed Aug 15 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-22mdv2008.0
++ Revision: 63689
+- Sec. fix CVE-2007-4224, CVE-2007-3820, CVE-2007-4225
+
+* Tue Aug 14 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-21mdv2008.0
++ Revision: 63408
+- Added another patch from upstream branch
+- Fixed file conflicts. New urpmi/rpm is doing a great job to fix our ancient problems
+
+* Mon Aug 13 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-20mdv2008.0
++ Revision: 62659
+- Rename patch for proper name
+- Submit package, which for some reason aren't submitted before. Should solve Mdv bug
+  http://qa.mandriva.com/show_bug.cgi?id=32488
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add patch 227 : Better consolekit support
+    - add some missing Excel mimetypes
+
+  + Funda Wang <fundawang@mandriva.org>
+    - meinproc requires xmllint
+
+* Fri Jul 27 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-19mdv2008.0
++ Revision: 56129
+- Removing invalid patch for share dialog disable. Was in same pack as kickoff old patches and was applied by mistake
+- Changing to one license only
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - add missing mimetype
+
+* Wed Jul 25 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-17mdv2008.0
++ Revision: 55210
+- Remove non-existant mimetypes from Makefile
+
+* Tue Jul 24 2007 David Walluck <walluck@mandriva.org> 30000000:3.5.7-16mdv2008.0
++ Revision: 55073
+- fix release
+- move binaries in libkdecore to common in order to allow parallel lib installs
+
+* Thu Jul 19 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-15mdv2008.0
++ Revision: 53378
+- Fix kde bug #130104
+
+* Mon Jul 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-14mdv2008.0
++ Revision: 52656
+- Update latest bugfixes from upstream branch
+
+* Mon Jul 16 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-13mdv2008.0
++ Revision: 52529
+- Do not add x-fli file
+
+* Mon Jul 16 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-12mdv2008.0
++ Revision: 52399
+- Add  Mimetypes for video/
+- Add Mimetypes for image/
+- Add Mimetypes for text/
+- Fix install of x-zip-compressed
+
+  + Anssi Hannula <anssi@mandriva.org>
+    - drop requires on aspell from kdelibs-common (users should be free to remove
+      aspell if they do not use it for spell-checking)
+
+* Mon Jul 09 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 30000000:3.5.7-11mdv2008.0
++ Revision: 50637
+- Remove the build requirement for the mandriva menu category script
+- Remove mandriva specific categories script
+- Fix the fix-document-path patch which was not using readlink in the right way
+
+* Thu Jun 14 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-10mdv2008.0
++ Revision: 39756
+- Add mimetype for flv files (bug #31285)
+
+* Wed Jun 13 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-9mdv2008.0
++ Revision: 38993
+- Own %%_libdir/kde3 directory
+
+* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 30000000:3.5.7-8mdv2008.0
++ Revision: 36178
+- rebuild with correct optflags
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Added latest relevant patches from branch
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Add patch202 from kde bugzilla ( bug #52151 )
+
+* Fri Jun 01 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-5mdv2008.0
++ Revision: 34251
+- Added post 3.5.7 gmail backport
+
+* Fri Jun 01 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000000:3.5.7-4mdv2008.0
++ Revision: 34037
+- Remove mandriva-create-kde-mdk-menu Requires
+- First patch to add new mimetypes ( excel related )
+
+  + Anssi Hannula <anssi@mandriva.org>
+    - Add missing buildrequires for idn-devel
+
+* Thu May 17 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-3mdv2008.0
++ Revision: 27591
+- Minor update in official tarball from kde.org
+
+* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-2mdv2008.0
++ Revision: 27434
+- 3.5.7 release
+- Added extrea catalog for kickoff translations
+
+* Thu May 10 2007 Helio Chissini de Castro <helio@mandriva.com> 30000000:3.5.7-0.6mdv2008.0
++ Revision: 26175
+- Updated for branch revision 663293
+- Fixed apidocs install
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Change Requires to use new script and do not generated %%_menudir file anymore
+    - Add back mandriva categories on .desktop file
+
diff --git a/mandriva/2010.2/kdelibs/verisign-class-3-secure-server-ca.pem b/mandriva/2010.2/kdelibs/verisign-class-3-secure-server-ca.pem
new file mode 100644
index 000000000..6a60f56cd
--- /dev/null
+++ b/mandriva/2010.2/kdelibs/verisign-class-3-secure-server-ca.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEnDCCBAWgAwIBAgIQdTN9mrDhIzuuLX3kRpFi1DANBgkqhkiG9w0BAQUFADBf
+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
+LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+HhcNMDUwMTE5MDAwMDAwWhcNMTUwMTE4MjM1OTU5WjCBsDELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cu
+dmVyaXNpZ24uY29tL3JwYSAoYykwNTEqMCgGA1UEAxMhVmVyaVNpZ24gQ2xhc3Mg
+MyBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAlcMhEo5AxQ0BX3ZeZpTZcyxYGSK4yfx6OZAqd3J8HT732FXjr0LLhzAC3Fus
+cOa4RLQrNeuT0hcFfstG1lxToDJRnXRkWPkMmgDqXkRJZHL0zRDihQr5NO6ziGap
+paRa0A6Yf1gNK1K7hql+LvqySHyN2y1fAXWijQY7i7RhB8m+Ipn4G9G1V2YETTX0
+kXGWtZkIJZuXyDrzILHdnpgMSmO3ps6wAc74k2rzDG6fsemEe4GYQeaB3D0s57Rr
+4578CBbXs9W5ZhKZfG1xyE2+xw/j+zet1XWHIWuG0EQUWlR5OZZpVsm5Mc2JYVjh
+2XYFBa33uQKvp/1HkaIiNFox0QIDAQABo4IBgTCCAX0wEgYDVR0TAQH/BAgwBgEB
+/wIBADBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYBBQUHAgEWHGh0
+dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0
+cDovL2NybC52ZXJpc2lnbi5jb20vcGNhMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBEG
+CWCGSAGG+EIBAQQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMRQ2xhc3Mz
+Q0EyMDQ4LTEtNDUwHQYDVR0OBBYEFG/sr6DdiqTv9SoQZy0/VYK81+8lMIGABgNV
+HSMEeTB3oWOkYTBfMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIElu
+Yy4xNzA1BgNVBAsTLkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHmCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQEFBQADgYEA
+w34IRl2RNs9n3Nenr6+4IsOLBHTTsWC85v63RBKBWzFzFGNWxnIu0RoDQ1w4ClBK
+Tc3athmo9JkNr+P32PF1KGX2av6b9L1S2T/L2hbLpZ4ujmZSeD0m+v6UNohKlV4q
+TBnvbvqCPy0D79YoszcYz0KyNCFkR9MgazpM3OYDkAw=
+-----END CERTIFICATE-----
diff --git a/mandriva/2010.2/readme.txt b/mandriva/2010.2/readme.txt
new file mode 100644
index 000000000..714353492
--- /dev/null
+++ b/mandriva/2010.2/readme.txt
@@ -0,0 +1,29 @@
+Many of the Mandriva TDE packages don't currently build without manual intervention.
+This is largely being caused by automake/autoconf issues which i'm expecting to be
+solved by the cmake migration in Trinity 3.5.13. Therefore, rather than spend a lot
+of time trying to fix an obsolete build process, i've got a procedure to work around
+the problem so that working Trinity packages can be built.
+
+The build problem is caused compilation failures at a number of points in the build
+process, with the linker being unable to find various QT classes. This is being
+caused by an option in the compilation command "-Wl,--as-needed", this option only
+gets added to the compilation options when the build process is initiated by
+rpmbuild, if I use the ./configure command with the same options and build the
+sources manually, then this option is never added and the packages compile normally.
+Therefore, it is being added by something in the rpmbuild process. So, the current
+build procedure is:
+
+1) execute
+       rpmbuild -ba <spec file>
+   as normal.
+2) If the build process crashes with the qt linking errors, switch to the build
+   directory to perform a manual build.
+3) ensure /opt/kde3/bin is in the PATH environment variable.
+4) re-run ./configure, using the options stored in the config.log file.
+5) start make again. You might need to do a "make clean" if the build still fails
+   with the same error.
+6) return to the SPEC's directory and execute
+       rpmbuild -bi --short-circuit=i <spec file>
+   followed by
+       rpmbuild -ba --short-circuit=i <spec file>
+7) You should now have the RPM packages.
author	Tim Williams <tmw@autotrain.org>	2011-10-14 13:51:18 +0100
committer	Tim Williams <tmw@autotrain.org>	2011-10-14 13:51:18 +0100
commit	ec2515f058c60d2478a549f58376db628ba556b9 (patch)
tree	aefbde1b807005611b397e01ebc5782c7d27ff91 /mandriva/2010.2
parent	bba295da1161579c6fe734680c827e50a3585131 (diff)
download	tde-packaging-ec2515f058c60d2478a549f58376db628ba556b9.tar.gz tde-packaging-ec2515f058c60d2478a549f58376db628ba556b9.zip