rev 9472 - in trunk/packages: arts/debian/patches kdeadmin/debian kdeadmin/debian/patches kdegraphics/debian kdegraphics/debian/patches kdemultimedia/debian kdemultimedia/debian/patches kdenetwork/debian kdenetwork/debian/patches kdetoys/debian kdetoys/debian/patches kdeutils/debian kdeutils/debian/patches

Modestas Vainius modax-guest at alioth.debian.org
Tue Feb 26 15:51:38 UTC 2008


Author: modax-guest
Date: 2008-02-26 15:51:35 +0000 (Tue, 26 Feb 2008)
New Revision: 9472

Added:
   trunk/packages/kdeadmin/debian/patches/97_automake_cleanup.diff
   trunk/packages/kdegraphics/debian/patches/97_automake_cleanup.diff
   trunk/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff
   trunk/packages/kdemultimedia/debian/patches/97_automake_cleanup.diff
   trunk/packages/kdenetwork/debian/patches/97_automake_cleanup.diff
   trunk/packages/kdetoys/debian/patches/97_automake_cleanup.diff
Removed:
   trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff
   trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff
   trunk/packages/kdemultimedia/debian/patches/02_noatun_kconf.diff
   trunk/packages/kdemultimedia/debian/patches/03_automake_cleanup.diff
   trunk/packages/kdenetwork/debian/patches/02_dlopen-xmms-automake.diff
   trunk/packages/kdenetwork/debian/patches/03_automake_cleanup.diff
   trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff
Modified:
   trunk/packages/arts/debian/patches/01_admin_cleanup.diff
   trunk/packages/arts/debian/patches/98_buildprep.diff
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff
   trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
   trunk/packages/kdegraphics/debian/changelog
   trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff
   trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
   trunk/packages/kdegraphics/debian/rules
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/patches/01_admin_cleanup.diff
   trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/patches/01_admin_cleanup.diff
   trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
   trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
   trunk/packages/kdenetwork/debian/rules
   trunk/packages/kdetoys/debian/changelog
   trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff
   trunk/packages/kdetoys/debian/patches/98_buildprep.diff
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff
   trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
* Bring 01_admin_cleanup.diff up-to-date (based on kdelibs version) for the rest of modules using it.
* Use 97_automake_cleanup.diff for automake cleanup patch name everywhere.
* Rebuilding buildprep.


Modified: trunk/packages/arts/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/arts/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/arts/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,6 +1,6 @@
---- kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-20 17:12:56.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -12,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -21,7 +21,53 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-@@ -4486,7 +4491,7 @@
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
  kde_save_cflags="$CFLAGS"
  CFLAGS="$CFLAGS $PYTHONINC"
  kde_save_libs="$LIBS"
@@ -30,7 +76,7 @@
  kde_save_ldflags="$LDFLAGS"
  LDFLAGS="$LDFLAGS $PYTHONLIB"
  
-@@ -4624,7 +4629,7 @@
+@@ -4626,7 +4632,7 @@
      and contact the authors to let them know about this problem])
  	])
  
@@ -39,8 +85,8 @@
    AC_SUBST(PYTHONINC)
    AC_SUBST(PYTHONLIB)
    AC_SUBST(LIBPYTHON)
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdeadmin/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,4 +1,4 @@
-kdeadmin (4:3.5.9-1~pre2) unstable; urgency=low
+kdeadmin (4:3.5.9-1~pre3) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -6,10 +6,10 @@
   * Fix offsets for the 01_really_recognize_etch.diff patch.
   * Add automake cleanup patches:
     - 001_admin_cleanup.diff
-    - 002_automake_cleanup.diff
+    - 97_automake_cleanup.diff
     - Finally, rebuild buildprep with automake 1.10.1
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Feb 2008 23:44:57 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Feb 2008 17:01:21 +0200
 
 kdeadmin (4:3.5.8-2) unstable; urgency=low
 

Modified: trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdeadmin/debian/patches/001_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,7 +1,6 @@
-diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
---- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -13,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -22,9 +21,72 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Deleted: trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff

Copied: trunk/packages/kdeadmin/debian/patches/97_automake_cleanup.diff (from rev 9471, trunk/packages/kdeadmin/debian/patches/002_automake_cleanup.diff)
===================================================================
--- trunk/packages/kdeadmin/debian/patches/97_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/97_automake_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,55 @@
+--- kdeadmin-3.5.9/kfile-plugins/deb/Makefile.am	2008-02-19 23:18:36.000000000 +0200
++++ kdeadmin-3.5.9/kfile-plugins/deb/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_deb_la_SOURCES = kfile_deb.cpp
+ kfile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_deb_la_LIBADD = $(LIB_KSYCOCA)
++kfile_deb_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdeadmin-3.5.9/kfile-plugins/rpm/Makefile.am	2008-02-19 23:18:36.000000000 +0200
++++ kdeadmin-3.5.9/kfile-plugins/rpm/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_rpm_la_SOURCES = kfile_rpm.cpp
+ kfile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_rpm_la_LIBADD = $(LIB_KSYCOCA)
++kfile_rpm_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdeadmin-3.5.9/knetworkconf/knetworkconf/Makefile.am	2008-02-19 23:18:34.000000000 +0200
++++ kdeadmin-3.5.9/knetworkconf/knetworkconf/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la
+ 
+-kcm_knetworkconfmodule_la_LIBADD   =  $(LIB_KDEUI)
++kcm_knetworkconfmodule_la_LIBADD   =  $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ 
+ # the library search path. 
+ kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+--- kdeadmin-3.5.9/kpackage/Makefile.am	2008-02-19 23:18:37.000000000 +0200
++++ kdeadmin-3.5.9/kpackage/Makefile.am	2008-02-19 23:37:02.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-kpackage_LDADD   =  $(LIB_KFILE) $(LIBINTL) $(LIBZ)  $(LIBUTEMPTER)
++kpackage_LDADD   =  $(LIB_KFILE) $(LIBINTL) $(LIBUTEMPTER)
+ 
+ INCLUDES = $(all_includes)
+ 
+--- kdeadmin-3.5.9/lilo-config/kde/Makefile.am	2008-02-19 23:18:33.000000000 +0200
++++ kdeadmin-3.5.9/lilo-config/kde/Makefile.am	2008-02-19 23:36:38.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ kcm_lilo_la_SOURCES = kcontrol.cpp Details.cpp InputBox.cpp
+ kcm_lilo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_KIO)
++kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ kcm_lilo_la_METASOURCES = AUTO
+ AM_CXXFLAGS = -DUSE_KDE
+ 

Modified: trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdegraphics/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,4 +1,4 @@
-kdegraphics (4:3.5.9-1~pre2) unstable; urgency=low
+kdegraphics (4:3.5.9-1~pre3) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -12,7 +12,7 @@
     undefined symbols in libraries:
     - 01_admin_cleanup.diff - clean up $(LIB_QT) variable and patch libtool
       to avoid useless dependencies when linking with static libraries.
-    - 02_makefile_am_clean.diff - many fixes to Makefile.am files all over the
+    - 97_automake_cleanup.diff - many fixes to Makefile.am files all over the
       place to resolve undefined and unused symbol errors.
   * Remove PACKAGES_WITH_LIBS from debian/rules. It's no longer needed with
     recent dpkg-shlibdeps.

Modified: trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,7 +1,6 @@
-diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
---- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -13,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -22,9 +21,72 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Deleted: trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff

Copied: trunk/packages/kdegraphics/debian/patches/97_automake_cleanup.diff (from rev 9471, trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff)
===================================================================
--- trunk/packages/kdegraphics/debian/patches/97_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/97_automake_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,643 @@
+--- kdegraphics-3.5.9/kmrml/kmrml/Makefile.am	2008-02-19 11:35:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/Makefile.am	2008-02-19 00:52:23.000000000 +0200
+@@ -9,13 +9,13 @@
+ kde_module_LTLIBRARIES = kio_mrml.la libkmrmlpart.la
+ 
+ kio_mrml_la_SOURCES = mrml.cpp
+-kio_mrml_la_LIBADD  = $(LIB_KMRMLSTUFF) $(LIB_KIO)
++kio_mrml_la_LIBADD  = $(LIB_KMRMLSTUFF) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ kio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \
+ 	mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \
+ 	collectioncombo.cpp algorithmcombo.cpp propertysheet.cpp
+-libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS)
++libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ libkmrmlpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ services_DATA = mrml.protocol mrml_part.desktop
+@@ -32,7 +32,7 @@
+ lib_LTLIBRARIES = 
+ kdeinit_LTLIBRARIES = mrmlsearch.la
+ 
+-mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE)
++mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE) $(LIB_QT) -lDCOP
+ mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ mrmlsearch_la_SOURCES = mrmlsearch.cpp
+ 
+--- kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am	2008-02-19 11:29:19.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am	2008-02-19 11:29:33.000000000 +0200
+@@ -7,4 +7,4 @@
+ libtext2path_include_HEADERS = BezierPath.h Glyph.h GlyphTracer.h
+ 
+ libtext2path_la_SOURCES = Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
+-libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS)
++libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS) -lfreetype
+--- kdegraphics-3.5.9/kamera/kcontrol/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kamera/kcontrol/Makefile.am	2008-02-19 01:04:41.000000000 +0200
+@@ -3,7 +3,7 @@
+ kcm_kamera_la_SOURCES = kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
+ 
+ kcm_kamera_la_LDFLAGS  = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kamera_la_LIBADD = $(LIB_KIO) $(GPHOTO2_LIBS)
++kcm_kamera_la_LIBADD = $(GPHOTO2_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ INCLUDES= $(all_includes) $(GPHOTO2_INCS)
+ 
+ kcm_kamera_la_METASOURCES = AUTO
+--- kdegraphics-3.5.9/kamera/kioslave/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kamera/kioslave/Makefile.am	2008-02-19 01:06:22.000000000 +0200
+@@ -8,7 +8,7 @@
+ kde_module_LTLIBRARIES = kio_kamera.la
+ 
+ kio_kamera_la_SOURCES = kamera.cpp
+-kio_kamera_la_LIBADD  = $(LIB_KIO) -lgphoto2
++kio_kamera_la_LIBADD  = $(LIB_KIO) -lgphoto2 $(LIB_QT) $(LIB_KDECORE)
+ kio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN)
+ 
+ noinst_HEADERS = kamera.h
+--- kdegraphics-3.5.9/kdvi/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kdvi/Makefile.am	2008-02-19 01:16:15.000000000 +0200
+@@ -31,6 +31,7 @@
+ 
+ kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \
++			$(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_KIO) \
+ 			$(top_builddir)/kviewshell/libkmultipage.la
+ 
+ # Which sources should be compiled for squeeze.
+--- kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am	2008-02-19 00:43:23.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ lib_LTLIBRARIES = libkfaximage.la
+ libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
+-libkfaximage_la_LIBADD  = $(LIB_KDECORE)
++libkfaximage_la_LIBADD  = $(LIB_KDECORE) $(LIB_QT)
+ libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
+ 
+ include_HEADERS = kfaximage.h
+--- kdegraphics-3.5.9/kfaxview/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfaxview/Makefile.am	2008-02-19 01:16:42.000000000 +0200
+@@ -23,7 +23,8 @@
+ 
+ kde_module_LTLIBRARIES = kfaxviewpart.la
+ kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kfaxviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la
++kfaxviewpart_la_LIBADD = -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la \
++	    $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp
+ 
+ partdir = $(kde_datadir)/kfaxview
+--- kdegraphics-3.5.9/kfile-plugins/bmp/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/bmp/Makefile.am	2008-02-19 00:54:01.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_bmp_la_SOURCES = kfile_bmp.cpp 
+ kfile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_bmp_la_LIBADD = $(LIB_KSYCOCA)
++kfile_bmp_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/dds/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/dds/Makefile.am	2008-02-19 00:31:41.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_dds_la_SOURCES = kfile_dds.cpp 
+ kfile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_dds_la_LIBADD = $(LIB_KSYCOCA)
++kfile_dds_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/dvi/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/dvi/Makefile.am	2008-02-19 00:32:21.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_dvi_la_SOURCES = kfile_dvi.cpp
+ kfile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_dvi_la_LIBADD = $(LIB_KIO)
++kfile_dvi_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/exr/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/exr/Makefile.am	2008-02-19 01:10:31.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ kfile_exr_la_SOURCES = kfile_exr.cpp
+ kfile_exr_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_exr_la_LIBADD = $(LIB_KIO) $(LIB_EXR)
++kfile_exr_la_LIBADD = $(LIB_KIO) -lIlmImf $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/gif/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/gif/Makefile.am	2008-02-19 00:55:46.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ kfile_gif_la_SOURCES = kfile_gif.cpp
+ kfile_gif_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_gif_la_LIBADD = $(LIB_KIO)
++kfile_gif_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/ico/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/ico/Makefile.am	2008-02-19 00:56:16.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_ico_la_SOURCES = kfile_ico.cpp 
+ kfile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_ico_la_LIBADD = $(LIB_KSYCOCA)
++kfile_ico_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/jpeg/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/jpeg/Makefile.am	2008-02-19 00:56:08.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ kfile_jpeg_la_SOURCES = kfile_jpeg.cpp exif.cpp kfile_setcomment.cpp
+ kfile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_jpeg_la_LIBADD = $(LIB_KIO)
++kfile_jpeg_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pcx/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pcx/Makefile.am	2008-02-19 01:12:23.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ kfile_pcx_la_SOURCES = kfile_pcx.cpp
+ kfile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
++kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pdf/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pdf/Makefile.am	2008-02-19 01:07:08.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_pdf_la_SOURCES = kfile_pdf.cpp
+ kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pdf_la_LIBADD = $(LIB_KIO) $(POPPLER_LIBS)
++kfile_pdf_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lpoppler-qt
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/png/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/png/Makefile.am	2008-02-19 00:38:03.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_png_la_SOURCES = kfile_png.cpp
+ kfile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_png_la_LIBADD = $(LIB_KIO)
++kfile_png_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIBZ)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pnm/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pnm/Makefile.am	2008-02-19 00:12:43.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_pnm_la_SOURCES = kfile_pnm.cpp
+ kfile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pnm_la_LIBADD = $(LIB_KIO)
++kfile_pnm_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/ps/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/ps/Makefile.am	2008-02-19 00:45:27.000000000 +0200
+@@ -10,10 +10,10 @@
+ 
+ kfile_ps_la_SOURCES = kfile_ps.cpp
+ kfile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la
++kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la $(LIB_KDECORE) $(LIB_QT)
+ 
+ gsthumbnail_la_SOURCES = gscreator.cpp
+-gsthumbnail_la_LIBADD = $(LIB_KDECORE) ../../kghostview/libdscparse.la
++gsthumbnail_la_LIBADD = $(LIB_QT) ../../kghostview/libdscparse.la
+ gsthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kfile-plugins/raw/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/raw/Makefile.am	2008-02-19 00:31:55.000000000 +0200
+@@ -9,7 +9,7 @@
+ kde_module_LTLIBRARIES = kfile_raw.la
+ 
+ kfile_raw_la_SOURCES = kcamerarawplugin.cpp parse.c
+-kfile_raw_la_LIBADD = $(LIB_KIO) 
++kfile_raw_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kfile_raw_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kfile-plugins/rgb/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/rgb/Makefile.am	2008-02-19 00:51:53.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_rgb_la_SOURCES = kfile_rgb.cpp
+ kfile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_rgb_la_LIBADD = $(LIB_KSYCOCA)
++kfile_rgb_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/tga/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/tga/Makefile.am	2008-02-19 00:50:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_tga_la_SOURCES = kfile_tga.cpp 
+ kfile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_tga_la_LIBADD = $(LIB_KSYCOCA)
++kfile_tga_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/tiff/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/tiff/Makefile.am	2008-02-19 01:08:51.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ kfile_tiff_la_SOURCES = kfile_tiff.cpp
+ kfile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
++kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/xbm/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/xbm/Makefile.am	2008-02-19 00:57:59.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_xbm_la_SOURCES = kfile_xbm.cpp 
+ kfile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_xbm_la_LIBADD = $(LIB_KSYCOCA)
++kfile_xbm_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/xpm/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/xpm/Makefile.am	2008-02-19 00:55:56.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ kfile_xpm_la_SOURCES = kfile_xpm.cpp
+ kfile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_xpm_la_LIBADD = $(LIB_KIO)
++kfile_xpm_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kfile_xpm_la_METASOURCES = kfile_xpm.moc
+ 
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kgamma/kcmkgamma/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kgamma/kcmkgamma/Makefile.am	2008-02-19 00:25:49.000000000 +0200
+@@ -5,7 +5,7 @@
+ kcm_kgamma_la_METASOURCES=AUTO
+ kcm_kgamma_la_SOURCES = xf86configpath.cpp xvidextwrap.cpp displaynumber.cpp \
+                         gammactrl.cpp kgamma.cpp 
+-kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_X11)
+ kcm_kgamma_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ SUBDIRS = pics 
+--- kdegraphics-3.5.9/kghostview/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kghostview/Makefile.am	2008-02-19 01:17:49.000000000 +0200
+@@ -10,10 +10,11 @@
+ noinst_LTLIBRARIES = libdscparse.la
+ 
+ libkghostviewlib_la_LDFLAGS = $(all_libraries)
+-libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la
++libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KDEPRINT) libdscparse.la \
++		$(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
+ 
+ libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-libkghostviewpart_la_LIBADD = libkghostviewlib.la
++libkghostviewpart_la_LIBADD = libkghostviewlib.la $(LIB_QT)
+ 
+ # Check "make final" after making changes to the following line!!
+ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
+--- kdegraphics-3.5.9/kmrml/kmrml/kcontrol/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/kcontrol/Makefile.am	2008-02-19 00:56:41.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ kcm_kmrml_la_SOURCES = kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp
+ kcm_kmrml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
++kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes)
+  
+ kcm_kmrml_la_METASOURCES = AUTO
+--- kdegraphics-3.5.9/kmrml/kmrml/server/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/server/Makefile.am	2008-02-19 01:20:05.000000000 +0200
+@@ -4,7 +4,8 @@
+ kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel
+ # watcher.stub
+ kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
++kded_daemonwatcher_la_LIBADD = $(LIB_KDEUI) \
++	$(LIB_QT) $(LIB_KDECORE) -lDCOP -lkdeinit_kded  $(LIB_QT) $(LIB_KDECORE)
+ 
+ METASOURCES = AUTO
+ 
+--- kdegraphics-3.5.9/kooka/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kooka/Makefile.am	2008-02-19 01:22:53.000000000 +0200
+@@ -16,7 +16,7 @@
+ 		kocrocrad.cpp
+ # 		pagesetup.cpp 
+ 
+-kooka_LDADD   = $(LIB_KFILE) -lkdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
++kooka_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT) $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB)
+ kooka_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
+--- kdegraphics-3.5.9/kpdf/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kpdf/Makefile.am	2008-02-19 00:34:21.000000000 +0200
+@@ -19,7 +19,9 @@
+ libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ libkpdfpart_la_LIBADD  = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \
+                          core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \
+-                         $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm
++                         $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm \
++                         $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -lDCOP \
++                         -lkwalletclient -lfreetype $(XFT_LIBS) $(LIBPAPER_LIBS)
+ 
+ partdesktopdir   = $(kde_servicesdir)
+ partdesktop_DATA = kpdf_part.desktop
+--- kdegraphics-3.5.9/kpovmodeler/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kpovmodeler/Makefile.am	2008-02-19 01:32:30.000000000 +0200
+@@ -110,7 +110,8 @@
+ 	pmpartiface.skel
+ 
+ libkpovmodeler_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined $(LIBFREETYPE_RPATH)
+-libkpovmodeler_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KPARTS) $(GLLIB) -lXmu -lXi
++libkpovmodeler_la_LIBADD = -lfreetype $(LIB_KPARTS) $(GLLIB) -lXmu \
++	$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lDCOP
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = pmpart.h pmfactory.h pmview.h pmshell.h pmobjectdrag.h \
+@@ -218,7 +219,7 @@
+ kde_module_LTLIBRARIES = libkpovmodelerpart.la
+ 
+ libkpovmodelerpart_la_SOURCES = dummy.cpp
+-libkpovmodelerpart_la_LIBADD = libkpovmodeler.la
++libkpovmodelerpart_la_LIBADD =
+ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ ####
+--- kdegraphics-3.5.9/ksvg/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/Makefile.am	2008-02-19 01:33:09.000000000 +0200
+@@ -6,7 +6,8 @@
+ libksvg_la_LDFLAGS = -version-info 0:1:0 -no-undefined $(all_libraries)
+ libksvg_la_LIBADD  = dom/libksvgdom.la impl/libksvgdomimpl.la core/libksvgcore.la ecma/libksvgecma.la \
+ 		     $(LCMS_LIBS) impl/libs/xrgbrender/libksvgxrgbrender.la impl/libs/libtext2path/src/libtext2path.la \
+-			 impl/libs/art_support/libksvgart.la -lkjs $(LIB_KHTML) $(LIBART_LIBS) $(FREETYPE_LIBS) $(FONTCONFIG_LIBS)
++			 impl/libs/art_support/libksvgart.la -lkjs $(LIB_KHTML) $(LIBART_LIBS) \
++			$(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDEUI) $(LIB_X11) $(LIB_KIO)
+ 
+ INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl $(all_includes)
+ 
+--- kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am	2008-02-19 00:42:03.000000000 +0200
+@@ -2,7 +2,8 @@
+ 
+ libksvgrendererlibart_la_SOURCES = BezierPathLibart.cpp GlyphTracerLibart.cpp LibartCanvas.cpp LibartCanvasItems.cpp LibartCanvasFactory.cpp 
+ libksvgrendererlibart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libksvgrendererlibart_la_LIBADD = ../../../libksvg.la
++libksvgrendererlibart_la_LIBADD = ../../../libksvg.la $(LIB_QT) $(LIB_KDECORE) \
++	$(LIB_KHTML) $(LIBART_LIBS) ../../../impl/libs/libtext2path/src/libtext2path.la
+ libksvgrendererlibart_la_METASOURCES = AUTO
+ 
+ kde_services_DATA = ksvglibartcanvas.desktop
+--- kdegraphics-3.5.9/ksvg/plugin/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/plugin/Makefile.am	2008-02-19 00:48:02.000000000 +0200
+@@ -7,7 +7,9 @@
+ kde_module_LTLIBRARIES = libksvgplugin.la svgthumbnail.la
+ 
+ libksvgplugin_la_SOURCES = ksvg_plugin.cpp ksvg_factory.cpp ksvg_widget.cpp
+-libksvgplugin_la_LIBADD = ../libksvg.la
++libksvgplugin_la_LIBADD = ../libksvg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++		 $(LIB_KPARTS) $(LIB_KHTML) $(LIB_KIO) \
++		 ../impl/libs/libtext2path/src/libtext2path.la
+ libksvgplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ ksvginclude_HEADERS = ksvg_plugin.h
+@@ -16,7 +18,7 @@
+ kde_services_DATA = ksvgplugin.desktop
+ 
+ svgthumbnail_la_SOURCES = svgcreator.cpp
+-svgthumbnail_la_LIBADD = ../libksvg.la
++svgthumbnail_la_LIBADD = ../libksvg.la $(LIB_QT) $(LIB_KDECORE)
+ svgthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ services_DATA = svgthumbnail.desktop
+--- kdegraphics-3.5.9/kuickshow/src/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kuickshow/src/Makefile.am	2008-02-19 01:34:59.000000000 +0200
+@@ -10,7 +10,8 @@
+ METASOURCES = AUTO
+ 
+ kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB)
++kuickshow_la_LIBADD  = $(LIB_KDEPRINT) -lImlib $(LIB_QT) \
++	$(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11)
+ kuickshow_la_SOURCES =	kuickshow.cpp \
+ 	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
+ 	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
+--- kdegraphics-3.5.9/kview/config/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/config/Makefile.am	2008-02-19 00:44:01.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ kcm_kviewgeneralconfig_la_SOURCES = kviewconfmodules.cpp
+ kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewgeneralconfig_la_LIBADD = $(LIB_KDEUI)
++kcm_kviewgeneralconfig_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop
+ kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/config/plugins/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/config/plugins/Makefile.am	2008-02-19 00:58:29.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ kcm_kviewpluginsconfig_la_SOURCES = kviewpluginsconfig.cpp
+ kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS)
++kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop
+ kcm_kviewpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kimageviewer/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kimageviewer/Makefile.am	2008-02-19 00:53:45.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ libkimageviewer_la_SOURCES = canvas.cpp viewer.cpp
+ libkimageviewer_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
+-libkimageviewer_la_LIBADD  = $(LIB_KPARTS)
++libkimageviewer_la_LIBADD  = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI)
+ 
+ INCLUDES = $(all_includes)
+ 
+--- kdegraphics-3.5.9/kview/kviewcanvas/config/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewcanvas/config/Makefile.am	2008-02-19 00:33:09.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ kcm_kviewcanvasconfig_la_SOURCES = generalconfigwidget.ui confmodules.cpp
+ kcm_kviewcanvasconfig_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kcm_kviewcanvasconfig_la_LIBADD  = $(LIB_KDEUI)
++kcm_kviewcanvasconfig_la_LIBADD  = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ kcm_kviewcanvasconfig_DATA = kviewcanvasconfig.desktop
+ kcm_kviewcanvasconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kviewcanvas/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewcanvas/Makefile.am	2008-02-19 01:37:07.000000000 +0200
+@@ -7,8 +7,8 @@
+ 
+ libkviewcanvas_la_SOURCES = kimageholder.cpp kimagecanvas.cpp
+ libkviewcanvas_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
+-libkviewcanvas_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KUTILS) \
+-                           $(top_builddir)/kview/kimageviewer/libkimageviewer.la
++libkviewcanvas_la_LIBADD = $(LIB_KUTILS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la \
++                           $(LIB_QT) $(LIB_KDECORE) -lkdefx
+ 
+ METASOURCES = AUTO
+ 
+--- kdegraphics-3.5.9/kview/kviewviewer/config/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewviewer/config/Makefile.am	2008-02-19 00:44:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ kcm_kviewviewerpluginsconfig_la_SOURCES = kviewviewerpluginsconfig.cpp
+ kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
++kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
+ kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kviewviewer/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewviewer/Makefile.am	2008-02-19 00:53:29.000000000 +0200
+@@ -8,7 +8,8 @@
+ libkviewviewer_la_SOURCES = printimagesettings.ui imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp
+ libkviewviewer_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkviewviewer_la_LIBADD = $(LIB_KDEPRINT) $(LIB_KUTILS) \
+-                           $(top_builddir)/kview/kimageviewer/libkimageviewer.la
++                           $(top_builddir)/kview/kimageviewer/libkimageviewer.la \
++                           $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KIO)
+ 
+ METASOURCES = AUTO
+ 
+--- kdegraphics-3.5.9/kview/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/Makefile.am	2008-02-19 00:48:35.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ kview_la_SOURCES = kview.cpp main.cpp
+ kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kview_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS)
++kview_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ 
+ xdg_apps_DATA = kview.desktop
+ 
+--- kdegraphics-3.5.9/kview/modules/browser/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/browser/Makefile.am	2008-02-19 01:35:42.000000000 +0200
+@@ -3,7 +3,8 @@
+ kde_module_LTLIBRARIES = kview_browserplugin.la
+ 
+ kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp
+-kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) \
++		$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ plugdir   = $(kde_datadir)/kviewviewer/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/effects/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/effects/Makefile.am	2008-02-19 01:36:11.000000000 +0200
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kview_effectsplugin.la
+ 
+ kview_effectsplugin_la_SOURCES = kvieweffects.cpp
+-kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_effectsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+ kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ plugdir   = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/presenter/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/presenter/Makefile.am	2008-02-19 00:17:19.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = kview_presenterplugin.la
+ 
+ kview_presenterplugin_la_SOURCES = imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
+-kview_presenterplugin_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS)
++kview_presenterplugin_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_presenterplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ plugdir   = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/scanner/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/scanner/Makefile.am	2008-02-19 01:36:19.000000000 +0200
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kview_scannerplugin.la
+ 
+ kview_scannerplugin_la_SOURCES = kviewscanner.cpp
+-kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+ plugdir   = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/photobook/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/photobook/Makefile.am	2008-02-19 00:59:21.000000000 +0200
+@@ -6,7 +6,7 @@
+ libphotobook_la_SOURCES = photobook.cpp
+ 
+ libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
++libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ partrcdir = $(kde_servicesdir)
+ partrc_DATA = photobook.desktop
+--- kdegraphics-3.5.9/kviewshell/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kviewshell/Makefile.am	2008-02-19 00:59:02.000000000 +0200
+@@ -18,7 +18,8 @@
+ 		optionDialogGUIWidget_base.ui optionDialogAccessibilityWidget.ui simplePageSize.cpp
+ 
+ kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts
++kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts \
++		$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ libkmultipage_la_SOURCES = kmultipage.cpp pageView.cpp marklist.cpp kmultipageInterface.skel \
+ 		units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \
+@@ -30,11 +31,12 @@
+ kde_kcfg_DATA = kviewshell.kcfg
+ 
+ libkmultipage_la_LDFLAGS = $(all_libraries)
+-libkmultipage_la_LIBADD = $(LIB_KFILE) -lkdeprint -lkparts
++libkmultipage_la_LIBADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KPARTS) \
++		 $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP -lkdefx
+ 
+ emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp
+ emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la
++emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ 
+ libkviewshell_la_SOURCES = kviewshell.cpp
+ 
+--- kdegraphics-3.5.9/kviewshell/plugins/djvu/Makefile.am	2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kviewshell/plugins/djvu/Makefile.am	2008-02-19 00:57:32.000000000 +0200
+@@ -18,7 +18,8 @@
+ 
+ kde_module_LTLIBRARIES = djvuviewpart.la
+ djvuviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la
++djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la \
++	$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lDCOP
+ djvuviewpart_la_SOURCES = djvumultipage.cpp djvurenderer.cpp kprintDialogPage_DJVUpageoptions.cpp \
+ 	kprintDialogPage_DJVUconversionoptions.cpp kprintDialogPage_DJVUconversionoptions_basewidget.ui \
+ 	pageRangeWidget_base.ui pageRangeWidget.cpp \
+--- kdegraphics-3.5.9/libkscan/Makefile.am	2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/libkscan/Makefile.am	2008-02-19 00:51:34.000000000 +0200
+@@ -19,7 +19,8 @@
+ 
+ 
+ libkscan_la_LDFLAGS = $(all_libraries) $(LIBSANE_LDFLAGS) -no-undefined -version-info 1:0
+-libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE)
++libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE) \
++	$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+ 
+ kde_services_DATA = scanservice.desktop
+ 

Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdegraphics/debian/rules	2008-02-26 15:51:35 UTC (rev 9472)
@@ -7,12 +7,12 @@
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdegraphics-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_kghostview	:= -V'kghostview (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_kpovmodeler	:= -V'kpovmodeler (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksvg		:= -V'ksvg (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_kview		:= -V'kview (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_kghostview	:= -V'kghostview (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kpovmodeler	:= -V'kpovmodeler (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_ksvg		:= -V'ksvg (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kview		:= -V'kview (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.5.9)'
 
 binary-post-install/kuickshow::
 ifeq ($(DEB_HOST_ARCH), powerpc)

Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdemultimedia/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -4,18 +4,16 @@
 
   * New upstream release (3.5.9).
   * Remove 05_gcc_4.3-fixes.diff patch, merged upstream.
-  * Rename 12_noatun_kconf.diff to 02_noatun_kconf.diff because it patches
-    Makefile.am.
   * Add automake clean patches:
     - 01_admin_cleanup.diff
-    - 03_automake_cleanup.diff
+    - 97_automake_cleanup.diff
   * debian/rules:
     - bump shlibs to 4:3.5.9.
     - remove PACKAGES_WITH_LIBS, no longer needed with recent dpkg-shlibdeps.
   * Use ${source:Upstream-Version} for kdelibs4-dev dependency.
   * Update kmix.install.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Feb 2008 14:58:49 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Feb 2008 17:03:04 +0200
 
 kdemultimedia (4:3.5.8-2) unstable; urgency=low
 

Modified: trunk/packages/kdemultimedia/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdemultimedia/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,7 +1,6 @@
-diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
---- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -13,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -22,9 +21,72 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Deleted: trunk/packages/kdemultimedia/debian/patches/02_noatun_kconf.diff

Deleted: trunk/packages/kdemultimedia/debian/patches/03_automake_cleanup.diff

Added: trunk/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff	                        (rev 0)
+++ trunk/packages/kdemultimedia/debian/patches/12_noatun_kconf.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,13 @@
+--- kde.orig/noatun/Makefile.am
++++ kde.patched/noatun/Makefile.am
+@@ -11,7 +11,9 @@
+ 
+ updatedir = $(kde_datadir)/kconf_update
+ update_DATA = noatun.upd
+-update_PROGRAMS = noatun20update
++
++kconfdir = $(libdir)/kconf_update_bin
++kconf_PROGRAMS = noatun20update
+ 
+ noatun20update_SOURCES  = noatun20update.cpp
+ noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)

Copied: trunk/packages/kdemultimedia/debian/patches/97_automake_cleanup.diff (from rev 9471, trunk/packages/kdemultimedia/debian/patches/03_automake_cleanup.diff)
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/97_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdemultimedia/debian/patches/97_automake_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,1049 @@
+--- kdemultimedia-3.5.9/akode_artsplugin/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/akode_artsplugin/Makefile.am	2008-02-20 12:12:44.000000000 +0200
+@@ -9,7 +9,7 @@
+         akodeFFMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \
+         akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
+ libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined
+-libarts_akode_la_LIBADD =  $(akode_libs) -lkmedia2_idl -lsoundserver_idl -lartsflow
++libarts_akode_la_LIBADD =  $(akode_libs) -lkmedia2_idl -lartsflow -lartsflow_idl -lmcop
+ libarts_akode_la_METASOURCES = AUTO
+ libarts_akode_la_COMPILE_FIRST = akodearts.h
+ 
+--- kdemultimedia-3.5.9/arts/builder/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/arts/builder/Makefile.am	2008-02-20 11:33:28.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-artsbuilder_LDADD   = $(LIB_KFILE) -lqtmcop $(LIB_X11) $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde
++artsbuilder_LDADD   = $(LIB_KFILE) -lqtmcop $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde
+ 
+ rcdir = $(kde_datadir)/artsbuilder
+ rc_DATA = artsbuilderui.rc
+--- kdemultimedia-3.5.9/arts/gui/common/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/gui/common/Makefile.am	2008-02-20 11:35:28.000000000 +0200
+@@ -3,12 +3,12 @@
+ INCLUDES= -I$(arts_includes) -I$(top_builddir)/arts/runtime $(all_includes)
+ 
+ libartsgui_idl_la_SOURCES = artsgui.cc
+-libartsgui_idl_la_LIBADD = -lmcop $(LIBDL)
++libartsgui_idl_la_LIBADD = -lmcop
+ libartsgui_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+   -no-undefined
+ 
+ libartsgui_la_SOURCES = genericguifactory_impl.cc
+-libartsgui_la_LIBADD = libartsgui_idl.la
++libartsgui_la_LIBADD = libartsgui_idl.la -lmcop
+ libartsgui_la_LDFLAGS = $(all_libraries) -no-undefined
+ libartsgui_la_COMPILE_FIRST = artsgui.h
+ 
+--- kdemultimedia-3.5.9/arts/gui/kde/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/gui/kde/Makefile.am	2008-02-20 11:34:40.000000000 +0200
+@@ -15,8 +15,8 @@
+   klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
+   ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
+ 
+-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
+-  $(top_builddir)/arts/gui/common/libartsgui_idl.la
++libartsgui_kde_la_LIBADD = -lkdecore -lkdeui \
++  $(top_builddir)/arts/gui/common/libartsgui_idl.la $(LIB_QT) $(LIB_KDEUI) -lmcop -lkdefx
+ libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
+ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
+ 
+--- kdemultimedia-3.5.9/arts/midi/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/midi/Makefile.am	2008-02-20 13:18:42.000000000 +0200
+@@ -19,7 +19,7 @@
+ midisynctest_COMPILE_FIRST = artsmidi.h
+ 
+ libartsmidi_idl_la_SOURCES = artsmidi.cc
+-libartsmidi_idl_la_LIBADD = -lmcop -lartsflow
++libartsmidi_idl_la_LIBADD = -lmcop -lartsflow_idl
+ libartsmidi_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+   -no-undefined
+ 
+@@ -30,7 +30,7 @@
+ 	alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
+ libartsmidi_la_COMPILE_FIRST = artsmidi.h
+ 
+-libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ARTS_LIBASOUND)
++libartsmidi_la_LIBADD = libartsmidi_idl.la $(ARTS_LIBASOUND) -lartsflow_idl -lmcop -lartsflow
+ libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+   -no-undefined
+ 
+--- kdemultimedia-3.5.9/arts/modules/common/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/modules/common/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -25,7 +25,8 @@
+ 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/midi/libartsmidi_idl.la \
+ 	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
+-	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
++	$(top_builddir)/arts/runtime/libartsbuilder.la \
++	-lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT)
+ 
+ libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+ 
+--- kdemultimedia-3.5.9/arts/modules/effects/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/modules/effects/Makefile.am	2008-02-20 13:17:42.000000000 +0200
+@@ -37,8 +37,9 @@
+ 	$(top_builddir)/arts/modules/effects/freeverb/libfreeverb.la \
+ 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+-	$(top_builddir)/arts/modules/common/libartsmodulescommon.la \
+-	-lartsflow -lartsflow_idl -lmcop
++	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
++	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
++	-lartsflow -lartsflow_idl -lmcop $(LIB_QT) $(LIB_KDECORE)
+ 
+ libartsmoduleseffects_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+ 
+--- kdemultimedia-3.5.9/arts/modules/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/modules/Makefile.am	2008-02-20 13:16:42.000000000 +0200
+@@ -27,15 +27,7 @@
+ 
+ libartsmodules_la_SOURCES = artsmodules.cc
+ 
+-libartsmodules_la_LIBADD = \
+-   $(top_builddir)/arts/runtime/libartsbuilder.la \
+-   $(top_builddir)/arts/midi/libartsmidi_idl.la \
+-   $(top_builddir)/arts/gui/common/libartsgui_idl.la \
+-   $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
+-   $(top_builddir)/arts/modules/common/libartsmodulescommon.la \
+-   $(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
+-   $(top_builddir)/arts/modules/mixers/libartsmodulesmixers.la \
+-   -lartsflow -lmcop $(LIB_KDECORE) $(LIBDL)
++libartsmodules_la_LIBADD = -lmcop -lartsflow_idl
+ libartsmodules_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+    -no-undefined
+ 
+--- kdemultimedia-3.5.9/arts/modules/mixers/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/modules/mixers/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -36,7 +36,8 @@
+ 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/modules/common/libartsmodulescommon.la \
+ 	$(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
+-	-lartsflow -lartsflow_idl -lmcop
++	$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
++	-lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT)
+ 
+ libartsmodulesmixers_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
+ 
+--- kdemultimedia-3.5.9/arts/runtime/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/runtime/Makefile.am	2008-02-20 11:27:14.000000000 +0200
+@@ -11,7 +11,7 @@
+   structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
+   compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+ 
+-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
++libartsbuilder_la_LIBADD = -lmcop -lartsflow -lartsflow_idl
+ libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
+ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
+   -no-undefined
+--- kdemultimedia-3.5.9/arts/tools/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/arts/tools/Makefile.am	2008-02-20 13:17:06.000000000 +0200
+@@ -36,8 +36,11 @@
+ libartscontrolsupport_la_LDFLAGS = $(all_libraries) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
+ 
+ libartscontrolapplet_la_LIBADD = \
+-	-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
+-	$(LIB_KDEUI) ./libartscontrolsupport.la
++	 -lartsflow_idl -lsoundserver_idl -lartskde \
++	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
++	$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
++	$(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
++	$(LIB_KDEUI) ./libartscontrolsupport.la $(LIB_KDECORE) $(LIB_QT)
+ 
+ # Arnolds version with dynamic-linking for testing.
+ #
+@@ -49,18 +52,19 @@
+ #	$(LIB_KDEUI)
+ 
+ libartscontrolsupport_la_LIBADD = \
+-	-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
++	-lartsflow_idl -lmcop -lsoundserver_idl $(LIB_ARTS) \
+ 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+-	$(top_builddir)/arts/modules/libartsmodules.la \
+-	$(LIB_KDEUI)
++	$(top_builddir)/arts/modules/common/libartsmodulescommon.la \
++	$(top_builddir)/arts/midi/libartsmidi_idl.la \
++	$(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ bin_PROGRAMS = artscontrol
+ artscontrol_SOURCES = main.cpp levelmeters.cpp
+ artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ artscontrol_LDADD = libartscontrolsupport.la \
+-	$(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
+-	-lqtmcop -lartsflow_idl -lsoundserver_idl -lartskde
++	$(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
++	$(LIB_KDEUI) -lqtmcop -lartsflow_idl -lsoundserver_idl -lartskde
+ 
+ xdg_apps_DATA = artscontrol.desktop
+ 
+--- kdemultimedia-3.5.9/audiofile_artsplugin/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/audiofile_artsplugin/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -6,7 +6,7 @@
+ libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h
+ libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp
+ libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined
+-libarts_audiofile_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile
++libarts_audiofile_la_LIBADD =  -lkmedia2_idl -lartsflow -laudiofile -lartsflow_idl -lmcop
+ libarts_audiofile_la_METASOURCES = AUTO
+ 
+ audiofilearts.mcopclass: audiofilearts.h
+--- kdemultimedia-3.5.9/juk/Makefile.am	2008-02-20 00:13:07.000000000 +0200
++++ kdemultimedia-3.5.9/juk/Makefile.am	2008-02-20 11:46:13.000000000 +0200
+@@ -83,8 +83,8 @@
+ mblibs = -ltunepimp
+ endif
+ ##################################################
+-
+-juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
++JUK_LDADD_GST=-lgstreamer-0.10 -lgobject-2.0 -lglib-2.0 -L/usr/lib
++juk_LDADD = -lm $(JUK_LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_ARTS)
+ juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)
+ 
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+--- kdemultimedia-3.5.9/kaboodle/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kaboodle/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -12,11 +12,11 @@
+ 	view.cpp \
+ 	kaboodle_factory.cpp
+ 
+-libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer
++libs = $(LIB_KPARTS) -lkmedia2_idl $(LIB_ARTS) -lkmediaplayer
+ 
+ libkaboodlepart_la_SOURCES = dummy.cpp
+ libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs)
++libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP -lmcop
+ 
+ kaboodle_SOURCES = main.cpp \
+ 	kaboodleapp.cpp \
+--- kdemultimedia-3.5.9/kaudiocreator/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kaudiocreator/Makefile.am	2008-02-20 03:55:41.000000000 +0200
+@@ -12,7 +12,7 @@
+ EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \
+ 	obqueimp.h ripper.h tracksimp.h encodefileimp.h
+ 
+-kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils
++kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ METASOURCES = AUTO
+ 
+@@ -20,7 +20,7 @@
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot
+ 
+ kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \
+-	$(top_builddir)/kscd/libkcompactdisc.la
++	$(top_builddir)/kscd/libkcompactdisc.la $(LIB_KUTILS) $(ARTS_LIBASOUND) -lartsc
+ 
+ KDE_ICON = AUTO
+ 
+--- kdemultimedia-3.5.9/kfile-plugins/au/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/au/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_au_la_SOURCES = kfile_au.cpp 
+ kfile_au_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_au_la_LIBADD = $(LIB_KIO)
++kfile_au_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/avi/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/avi/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_avi_la_SOURCES = kfile_avi.cpp 
+ kfile_avi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_avi_la_LIBADD = $(LIB_KIO)
++kfile_avi_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/flac/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/flac/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_flac_la_SOURCES = kfile_flac.cpp
+ kfile_flac_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN)
+-kfile_flac_la_LIBADD = $(LIB_KIO)
++kfile_flac_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/m3u/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/m3u/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_m3u_la_SOURCES = kfile_m3u.cpp
+ kfile_m3u_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_m3u_la_LIBADD = $(LIB_KSYCOCA)
++kfile_m3u_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/mp3/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/mp3/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_mp3_la_SOURCES = kfile_mp3.cpp
+ kfile_mp3_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN)
+-kfile_mp3_la_LIBADD = $(LIB_KIO)
++kfile_mp3_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/mpc/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/mpc/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_mpc_la_SOURCES = kfile_mpc.cpp
+ kfile_mpc_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN)
+-kfile_mpc_la_LIBADD = $(LIB_KIO)
++kfile_mpc_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/mpeg/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/mpeg/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_mpeg_la_SOURCES = kfile_mpeg.cpp
+ kfile_mpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_mpeg_la_LIBADD = $(LIB_KIO)
++kfile_mpeg_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/ogg/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/ogg/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_ogg_la_SOURCES = kfile_ogg.cpp vcedit.c
+ kfile_ogg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile
++kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/sid/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/sid/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_sid_la_SOURCES = kfile_sid.cpp
+ kfile_sid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_sid_la_LIBADD = $(LIB_KIO)
++kfile_sid_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/theora/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/theora/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_theora_la_SOURCES = kfile_theora.cpp
+ kfile_theora_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora
++kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kfile-plugins/wav/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kfile-plugins/wav/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ kfile_wav_la_SOURCES = kfile_wav.cpp 
+ kfile_wav_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_wav_la_LIBADD = $(LIB_KIO)
++kfile_wav_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdemultimedia-3.5.9/kioslave/audiocd/kcmaudiocd/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/kcmaudiocd/Makefile.am	2008-02-20 12:01:24.000000000 +0200
+@@ -3,7 +3,7 @@
+ kcm_audiocd_la_SOURCES = audiocdconfig.ui kcmaudiocd.cpp
+ 
+ kcm_audiocd_la_LDFLAGS  =  $(all_libraries) $(KDE_PLUGIN) -module
+-kcm_audiocd_la_LIBADD = ../plugins/libaudiocdplugins.la $(LIB_KDEUI)
++kcm_audiocd_la_LIBADD = ../plugins/libaudiocdplugins.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ INCLUDES = -I$(srcdir)/../plugins -I$(top_srcdir)/libkcddb $(all_includes)
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/Makefile.am	2008-02-20 13:59:20.000000000 +0200
+@@ -16,7 +16,9 @@
+ 
+ kio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+-kio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la 
++kio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) \
++	$(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la \
++	$(ARTS_LIBASOUND) -lartsc $(LIB_KDECORE) $(LIB_QT) -lDCOP $(KDE_MT_LIBS)
+ 
+ noinst_HEADERS = audiocd.h
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/plugins/flac/Makefile.am	2008-02-20 00:13:07.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/plugins/flac/Makefile.am	2008-02-20 11:56:27.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ libaudiocd_encoder_flac_la_SOURCES = encoderflac.cpp
+ 
+-libaudiocd_encoder_flac_la_LIBADD = $(LIBFLAC) $(LIB_KIO) ../libaudiocdplugins.la
++libaudiocd_encoder_flac_la_LIBADD = $(LIBFLAC)
+ 
+ libaudiocd_encoder_flac_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/plugins/lame/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/plugins/lame/Makefile.am	2008-02-20 13:20:47.000000000 +0200
+@@ -6,9 +6,9 @@
+ 
+ libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui collectingprocess.cpp
+ 
+-libaudiocd_encoder_lame_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la
++libaudiocd_encoder_lame_la_LIBADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la $(LIB_QT) $(LIB_KDECORE)
+ 
+-libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(taglib_libs) $(all_libraries)
++libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+ 
+ pluginsdir = $(kde_datadir)/audiocd/plugins
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/plugins/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/plugins/Makefile.am	2008-02-20 11:58:23.000000000 +0200
+@@ -8,7 +8,7 @@
+ 		   
+ lib_LTLIBRARIES = libaudiocdplugins.la
+ 
+-libaudiocdplugins_la_LIBADD =  $(LIB_KDECORE) $(top_builddir)/libkcddb/libkcddb.la
++libaudiocdplugins_la_LIBADD =  $(LIB_KDECORE) $(LIB_QT)
+ 
+ libaudiocdplugins_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/plugins/vorbis/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/plugins/vorbis/Makefile.am	2008-02-20 13:20:05.000000000 +0200
+@@ -6,7 +6,8 @@
+ 
+ libaudiocd_encoder_vorbis_la_SOURCES = audiocd_vorbis_encoder.kcfgc encodervorbis.cpp encodervorbisconfig.ui
+ 
+-libaudiocd_encoder_vorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISFILE_LIBS) $(VORBISENC_LIBS) $(LIB_KIO) ../libaudiocdplugins.la
++libaudiocd_encoder_vorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS) $(LIB_KIO) \
++	$(top_builddir)/libkcddb/libkcddb.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT)
+ 
+ libaudiocd_encoder_vorbis_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+ 
+--- kdemultimedia-3.5.9/kioslave/audiocd/plugins/wav/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kioslave/audiocd/plugins/wav/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ libaudiocd_encoder_wav_la_SOURCES = encoderwav.cpp encodercda.cpp
+ 
+-libaudiocd_encoder_wav_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la $(CDPARANOIA_LIBS)
++libaudiocd_encoder_wav_la_LIBADD = $(LIB_KIO) $(LIB_QT)
+ 
+ libaudiocd_encoder_wav_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+ 
+--- kdemultimedia-3.5.9/kmid/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kmid/Makefile.am	2008-02-20 12:03:34.000000000 +0200
+@@ -4,10 +4,9 @@
+ lib_LTLIBRARIES = libkmidlib.la
+ 
+ libkmidlib_la_LDFLAGS = $(all_libraries)
+-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
++libkmidlib_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) -lkmid $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ 
+ libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-libkmidpart_la_LIBADD = libkmidlib.la
+ 
+ libkmidlib_la_SOURCES = kmidframe.cpp kmidclient.cpp kdisptext.cpp \
+ 	qslidertime.cpp klcdnumber.cpp ktrianglebutton.cpp \
+--- kdemultimedia-3.5.9/kmix/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kmix/Makefile.am	2008-02-20 12:06:28.000000000 +0200
+@@ -25,13 +25,13 @@
+ 	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
+ 	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
+ 
+-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_KDECORE) $(LIB_QT) -lDCOP
+ kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
+ 
+ kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
+ 	mixertoolbox.cpp mixer_backend.cpp
+ 
+-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
+ kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
+@@ -42,7 +42,7 @@
+ 	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
+ 
+ kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_KDECORE) $(LIB_QT) -lDCOP
+ 
+ xdg_apps_DATA = kmix.desktop
+ 
+--- kdemultimedia-3.5.9/krec/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/krec/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -45,17 +45,20 @@
+ krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ krec_la_LIBADD = \
+ 	lib_krec_common.la \
++	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+ 	$(top_builddir)/arts/tools/libartscontrolsupport.la \
+-	-lartskde $(LIBDL) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KUTILS)
++	$(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
++	-lartskde $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lmcop $(LIB_KDECORE) \
++	-lartsflow_idl -lsoundserver_idl $(LIB_KUTILS)
+ 
+ kcm_krec_la_SOURCES = krecconfigure.cpp
+ kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+-kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
++kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ kcm_krec_files_la_SOURCES = krecconfig_files.cpp
+ kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+-kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
++kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ lib_krec_common_la_SOURCES = \
+ 	krecglobal.cpp \
+@@ -67,7 +70,7 @@
+ 
+ libkrecexport_wave_la_SOURCES = krecexport_wave.cpp
+ libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkrecexport_wave_la_LIBADD = lib_krec_common.la
++libkrecexport_wave_la_LIBADD = lib_krec_common.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ rcdir = $(kde_datadir)/krec
+ rc_DATA = krecui.rc
+--- kdemultimedia-3.5.9/krec/ogg_export/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/krec/ogg_export/Makefile.am	2008-02-20 12:07:48.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ libkrecexport_ogg_la_SOURCES = krecexport_ogg.cpp
+ libkrecexport_ogg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_RPATH)
+-libkrecexport_ogg_la_LIBADD = ../lib_krec_common.la $(VORBISENC_LIBS) $(VORBIS_LIBS)
++libkrecexport_ogg_la_LIBADD = ../lib_krec_common.la $(VORBISENC_LIBS) $(VORBIS_LIBS) $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ kde_services_DATA = krec_exportogg.desktop
+ 
+--- kdemultimedia-3.5.9/kscd/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/kscd/Makefile.am	2008-02-20 03:55:41.000000000 +0200
+@@ -25,7 +25,7 @@
+ kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \
+ 	     $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \
+-	     libkcompactdisc.la
++	     libkcompactdisc.la $(ARTS_LIBASOUND) -lartsc
+ 
+ profiledata_DATA = kscd.profile.xml
+ profiledatadir = $(kde_datadir)/profiles
+--- kdemultimedia-3.5.9/libkcddb/kcmcddb/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/libkcddb/kcmcddb/Makefile.am	2008-02-20 13:26:28.000000000 +0200
+@@ -8,7 +8,7 @@
+ kcm_cddb_la_LDFLAGS = \
+   $(all_libraries) -module -avoid-version -no-undefined
+ 
+-kcm_cddb_la_LIBADD = ../libkcddb.la $(LIB_KDEUI)
++kcm_cddb_la_LIBADD = ../libkcddb.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT)
+ 
+ kcm_cddb_la_COMPILE_FIRST = ../configbase.h
+ 
+--- kdemultimedia-3.5.9/libkcddb/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/libkcddb/Makefile.am	2008-02-20 13:25:56.000000000 +0200
+@@ -14,7 +14,7 @@
+     cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
+ 
+ libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
+-libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO)
++libkcddb_la_LIBADD  = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
+ 
+ METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/cddaplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/cddaplay/Makefile.am	2008-02-20 13:55:15.000000000 +0200
+@@ -13,8 +13,7 @@
+ cddaplay_LDFLAGS	=	$(all_libraries) 
+ 
+ 
+-cddaplay_LDADD		=	../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
++cddaplay_LDADD		=	../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafcdda/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafcdda/Makefile.am	2008-02-20 13:55:44.000000000 +0200
+@@ -15,9 +15,7 @@
+ 
+ yaf_cdda_LDADD		=	../yafxplayer/libyafxplayer.la \
+ 				../yafcore/libyafcore.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafcore/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafcore/Makefile.am	2008-02-20 13:43:24.000000000 +0200
+@@ -32,7 +32,7 @@
+ libyafcore_la_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) \
+ 				-no-undefined -avoid-version
+ 
+-libyafcore_la_LIBADD	=	-lkdefakes $(THIS_LIB_LIBS)
++libyafcore_la_LIBADD	=	-lkdefakes
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafyuv/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafyuv/Makefile.am	2008-02-20 13:56:33.000000000 +0200
+@@ -16,9 +16,7 @@
+ 
+ yaf_yuv_LDADD		=	../yafxplayer/libyafxplayer.la \
+ 				../yafcore/libyafcore.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafmpgplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafmpgplay/Makefile.am	2008-02-20 13:45:09.000000000 +0200
+@@ -16,8 +16,7 @@
+ 
+ yaf_mpgplay_LDADD	=	../yafcore/libyafcore.la \
+ 				../yafxplayer/libyafxplayer.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafsplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafsplay/Makefile.am	2008-02-20 13:56:07.000000000 +0200
+@@ -16,9 +16,7 @@
+ 
+ yaf_splay_LDADD		=	../yafxplayer/libyafxplayer.la \
+ 				../yafcore/libyafcore.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yaftplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yaftplay/Makefile.am	2008-02-20 13:56:11.000000000 +0200
+@@ -14,9 +14,7 @@
+ 
+ yaf_tplay_LDADD		=	../yafcore/libyafcore.la \
+ 				../yafxplayer/libyafxplayer.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafvorbis/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafvorbis/Makefile.am	2008-02-20 13:56:18.000000000 +0200
+@@ -15,9 +15,7 @@
+ yaf_vorbis_LDADD	=	 \
+ 				../yafcore/libyafcore.la \
+ 				../yafxplayer/libyafxplayer.la \
+-				../../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++				../../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/yaf/yafxplayer/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/yaf/yafxplayer/Makefile.am	2008-02-20 13:56:26.000000000 +0200
+@@ -24,9 +24,7 @@
+ 					-no-undefined -avoid-version
+ 
+ libyafxplayer_la_LIBADD		=	../../../lib/libmpeg.la \
+-					../yafcore/libyafcore.la \
+-					$(THIS_LIB_LIBS)
+-
++					../yafcore/libyafcore.la
+ 
+ 
+ yafxplayerdir			=	$(includedir)/$(THIS_LIB_NAME)/util/yaf/yafxplayer
+--- kdemultimedia-3.5.9/mpeglib/example/mpgplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/mpgplay/Makefile.am	2008-02-20 13:55:20.000000000 +0200
+@@ -12,8 +12,7 @@
+ 
+ mpgplay_LDFLAGS         =       $(all_libraries) 
+ 
+-mpgplay_LDADD		=	../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
++mpgplay_LDADD		=	../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/splay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/splay/Makefile.am	2008-02-20 13:55:27.000000000 +0200
+@@ -18,9 +18,7 @@
+ 				$(THIS_LIB_LIBS)
+ 
+ mp3framing_LDFLAGS      =       $(all_libraries)
+-mp3framing_LDADD        =       ../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++mp3framing_LDADD        =       ../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib/example/tplay/Makefile.am	2008-02-20 00:13:08.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib/example/tplay/Makefile.am	2008-02-20 13:55:34.000000000 +0200
+@@ -13,9 +13,7 @@
+ tplay_LDFLAGS		=	$(all_libraries) 
+ 
+ 
+-tplay_LDADD		=	../../lib/libmpeg.la \
+-				$(THIS_LIB_LIBS)
+-
++tplay_LDADD		=	../../lib/libmpeg.la
+ 
+ 
+ 
+--- kdemultimedia-3.5.9/mpeglib_artsplug/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/mpeglib_artsplug/Makefile.am	2008-02-20 13:23:54.000000000 +0200
+@@ -79,8 +79,7 @@
+ 					-module \
+ 					-release $(MPEGLIB_ARTS_VERSION) \
+ 					-version-info $(MPEGLIB_ARTS_MAJOR_VERSION):$(MPEGLIB_ARTS_MINOR_VERSION):$(MPEGLIB_ARTS_MICRO_VERSION)
+-libarts_mpeglib_la_LIBADD       =       $(top_builddir)/mpeglib/lib/libmpeg.la \
+-					$(LIB_ARTS)
++libarts_mpeglib_la_LIBADD       =       $(top_builddir)/mpeglib/lib/libmpeg.la -lkmedia2_idl -lartsflow_idl -lartsflow -lmcop
+ 
+ libarts_splay_la_SOURCES	=	splayPlayObject.cc \
+ 					splayPlayObject_impl.cpp
+@@ -89,17 +88,16 @@
+ 					-no-undefined	 \
+ 					-module
+ libarts_splay_la_LIBADD         =       $(top_builddir)/mpeglib/lib/libmpeg.la \
+-					$(LIB_ARTS)
++					-lkmedia2_idl -lartsflow_idl -lartsflow -lmcop
+ 
+ 
+ bin_PROGRAMS			=	mpeglibartsplay
+ 
+-mpeglibartsplay_LDFLAGS         =       $(ARTSC_LIBS) $(all_libraries)
++mpeglibartsplay_LDFLAGS         =       $(all_libraries)
+ mpeglibartsplay_SOURCES		=	mpeglibartsplay.cpp
+ 
+ mpeglibartsplay_LDADD		=	-lsoundserver_idl \
+ 					-lkmedia2_idl \
+-					-lartsflow_idl \
+ 					-lmcop
+ 
+ splayPlayObject.lo: splayPlayObject.h
+--- kdemultimedia-3.5.9/noatun/app/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/app/Makefile.am	2008-02-20 12:39:44.000000000 +0200
+@@ -3,7 +3,7 @@
+ kdeinit_LTLIBRARIES = noatun.la
+ noatun_la_SOURCES = main.cpp
+ noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la
++noatun_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ bin_PROGRAMS =
+ lib_LTLIBRARIES =
+--- kdemultimedia-3.5.9/noatun/library/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/library/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -27,14 +27,14 @@
+ 
+ libnoatun_la_LDFLAGS     = \
+ 		-version-info 3:0:2 $(KDE_RPATH) $(all_libraries)
+-libnoatun_la_LIBADD      = $(top_builddir)/arts/gui/common/libartsgui.la \
+-	$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
+-	-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
+-	-lartsflow -lsoundserver_idl -lartskde $(LIBDL)
++libnoatun_la_LIBADD  = $(top_builddir)/arts/gui/kde/libartsgui_kde.la  \
++	-lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
++	-lartsflow -lsoundserver_idl $(LIB_ARTS) \
++	$(top_builddir)/arts/gui/common/libartsgui_idl.la -lartsflow_idl $(LIB_QT) -lmcop -lartsflow $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP $(LIB_KIO)
+ 
+ libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
+ libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
+-libnoatuncontrols_la_LIBADD  = $(LIBDL) $(LIB_KDEUI)
++libnoatuncontrols_la_LIBADD  = $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ METASOURCES = AUTO
+ META_INCLUDES = $(srcdir)/noatun
+--- kdemultimedia-3.5.9/noatun/library/noatunarts/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/library/noatunarts/Makefile.am	2008-02-20 13:15:27.000000000 +0200
+@@ -7,7 +7,7 @@
+                            StereoVolumeControl_impl.cpp Session_impl.cpp
+ libnoatunarts_la_COMPILE_FIRST = noatunarts.h
+ libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
+-libnoatunarts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow
++libnoatunarts_la_LIBADD =  -lartsflow -lartsflow_idl -lmcop
+ libnoatunarts_la_METASOURCES = AUTO
+ 
+ noatunarts.mcoptype: noatunarts.h
+--- kdemultimedia-3.5.9/noatun/library/noatuntags/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/library/noatuntags/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ libnoatuntags_la_SOURCES = tags.cpp
+ libnoatuntags_la_LDFLAGS = -version-info 3:0:2 $(all_libraries)
+-libnoatuntags_la_LIBADD = ../libnoatun.la
++libnoatuntags_la_LIBADD = ../libnoatun.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ libnoatuntags_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/artseffects/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/artseffects/Makefile.am	2008-02-20 12:36:26.000000000 +0200
+@@ -5,7 +5,7 @@
+ libartseffects_la_SOURCES = artseffects.cc extrastereo_impl.cc
+ libartseffects_la_COMPILE_FIRST = artseffects.cc
+ libartseffects_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-libartseffects_la_LIBADD =  $(top_builddir)/arts/gui/common/libartsgui_idl.la -lkmedia2_idl -lsoundserver_idl -lartsflow
++libartseffects_la_LIBADD =  $(top_builddir)/arts/gui/common/libartsgui_idl.la -lartsflow -lartsflow_idl -lmcop
+ 
+ 
+ artseffects.mcopclass: artseffects.h
+--- kdemultimedia-3.5.9/noatun/modules/dcopiface/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/dcopiface/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -4,7 +4,7 @@
+ noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel
+ 
+ noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_dcopiface_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la -lDCOP $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_dcopiface_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/excellent/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/excellent/Makefile.am	2008-02-20 13:13:19.000000000 +0200
+@@ -5,10 +5,9 @@
+ 	userinterface.cpp 
+ 
+ noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_excellent_la_LIBADD = $(LIB_KFILE) \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++noatun_excellent_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \
+ 	$(top_builddir)/noatun/library/libnoatuncontrols.la \
+-	-lqtmcop -lkmedia2_idl -lsoundserver_idl
++	$(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_excellent_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/htmlexport/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/htmlexport/Makefile.am	2008-02-20 12:37:03.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+-                        -lqtmcop -lkmedia2_idl -lsoundserver_idl
++                        $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ noatun_htmlexport_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/infrared/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/infrared/Makefile.am	2008-02-20 12:34:06.000000000 +0200
+@@ -6,8 +6,7 @@
+ noinst_HEADERS = infrared.h lirc.h irprefs.h
+ 
+ noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+-                        -lqtmcop -lkmedia2_idl -lsoundserver_idl
++noatun_infrared_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ noatun_infrared_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/kaiman/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/kaiman/Makefile.am	2008-02-20 14:03:42.000000000 +0200
+@@ -9,8 +9,8 @@
+ 	pref.cpp
+ 
+ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+-                        -lqtmcop -lkmedia2_idl -lsoundserver_idl
++noatun_kaiman_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \
++                        $(LIB_XEXT) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_kaiman_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/keyz/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/keyz/Makefile.am	2008-02-20 12:42:29.000000000 +0200
+@@ -4,7 +4,7 @@
+ noatun_keyz_la_SOURCES = keyz.cpp
+ 
+ noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_keyz_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_keyz_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/kjofol-skin/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/kjofol-skin/Makefile.am	2008-02-20 14:41:57.000000000 +0200
+@@ -23,9 +23,8 @@
+ 										kjskinselectorwidget.ui kjguisettingswidget.ui
+ 
+ noatun_kjofol_la_LDFLAGS	=	$(all_libraries) -module -avoid-version -no-undefined
+-noatun_kjofol_la_LIBADD		=	$(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+-										$(LIB_KIO) -lm \
+-										$(top_builddir)/arts/modules/libartsmodules.la
++noatun_kjofol_la_LIBADD		=	$(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \
++										-lm $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx -lkmedia2_idl
+ 
+ noinst_HEADERS					=	kjloader.h kjwidget.h kjbutton.h kjseeker.h \
+ 										kjsliders.h kjfont.h kjtextdisplay.h \
+--- kdemultimedia-3.5.9/noatun/modules/marquis/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/marquis/Makefile.am	2008-02-20 13:16:08.000000000 +0200
+@@ -4,8 +4,7 @@
+ noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp
+ 
+ noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+-                        -lqtmcop -lkmedia2_idl -lsoundserver_idl
++noatun_marquis_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_marquis_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/metatag/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/metatag/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \
+-	$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
++	$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_metatag_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/monoscope/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/monoscope/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -5,7 +5,7 @@
+ #prefs.cpp
+ 
+ noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_monoscope_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la -lm $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_monoscope_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/net/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/net/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -4,7 +4,7 @@
+ noatun_net_la_SOURCES = net.cpp
+ 
+ noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_net_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_net_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/noatunui/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/noatunui/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -4,9 +4,9 @@
+ noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp
+ 
+ noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_ui_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \
+                         $(top_builddir)/noatun/library/libnoatuncontrols.la \
+-                        -lqtmcop -lkmedia2_idl -lsoundserver_idl
++                         $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatun_ui_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/simple/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/simple/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -6,7 +6,7 @@
+ noatunsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ noatunsimple_la_LIBADD =  $(top_builddir)/noatun/library/libnoatun.la \
+ 			  $(top_builddir)/noatun/library/libnoatuncontrols.la \
+-			 -lkmedia2_idl -lsoundserver_idl -lartskde
++			 -lkmedia2_idl $(LIB_ARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ noatunsimple_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/systray/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/systray/Makefile.am	2008-02-20 03:55:41.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ 
+ noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ noatun_systray_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/splitplaylist/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/splitplaylist/Makefile.am	2008-02-20 03:55:41.000000000 +0200
+@@ -4,7 +4,7 @@
+ noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp
+ 
+ noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la
++noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ noatun_splitplaylist_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/voiceprint/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/voiceprint/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -4,7 +4,7 @@
+ noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp
+ 
+ noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_voiceprint_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la -lm $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ 
+ noatun_voiceprint_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/winskin/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/winskin/Makefile.am	2008-02-20 13:08:22.000000000 +0200
+@@ -40,7 +40,8 @@
+ 					-module -avoid-version -no-undefined 
+ 
+ noatun_winskin_la_LIBADD		= $(top_builddir)/noatun/library/libnoatun.la \
+-					$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
++					$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la \
++					$(top_builddir)/noatun/library/noatunarts/libnoatunarts.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lsoundserver_idl
+ 
+ noatun_winskin_la_METASOURCES	=	AUTO
+ 
+--- kdemultimedia-3.5.9/noatun/modules/winskin/vis/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/noatun/modules/winskin/vis/Makefile.am	2008-02-20 13:14:40.000000000 +0200
+@@ -17,7 +17,7 @@
+ libwinskinvis_la_LDFLAGS=	$(all_libraries) -avoid-version \
+ 				-no-undefined
+ 
+-libwinskinvis_la_LIBADD =	-lkmedia2_idl -lsoundserver_idl -lartsflow
++libwinskinvis_la_LIBADD =	 -lartsflow -lartsflow_idl -lmcop
+ libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
+ libwinskinvis_la_METASOURCES =	AUTO
+ 
+--- kdemultimedia-3.5.9/xine_artsplugin/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/xine_artsplugin/Makefile.am	2008-02-20 13:25:25.000000000 +0200
+@@ -9,7 +9,7 @@
+ 			  audio_fifo_out.c
+ libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
+ libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
+-			 -lkmedia2_idl -lsoundserver_idl -lartsflow
++			 -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl $(KDE_MT_LIBS) -lmcop
+ 
+ libarts_xine_la_METASOURCES = AUTO
+ 
+--- kdemultimedia-3.5.9/xine_artsplugin/tools/thumbnail/Makefile.am	2008-02-20 03:52:00.000000000 +0200
++++ kdemultimedia-3.5.9/xine_artsplugin/tools/thumbnail/Makefile.am	2008-02-20 13:25:12.000000000 +0200
+@@ -10,7 +10,7 @@
+ kde_module_LTLIBRARIES = videothumbnail.la
+ 
+ videothumbnail_la_SOURCES = videocreator.cpp videoscaler.cpp
+-videothumbnail_la_LIBADD = $(XINE_LIBS) $(LIB_KDECORE)
++videothumbnail_la_LIBADD = $(XINE_LIBS) $(LIB_KDECORE) $(KDE_MT_LIBS) $(LIB_QT)
+ videothumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -pthread
+ 
+ noinst_HEADERS = videocreator.h

Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdenetwork/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,4 +1,4 @@
-kdenetwork (4:3.5.9-1~pre3) unstable; urgency=low
+kdenetwork (4:3.5.9-1~pre4) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
@@ -10,11 +10,10 @@
   * Tighten shlibs to 3.5.9 in debian/rules.
   * Update kdenetwork-dev.install - add
     - usr/include/kde/kopete/kopetepluginmanager.h
-  * Add 01_admin_cleanup.diff and 03_automake_cleanup.diff to fix missing
-    symbol warnings from dpkg-shlibdeps.
-  * Split off Makefile.am diff part from the 11_dlopen-xmms.diff patch into
-    a new 02_dlopen-xmms-automake.diff patch. All custom Makefile.am patches
-    must be applied before 03_automake_cleanup.diff to ease maintainance.
+  * Add automake cleanup patches to fix missing symbol warnings from
+    dpkg-shlibdeps:
+    - 01_admin_cleanup.diff
+    - 97_automake_cleanup.diff 
   * Drop PACKAGES_WITH_LIBS from debian/rules. It's no longer needed with
     recent dpkg-shlibdeps.
   * Use ${source:Upstream-Version} for kdelibs4-dev dependency.
@@ -28,7 +27,7 @@
   * debian/copyright file: GFDL text removed and replaced by a
     link to common-licenses.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Feb 2008 22:42:50 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Feb 2008 16:57:38 +0200
 
 kdenetwork (4:3.5.8-1) unstable; urgency=low
 

Modified: trunk/packages/kdenetwork/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdenetwork/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,7 +1,6 @@
-diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
---- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -13,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -22,9 +21,72 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Deleted: trunk/packages/kdenetwork/debian/patches/02_dlopen-xmms-automake.diff

Deleted: trunk/packages/kdenetwork/debian/patches/03_automake_cleanup.diff

Modified: trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -45,3 +45,16 @@
  	{
  		QString newTrack;
  		// see if it's playing
+--- kdenetwork.orig/kopete/plugins/nowlistening/Makefile.am
++++ kdenetwork.patched/kopete/plugins/nowlistening/Makefile.am
+@@ -5,8 +5,8 @@
+ kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
+ 
+ kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS) $(all_libraries)
+-kopete_nowlistening_la_LIBADD =  ../../libkopete/libkopete.la $(XMMS_LIBS)
++kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries)
++kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
+ 
+ kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
+ kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)

Copied: trunk/packages/kdenetwork/debian/patches/97_automake_cleanup.diff (from rev 9471, trunk/packages/kdenetwork/debian/patches/03_automake_cleanup.diff)
===================================================================
--- trunk/packages/kdenetwork/debian/patches/97_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/97_automake_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,806 @@
+--- kdenetwork-3.5.9/kopete/kopete/addaccountwizard/Makefile.am	2008-02-19 14:06:26.000000000 +0200
++++ kdenetwork-3.5.9/kopete/kopete/addaccountwizard/Makefile.am	2008-02-19 14:46:51.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ libkopeteaddaccountwizard_la_SOURCES = addaccountwizardpage1.ui addaccountwizardpage2.ui addaccountwizardpage3.ui addaccountwizard.cpp
+ libkopeteaddaccountwizard_la_LDFLAGS = $(all_libraries) -no-undefined
+-libkopeteaddaccountwizard_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KDEUI) 
++libkopeteaddaccountwizard_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KDEUI) $(LIB_KUTILS)
+ 
+ # vim: set noet:
+ 
+--- kdenetwork-3.5.9/kopete/kopete/Makefile.am	2008-02-19 14:49:09.000000000 +0200
++++ kdenetwork-3.5.9/kopete/kopete/Makefile.am	2008-02-19 21:05:54.000000000 +0200
+@@ -33,14 +33,14 @@
+ 
+ kimiface_DIR = $(kde_includes)
+ 
+-kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor
++kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH)
+ kopete_LDADD = \
+ 	addcontactwizard/libkopeteaddcontactwizard.la \
+ 	addaccountwizard/libkopeteaddaccountwizard.la \
+ 	contactlist/libkopetecontactlist.la \
+ 	config/plugins/libkopetepluginconfig.la \
+ 	../libkopete/libkopete.la \
+-	../libkopete/ui/libkopeteui.la
++	../libkopete/ui/libkopeteui.la $(LIB_KUTILS)
+ 
+ mydatadir    = $(kde_datadir)/kopete
+ mydata_DATA  = kopeteui.rc eventsrc
+--- kdenetwork-3.5.9/kopete/libkopete/Makefile.am	2008-02-19 14:44:29.000000000 +0200
++++ kdenetwork-3.5.9/kopete/libkopete/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -35,7 +35,7 @@
+ 	kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp
+ 
+ libkopete_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+-libkopete_la_LIBADD = -lkabc ui/libkopeteui.la $(COMPAT_LIBS) $(LIB_KIO) $(LIB_XSS) $(LIB_XRENDER)
++libkopete_la_LIBADD = -lkabc ui/libkopeteui.la $(COMPAT_LIBS) $(LIB_KIO) $(LIB_XSS) $(LIB_XRENDER) $(LIB_KUTILS) $(LIB_KHTML) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) -lkwalletclient -lDCOP $(LIB_X11)
+ 
+ kde_kcfg_DATA = kopete.kcfg
+ 
+--- kdenetwork-3.5.9/kopete/plugins/nowlistening/Makefile.am	2008-02-19 14:16:11.000000000 +0200
++++ kdenetwork-3.5.9/kopete/plugins/nowlistening/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,12 +5,12 @@
+ kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
+ 
+ kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries)
+-kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries)
++kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI)
+ 
+ kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
+ kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_nowlistening.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/krfb/krfb/Makefile.am	2008-02-19 14:06:25.000000000 +0200
++++ kdenetwork-3.5.9/krfb/krfb/Makefile.am	2008-02-19 15:45:07.000000000 +0200
+@@ -12,7 +12,7 @@
+ krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
+                connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \
+                trayicon.cpp connectiondialog.cc
+-krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) -lkio 
++krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) $(LIB_KIO) $(LIB_SLP)
+ krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ appdatadir = $(kde_datadir)/krfb/pics
+--- kdenetwork-3.5.9/filesharing/advanced/kcm_sambaconf/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/filesharing/advanced/kcm_sambaconf/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -16,7 +16,7 @@
+ 
+ kcm_kcmsambaconf_la_LIBADD = \
+       -lkdeprint \
+-      libfilesharesamba.la
++      libfilesharesamba.la $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI)
+       
+ kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+--- kdenetwork-3.5.9/filesharing/advanced/propsdlgplugin/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/filesharing/advanced/propsdlgplugin/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,7 +12,7 @@
+     libpropsdlgplugin_common.la \
+     ../nfs/libfilesharenfs.la \
+     ../kcm_sambaconf/libfilesharesamba.la \
+-	$(LIB_KIO)
++	$(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+--- kdenetwork-3.5.9/filesharing/simple/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/filesharing/simple/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ kcm_fileshare_la_LIBADD = ../advanced/propsdlgplugin/libpropsdlgplugin_common.la \
+     ../advanced/nfs/libfilesharenfs.la \
+     ../advanced/kcm_sambaconf/libfilesharesamba.la \
+-    $(LIB_KIO)
++    $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ AM_CPPFLAGS = -I$(srcdir)/../advanced/propsdlgplugin -I../advanced/propsdlgplugin $(all_includes)
+ 
+--- kdenetwork-3.5.9/kdict/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kdict/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ AM_CPPFLAGS         = $(all_includes)
+ 
+ kdict_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN)
+-kdict_la_LIBADD  = $(LIB_KFILE) $(LIB_KHTML) $(LIBPTHREAD) $(LIBRESOLV)
++kdict_la_LIBADD  = $(LIB_KFILE) $(LIB_KHTML) $(LIBPTHREAD) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP $(LIB_QT) $(LIB_KPARTS)
+ kdict_la_SOURCES = dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp \
+                    queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp
+ 
+--- kdenetwork-3.5.9/kdict/applet/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kdict/applet/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+ 
+ kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kdict_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
++kdict_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/kdictapplet.pot
+--- kdenetwork-3.5.9/kdnssd/ioslave/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kdnssd/ioslave/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kio_zeroconf.la
+ 
+ kio_zeroconf_la_SOURCES = dnssd.cpp
+-kio_zeroconf_la_LIBADD = $(LIB_KDNSSD) $(LIB_KIO)
++kio_zeroconf_la_LIBADD = $(LIB_KDNSSD) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kio_zeroconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
+ 
+ protocol_DATA = zeroconf.protocol invitation.protocol
+--- kdenetwork-3.5.9/kdnssd/kdedmodule/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kdnssd/kdedmodule/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ 
+ kded_dnssdwatcher_la_SOURCES = dnssdwatcher.cpp dnssdwatcher.skel watcher.cpp
+ kded_dnssdwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_dnssdwatcher_la_LIBADD =  $(LIB_KDNSSD) $(LIB_KIO)
++kded_dnssdwatcher_la_LIBADD =  $(LIB_KDNSSD) $(LIB_KIO) $(LIB_QT) -lDCOP -lkdeinit_kded $(LIB_KDECORE)
+ 
+ 
+ servicesdir = $(kde_servicesdir)/kded
+--- kdenetwork-3.5.9/kfile-plugins/torrent/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kfile-plugins/torrent/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -10,7 +10,7 @@
+ 
+ kfile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp kfile_torrent.cpp
+ kfile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_torrent_la_LIBADD = $(LIB_KIO)
++kfile_torrent_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdenetwork-3.5.9/kget/kget_plug_in/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kget/kget_plug_in/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -4,7 +4,7 @@
+ 
+ khtml_kget_la_METASOURCES = AUTO
+ khtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp
+-khtml_kget_la_LIBADD =  $(LIB_KHTML)
++khtml_kget_la_LIBADD =  $(LIB_KHTML) $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KIO)
+ khtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+ KDE_ICON = AUTO
+--- kdenetwork-3.5.9/knewsticker/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/knewsticker/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -13,7 +13,7 @@
+ 	newssourcedlgimpl.cpp newssourcedlg.ui
+ knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
+-	$(LIB_KIO) $(LIB_KDEUI)
++	$(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ 
+ appdatadir = $(kde_datadir)/knewsticker
+ appdata_DATA = eventsrc
+--- kdenetwork-3.5.9/knewsticker/kntsrcfilepropsdlg/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/knewsticker/kntsrcfilepropsdlg/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ libkntsrcfilepropsdlg_la_SOURCES = kntsrcfilepropsdlg.cpp \
+ 	kntsrcfilepropsdlgwidget.ui
+ libkntsrcfilepropsdlg_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libkntsrcfilepropsdlg_la_LIBADD = $(LIB_KIO) ../common/libknewstickercommon.la ../../librss/librss.la
++libkntsrcfilepropsdlg_la_LIBADD = $(LIB_KIO) ../common/libknewstickercommon.la ../../librss/librss.la $(LIB_QT) -lDCOP $(LIB_KDEUI) $(LIB_KDECORE)
+ libkntsrcfilepropsdlg_la_METASOURCES = AUTO
+ 
+ service_DATA = kntsrcfilepropsdlg.desktop
+--- kdenetwork-3.5.9/kopete/kopete/chatwindow/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/chatwindow/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -6,15 +6,15 @@
+ 
+ kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
+ kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI)
++kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI) $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KABC)
+ 
+ kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
+ kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI)
++kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI) $(LIB_QT) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDECORE)
+ 
+ libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
+ libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
+-libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_KDEPRINT)
++libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
+ 	chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
+--- kdenetwork-3.5.9/kopete/kopete/config/accounts/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/config/accounts/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -9,7 +9,7 @@
+ 
+ kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp
+ kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_accountconfig.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/kopete/config/appearance/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/config/appearance/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ 	$(all_libraries)
+ kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la  \
+ 	../../../kopete/chatwindow/libkopetechatwindow.la \
+-	-lktexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
++	$(LIB_KOPETECOMPAT) $(LIB_KNEWSTUFF) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_appearanceconfig.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/kopete/config/avdevice/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/config/avdevice/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -10,9 +10,9 @@
+ 
+ kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ 
+-kcm_kopete_avdeviceconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
++kcm_kopete_avdeviceconfig_la_LIBADD  = \
+ 	../../../libkopete/avdevice/libkopete_videodevice.la \
+-	$(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++	$(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_avdeviceconfig.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/kopete/config/behavior/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/config/behavior/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -10,7 +10,7 @@
+ kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ kcm_kopete_behaviorconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
+-	$(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++	$(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_behaviorconfig.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/kopete/config/identity/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/kopete/config/identity/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -6,7 +6,7 @@
+ kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \
+ 		kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc
+ kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_identityconfig_la_LIBADD  = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_identityconfig_la_LIBADD  = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ 
+ service_DATA = kopete_identityconfig.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/libkopete/avdevice/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/libkopete/avdevice/Makefile.am	2008-02-19 17:36:45.000000000 +0000
+@@ -6,6 +6,7 @@
+ lib_LTLIBRARIES = libkopete_videodevice.la
+ noinst_LTLIBRARIES = libkvideoio.la
+ libkopete_videodevice_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkopete_videodevice_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+ 
+ noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
+ 	videodevicemodelpool.h videodevicepool.h videoinput.h \
+--- kdenetwork-3.5.9/kopete/plugins/addbookmarks/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/addbookmarks/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,11 +7,11 @@
+ kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la
+ 
+ kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la
++kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+ kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp
+ 
+ kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \
+                                      addbookmarksprefssettings.cpp
+ 
+--- kdenetwork-3.5.9/kopete/plugins/alias/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/alias/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,11 +5,11 @@
+ 
+ kopete_alias_la_SOURCES     = aliasplugin.cpp
+ kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kopete_alias_la_SOURCES     = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
+ kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la
++kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_alias.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/autoreplace/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/autoreplace/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,11 +7,11 @@
+ 
+ kopete_autoreplace_la_SOURCES     = autoreplaceplugin.cpp autoreplaceconfig.cpp
+ kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kopete_autoreplace_la_SOURCES     = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui
+ kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_autoreplace.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/connectionstatus/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/connectionstatus/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ kopete_connectionstatus_la_SOURCES     = connectionstatusplugin.cpp
+ kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries)
+-kopete_connectionstatus_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_connectionstatus_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_connectionstatus.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/contactnotes/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/contactnotes/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ kopete_contactnotes_la_SOURCES     = contactnotesplugin.cpp contactnotesedit.cpp
+ kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_contactnotes_la_LIBADD      = ../../libkopete/libkopete.la -lkio
++kopete_contactnotes_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_contactnotes.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/cryptography/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/cryptography/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -8,11 +8,11 @@
+ 
+ kopete_cryptography_la_SOURCES     = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp
+ kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_cryptography_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_cryptography_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui  kgpgselkey.cpp
+ kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_cryptography.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/highlight/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/highlight/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -8,11 +8,11 @@
+ 
+ kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
+ kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
+ kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ 
+ service_DATA = kopete_highlight.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/history/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/history/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -8,11 +8,11 @@
+ 	historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
+ 
+ kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_history_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_history_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KUTILS) $(LIB_KIO)
+ 
+ kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp  historyconfig.kcfgc
+ kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_history_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_history.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/latex/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/latex/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -8,11 +8,11 @@
+ 
+ kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp
+ kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
+ kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_latex.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/netmeeting/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/netmeeting/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ kopete_netmeeting_la_SOURCES     = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp
+ kopete_netmeeting_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_netmeeting_la_LIBADD      = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la
++kopete_netmeeting_la_LIBADD      = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_netmeeting.desktop
+ servicedir = $(kde_servicesdir)
+@@ -16,7 +16,7 @@
+ 
+ kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp
+ kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
++kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ 
+ kcm_DATA = kopete_netmeeting_config.desktop
+--- kdenetwork-3.5.9/kopete/plugins/statistics/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/statistics/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -9,7 +9,7 @@
+ kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
+ 
+ kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la sqlite/libsqlite.la
++kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la sqlite/libsqlite.la -lDCOP $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML)
+ 
+ service_DATA = kopete_statistics.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/texteffect/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/texteffect/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,11 +7,11 @@
+ 
+ kopete_texteffect_la_SOURCES     = texteffectplugin.cpp texteffectconfig.cpp
+ kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_texteffect_la_LIBADD      = ../../libkopete/libkopete.la
++kopete_texteffect_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp
+ kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_texteffect_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_texteffect.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/translator/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/translator/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,11 +7,11 @@
+ kopete_translator_la_SOURCES     = translatorplugin.cpp  \
+     translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp
+ kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KIO)
++kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp
+ kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_translator.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/plugins/webpresence/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/plugins/webpresence/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,11 +7,11 @@
+ kopete_webpresence_la_SOURCES     = webpresenceplugin.cpp
+ 
+ kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kopete_webpresence_la_LIBADD      = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS)
++kopete_webpresence_la_LIBADD      = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ 
+ kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui
+ kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_KUTILS)
++kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_webpresence.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/gadu/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/gadu/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -32,7 +32,7 @@
+ kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_gadu_la_LIBADD  = ./ui/libgaduui.la \
+ 		       $(top_builddir)/kopete/libkopete/libkopete.la \
+-		       $(GG_LIBS)
++		       $(GG_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
+ 
+ service_DATA = kopete_gadu.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/groupwise/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/groupwise/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -14,7 +14,7 @@
+ kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
+ 	$(all_libraries)
+ kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \
+-	libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO)
++	libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_groupwise.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/irc/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/irc/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -26,7 +26,7 @@
+ kopete_irc_la_LIBADD      = ../../libkopete/libkopete.la \
+ 		./ui/libkopeteircui.la \
+ 		./libkirc/libkirc.la \
+-		$(LIB_KIO)
++		$(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) -lDCOP
+ 
+ service_DATA = kopete_irc.desktop irc.protocol
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/jabber/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/jabber/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -55,7 +55,7 @@
+ 	libiris/cutestuff/network/libcutestuff_network.la \
+ 	libiris/cutestuff/util/libcutestuff_util.la \
+ 	libjabberclient.la \
+-	$(JINGLE_LIBS)
++	$(JINGLE_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(IDN_LIBS) $(LIB_KIO)
+ 
+ service_DATA = kopete_jabber.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/jabber/kioslave/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/jabber/kioslave/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -13,7 +13,7 @@
+ kde_module_LTLIBRARIES = kio_jabberdisco.la
+ 
+ kio_jabberdisco_la_SOURCES = jabberdisco.cpp
+-kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO)
++kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) $(IDN_LIBS)
+ kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ 
+ noinst_HEADERS = jabberdisco.h
+--- kdenetwork-3.5.9/kopete/protocols/meanwhile/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/meanwhile/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -31,7 +31,7 @@
+ 	$(KDE_PLUGIN) $(all_libraries) 
+ 
+ kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
+-	ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)
++	ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_meanwhile.desktop
+ servicedir= $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/msn/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/msn/Makefile.am	2008-02-19 21:08:40.000000000 +0200
+@@ -24,11 +24,11 @@
+ 	p2p.cpp messageformatter.cpp incomingtransfer.cpp outgoingtransfer.cpp \
+ 	webcam.cpp
+ 
+-libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la   $(LIB_KIO)
++libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la   $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) -lglib-2.0
+ libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries)
+ 
+ kopete_msn_la_SOURCES = dummy.cpp webcam.cpp
+-kopete_msn_la_LIBADD = libkopete_msn_shared.la
++kopete_msn_la_LIBADD = libkopete_msn_shared.la ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ 
+--- kdenetwork-3.5.9/kopete/protocols/msn/config/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/msn/config/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ 
+ kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp
+ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+-kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_KUTILS)
++kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_msn_config.desktop
+ servicedir = $(kde_servicesdir)/kconfiguredialog
+--- kdenetwork-3.5.9/kopete/protocols/oscar/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/oscar/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,4 +12,4 @@
+ 	oscarvisibilitybase.ui oscarvisibilitydialog.cpp \
+ 	oscarversionupdater.cpp
+ libkopete_oscar_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
+-libkopete_oscar_la_LIBADD  = $(LIB_KIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la
++libkopete_oscar_la_LIBADD  = $(LIB_KIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+--- kdenetwork-3.5.9/kopete/protocols/oscar/aim/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/oscar/aim/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ 
+ kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_aim_la_LIBADD  = ../libkopete_oscar.la ui/libkopeteaimui.la \
+-	$(top_builddir)/kopete/libkopete/libkopete.la
++	$(top_builddir)/kopete/libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_aim.desktop aim.protocol
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/oscar/icq/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/oscar/icq/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -13,7 +13,7 @@
+ 
+ kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_icq_la_LIBADD  = ../libkopete_oscar.la \
+-	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la
++	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ 
+ service_DATA = kopete_icq.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/sms/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/sms/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -15,7 +15,7 @@
+ kopete_sms_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_sms_la_LIBADD  = ./ui/libkopetesmsui.la \
+ 	./services/libkopetesmsservices.la \
+-	../../libkopete/libkopete.la  $(LIB_KIO)
++	../../libkopete/libkopete.la  $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) -lgsmme $(LIB_KDECORE)
+ 
+ service_DATA = kopete_sms.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/testbed/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/testbed/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -9,7 +9,7 @@
+ kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp
+ kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
+-	ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO)
++	ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ service_DATA = kopete_testbed.desktop
+ servicedir= $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/winpopup/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/winpopup/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -13,7 +13,7 @@
+ kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp  wpaddcontact.cpp wpeditaccount.cpp  wpaccount.cpp wpuserinfo.cpp
+ kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+ kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \
+-	./libwinpopup/libwinpopup.la $(LIB_KIO)
++	./libwinpopup/libwinpopup.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ service_DATA = kopete_wp.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kopete/protocols/yahoo/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kopete/protocols/yahoo/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -14,7 +14,7 @@
+ 	yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp
+ kopete_yahoo_la_LDFLAGS     = -module $(KDE_PLUGIN)
+ kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
+-	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la
++	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
+ 
+ service_DATA = kopete_yahoo.desktop
+ servicedir = $(kde_servicesdir)
+--- kdenetwork-3.5.9/kpf/src/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/kpf/src/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -39,7 +39,7 @@
+ 
+ kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+-kpf_panelapplet_la_LIBADD = $(LIB_KIO) -lkdnssd
++kpf_panelapplet_la_LIBADD = $(LIB_KIO) -lkdnssd $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE)
+ 
+ kpfpropertiesdialog_la_SOURCES = \
+   PropertiesDialogPlugin.cpp \
+@@ -49,7 +49,7 @@
+   Defaults.cpp \
+   Help.cpp
+ 
+-kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -lkdnssd
++kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -lkdnssd $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) -lDCOP
+ 
+ kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ 
+--- kdenetwork-3.5.9/krfb/kcm_krfb/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/krfb/kcm_krfb/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ 
+ kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
+ kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
+-kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI) -lkio
++kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI) -lkio $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_SLP)
+ 
+ # Services
+ xdg_apps_DATA = kcmkrfb.desktop
+--- kdenetwork-3.5.9/krfb/kinetd/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/krfb/kinetd/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ 
+ kded_kinetd_la_SOURCES = kinetd.cpp kinetd.skel
+ kded_kinetd_la_LDFLAGS  = $(all_libraries) -module -avoid-version
+-kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) $(LIB_KDNSSD)
++kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) $(LIB_KDNSSD) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdeinit_kded $(LIB_SLP)
+ 
+ # Services
+ kde_servicetypes_DATA = kinetdmodule.desktop
+--- kdenetwork-3.5.9/ksirc/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/ksirc/Makefile.am	2008-02-19 21:04:57.000000000 +0200
+@@ -77,11 +77,11 @@
+ 	./KSProgress/libksprogress.la  \
+ 	./KSOpenkSirc/libksopenksirc.la \
+         ./KSTicker/libksticker.la \
+-	$(LIB_KIO) $(LIBDL) 
++	$(LIB_KIO)
+ 
+ # the libraries to link against. Be aware of the order. First the libraries,
+ # that depend on the following ones.
+-ksirc_la_LIBADD   = $(all_ksirc_libraries)
++ksirc_la_LIBADD   = $(all_ksirc_libraries) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT)
+ 
+ kdoc:
+ 	kdoc -ddoc ksirc *.h
+--- kdenetwork-3.5.9/ktalkd/kcmktalkd/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/ktalkd/kcmktalkd/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -9,7 +9,7 @@
+ kcm_ktalkd_la_SOURCES = main.cpp soundpage.cpp answmachpage.cpp \
+ 	forwmachpage.cpp
+ kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kcm_ktalkd_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
++kcm_ktalkd_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ 
+ #for extra warnings during compilation :
+ # AMDEFS		=	-ansi -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE
+--- kdenetwork-3.5.9/lanbrowsing/kcmlisa/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/lanbrowsing/kcmlisa/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp portsettingsbar.cpp findnic.cpp
+ 
+ kcm_lanbrowser_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
+-kcm_lanbrowser_la_LIBADD = -lkdeui
++kcm_lanbrowser_la_LIBADD = -lkdeui $(LIB_QT) $(LIB_KDECORE)
+ 
+ INCLUDES= $(all_includes)
+ 
+--- kdenetwork-3.5.9/lanbrowsing/kio_lan/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/lanbrowsing/kio_lan/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES = kio_lan.la
+ 
+ kio_lan_la_SOURCES = kio_lan.cpp
+-kio_lan_la_LIBADD = $(LIB_KIO)
++kio_lan_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kio_lan_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = kio_lan.h
+--- kdenetwork-3.5.9/librss/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/librss/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -5,7 +5,7 @@
+ librss_la_SOURCES = article.cpp document.cpp image.cpp textinput.cpp \
+   tools_p.cpp loader.cpp
+ librss_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+-librss_la_LIBADD = $(LIB_KIO)
++librss_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ librssincludedir = $(includedir)/rss
+ librssinclude_HEADERS = article.h document.h global.h image.h textinput.h \
+--- kdenetwork-3.5.9/wifi/kcmwifi/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/wifi/kcmwifi/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -7,7 +7,7 @@
+                       ifconfigpagebase.ui configpower.ui mainconfigbase.ui \
+                       mainconfig.cpp ifconfigpage.cpp vendorconfig.cpp
+ kcm_wifi_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+-kcm_wifi_la_LIBADD = $(LIB_KIO)
++kcm_wifi_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ 
+ METASOURCES = AUTO
+ 
+--- kdenetwork-3.5.9/wifi/kwireless/Makefile.am	2008-02-19 17:36:30.000000000 +0000
++++ kdenetwork-3.5.9/wifi/kwireless/Makefile.am	2008-02-19 17:36:30.000000000 +0000
+@@ -8,7 +8,7 @@
+ 	linuxwirelesswidget.cpp  \
+ 	propertytablebase.ui propertytable.cpp 
+ libkwireless_la_LDFLAGS = -module -avoid-version $(all_libraries)
+-libkwireless_la_LIBADD =  -liw $(LIB_KDEUI)
++libkwireless_la_LIBADD =  -liw $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ kwireless_DATA = kwireless.desktop
+ kwirelessdir = $(kde_datadir)/kicker/applets
+--- kdenetwork-3.5.9.o/ktalkd/ktalkdlg/Makefile.am	2008-02-19 21:00:02.000000000 +0200
++++ kdenetwork-3.5.9/ktalkd/ktalkdlg/Makefile.am	2008-02-19 21:01:06.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ INCLUDES	=	$(all_includes)
+ ktalkdlg_LDFLAGS=	$(all_libraries) $(KDE_RPATH)
+-ktalkdlg_LDADD	=	$(LIB_KDEUI)
++ktalkdlg_LDADD	=	$(LIB_QT) $(LIB_KDECORE)
+ 
+ #for extra warnings during compilation :
+ #AM_CXXFLAGS = -ansi -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE
+--- kdenetwork-3.5.9.o/wifi/Makefile.am	2008-02-19 21:00:06.000000000 +0200
++++ kdenetwork-3.5.9/wifi/Makefile.am	2008-02-19 21:03:57.000000000 +0200
+@@ -26,7 +26,7 @@
+ kwifimanager_LDFLAGS = $(all_libraries)
+ 
+ if include_ARTS
+-ARTS_LIBS = -lartsflow -lmcop
++ARTS_LIBS = -lartsflow
+ endif
+ 
+ kwifimanager_LDADD = $(ARTS_LIBS) -liw $(LIB_KDEUI)

Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdenetwork/debian/rules	2008-02-26 15:51:35 UTC (rev 9472)
@@ -22,8 +22,8 @@
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdenetwork-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.5.9)'
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Modified: trunk/packages/kdetoys/debian/changelog
===================================================================
--- trunk/packages/kdetoys/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdetoys/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,11 +1,11 @@
-kdetoys (4:3.5.9-1~pre2) unstable; urgency=low
+kdetoys (4:3.5.9-1~pre3) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
   * New upstream release (3.5.9).
   * Add patches for automake cleanup:
     - 01_admin_cleanup.diff
-    - 02_automake_cleanup.diff
+    - 97_automake_cleanup.diff
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -16,7 +16,7 @@
   * debian/copyright file: GFDL text removed and replaced by a
     link to common-licenses.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Feb 2008 15:30:28 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Feb 2008 17:06:00 +0200
 
 kdetoys (4:3.5.8-1) unstable; urgency=low
 

Modified: trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdetoys/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,7 +1,6 @@
-diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
---- kde/admin/acinclude.m4.in	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -13,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -22,9 +21,72 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+ 
+@@ -4626,7 +4632,7 @@
+     and contact the authors to let them know about this problem])
+ 	])
+ 
+-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++  LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+   AC_SUBST(PYTHONINC)
+   AC_SUBST(PYTHONLIB)
+   AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Deleted: trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff

Copied: trunk/packages/kdetoys/debian/patches/97_automake_cleanup.diff (from rev 9471, trunk/packages/kdetoys/debian/patches/02_automake_cleanup.diff)
===================================================================
--- trunk/packages/kdetoys/debian/patches/97_automake_cleanup.diff	                        (rev 0)
+++ trunk/packages/kdetoys/debian/patches/97_automake_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -0,0 +1,85 @@
+diff -ur kdetoys-3.5.9_src/eyesapplet/Makefile.am kdetoys-3.5.9_dst/eyesapplet/Makefile.am
+--- kdetoys-3.5.9_src/eyesapplet/Makefile.am	2008-02-20 13:35:13.000000000 +0000
++++ kdetoys-3.5.9_dst/eyesapplet/Makefile.am	2008-02-20 13:35:14.000000000 +0000
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+ 
+ eyes_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-eyes_panelapplet_la_LIBADD = $(LIB_KDEUI)
++eyes_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/keyesapplet.pot
+diff -ur kdetoys-3.5.9_src/fifteenapplet/Makefile.am kdetoys-3.5.9_dst/fifteenapplet/Makefile.am
+--- kdetoys-3.5.9_src/fifteenapplet/Makefile.am	2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/fifteenapplet/Makefile.am	2008-02-20 13:35:14.000000000 +0000
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+ 
+ fifteen_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-fifteen_panelapplet_la_LIBADD = $(LIB_KDEUI)
++fifteen_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/kfifteenapplet.pot
+diff -ur kdetoys-3.5.9_src/kmoon/Makefile.am kdetoys-3.5.9_dst/kmoon/Makefile.am
+--- kdetoys-3.5.9_src/kmoon/Makefile.am	2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/kmoon/Makefile.am	2008-02-20 13:35:14.000000000 +0000
+@@ -3,7 +3,7 @@
+ 
+ kmoon_panelapplet_la_SOURCES = kmoonapplet.cpp phases.cpp kmoondlg.cpp kmoonwidget.cpp
+ kmoon_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-kmoon_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
++kmoon_panelapplet_la_LIBADD = $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ 
+ lnkdir = $(kde_datadir)/kicker/applets
+ lnk_DATA = kmoonapplet.desktop
+diff -ur kdetoys-3.5.9_src/kweather/Makefile.am kdetoys-3.5.9_dst/kweather/Makefile.am
+--- kdetoys-3.5.9_src/kweather/Makefile.am	2008-02-20 13:35:13.000000000 +0000
++++ kdetoys-3.5.9_dst/kweather/Makefile.am	2008-02-20 13:35:14.000000000 +0000
+@@ -26,7 +26,7 @@
+                                  weatherIface.skel weatherservice.stub \
+                                  weatherbutton.cpp
+ weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-weather_panelapplet_la_LIBADD = $(LIB_KHTML)
++weather_panelapplet_la_LIBADD = $(LIB_KHTML) $(LIB_KDECORE) $(LIB_QT) -lDCOP $(LIB_KDEUI) $(LIB_KUTILS)
+ 
+ appletdir = $(kde_datadir)/kicker/applets
+ applet_DATA = kweather.desktop
+@@ -37,13 +37,13 @@
+ kcm_weather_la_SOURCES = kcmweather.cpp prefdialogdata.ui weatherservice.stub
+ kcm_weather_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+                          -avoid-version -no-undefined
+-kcm_weather_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
++kcm_weather_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ 
+ kcm_weatherservice_la_SOURCES = kcmweatherservice.cpp serviceconfigwidget.cpp \
+                                 serviceconfigdata.ui weatherservice.stub
+ kcm_weatherservice_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+                                 -avoid-version -no-undefined
+-kcm_weatherservice_la_LIBADD = $(LIB_KDEUI)
++kcm_weatherservice_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ 
+ #weather_sidebar_la_SOURCES = sidebarwidgetbase.ui sidebarwidget.cpp dockwidget.cpp weatherbar.cpp weatherbar.skel
+ #weather_sidebar_la_LDFLAGS = $(all_libraries) -module -no-undefined
+@@ -67,7 +67,7 @@
+ kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
+ 
+ kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
++kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
+ 
+ KDE_ICON = kweather
+diff -ur kdetoys-3.5.9_src/kworldwatch/Makefile.am kdetoys-3.5.9_dst/kworldwatch/Makefile.am
+--- kdetoys-3.5.9_src/kworldwatch/Makefile.am	2008-02-20 13:35:14.000000000 +0000
++++ kdetoys-3.5.9_dst/kworldwatch/Makefile.am	2008-02-20 13:35:14.000000000 +0000
+@@ -35,7 +35,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+ 
+ ww_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+-ww_panelapplet_la_LIBADD = libww.la $(LIB_KSYCOCA) 
++ww_panelapplet_la_LIBADD = libww.la $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) rc.cpp $(kworldclock_SOURCES) $(libww_la_SOURCES) -o $(podir)/kworldclock.pot

Modified: trunk/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdeutils/debian/changelog	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,4 +1,4 @@
-kdeutils (4:3.5.9-1~pre2) unstable; urgency=low
+kdeutils (4:3.5.9-1~pre3) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -19,7 +19,7 @@
     - remove PACKAGES_WITH_LIBS
     - bump shlibs to 3.5.9
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Feb 2008 17:28:44 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Feb 2008 17:04:56 +0200
 
 kdeutils (4:3.5.8-2) unstable; urgency=low
 

Modified: trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff	2008-02-25 12:58:37 UTC (rev 9471)
+++ trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff	2008-02-26 15:51:35 UTC (rev 9472)
@@ -1,6 +1,6 @@
---- kde/admin/acinclude.m4.in	2008-02-19 01:31:24.000000000 +0200
-+++ kde/admin/acinclude.m4.in	2008-02-20 17:12:56.000000000 +0200
-@@ -1613,6 +1613,11 @@
+--- kde/admin/acinclude.m4.in	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in	2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
    fi
  done
  
@@ -12,7 +12,7 @@
  AC_SUBST(LIB_QT)
  AC_SUBST(LIB_QPE)
  
-@@ -2696,7 +2701,7 @@
+@@ -2698,7 +2703,7 @@
  ],
      [return (TIFFOpen( "", "r") == 0); ],
  [
@@ -21,7 +21,53 @@
  ], [
      kde_cv_libtiff_$1=no
  ])
-@@ -4486,7 +4491,7 @@
+@@ -2762,7 +2767,8 @@
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+            AC_LANG_SAVE
+            AC_LANG_CPLUSPLUS
+            kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+                RgbaInputFile file ("dummy");
+                return 0;
+                ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr='$kde_libexr_libs'",
+                eval "ac_cv_libexr=no"
+            )
+            LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+            ])dnl
+            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+                AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
++               LIB_EXR="$kde_libexr_libs"
+                AC_MSG_RESULT($ac_cv_libexr)
+            else
+                AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ 
+@@ -2865,7 +2871,7 @@
+     [
+     return( jas_init() );
+     ],
+-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++    eval "ac_cv_jasper='-ljasper -lm'",
+     eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
  kde_save_cflags="$CFLAGS"
  CFLAGS="$CFLAGS $PYTHONINC"
  kde_save_libs="$LIBS"
@@ -30,7 +76,7 @@
  kde_save_ldflags="$LDFLAGS"
  LDFLAGS="$LDFLAGS $PYTHONLIB"
  
-@@ -4624,7 +4629,7 @@
+@@ -4626,7 +4632,7 @@
      and contact the authors to let them know about this problem])
  	])
  
@@ -39,8 +85,8 @@
    AC_SUBST(PYTHONINC)
    AC_SUBST(PYTHONLIB)
    AC_SUBST(LIBPYTHON)
---- kde/admin/ltmain.sh	2008-02-19 03:20:35.000000000 +0200
-+++ kde/admin/ltmain.sh	2008-02-19 03:16:14.000000000 +0200
+--- kde/admin/ltmain.sh	2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh	2008-02-24 16:51:22.000000000 +0200
 @@ -2377,16 +2377,16 @@
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"

Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================




More information about the pkg-kde-commits mailing list