diff -Nru k3b-kde3-3.5.12/admin/acinclude.m4.in k3b-kde3-3.5.12/admin/acinclude.m4.in
--- k3b-kde3-3.5.12/admin/acinclude.m4.in	2010-02-03 02:54:38.000000000 +0000
+++ k3b-kde3-3.5.12/admin/acinclude.m4.in	2010-09-03 22:55:50.000000000 +0100
@@ -251,6 +251,18 @@
 ])
 ])
 
+AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE],
+[
+    AC_MSG_ERROR([No Trinity Qt meta object compiler (moc-tqt) found!
+Please check whether you installed the Trinity Qt Interface correctly.
+You need to have a running moc-tqt binary.
+configure tried to run $ac_cv_path_moc and the test didn't
+succeed. If configure shouldn't have tried this one, set
+the environment variable TQTMOC to the right one before running
+configure.
+])
+])
+
 AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No Qt ui compiler (uic) found!
@@ -311,6 +323,14 @@
       qt_bindirs="$ac_qt_bindir $qt_bindirs"
    fi
 
+   if test "$kde_qtver" = "3"; then
+     qt_bindirs="/usr/share/qt3/bin $qt_bindirs"
+   fi
+
+   if test "$kde_qtver" = "4"; then
+     qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
+   fi
+
    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
    if test -z "$UIC_NOT_NEEDED"; then
      KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
@@ -331,6 +351,18 @@
              UIC="$UIC -nounload"
          fi
        fi
+
+       if test $kde_qtver = 4; then
+         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
+         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
+
+         if test x$ac_uic_supports_libpath = xyes; then
+             UIC="$UIC -L \$(kde_widgetdir)"
+         fi
+         if test x$ac_uic_supports_nounload = xyes; then
+             UIC="$UIC -nounload"
+         fi
+       fi
      fi
    else
      UIC="echo uic not available: "
@@ -343,6 +375,9 @@
    if test $kde_qtver = 3; then
      UIC_TR="tr2i18n"
    fi
+   if test $kde_qtver = 4; then
+     UIC_TR="tr2i18n"
+   fi
 
    AC_SUBST(UIC_TR)
 ])
@@ -546,7 +581,7 @@
 
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
     if test -n "$KDEDIRS"; then
        kde_save_IFS=$IFS
@@ -599,6 +634,10 @@
                 fi
               fi
             fi
+            if test "$kde_qtver" = "4"; then
+              kde32ornewer=
+              kde33ornewer=
+            fi
         fi
 
         if test -n "$kde32ornewer"; then
@@ -612,7 +651,7 @@
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/trinity/share /opt/kde/share $prefix/share"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1092,9 +1131,22 @@
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
+EOF
+
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+#include <Qt/qglobal.h>
+#include <Qt/qapplication.h>
+EOF
+fi
+
+if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF
 #include <qglobal.h>
 #include <qapplication.h>
 EOF
+fi
+
 if test "$kde_qtver" = "2"; then
 cat >> conftest.$ac_ext <<EOF
 #include <qevent.h>
@@ -1119,6 +1171,13 @@
 EOF
 fi
 
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+#include <Qt/qcursor.h>
+#include <Qt/qstylefactory.h>
+EOF
+fi
+
 echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
 cat >> conftest.$ac_ext <<EOF
 #error 1
@@ -1144,6 +1203,12 @@
     QCursor c(Qt::WhatsThisCursor);
 EOF
 fi
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+    (void)QStyleFactory::create(QString::null);
+    QCursor c(Qt::WhatsThisCursor);
+EOF
+fi
 cat >> conftest.$ac_ext <<EOF
     return 0;
 }
@@ -1191,6 +1256,21 @@
       kde_qt_minversion=">= Qt 3.0 and < 4.0"
     fi
   fi
+  if test "$kde_qtver" = "4"; then
+    if test $kde_qtsubver -gt 0; then
+	 if test $kde_qtsubver -gt 1; then
+	    if test $kde_qtsubver -gt 2; then
+		kde_qt_minversion=">= Qt 4.3 and < 5.0"
+	    else
+	        kde_qt_minversion=">= Qt 4.2 and < 5.0"
+	    fi
+	 else
+            kde_qt_minversion=">= Qt 4.1 and < 5.0"
+         fi
+    else
+      kde_qt_minversion=">= Qt 4.0 and < 5.0"
+    fi
+  fi
   if test "$kde_qtver" = "1"; then
     kde_qt_minversion=">= 1.42 and < 2.0"
   fi
@@ -1199,6 +1279,15 @@
 fi
 
 if test -z "$3"; then
+   if test $kde_qtver = 4; then
+     if test $kde_qtsubver -gt 0; then
+       kde_qt_verstring="QT_VERSION >= 0x04@VER@00 && QT_VERSION < 0x050000"
+       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
+     else
+       kde_qt_verstring="QT_VERSION >= 400 && QT_VERSION < 0x050000"
+     fi
+   fi
    if test $kde_qtver = 3; then
      if test $kde_qtsubver -gt 0; then
        kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
@@ -1357,20 +1446,31 @@
 dnl If we haven't been told how to link to Qt, we work it out for ourselves.
 dnl ------------------------------------------------------------------------
 if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
+  if test "$kde_qtver" = "4"; then
+    LIBQT_GLOB="libQtCore.*"
+  fi
+  if test "$kde_qtver" = "3"; then
+    if test "x$kde_use_qt_emb" = "xyes"; then
+      LIBQT_GLOB="libqte.*"
+    else
+      LIBQT_GLOB="libqt.*"
+    fi
   fi
 fi
 
 dnl ------------------------------------------------------------
 dnl If we got --enable-embedded then adjust the Qt library name.
+dnl Also Qt4 uses a different library name
 dnl ------------------------------------------------------------
-if test "x$kde_use_qt_emb" = "xyes"; then
-  qtlib="qte"
-else
-  qtlib="qt"
+if test "$kde_qtver" = "4"; then
+  qtlib="QtCore -lQtGui -lQt3Support"
+fi
+if test "$kde_qtver" = "3"; then
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    qtlib="qte"
+  else
+    qtlib="qt"
+  fi
 fi
 
 kde_int_qt="-l$qtlib"
@@ -1397,7 +1497,9 @@
 if test "x$kde_use_qt_mt" = "xyes"; then
   LIBQT="-l$qtlib-mt"
   kde_int_qt="-l$qtlib-mt"
-  LIBQT_GLOB="lib$qtlib-mt.*"
+  if test "$kde_qtver" = "3"; then
+    LIBQT_GLOB="lib$qtlib-mt.*"
+  fi
   USING_QT_MT="using -mt"
 else
   LIBQT="-l$qtlib"
@@ -1415,6 +1517,11 @@
   LIBQT="$LIBQT $LIBDL"
 fi
 
+if test $kde_qtver = 4; then
+  AC_REQUIRE([KDE_CHECK_LIBDL])
+  LIBQT="$LIBQT $LIBDL"
+fi
+
 AC_MSG_CHECKING([for Qt])
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
@@ -1465,7 +1572,11 @@
 fi
 
 if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
+  if test "$kde_qtver" = "4"; then
+    kde_qt_header="Qt/qstyle.h"
+  else
+    kde_qt_header=qstyle.h
+  fi
 else
   kde_qt_header=qglobal.h
 fi
@@ -1598,12 +1709,14 @@
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_QT_MOC_UIC
 
+KDE_CHECK_TQT
+
 KDE_CHECK_QT_JPEG
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
 else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
 fi
 test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
@@ -1817,7 +1930,7 @@
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /opt/trinity/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1829,7 +1942,7 @@
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -2057,6 +2170,7 @@
  CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
+if test "$kde_qtver" = "3"; then
  AC_TRY_LINK([
    #include <qdom.h>
  ],
@@ -2066,11 +2180,24 @@
   kde_cv_have_kdeqtaddon=yes,
   kde_cv_have_kdeqtaddon=no
  )
+fi
+
+if test "$kde_qtver" = "4"; then
+ AC_TRY_LINK([
+   #include <Qt/qdom.h>
+ ],
+ [
+   QDomDocument doc;
+ ],
+  kde_cv_have_kdeqtaddon=yes,
+  kde_cv_have_kdeqtaddon=no
+ )
 
  LDFLAGS=$kde_ldflags_safe
  LIBS=$kde_libs_safe
  CXXFLAGS=$kde_cxxflags_safe
 ])
+fi
 
 AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
 
@@ -2086,7 +2213,33 @@
    AC_REQUIRE([KDE_CHECK_LIBDL])
    AC_REQUIRE([K_PATH_X])
 
-if test $kde_qtver = 3; then
+if test $kde_qtver = 4; then
+   case $host in 
+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *) lib_kded="" ;;
+       esac
+   AC_SUBST(LIB_KDED, $lib_kded)
+   AC_SUBST(LIB_KDECORE, "-lkdecore")
+   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_KJS, "-lkjs")
+   AC_SUBST(LIB_SMB, "-lsmb")
+   AC_SUBST(LIB_KAB, "-lkab")
+   AC_SUBST(LIB_KABC, "-lkabc")
+   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
+   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+# these are for backward compatibility
+   AC_SUBST(LIB_KSYCOCA, "-lkio")
+   AC_SUBST(LIB_KFILE, "-lkio")
+elif test $kde_qtver = 3; then
    case $host in 
                *cygwin*) lib_kded="-lkdeinit_kded" ;;
                *) lib_kded="" ;;
@@ -2605,6 +2758,67 @@
 ])
 ])
 
+AC_DEFUN([KDE_CHECK_TQT],
+[
+AC_MSG_CHECKING([if TQt is available])
+AC_CACHE_VAL(kde_cv_tqt,
+[
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+ac_save_LIBS="$LIBS"
+LIBS="$all_libraries $USER_LDFLAGS $LIBQT -ltqt"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+if test "$kde_qtver" -gt "2"; then
+AC_TRY_LINK(
+[#include <tqtimer.h>],
+            [
+            QTimer *test_timer(0);
+            test_timer->start(1000);],
+            eval "kde_cv_tqt=no",
+            eval "kde_cv_tqt=yes")
+fi
+LIBS="$ac_save_LIBS"
+CXXFLAGS="$ac_save_CXXFLAGS"
+AC_LANG_RESTORE
+])
+
+if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then
+  AC_MSG_RESULT(no)
+dnl  AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt Interface installed.  Please install libtqtinterface-dev and try again!])
+  AC_MSG_WARN([You are attempting to compile Trinity without the Trinity Qt Interface installed.  Please install libtqtinterface-dev and try again!])
+else
+  AC_MSG_RESULT(yes)
+  LIBTQT_LDFLAGS="-ltqt"
+  AC_SUBST(LIBTQT_LDFLAGS)
+dnl  all_libraries="$all_libraries $LIBTQT_LDFLAGS"
+  QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
+  AC_SUBST(QT_LDFLAGS)
+  qtlib="$qtlib $LIBTQT_LDFLAGS"
+  LIBTQT_CXXFLAGS="-include tqt.h"
+  all_includes="$all_includes $LIBTQT_CXXFLAGS"
+  QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS"
+
+  KDE_FIND_PATH(moc-tqt, TQTMOC, [$qt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
+  AC_SUBST(TQTMOC)
+
+  KDE_FIND_PATH(dcopidl-tqt, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl-tqt)])
+  KDE_FIND_PATH(dcopidl2cpp-tqt, TQTDCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp-tqt)])
+  if test "$build_arts" '!=' "no"; then
+    KDE_FIND_PATH(mcopidl-tqt, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl-tqt)])
+  fi
+  if test -n "$kde32ornewer"; then
+    KDE_FIND_PATH(dcopidlng-tqt, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng-tqt)])
+  fi
+
+  AC_SUBST(TQTDCOPIDL)
+  AC_SUBST(TQTMCOPIDL)
+  AC_SUBST(TQTDCOPIDLNG)
+  AC_SUBST(TQTDCOPIDL2CPP)
+fi
+
+])
+
 AC_DEFUN([KDE_CHECK_QT_JPEG],
 [
 if test -n "$LIBJPEG"; then
@@ -2618,6 +2832,17 @@
 LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+if test "$kde_qtver" = "4"; then
+AC_TRY_LINK(
+[#include <Qt/qapplication.h>],
+            [
+            int argc;
+            char** argv;
+            QApplication app(argc, argv);],
+            eval "kde_cv_qt_jpeg=no",
+            eval "kde_cv_qt_jpeg=yes")
+fi
+if test "$kde_qtver" = "3"; then
 AC_TRY_LINK(
 [#include <qapplication.h>],
             [
@@ -2626,6 +2851,7 @@
             QApplication app(argc, argv);],
             eval "kde_cv_qt_jpeg=no",
             eval "kde_cv_qt_jpeg=yes")
+fi
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
@@ -3462,6 +3688,7 @@
           safe_CXXFLAGS=$CXXFLAGS
           CXXFLAGS="$CXXFLAGS $all_includes"
 
+if test "$kde_qtver" = "3"; then
           AC_TRY_COMPILE(
           [
 #include <qglobal.h>
@@ -3471,6 +3698,19 @@
 #endif
           ], [/* elvis is alive */],
           kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+fi
+
+if test "$kde_qtver" = "4"; then
+AC_TRY_COMPILE(
+          [
+#include <Qt/qglobal.h>
+#if Q_EXPORT - 0 != 0
+/* if this compiles, then Q_EXPORT is undefined */
+/* if Q_EXPORT is nonempty, this will break compilation */
+#endif
+          ], [/* elvis is alive */],
+          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+fi
 
           CXXFLAGS=$safe_CXXFLAGS
           AC_LANG_RESTORE
@@ -3509,7 +3749,8 @@
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
-LIBTOOL_SHELL="/bin/sh ./libtool"
+# LIBTOOL_SHELL="/bin/sh ./libtool"
+LIBTOOL_SHELL="libtool"
 #  LIBTOOL="$LIBTOOL --silent"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
@@ -4711,6 +4952,8 @@
 AC_LANG_CPLUSPLUS
 ac_save_LIBS="$LIBS"
 ac_save_CXXFLAGS="$CXXFLAGS"
+
+if test "$kde_qtver" = "3"; then
 LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
 AC_TRY_RUN(dnl
@@ -4726,6 +4969,26 @@
             ac_cv_lib_qimgio=yes,
             ac_cv_lib_qimgio=no,
 	    ac_cv_lib_qimgio=no)
+fi
+
+if test "$kde_qtver" = "4"; then
+LIBS="$all_libraries -lpng -lz $LIBJPEG $LIBQT"
+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
+AC_TRY_RUN(dnl
+[
+#include <tqimageio.h>
+#include <tqstring.h>
+int main() {
+		QString t = "hallo";
+		t.fill('t');
+		qInitImageIO();
+}
+],
+            ac_cv_lib_qimgio=yes,
+            ac_cv_lib_qimgio=no,
+	    ac_cv_lib_qimgio=no)
+fi
+
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
@@ -4740,6 +5003,61 @@
 fi
 ])
 
+AC_DEFUN([KDE_CHECK_HONORS_SOCKET_PERMS],
+[
+AC_MSG_CHECKING([if underlying system honors socket permissions])
+AC_CACHE_VAL(ac_cv_honors_socket_perms,
+[
+AC_LANG_SAVE
+AC_LANG_C
+ac_save_LIBS="$LIBS"
+ac_save_CPPFLAGS="$CPPFLAGS"
+LIBS="$all_libraries"
+CPPFLAGS="$CPPFLAGS $all_includes"
+AC_TRY_RUN(dnl
+[
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+int main()
+{
+    int fd, fd2;
+    struct sockaddr_un sa;
+
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+        return 2;
+    sa.sun_family = AF_UNIX;
+    strcpy(sa.sun_path, "testsock");
+    unlink(sa.sun_path);
+    if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)))
+        return 2;
+    chmod(sa.sun_path, 0);
+    setuid(getuid() + 1000);
+    if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+        return 2;
+    connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
+    return errno != EACCES;
+}
+],
+            ac_cv_honors_socket_perms=yes,
+            ac_cv_honors_socket_perms=no,
+	    ac_cv_honors_socket_perms=no)
+LIBS="$ac_save_LIBS"
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_LANG_RESTORE
+])dnl
+if eval "test \"`echo $ac_cv_honors_socket_perms`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE_UNQUOTED(HONORS_SOCKET_PERMS, 1, [Defined if the underlying system honors socket permissions])
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
 AC_DEFUN([AM_DISABLE_LIBRARIES],
 [
     AC_PROVIDE([AM_ENABLE_STATIC])
diff -Nru k3b-kde3-3.5.12/admin/am_edit k3b-kde3-3.5.12/admin/am_edit
--- k3b-kde3-3.5.12/admin/am_edit	2010-02-03 02:54:38.000000000 +0000
+++ k3b-kde3-3.5.12/admin/am_edit	2010-09-03 22:55:50.000000000 +0100
@@ -820,6 +820,7 @@
             $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
             $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
             $handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n";
+#            $handling .= "\t  tqt-replace \$\(srcdir\)/\$\$file; \\\n";
             $handling .= "\t  echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
             $handling .= "\t  test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
             $handling .= "\tdone; \\\n";
@@ -1263,7 +1264,7 @@
             if ($allidls !~ /$source\_kidl/) {
                 
                 $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(DCOPIDLNG)" : "\$(DCOPIDL)";
+                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG) \$(DCOPIDLNG)" : " \$(TQTDCOPIDL) \$(DCOPIDL)";
 
                 $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
                 $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
@@ -1277,11 +1278,11 @@
 
                 if ($skel) {
                     $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n";
-                    $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
+                    $dep_lines .= "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
                 } elsif ($stub) {
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
                 } else { # signals - obsolete, remove in KDE 4
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
                 }
 
                 if ($stub || $signals) {
@@ -1380,7 +1381,7 @@
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
                 }
                 $dep_lines .= "$source.moc: $source.h\n";
-                $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
+                $dep_lines .= "\t\$(TQTMOC) \$(MOC) $source.h $source.moc\n";
 
                 $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
 
@@ -2241,13 +2242,13 @@
 	  $cppFile =~ s,\.[^.]*$,,;
 	  $target_adds{"$cppFile.o"} .= "$mocFile.moc ";
 	  $target_adds{"$cppFile.lo"} .= "$mocFile.moc ";
-	  appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
+	  appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile.moc\n");
 	  $cleanMoc .= " $mocFile.moc";
 	  appendLines ("mocs: $mocFile.moc\n");
         }
         else
         {
-            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
+            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile$mocExt\n");
             $cleanMoc .= " $mocFile$mocExt";
 	    appendLines ("mocs: $mocFile$mocExt\n");
         }
@@ -2353,7 +2354,7 @@
     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
     # Append our $progId line, _below_ the "generated by automake" line
     # because automake-1.6 relies on the first line to be his own.
-    my $progIdLine = "\# $progId - " . '$Revision: 483858 $ '."\n";
+    my $progIdLine = "\# $progId - " . '$Revision: 1154613 $ '."\n";
     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
         warn "automake line not found in $makefile\n";
 	# Fallback: first line
diff -Nru k3b-kde3-3.5.12/admin/cvs.sh k3b-kde3-3.5.12/admin/cvs.sh
--- k3b-kde3-3.5.12/admin/cvs.sh	2010-02-03 02:54:38.000000000 +0000
+++ k3b-kde3-3.5.12/admin/cvs.sh	2010-09-03 22:55:50.000000000 +0100
@@ -533,7 +533,7 @@
 files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
 dirs=`for i in $files; do echo \`dirname $i\`; done`
 tmpname="$PWD/messages.log"
-export PATH=$PATH:/opt/kde3/bin
+export PATH=$PATH:/opt/kde3/bin:/opt/trinity/bin
 if test -z "$EXTRACTRC"; then EXTRACTRC=extractrc ; fi
 if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
 export EXTRACTRC PREPARETIPS
diff -Nru k3b-kde3-3.5.12/admin/ltmain.sh k3b-kde3-3.5.12/admin/ltmain.sh
--- k3b-kde3-3.5.12/admin/ltmain.sh	2010-02-03 02:54:38.000000000 +0000
+++ k3b-kde3-3.5.12/admin/ltmain.sh	2010-05-13 23:21:27.000000000 +0100
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff -Nru k3b-kde3-3.5.12/admin/.svn/entries k3b-kde3-3.5.12/admin/.svn/entries
--- k3b-kde3-3.5.12/admin/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/admin/.svn/entries	2010-09-03 22:55:50.000000000 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin
 svn://anonsvn.kde.org/home/kde
 
 
 
-2010-02-24T18:26:48.239230Z
-1095637
+2010-08-05T21:52:21.897901Z
+1159656
 tpearson
 has-props
 
@@ -26,17 +26,18 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-Doxyfile.am
+config.pl
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-cc6a0150c4897e53a3f4fee894e67141
-2008-01-28T15:07:32.341517Z
-767697
+dd24be540c3a198d3c26ef76125760b2
+2005-09-29T12:08:21.264156Z
+465313
 dfaure
+has-props
 
 
 
@@ -57,21 +58,19 @@
 
 
 
-
-3697
+6875
 
-config.pl
+Doxyfile.am
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-dd24be540c3a198d3c26ef76125760b2
-2005-09-29T12:08:21.264156Z
-465313
+cc6a0150c4897e53a3f4fee894e67141
+2008-01-28T15:07:32.341517Z
+767697
 dfaure
-has-props
 
 
 
@@ -92,7 +91,8 @@
 
 
 
-6875
+
+3697
 
 mkinstalldirs
 file
@@ -128,17 +128,18 @@
 
 3474
 
-config.rpath
+Doxyfile.global
 file
 
 
 
 
-2010-03-01T19:07:42.000000Z
-d41d8cd98f00b204e9800998ecf8427e
-2010-02-24T18:26:48.239230Z
-1095637
+2010-02-03T02:54:38.000000Z
+6518fc6788d231c2e510bbbe75337849
+2010-01-02T21:39:46.389293Z
+1069180
 tpearson
+has-props
 
 
 
@@ -159,21 +160,19 @@
 
 
 
-
-0
+64672
 
-Doxyfile.global
+config.rpath
 file
 
 
 
 
-2010-02-03T02:54:38.000000Z
-6518fc6788d231c2e510bbbe75337849
-2010-01-02T21:39:46.389293Z
-1069180
+2010-03-01T19:07:42.000000Z
+d41d8cd98f00b204e9800998ecf8427e
+2010-02-24T18:26:48.239230Z
+1095637
 tpearson
-has-props
 
 
 
@@ -194,7 +193,8 @@
 
 
 
-64672
+
+0
 
 conf.change.pl
 file
@@ -264,17 +264,17 @@
 
 22760
 
-deps.am
+depcomp
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-eb846309aca35c1b4e2189e5c5941348
-2004-11-19T09:24:13.000000Z
-364177
-coolo
+d7d8db17e074dcabf513d766b728993d
+2006-02-27T09:56:01.567390Z
+514050
+mueller
 has-props
 
 
@@ -296,19 +296,19 @@
 
 
 
-932
+15936
 
-depcomp
+deps.am
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-d7d8db17e074dcabf513d766b728993d
-2006-02-27T09:56:01.567390Z
-514050
-mueller
+eb846309aca35c1b4e2189e5c5941348
+2004-11-19T09:24:13.000000Z
+364177
+coolo
 has-props
 
 
@@ -330,19 +330,19 @@
 
 
 
-15936
+932
 
-libtool.m4.in
+compile
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-a647a2622ba06882b9d72602d23e8fd1
-2010-01-01T20:06:03.339507Z
-1068663
-tpearson
+b2a35e98453194ca837c363ee9c0d379
+2005-07-06T21:21:25.553772Z
+432279
+mueller
 has-props
 
 
@@ -364,19 +364,19 @@
 
 
 
-260348
+3707
 
-compile
+libtool.m4.in
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-b2a35e98453194ca837c363ee9c0d379
-2005-07-06T21:21:25.553772Z
-432279
-mueller
+a647a2622ba06882b9d72602d23e8fd1
+2010-01-01T20:06:03.339507Z
+1068663
+tpearson
 has-props
 
 
@@ -398,7 +398,7 @@
 
 
 
-3707
+260348
 
 bcheck.pl
 file
@@ -468,17 +468,17 @@
 
 43479
 
-config.sub
+debianrules
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-06d381f57200d8220362d994ecbee581
-2005-07-06T21:21:25.553772Z
-432279
-mueller
+252fca46dfa6eb49537aac6d27288da5
+2004-02-27T22:51:51.000000Z
+292053
+ccheney
 has-props
 
 
@@ -500,19 +500,19 @@
 
 
 
-31656
+1299
 
-debianrules
+config.sub
 file
 
 
 
 
 2010-02-03T02:54:38.000000Z
-252fca46dfa6eb49537aac6d27288da5
-2004-02-27T22:51:51.000000Z
-292053
-ccheney
+06d381f57200d8220362d994ecbee581
+2005-07-06T21:21:25.553772Z
+432279
+mueller
 has-props
 
 
@@ -534,7 +534,7 @@
 
 
 
-1299
+31656
 
 ltmain.sh
 file
@@ -542,10 +542,10 @@
 
 
 
-2010-02-03T02:54:38.000000Z
-21ce5ea9f34f302c23f4b76ef9b5c93e
-2010-01-01T20:06:03.339507Z
-1068663
+2010-05-13T22:21:27.000000Z
+0cfa0edd599b3ec14976d6306ea2ef18
+2010-05-03T00:17:15.489184Z
+1122030
 tpearson
 has-props
 
@@ -568,7 +568,7 @@
 
 
 
-243452
+243469
 
 detect-autoconf.pl
 file
@@ -610,11 +610,11 @@
 
 
 
-2010-02-03T02:54:38.000000Z
-f153eb68565188dcd7ad1440a1da200a
-2005-11-28T13:00:33.863214Z
-483858
-mueller
+2010-09-03T21:55:50.000000Z
+1d909e696c28e85b579df78af13fcf3a
+2010-07-26T02:04:25.942827Z
+1154613
+tpearson
 has-props
 
 
@@ -636,7 +636,7 @@
 
 
 
-88731
+88919
 
 cvs.sh
 file
@@ -644,10 +644,10 @@
 
 
 
-2010-02-03T02:54:38.000000Z
-84861fb15acb7f93f6a3ab5f8cf1033a
-2010-01-09T09:45:37.539210Z
-1071990
+2010-09-03T21:55:50.000000Z
+c2def855c464cd69995c5e09298438fe
+2010-06-15T09:02:41.742216Z
+1138167
 tpearson
 has-props
 
@@ -670,7 +670,7 @@
 
 
 
-19276
+19293
 
 Makefile.common
 file
@@ -882,10 +882,10 @@
 
 
 
-2010-02-03T02:54:38.000000Z
-7403b993afccacb66708b6a61a497445
-2010-01-17T00:56:35.775841Z
-1075919
+2010-09-03T21:55:50.000000Z
+e8a975bca38ba412f247fdbd71948492
+2010-08-05T21:52:21.897901Z
+1159656
 tpearson
 has-props
 
@@ -908,7 +908,7 @@
 
 
 
-165781
+174555
 
 configure.in.bot.end
 file
diff -Nru k3b-kde3-3.5.12/admin/.svn/text-base/acinclude.m4.in.svn-base k3b-kde3-3.5.12/admin/.svn/text-base/acinclude.m4.in.svn-base
--- k3b-kde3-3.5.12/admin/.svn/text-base/acinclude.m4.in.svn-base	2010-02-03 02:54:37.000000000 +0000
+++ k3b-kde3-3.5.12/admin/.svn/text-base/acinclude.m4.in.svn-base	2010-09-03 22:55:50.000000000 +0100
@@ -251,6 +251,18 @@
 ])
 ])
 
+AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE],
+[
+    AC_MSG_ERROR([No Trinity Qt meta object compiler (moc-tqt) found!
+Please check whether you installed the Trinity Qt Interface correctly.
+You need to have a running moc-tqt binary.
+configure tried to run $ac_cv_path_moc and the test didn't
+succeed. If configure shouldn't have tried this one, set
+the environment variable TQTMOC to the right one before running
+configure.
+])
+])
+
 AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No Qt ui compiler (uic) found!
@@ -311,6 +323,14 @@
       qt_bindirs="$ac_qt_bindir $qt_bindirs"
    fi
 
+   if test "$kde_qtver" = "3"; then
+     qt_bindirs="/usr/share/qt3/bin $qt_bindirs"
+   fi
+
+   if test "$kde_qtver" = "4"; then
+     qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
+   fi
+
    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
    if test -z "$UIC_NOT_NEEDED"; then
      KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
@@ -331,6 +351,18 @@
              UIC="$UIC -nounload"
          fi
        fi
+
+       if test $kde_qtver = 4; then
+         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
+         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
+
+         if test x$ac_uic_supports_libpath = xyes; then
+             UIC="$UIC -L \$(kde_widgetdir)"
+         fi
+         if test x$ac_uic_supports_nounload = xyes; then
+             UIC="$UIC -nounload"
+         fi
+       fi
      fi
    else
      UIC="echo uic not available: "
@@ -343,6 +375,9 @@
    if test $kde_qtver = 3; then
      UIC_TR="tr2i18n"
    fi
+   if test $kde_qtver = 4; then
+     UIC_TR="tr2i18n"
+   fi
 
    AC_SUBST(UIC_TR)
 ])
@@ -546,7 +581,7 @@
 
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
     if test -n "$KDEDIRS"; then
        kde_save_IFS=$IFS
@@ -599,6 +634,10 @@
                 fi
               fi
             fi
+            if test "$kde_qtver" = "4"; then
+              kde32ornewer=
+              kde33ornewer=
+            fi
         fi
 
         if test -n "$kde32ornewer"; then
@@ -612,7 +651,7 @@
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/trinity/share /opt/kde/share $prefix/share"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1092,9 +1131,22 @@
 AC_REQUIRE([KDE_USE_QT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
+EOF
+
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+#include <Qt/qglobal.h>
+#include <Qt/qapplication.h>
+EOF
+fi
+
+if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF
 #include <qglobal.h>
 #include <qapplication.h>
 EOF
+fi
+
 if test "$kde_qtver" = "2"; then
 cat >> conftest.$ac_ext <<EOF
 #include <qevent.h>
@@ -1119,6 +1171,13 @@
 EOF
 fi
 
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+#include <Qt/qcursor.h>
+#include <Qt/qstylefactory.h>
+EOF
+fi
+
 echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
 cat >> conftest.$ac_ext <<EOF
 #error 1
@@ -1144,6 +1203,12 @@
     QCursor c(Qt::WhatsThisCursor);
 EOF
 fi
+if test "$kde_qtver" = "4"; then
+cat >> conftest.$ac_ext <<EOF
+    (void)QStyleFactory::create(QString::null);
+    QCursor c(Qt::WhatsThisCursor);
+EOF
+fi
 cat >> conftest.$ac_ext <<EOF
     return 0;
 }
@@ -1191,6 +1256,21 @@
       kde_qt_minversion=">= Qt 3.0 and < 4.0"
     fi
   fi
+  if test "$kde_qtver" = "4"; then
+    if test $kde_qtsubver -gt 0; then
+	 if test $kde_qtsubver -gt 1; then
+	    if test $kde_qtsubver -gt 2; then
+		kde_qt_minversion=">= Qt 4.3 and < 5.0"
+	    else
+	        kde_qt_minversion=">= Qt 4.2 and < 5.0"
+	    fi
+	 else
+            kde_qt_minversion=">= Qt 4.1 and < 5.0"
+         fi
+    else
+      kde_qt_minversion=">= Qt 4.0 and < 5.0"
+    fi
+  fi
   if test "$kde_qtver" = "1"; then
     kde_qt_minversion=">= 1.42 and < 2.0"
   fi
@@ -1199,6 +1279,15 @@
 fi
 
 if test -z "$3"; then
+   if test $kde_qtver = 4; then
+     if test $kde_qtsubver -gt 0; then
+       kde_qt_verstring="QT_VERSION >= 0x04@VER@00 && QT_VERSION < 0x050000"
+       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
+     else
+       kde_qt_verstring="QT_VERSION >= 400 && QT_VERSION < 0x050000"
+     fi
+   fi
    if test $kde_qtver = 3; then
      if test $kde_qtsubver -gt 0; then
        kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
@@ -1357,20 +1446,31 @@
 dnl If we haven't been told how to link to Qt, we work it out for ourselves.
 dnl ------------------------------------------------------------------------
 if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
+  if test "$kde_qtver" = "4"; then
+    LIBQT_GLOB="libQtCore.*"
+  fi
+  if test "$kde_qtver" = "3"; then
+    if test "x$kde_use_qt_emb" = "xyes"; then
+      LIBQT_GLOB="libqte.*"
+    else
+      LIBQT_GLOB="libqt.*"
+    fi
   fi
 fi
 
 dnl ------------------------------------------------------------
 dnl If we got --enable-embedded then adjust the Qt library name.
+dnl Also Qt4 uses a different library name
 dnl ------------------------------------------------------------
-if test "x$kde_use_qt_emb" = "xyes"; then
-  qtlib="qte"
-else
-  qtlib="qt"
+if test "$kde_qtver" = "4"; then
+  qtlib="QtCore -lQtGui -lQt3Support"
+fi
+if test "$kde_qtver" = "3"; then
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    qtlib="qte"
+  else
+    qtlib="qt"
+  fi
 fi
 
 kde_int_qt="-l$qtlib"
@@ -1397,7 +1497,9 @@
 if test "x$kde_use_qt_mt" = "xyes"; then
   LIBQT="-l$qtlib-mt"
   kde_int_qt="-l$qtlib-mt"
-  LIBQT_GLOB="lib$qtlib-mt.*"
+  if test "$kde_qtver" = "3"; then
+    LIBQT_GLOB="lib$qtlib-mt.*"
+  fi
   USING_QT_MT="using -mt"
 else
   LIBQT="-l$qtlib"
@@ -1415,6 +1517,11 @@
   LIBQT="$LIBQT $LIBDL"
 fi
 
+if test $kde_qtver = 4; then
+  AC_REQUIRE([KDE_CHECK_LIBDL])
+  LIBQT="$LIBQT $LIBDL"
+fi
+
 AC_MSG_CHECKING([for Qt])
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
@@ -1465,7 +1572,11 @@
 fi
 
 if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
+  if test "$kde_qtver" = "4"; then
+    kde_qt_header="Qt/qstyle.h"
+  else
+    kde_qt_header=qstyle.h
+  fi
 else
   kde_qt_header=qglobal.h
 fi
@@ -1598,12 +1709,14 @@
 AC_SUBST(QT_LDFLAGS)
 AC_PATH_QT_MOC_UIC
 
+KDE_CHECK_TQT
+
 KDE_CHECK_QT_JPEG
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
 else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
 fi
 test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
@@ -1817,7 +1930,7 @@
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /opt/trinity/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1829,7 +1942,7 @@
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -2057,6 +2170,7 @@
  CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
+if test "$kde_qtver" = "3"; then
  AC_TRY_LINK([
    #include <qdom.h>
  ],
@@ -2066,11 +2180,24 @@
   kde_cv_have_kdeqtaddon=yes,
   kde_cv_have_kdeqtaddon=no
  )
+fi
+
+if test "$kde_qtver" = "4"; then
+ AC_TRY_LINK([
+   #include <Qt/qdom.h>
+ ],
+ [
+   QDomDocument doc;
+ ],
+  kde_cv_have_kdeqtaddon=yes,
+  kde_cv_have_kdeqtaddon=no
+ )
 
  LDFLAGS=$kde_ldflags_safe
  LIBS=$kde_libs_safe
  CXXFLAGS=$kde_cxxflags_safe
 ])
+fi
 
 AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
 
@@ -2086,7 +2213,33 @@
    AC_REQUIRE([KDE_CHECK_LIBDL])
    AC_REQUIRE([K_PATH_X])
 
-if test $kde_qtver = 3; then
+if test $kde_qtver = 4; then
+   case $host in 
+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *) lib_kded="" ;;
+       esac
+   AC_SUBST(LIB_KDED, $lib_kded)
+   AC_SUBST(LIB_KDECORE, "-lkdecore")
+   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_KJS, "-lkjs")
+   AC_SUBST(LIB_SMB, "-lsmb")
+   AC_SUBST(LIB_KAB, "-lkab")
+   AC_SUBST(LIB_KABC, "-lkabc")
+   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
+   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+# these are for backward compatibility
+   AC_SUBST(LIB_KSYCOCA, "-lkio")
+   AC_SUBST(LIB_KFILE, "-lkio")
+elif test $kde_qtver = 3; then
    case $host in 
                *cygwin*) lib_kded="-lkdeinit_kded" ;;
                *) lib_kded="" ;;
@@ -2605,6 +2758,67 @@
 ])
 ])
 
+AC_DEFUN([KDE_CHECK_TQT],
+[
+AC_MSG_CHECKING([if TQt is available])
+AC_CACHE_VAL(kde_cv_tqt,
+[
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+ac_save_LIBS="$LIBS"
+LIBS="$all_libraries $USER_LDFLAGS $LIBQT -ltqt"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+if test "$kde_qtver" -gt "2"; then
+AC_TRY_LINK(
+[#include <tqtimer.h>],
+            [
+            QTimer *test_timer(0);
+            test_timer->start(1000);],
+            eval "kde_cv_tqt=no",
+            eval "kde_cv_tqt=yes")
+fi
+LIBS="$ac_save_LIBS"
+CXXFLAGS="$ac_save_CXXFLAGS"
+AC_LANG_RESTORE
+])
+
+if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then
+  AC_MSG_RESULT(no)
+dnl  AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt Interface installed.  Please install libtqtinterface-dev and try again!])
+  AC_MSG_WARN([You are attempting to compile Trinity without the Trinity Qt Interface installed.  Please install libtqtinterface-dev and try again!])
+else
+  AC_MSG_RESULT(yes)
+  LIBTQT_LDFLAGS="-ltqt"
+  AC_SUBST(LIBTQT_LDFLAGS)
+dnl  all_libraries="$all_libraries $LIBTQT_LDFLAGS"
+  QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
+  AC_SUBST(QT_LDFLAGS)
+  qtlib="$qtlib $LIBTQT_LDFLAGS"
+  LIBTQT_CXXFLAGS="-include tqt.h"
+  all_includes="$all_includes $LIBTQT_CXXFLAGS"
+  QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS"
+
+  KDE_FIND_PATH(moc-tqt, TQTMOC, [$qt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
+  AC_SUBST(TQTMOC)
+
+  KDE_FIND_PATH(dcopidl-tqt, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl-tqt)])
+  KDE_FIND_PATH(dcopidl2cpp-tqt, TQTDCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp-tqt)])
+  if test "$build_arts" '!=' "no"; then
+    KDE_FIND_PATH(mcopidl-tqt, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl-tqt)])
+  fi
+  if test -n "$kde32ornewer"; then
+    KDE_FIND_PATH(dcopidlng-tqt, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng-tqt)])
+  fi
+
+  AC_SUBST(TQTDCOPIDL)
+  AC_SUBST(TQTMCOPIDL)
+  AC_SUBST(TQTDCOPIDLNG)
+  AC_SUBST(TQTDCOPIDL2CPP)
+fi
+
+])
+
 AC_DEFUN([KDE_CHECK_QT_JPEG],
 [
 if test -n "$LIBJPEG"; then
@@ -2618,6 +2832,17 @@
 LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+if test "$kde_qtver" = "4"; then
+AC_TRY_LINK(
+[#include <Qt/qapplication.h>],
+            [
+            int argc;
+            char** argv;
+            QApplication app(argc, argv);],
+            eval "kde_cv_qt_jpeg=no",
+            eval "kde_cv_qt_jpeg=yes")
+fi
+if test "$kde_qtver" = "3"; then
 AC_TRY_LINK(
 [#include <qapplication.h>],
             [
@@ -2626,6 +2851,7 @@
             QApplication app(argc, argv);],
             eval "kde_cv_qt_jpeg=no",
             eval "kde_cv_qt_jpeg=yes")
+fi
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
@@ -3462,6 +3688,7 @@
           safe_CXXFLAGS=$CXXFLAGS
           CXXFLAGS="$CXXFLAGS $all_includes"
 
+if test "$kde_qtver" = "3"; then
           AC_TRY_COMPILE(
           [
 #include <qglobal.h>
@@ -3471,6 +3698,19 @@
 #endif
           ], [/* elvis is alive */],
           kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+fi
+
+if test "$kde_qtver" = "4"; then
+AC_TRY_COMPILE(
+          [
+#include <Qt/qglobal.h>
+#if Q_EXPORT - 0 != 0
+/* if this compiles, then Q_EXPORT is undefined */
+/* if Q_EXPORT is nonempty, this will break compilation */
+#endif
+          ], [/* elvis is alive */],
+          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+fi
 
           CXXFLAGS=$safe_CXXFLAGS
           AC_LANG_RESTORE
@@ -3509,7 +3749,8 @@
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX
 
-LIBTOOL_SHELL="/bin/sh ./libtool"
+# LIBTOOL_SHELL="/bin/sh ./libtool"
+LIBTOOL_SHELL="libtool"
 #  LIBTOOL="$LIBTOOL --silent"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
@@ -4711,6 +4952,8 @@
 AC_LANG_CPLUSPLUS
 ac_save_LIBS="$LIBS"
 ac_save_CXXFLAGS="$CXXFLAGS"
+
+if test "$kde_qtver" = "3"; then
 LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
 CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
 AC_TRY_RUN(dnl
@@ -4726,6 +4969,26 @@
             ac_cv_lib_qimgio=yes,
             ac_cv_lib_qimgio=no,
 	    ac_cv_lib_qimgio=no)
+fi
+
+if test "$kde_qtver" = "4"; then
+LIBS="$all_libraries -lpng -lz $LIBJPEG $LIBQT"
+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
+AC_TRY_RUN(dnl
+[
+#include <tqimageio.h>
+#include <tqstring.h>
+int main() {
+		QString t = "hallo";
+		t.fill('t');
+		qInitImageIO();
+}
+],
+            ac_cv_lib_qimgio=yes,
+            ac_cv_lib_qimgio=no,
+	    ac_cv_lib_qimgio=no)
+fi
+
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
@@ -4740,6 +5003,61 @@
 fi
 ])
 
+AC_DEFUN([KDE_CHECK_HONORS_SOCKET_PERMS],
+[
+AC_MSG_CHECKING([if underlying system honors socket permissions])
+AC_CACHE_VAL(ac_cv_honors_socket_perms,
+[
+AC_LANG_SAVE
+AC_LANG_C
+ac_save_LIBS="$LIBS"
+ac_save_CPPFLAGS="$CPPFLAGS"
+LIBS="$all_libraries"
+CPPFLAGS="$CPPFLAGS $all_includes"
+AC_TRY_RUN(dnl
+[
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+int main()
+{
+    int fd, fd2;
+    struct sockaddr_un sa;
+
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+        return 2;
+    sa.sun_family = AF_UNIX;
+    strcpy(sa.sun_path, "testsock");
+    unlink(sa.sun_path);
+    if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)))
+        return 2;
+    chmod(sa.sun_path, 0);
+    setuid(getuid() + 1000);
+    if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+        return 2;
+    connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
+    return errno != EACCES;
+}
+],
+            ac_cv_honors_socket_perms=yes,
+            ac_cv_honors_socket_perms=no,
+	    ac_cv_honors_socket_perms=no)
+LIBS="$ac_save_LIBS"
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_LANG_RESTORE
+])dnl
+if eval "test \"`echo $ac_cv_honors_socket_perms`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE_UNQUOTED(HONORS_SOCKET_PERMS, 1, [Defined if the underlying system honors socket permissions])
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
 AC_DEFUN([AM_DISABLE_LIBRARIES],
 [
     AC_PROVIDE([AM_ENABLE_STATIC])
diff -Nru k3b-kde3-3.5.12/admin/.svn/text-base/am_edit.svn-base k3b-kde3-3.5.12/admin/.svn/text-base/am_edit.svn-base
--- k3b-kde3-3.5.12/admin/.svn/text-base/am_edit.svn-base	2010-02-03 02:54:37.000000000 +0000
+++ k3b-kde3-3.5.12/admin/.svn/text-base/am_edit.svn-base	2010-09-03 22:55:50.000000000 +0100
@@ -820,6 +820,7 @@
             $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
             $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
             $handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n";
+#            $handling .= "\t  tqt-replace \$\(srcdir\)/\$\$file; \\\n";
             $handling .= "\t  echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
             $handling .= "\t  test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
             $handling .= "\tdone; \\\n";
@@ -1263,7 +1264,7 @@
             if ($allidls !~ /$source\_kidl/) {
                 
                 $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(DCOPIDLNG)" : "\$(DCOPIDL)";
+                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG) \$(DCOPIDLNG)" : " \$(TQTDCOPIDL) \$(DCOPIDL)";
 
                 $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
                 $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
@@ -1277,11 +1278,11 @@
 
                 if ($skel) {
                     $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n";
-                    $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
+                    $dep_lines .= "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
                 } elsif ($stub) {
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
                 } else { # signals - obsolete, remove in KDE 4
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
                 }
 
                 if ($stub || $signals) {
@@ -1380,7 +1381,7 @@
                     $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
                 }
                 $dep_lines .= "$source.moc: $source.h\n";
-                $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
+                $dep_lines .= "\t\$(TQTMOC) \$(MOC) $source.h $source.moc\n";
 
                 $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
 
@@ -2241,13 +2242,13 @@
 	  $cppFile =~ s,\.[^.]*$,,;
 	  $target_adds{"$cppFile.o"} .= "$mocFile.moc ";
 	  $target_adds{"$cppFile.lo"} .= "$mocFile.moc ";
-	  appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
+	  appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile.moc\n");
 	  $cleanMoc .= " $mocFile.moc";
 	  appendLines ("mocs: $mocFile.moc\n");
         }
         else
         {
-            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
+            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(TQTMOC) \$(MOC) $dir/$hFile $mocFile$mocExt\n");
             $cleanMoc .= " $mocFile$mocExt";
 	    appendLines ("mocs: $mocFile$mocExt\n");
         }
diff -Nru k3b-kde3-3.5.12/admin/.svn/text-base/cvs.sh.svn-base k3b-kde3-3.5.12/admin/.svn/text-base/cvs.sh.svn-base
--- k3b-kde3-3.5.12/admin/.svn/text-base/cvs.sh.svn-base	2010-02-03 02:54:37.000000000 +0000
+++ k3b-kde3-3.5.12/admin/.svn/text-base/cvs.sh.svn-base	2010-09-03 22:55:50.000000000 +0100
@@ -533,7 +533,7 @@
 files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
 dirs=`for i in $files; do echo \`dirname $i\`; done`
 tmpname="$PWD/messages.log"
-export PATH=$PATH:/opt/kde3/bin
+export PATH=$PATH:/opt/kde3/bin:/opt/trinity/bin
 if test -z "$EXTRACTRC"; then EXTRACTRC=extractrc ; fi
 if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
 export EXTRACTRC PREPARETIPS
diff -Nru k3b-kde3-3.5.12/admin/.svn/text-base/ltmain.sh.svn-base k3b-kde3-3.5.12/admin/.svn/text-base/ltmain.sh.svn-base
--- k3b-kde3-3.5.12/admin/.svn/text-base/ltmain.sh.svn-base	2010-02-03 02:54:37.000000000 +0000
+++ k3b-kde3-3.5.12/admin/.svn/text-base/ltmain.sh.svn-base	2010-05-13 23:21:27.000000000 +0100
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff -Nru k3b-kde3-3.5.12/configure.in k3b-kde3-3.5.12/configure.in
--- k3b-kde3-3.5.12/configure.in	2010-02-03 02:26:06.000000000 +0000
+++ k3b-kde3-3.5.12/configure.in	2010-09-03 22:55:48.000000000 +0100
@@ -781,6 +781,20 @@
 		],
 		[], [], [])
   ])
+
+  if test "$have_mpc" = "no"; then
+    KDE_CHECK_HEADERS(mpc/mpcdec.h, [
+        AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+                have_mpc=yes
+                MPC_LIBS="-lmpcdec"
+                AC_DEFINE(
+                        MPC_HEADER_FILE,
+                        <mpc/mpcdec.h>,
+                        [The header to include for MPC decoding.])
+                ],
+                [], [], [])
+    ])
+  fi
 	
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(musepack/musepack.h, [
diff -Nru k3b-kde3-3.5.12/debian/changelog k3b-kde3-3.5.12/debian/changelog
--- k3b-kde3-3.5.12/debian/changelog	2010-03-24 03:53:13.000000000 +0000
+++ k3b-kde3-3.5.12/debian/changelog	2010-09-03 22:55:52.000000000 +0100
@@ -1,8 +1,8 @@
-k3b-kde3 (4:3.5.12-0ubuntu6+r1106812) lucid; urgency=low
+k3b-kde3 (4:3.5.12-0ubuntu6+r1164898) lucid; urgency=low
 
   * Automated svn build
 
- -- root <kb9vqf@pearsoncomputing.net>  Tue, 23 Mar 2010 22:53:13 -0500
+ -- root <kb9vqf@pearsoncomputing.net>  Fri, 03 Sep 2010 16:55:52 -0500
 
 k3b-kde3 (1.0.5-4ubuntu2) karmic; urgency=low
 
diff -Nru k3b-kde3-3.5.12/doc/.svn/entries k3b-kde3-3.5.12/doc/.svn/entries
--- k3b-kde3-3.5.12/doc/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/doc/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/doc
 svn://anonsvn.kde.org/home/kde
 
@@ -230,14 +230,14 @@
 
 19981
 
-cdcopy_reading.png
+burndialog_progress.png
 file
 
 
 
 
 2010-03-24T03:53:10.000000Z
-2d154c36aac1e232653075111af94b68
+b5dd7a367b97c0e3558451bcd9016599
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -262,16 +262,16 @@
 
 
 
-19405
+22372
 
-burndialog_progress.png
+cdcopy_reading.png
 file
 
 
 
 
 2010-03-24T03:53:10.000000Z
-b5dd7a367b97c0e3558451bcd9016599
+2d154c36aac1e232653075111af94b68
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -296,7 +296,7 @@
 
 
 
-22372
+19405
 
 cdcopy-howto.docbook
 file
@@ -468,18 +468,17 @@
 
 22495
 
-cdcopy_done.png
+Makefile.am
 file
 
 
 
 
-2010-03-24T03:53:10.000000Z
-cde8231feccbb5bc2e84f1bd0654baee
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:55.000000Z
+ddbd158027bf2333917f425adf2574e4
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
-has-props
 
 
 
@@ -500,19 +499,21 @@
 
 
 
-22165
+
+31
 
-Makefile.am
+cdcopy_done.png
 file
 
 
 
 
-2010-02-03T02:25:55.000000Z
-ddbd158027bf2333917f425adf2574e4
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:10.000000Z
+cde8231feccbb5bc2e84f1bd0654baee
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
+has-props
 
 
 
@@ -533,8 +534,7 @@
 
 
 
-
-31
+22165
 
 cdcloning_reading.png
 file
diff -Nru k3b-kde3-3.5.12/k3bsetup/.svn/entries k3b-kde3-3.5.12/k3bsetup/.svn/entries
--- k3b-kde3-3.5.12/k3bsetup/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/k3bsetup/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/k3bsetup
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/kfile-plugins/k3bproject/.svn/entries k3b-kde3-3.5.12/kfile-plugins/k3bproject/.svn/entries
--- k3b-kde3-3.5.12/kfile-plugins/k3bproject/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/kfile-plugins/k3bproject/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/kfile-plugins/k3bproject
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/kfile-plugins/.svn/entries k3b-kde3-3.5.12/kfile-plugins/.svn/entries
--- k3b-kde3-3.5.12/kfile-plugins/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/kfile-plugins/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/kfile-plugins
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/kioslaves/.svn/entries k3b-kde3-3.5.12/kioslaves/.svn/entries
--- k3b-kde3-3.5.12/kioslaves/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/kioslaves/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/kioslaves
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/kioslaves/videodvd/.svn/entries k3b-kde3-3.5.12/kioslaves/videodvd/.svn/entries
--- k3b-kde3-3.5.12/kioslaves/videodvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/kioslaves/videodvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/kioslaves/videodvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/cddb/.svn/entries k3b-kde3-3.5.12/libk3b/cddb/.svn/entries
--- k3b-kde3-3.5.12/libk3b/cddb/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/cddb/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/cddb
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bcddblocalsubmit.h
+k3bcddbresult.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-0e6f1733c6bfea1bd5ad36c51e01d6bf
+96ce61025f7121a96c585fa3ae0dfcae
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-982
+1534
 
-k3bcddbresult.h
+k3bcddblocalsubmit.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-96ce61025f7121a96c585fa3ae0dfcae
+0e6f1733c6bfea1bd5ad36c51e01d6bf
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-1534
+982
 
 k3bcddb.h
 file
@@ -128,14 +128,14 @@
 
 2386
 
-k3bcddbpquery.cpp
+k3bcddblocalquery.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-f894f4eaecea029e6efeb5d3959a8a0e
+4aabcbde05935df56347e53f810c2480
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -160,16 +160,16 @@
 
 
 
-6353
+1062
 
-k3bcddblocalquery.h
+k3bcddbpquery.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-4aabcbde05935df56347e53f810c2480
+f894f4eaecea029e6efeb5d3959a8a0e
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -194,7 +194,7 @@
 
 
 
-1062
+6353
 
 k3bcddbpquery.h
 file
@@ -298,14 +298,14 @@
 
 2120
 
-k3bcddbquery.cpp
+k3bcddbhttpquery.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-c1e1ec947e29162347ffc78d34be7efb
+5aad6638bfad90bbbd404a4886eb5b65
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -330,16 +330,16 @@
 
 
 
-6962
+5223
 
-k3bcddbhttpquery.cpp
+k3bcddbquery.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-5aad6638bfad90bbbd404a4886eb5b65
+c1e1ec947e29162347ffc78d34be7efb
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -364,7 +364,7 @@
 
 
 
-5223
+6962
 
 k3bcddbsubmit.h
 file
@@ -434,14 +434,14 @@
 
 1114
 
-k3bcddbquery.h
+k3bcddbhttpquery.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-996c8104fb653bd77f087867bfa6fc81
+a34aa1350062223036beef557783a466
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -466,16 +466,16 @@
 
 
 
-2898
+1463
 
-k3bcddbhttpquery.h
+k3bcddbquery.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-a34aa1350062223036beef557783a466
+996c8104fb653bd77f087867bfa6fc81
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -500,7 +500,7 @@
 
 
 
-1463
+2898
 
 Makefile.am
 file
diff -Nru k3b-kde3-3.5.12/libk3b/core/.svn/entries k3b-kde3-3.5.12/libk3b/core/.svn/entries
--- k3b-kde3-3.5.12/libk3b/core/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/core/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/core
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bdefaultexternalprograms.cpp
+k3bthreadjob.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-340b50ba759f86d5559bb48dbe6a2853
+b813af884ec66ecd8fb3a0590318fb42
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-25393
+4013
 
-k3bthreadjob.cpp
+k3bdefaultexternalprograms.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-b813af884ec66ecd8fb3a0590318fb42
+340b50ba759f86d5559bb48dbe6a2853
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-4013
+25393
 
 k3bexternalbinmanager.cpp
 file
@@ -128,14 +128,14 @@
 
 9745
 
-k3bdefaultexternalprograms.h
+k3bthreadjob.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-2fed4facbe9c33a5ee6cba0330a382ee
+0d1cf1d4e45bbe05a65bfc7b7f138ee9
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -160,7 +160,7 @@
 
 
 
-2766
+2182
 
 k3bthread.cpp
 file
@@ -196,14 +196,14 @@
 
 5719
 
-k3bthreadjob.h
+k3bdefaultexternalprograms.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-0d1cf1d4e45bbe05a65bfc7b7f138ee9
+2fed4facbe9c33a5ee6cba0330a382ee
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -228,7 +228,7 @@
 
 
 
-2182
+2766
 
 k3bjob.cpp
 file
diff -Nru k3b-kde3-3.5.12/libk3b/jobs/.svn/entries k3b-kde3-3.5.12/libk3b/jobs/.svn/entries
--- k3b-kde3-3.5.12/libk3b/jobs/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/jobs/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/jobs
 svn://anonsvn.kde.org/home/kde
 
@@ -604,14 +604,14 @@
 
 9999
 
-k3baudiocuefilewritingjob.h
+k3bvideodvdtitletranscodingjob.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-d92e7983d22d4a960248de724c40274a
+ed815bbdfc6721be30370d0cc0d7fdd2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -636,16 +636,16 @@
 
 
 
-1881
+7709
 
-k3bvideodvdtitletranscodingjob.h
+k3baudiocuefilewritingjob.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-ed815bbdfc6721be30370d0cc0d7fdd2
+d92e7983d22d4a960248de724c40274a
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -670,16 +670,16 @@
 
 
 
-7709
+1881
 
-k3bdvdformattingjob.cpp
+k3bdvdcopyjob.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-1c0e20a0bc76769802098d3951ea2066
+50312cda218fd30fe14be1bb159eda5a
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -704,16 +704,16 @@
 
 
 
-14166
+26474
 
-k3bdvdcopyjob.cpp
+k3bdvdformattingjob.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-50312cda218fd30fe14be1bb159eda5a
+1c0e20a0bc76769802098d3951ea2066
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -738,7 +738,7 @@
 
 
 
-26474
+14166
 
 k3breadcdreader.cpp
 file
@@ -842,14 +842,14 @@
 
 36517
 
-k3bvideodvdtitledetectclippingjob.cpp
+k3bblankingjob.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-28785631c0625615d12738b3b69ea5a4
+ef19eef6fa44470b157887801f5da01f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -874,16 +874,16 @@
 
 
 
-8676
+3953
 
-k3bblankingjob.cpp
+k3bvideodvdtitledetectclippingjob.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-ef19eef6fa44470b157887801f5da01f
+28785631c0625615d12738b3b69ea5a4
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -908,7 +908,7 @@
 
 
 
-3953
+8676
 
 k3bverificationjob.h
 file
@@ -978,14 +978,14 @@
 
 1653
 
-k3biso9660imagewritingjob.h
+k3bdatatrackreader.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-18a4969a671898bbc540e21fcb357684
+af3c3b46f023c9fdd610835ec09c95f8
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1010,16 +1010,16 @@
 
 
 
-2263
+2319
 
-k3bdatatrackreader.h
+k3biso9660imagewritingjob.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-af3c3b46f023c9fdd610835ec09c95f8
+18a4969a671898bbc540e21fcb357684
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1044,7 +1044,7 @@
 
 
 
-2319
+2263
 
 Makefile.am
 file
diff -Nru k3b-kde3-3.5.12/libk3b/plugin/libsamplerate/.svn/entries k3b-kde3-3.5.12/libk3b/plugin/libsamplerate/.svn/entries
--- k3b-kde3-3.5.12/libk3b/plugin/libsamplerate/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/plugin/libsamplerate/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/plugin/libsamplerate
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/plugin/.svn/entries k3b-kde3-3.5.12/libk3b/plugin/.svn/entries
--- k3b-kde3-3.5.12/libk3b/plugin/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/plugin/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/plugin
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bplugin.cpp
+k3bpluginmanager.h
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-783e09dbdb9b3dfb5e6388ad796d5999
+8636c2b165a9d8d3f7574d76317abf69
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-813
+1673
 
-k3bpluginmanager.h
+k3bplugin.cpp
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-8636c2b165a9d8d3f7574d76317abf69
+783e09dbdb9b3dfb5e6388ad796d5999
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-1673
+813
 
 k3baudioclient.cpp
 file
@@ -162,6 +162,9 @@
 
 3344
 
+libsamplerate
+dir
+
 k3bplugin.h
 file
 
@@ -196,9 +199,6 @@
 
 2526
 
-libsamplerate
-dir
-
 k3baudioclient.h
 file
 
@@ -233,14 +233,14 @@
 
 1181
 
-k3baudiooutputplugin.h
+k3baudioencoder.h
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-cd326cfc48aad09cbffeb05b3ce176a3
+0456d9b31c2f10208cbc4796d127f5f4
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -265,16 +265,16 @@
 
 
 
-1689
+5939
 
-k3baudioencoder.h
+k3baudiooutputplugin.h
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-0456d9b31c2f10208cbc4796d127f5f4
+cd326cfc48aad09cbffeb05b3ce176a3
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -299,7 +299,7 @@
 
 
 
-5939
+1689
 
 k3bpluginfactory.cpp
 file
@@ -369,14 +369,14 @@
 
 14999
 
-k3bpluginconfigwidget.cpp
+Makefile.am
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-1db39f35fa529e43ad32f1d049af145b
+f68ddeed1f083c6e6bb4f2ec02363f2b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -401,7 +401,7 @@
 
 
 
-1017
+794
 
 k3baudioserver.cpp
 file
@@ -437,14 +437,14 @@
 
 4823
 
-Makefile.am
+k3bpluginconfigwidget.cpp
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-f68ddeed1f083c6e6bb4f2ec02363f2b
+1db39f35fa529e43ad32f1d049af145b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -469,7 +469,7 @@
 
 
 
-794
+1017
 
 k3bpluginmanager.cpp
 file
diff -Nru k3b-kde3-3.5.12/libk3b/projects/audiocd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/audiocd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/audiocd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/audiocd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/audiocd
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3baudiocdtrackdrag.h
+k3baudiozerodata.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-6ca3e6e9de1215f8c531c349567cc5b8
+8bdf5aca002df11ad868d36e4aff0d9f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-1754
+1375
 
-k3baudiozerodata.h
+k3baudiocdtrackdrag.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-8bdf5aca002df11ad868d36e4aff0d9f
+6ca3e6e9de1215f8c531c349567cc5b8
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,16 +92,16 @@
 
 
 
-1375
+1754
 
-k3baudiofile.cpp
+k3baudiojob.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-664f68dbed639b16bd1c18cb806a5979
+6f61920ea5371c5c64ba16548c1d2f8d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -126,16 +126,16 @@
 
 
 
-2356
+2370
 
-k3baudiojob.h
+k3baudiofile.cpp
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-6f61920ea5371c5c64ba16548c1d2f8d
+664f68dbed639b16bd1c18cb806a5979
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -160,7 +160,7 @@
 
 
 
-2370
+2356
 
 k3baudiofile.h
 file
@@ -196,14 +196,14 @@
 
 2251
 
-k3baudiodatasource.cpp
+k3baudiojobtempdata.cpp
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-0fdb02ee6c4f253e4ee20c2a44207152
+35c5722c3726420f72fca47954be028d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -228,16 +228,16 @@
 
 
 
-3913
+2970
 
-k3baudiojobtempdata.cpp
+k3baudiodatasource.cpp
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-35c5722c3726420f72fca47954be028d
+0fdb02ee6c4f253e4ee20c2a44207152
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -262,7 +262,7 @@
 
 
 
-2970
+3913
 
 k3baudionormalizejob.cpp
 file
@@ -332,14 +332,14 @@
 
 6968
 
-k3baudiodatasource.h
+k3baudiojobtempdata.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-e329d45ac3271c41d938186d205541e2
+59c566a6ca00243067a852f408ab8ef7
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -364,16 +364,16 @@
 
 
 
-4975
+1585
 
-k3baudiojobtempdata.h
+k3baudiodatasource.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-59c566a6ca00243067a852f408ab8ef7
+e329d45ac3271c41d938186d205541e2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -398,7 +398,7 @@
 
 
 
-1585
+4975
 
 k3baudionormalizejob.h
 file
@@ -434,14 +434,14 @@
 
 1334
 
-k3baudiocdtracksource.h
+k3baudiomaxspeedjob.cpp
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-36ebc0f3eede55b4f3920724cf5953ee
+aa7e2b355c0006cec538d9636ccf19d7
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -466,16 +466,16 @@
 
 
 
-2918
+4996
 
-k3baudiomaxspeedjob.cpp
+k3baudiocdtracksource.h
 file
 
 
 
 
 2010-02-03T02:25:58.000000Z
-aa7e2b355c0006cec538d9636ccf19d7
+36ebc0f3eede55b4f3920724cf5953ee
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -500,7 +500,7 @@
 
 
 
-4996
+2918
 
 k3baudiodatasourceiterator.cpp
 file
diff -Nru k3b-kde3-3.5.12/libk3b/projects/datacd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/datacd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/datacd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/datacd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/datacd
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bfileitem.cpp
+k3bspecialdataitem.h
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-056cd28226b5a811833d32954466d0e0
+a80842b86ec24493a4f2b2ccbdf85bb0
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-6849
+1944
 
-k3bspecialdataitem.h
+k3bfileitem.cpp
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-a80842b86ec24493a4f2b2ccbdf85bb0
+056cd28226b5a811833d32954466d0e0
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-1944
+6849
 
 k3bdatadoc.cpp
 file
@@ -162,14 +162,14 @@
 
 1563
 
-k3bdiritem.h
+k3bsessionimportitem.h
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-65225d0fd4c982ea08187a9f9ecd6c29
+a8c0a02ef658eb043e7a3a1608dcc5f6
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -194,16 +194,16 @@
 
 
 
-3962
+1755
 
-k3bsessionimportitem.h
+k3bdiritem.h
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-a8c0a02ef658eb043e7a3a1608dcc5f6
+65225d0fd4c982ea08187a9f9ecd6c29
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -228,7 +228,7 @@
 
 
 
-1755
+3962
 
 k3bfileitem.h
 file
@@ -264,14 +264,14 @@
 
 3130
 
-k3bdatajob.cpp
+k3bdatadoc.h
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-93891ac0df1049966b8504e4780296b2
+83c242fd21dbede451f7194d509d32c2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -296,16 +296,16 @@
 
 
 
-26127
+8124
 
-k3bdatadoc.h
+k3bdatajob.cpp
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-83c242fd21dbede451f7194d509d32c2
+93891ac0df1049966b8504e4780296b2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -330,7 +330,7 @@
 
 
 
-8124
+26127
 
 k3bisooptions.cpp
 file
@@ -400,14 +400,14 @@
 
 5716
 
-k3bdatapreparationjob.cpp
+k3bmkisofshandler.cpp
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-1a7bbe97f37a2206b75e736cd0243556
+0c3547b36c6b06a0b8f4b7b981c8c105
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -432,7 +432,7 @@
 
 
 
-7241
+4631
 
 k3bdatajob.h
 file
@@ -468,14 +468,14 @@
 
 2661
 
-k3bmkisofshandler.cpp
+k3bdatapreparationjob.cpp
 file
 
 
 
 
 2010-02-03T02:25:57.000000Z
-0c3547b36c6b06a0b8f4b7b981c8c105
+1a7bbe97f37a2206b75e736cd0243556
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -500,7 +500,7 @@
 
 
 
-4631
+7241
 
 k3bisooptions.h
 file
diff -Nru k3b-kde3-3.5.12/libk3b/projects/datadvd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/datadvd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/datadvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/datadvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/datadvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/mixedcd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/mixedcd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/mixedcd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/mixedcd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/mixedcd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/movixcd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/movixcd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/movixcd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/movixcd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/movixcd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/movixdvd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/movixdvd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/movixdvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/movixdvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/movixdvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/.svn/entries k3b-kde3-3.5.12/libk3b/projects/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects
 svn://anonsvn.kde.org/home/kde
 
@@ -378,14 +378,14 @@
 movixcd
 dir
 
-k3bcuefileparser.h
+k3bcdrdaowriter.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-27051a5df6d6d6e2515428064c67a3a6
+00a3088c8ac227280f85f37220bd5d04
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -410,16 +410,16 @@
 
 
 
-1650
+3997
 
-k3bcdrdaowriter.h
+k3bcuefileparser.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-00a3088c8ac227280f85f37220bd5d04
+27051a5df6d6d6e2515428064c67a3a6
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -444,16 +444,16 @@
 
 
 
-3997
+1650
 
-k3bimagefilereader.cpp
+k3bdoc.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-99345d1a655f5050c1c4a8ecff076a6e
+d9fb3dac9941d6a408cf3cdb4a8b4c06
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -478,7 +478,7 @@
 
 
 
-1530
+4672
 
 k3babstractwriter.h
 file
@@ -514,14 +514,14 @@
 
 2501
 
-k3bdoc.cpp
+k3bimagefilereader.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-d9fb3dac9941d6a408cf3cdb4a8b4c06
+99345d1a655f5050c1c4a8ecff076a6e
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -546,16 +546,16 @@
 
 
 
-4672
+1530
 
-k3binffilewriter.cpp
+k3bdvdrecordwriter.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-ee1334e7646d907effe8dd3c54a3aa1b
+9bbb4c61780aaf515b8b22ef5ef09276
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -580,16 +580,16 @@
 
 
 
-4649
+4190
 
-k3bdvdrecordwriter.cpp
+k3binffilewriter.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-9bbb4c61780aaf515b8b22ef5ef09276
+ee1334e7646d907effe8dd3c54a3aa1b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -614,7 +614,7 @@
 
 
 
-4190
+4649
 
 k3bgrowisofswriter.cpp
 file
@@ -687,14 +687,17 @@
 videodvd
 dir
 
-k3btocfilewriter.h
+audiocd
+dir
+
+k3bcdrecordwriter.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-732931052bc58dbc368f9391672094e7
+1381e391f9447f2558d487e9c0d7ee90
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -719,16 +722,16 @@
 
 
 
-1726
+2634
 
-k3bcdrecordwriter.h
+k3btocfilewriter.h
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-1381e391f9447f2558d487e9c0d7ee90
+732931052bc58dbc368f9391672094e7
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -753,10 +756,7 @@
 
 
 
-2634
-
-audiocd
-dir
+1726
 
 Makefile.am
 file
@@ -792,14 +792,14 @@
 
 1402
 
-k3bcuefileparser.cpp
+k3bcdrdaowriter.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-a4d7afe9b2d3dd21da3e6d7282c67ed7
+2fb94465dcc5442ce0ecb4bad22e3d10
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -824,16 +824,16 @@
 
 
 
-11906
+31387
 
-k3bcdrdaowriter.cpp
+k3bcuefileparser.cpp
 file
 
 
 
 
 2010-02-03T02:26:04.000000Z
-2fb94465dcc5442ce0ecb4bad22e3d10
+a4d7afe9b2d3dd21da3e6d7282c67ed7
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -858,7 +858,7 @@
 
 
 
-31387
+11906
 
 mixedcd
 dir
diff -Nru k3b-kde3-3.5.12/libk3b/projects/videocd/cdi/.svn/entries k3b-kde3-3.5.12/libk3b/projects/videocd/cdi/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/videocd/cdi/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/videocd/cdi/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/videocd/cdi
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/videocd/extra/.svn/entries k3b-kde3-3.5.12/libk3b/projects/videocd/extra/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/videocd/extra/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/videocd/extra/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/videocd/extra
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/videocd/mpeginfo/.svn/entries k3b-kde3-3.5.12/libk3b/projects/videocd/mpeginfo/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/videocd/mpeginfo/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/videocd/mpeginfo/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/videocd/mpeginfo
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/videocd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/videocd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/videocd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/videocd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/videocd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/projects/videodvd/.svn/entries k3b-kde3-3.5.12/libk3b/projects/videodvd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/projects/videodvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/projects/videodvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/projects/videodvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/scripts/.svn/entries k3b-kde3-3.5.12/libk3b/scripts/.svn/entries
--- k3b-kde3-3.5.12/libk3b/scripts/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/scripts/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/scripts
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/.svn/entries k3b-kde3-3.5.12/libk3b/.svn/entries
--- k3b-kde3-3.5.12/libk3b/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/tools/libisofs/.svn/entries k3b-kde3-3.5.12/libk3b/tools/libisofs/.svn/entries
--- k3b-kde3-3.5.12/libk3b/tools/libisofs/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/tools/libisofs/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/tools/libisofs
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3b/tools/.svn/entries k3b-kde3-3.5.12/libk3b/tools/.svn/entries
--- k3b-kde3-3.5.12/libk3b/tools/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/tools/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/tools
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bsignalwaiter.h
+k3bactivepipe.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-a19c0cec3404955ce44696f86e345935
+c9a065c84ee72ef4cb062ae1b732e70b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-1172
+3224
 
-k3bactivepipe.h
+k3bsignalwaiter.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-c9a065c84ee72ef4cb062ae1b732e70b
+a19c0cec3404955ce44696f86e345935
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-3224
+1172
 
 k3bmsfedit.h
 file
@@ -230,14 +230,14 @@
 
 1261
 
-k3bpushbutton.h
+k3bchecksumpipe.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-ebd4992e2557d09429a7682fc44cfa51
+e0ac0b9a86f4f9ba1060de3b9fafcc02
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -262,7 +262,7 @@
 
 
 
-1890
+1700
 
 k3blistviewitemanimator.cpp
 file
@@ -298,14 +298,14 @@
 
 2741
 
-k3bchecksumpipe.cpp
+k3bpushbutton.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-e0ac0b9a86f4f9ba1060de3b9fafcc02
+ebd4992e2557d09429a7682fc44cfa51
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -330,7 +330,7 @@
 
 
 
-1700
+1890
 
 k3bcutcombobox.cpp
 file
@@ -468,14 +468,14 @@
 
 3476
 
-k3bactivepipe.cpp
+k3bsignalwaiter.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-2e4f4e99dbd33d6e4167a526f9e320e4
+889a4a55eb74cc9a617d4f1188da5c15
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -500,16 +500,16 @@
 
 
 
-4683
+1246
 
-k3bsignalwaiter.cpp
+k3bactivepipe.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-889a4a55eb74cc9a617d4f1188da5c15
+2e4f4e99dbd33d6e4167a526f9e320e4
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -534,7 +534,7 @@
 
 
 
-1246
+4683
 
 k3bmsfedit.cpp
 file
@@ -1046,14 +1046,14 @@
 
 2525
 
-k3bchecksumpipe.h
+k3blistviewitemanimator.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-51c12e11ebde0bfeb6c3bb5f0a74993f
+cc13839621aea73649b97808e5d9dfc3
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1078,16 +1078,16 @@
 
 
 
-1403
+1689
 
-k3blistviewitemanimator.h
+k3bchecksumpipe.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-cc13839621aea73649b97808e5d9dfc3
+51c12e11ebde0bfeb6c3bb5f0a74993f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1112,16 +1112,16 @@
 
 
 
-1689
+1403
 
-k3bbusywidget.cpp
+k3btitlelabel.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-7e0b9a347cfc10f02f1d53d386abc3b7
+2c7d11a147aa8d57ac75fbfb1701d903
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1146,16 +1146,16 @@
 
 
 
-2032
+1503
 
-k3btitlelabel.h
+k3bbusywidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-2c7d11a147aa8d57ac75fbfb1701d903
+7e0b9a347cfc10f02f1d53d386abc3b7
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1180,16 +1180,16 @@
 
 
 
-1503
+2032
 
-k3bdevicecombobox.cpp
+k3bcdparanoialib.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-a31b8a30c9ba6e0c43998f9df87b987f
+c370b0969a80440c8e3b6469645f9056
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1214,16 +1214,16 @@
 
 
 
-4282
+19910
 
-k3bcdparanoialib.cpp
+k3bdevicecombobox.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-c370b0969a80440c8e3b6469645f9056
+a31b8a30c9ba6e0c43998f9df87b987f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1248,7 +1248,7 @@
 
 
 
-19910
+4282
 
 k3bcutcombobox.h
 file
@@ -1318,14 +1318,14 @@
 
 4082
 
-k3bfilesysteminfo.cpp
+k3bintvalidator.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-59242a205dd616fff629a6739e627c76
+f37336e00650d15558a7b0659a91f20d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1350,16 +1350,16 @@
 
 
 
-2621
+2668
 
-k3bintvalidator.cpp
+k3bfilesysteminfo.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-f37336e00650d15558a7b0659a91f20d
+59242a205dd616fff629a6739e627c76
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1384,16 +1384,16 @@
 
 
 
-2668
+2621
 
-k3bradioaction.h
+k3bthroughputestimator.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-15795bb51afc158f4ff5675efcac30d3
+3d544d127155c37f3cd504ea3f583025
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1418,7 +1418,7 @@
 
 
 
-4515
+2094
 
 k3bcdtextvalidator.cpp
 file
@@ -1454,14 +1454,14 @@
 
 1140
 
-k3bthroughputestimator.cpp
+k3bradioaction.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-3d544d127155c37f3cd504ea3f583025
+15795bb51afc158f4ff5675efcac30d3
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1486,7 +1486,7 @@
 
 
 
-2094
+4515
 
 k3btempfile.cpp
 file
@@ -1522,14 +1522,14 @@
 
 1250
 
-k3bstdguiitems.h
+k3blistview.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-07ddb36e3562c9c65e0f2e607bfd1118
+2541b1955b87d65fc2d82352dcbad3c6
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1554,16 +1554,16 @@
 
 
 
-2099
+32294
 
-k3blistview.cpp
+k3bstdguiitems.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-2541b1955b87d65fc2d82352dcbad3c6
+07ddb36e3562c9c65e0f2e607bfd1118
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1588,7 +1588,7 @@
 
 
 
-32294
+2099
 
 k3bvalidators.cpp
 file
@@ -1828,14 +1828,14 @@
 
 1962
 
-k3bintmapcombobox.h
+k3btoolbox.cpp
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-31c2dbb18f8675c7beafa16c5a79f592
+a76d94791fd85bfc061c1d6ecdebaa60
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1860,16 +1860,16 @@
 
 
 
-2269
+7025
 
-k3btoolbox.cpp
+k3bintmapcombobox.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-a76d94791fd85bfc061c1d6ecdebaa60
+31c2dbb18f8675c7beafa16c5a79f592
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1894,7 +1894,7 @@
 
 
 
-7025
+2269
 
 k3bprogressdialog.h
 file
@@ -2032,14 +2032,14 @@
 
 2068
 
-k3bdevicecombobox.h
+k3bcdparanoialib.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-0d3c1718506e02fc73a28722295c5c0f
+a02ba68bed86e878827ebbc6e5dc8608
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2064,16 +2064,16 @@
 
 
 
-1645
+3953
 
-k3bcdparanoialib.h
+k3bdevicecombobox.h
 file
 
 
 
 
 2010-02-03T02:25:56.000000Z
-a02ba68bed86e878827ebbc6e5dc8608
+0d3c1718506e02fc73a28722295c5c0f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2098,7 +2098,7 @@
 
 
 
-3953
+1645
 
 k3bstdguiitems.cpp
 file
diff -Nru k3b-kde3-3.5.12/libk3b/videodvd/.svn/entries k3b-kde3-3.5.12/libk3b/videodvd/.svn/entries
--- k3b-kde3-3.5.12/libk3b/videodvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3b/videodvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3b/videodvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/libk3bdevice/.svn/entries k3b-kde3-3.5.12/libk3bdevice/.svn/entries
--- k3b-kde3-3.5.12/libk3bdevice/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/libk3bdevice/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/libk3bdevice
 svn://anonsvn.kde.org/home/kde
 
@@ -570,14 +570,14 @@
 
 100750
 
-k3bscsicommand.cpp
+k3bcdtext.h
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-d6476a6289a21d66d30c90d9df0b3db2
+deba859d81a5fab1674ae1f733249cdb
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -602,16 +602,16 @@
 
 
 
-6165
+6226
 
-k3bcdtext.h
+k3bscsicommand.cpp
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-deba859d81a5fab1674ae1f733249cdb
+d6476a6289a21d66d30c90d9df0b3db2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -636,7 +636,7 @@
 
 
 
-6226
+6165
 
 k3bdevice_export.h
 file
@@ -876,14 +876,14 @@
 
 20662
 
-k3btoc.cpp
+k3bmsf.cpp
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-1f9e6bf7293fc2588536bc31ac8f8fcc
+8535060bad69d196458c1a2e42b8f459
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -908,16 +908,16 @@
 
 
 
-3492
+5934
 
-k3bmsf.cpp
+k3btoc.cpp
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-8535060bad69d196458c1a2e42b8f459
+1f9e6bf7293fc2588536bc31ac8f8fcc
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -942,7 +942,7 @@
 
 
 
-5934
+3492
 
 libk3bdevice.doxy
 file
@@ -978,14 +978,14 @@
 
 8109
 
-k3bscsicommand_bsd.cpp
+configure.in.bot
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-b37f78442dac0280802ed979707a5c16
+7f702f3487f6d6f1a259f7edb9acc685
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1010,7 +1010,7 @@
 
 
 
-6042
+486
 
 Makefile.am
 file
@@ -1046,14 +1046,14 @@
 
 1328
 
-configure.in.bot
+k3bscsicommand_bsd.cpp
 file
 
 
 
 
 2010-02-03T02:25:42.000000Z
-7f702f3487f6d6f1a259f7edb9acc685
+b37f78442dac0280802ed979707a5c16
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1078,7 +1078,7 @@
 
 
 
-486
+6042
 
 k3bdevicetypes.h
 file
diff -Nru k3b-kde3-3.5.12/plugins/audiooutput/alsa/.svn/entries k3b-kde3-3.5.12/plugins/audiooutput/alsa/.svn/entries
--- k3b-kde3-3.5.12/plugins/audiooutput/alsa/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/audiooutput/alsa/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/audiooutput/alsa
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/audiooutput/arts/.svn/entries k3b-kde3-3.5.12/plugins/audiooutput/arts/.svn/entries
--- k3b-kde3-3.5.12/plugins/audiooutput/arts/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/audiooutput/arts/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/audiooutput/arts
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/audiooutput/.svn/entries k3b-kde3-3.5.12/plugins/audiooutput/.svn/entries
--- k3b-kde3-3.5.12/plugins/audiooutput/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/audiooutput/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/audiooutput
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/ffmpeg/.svn/entries k3b-kde3-3.5.12/plugins/decoder/ffmpeg/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/ffmpeg/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/ffmpeg/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/ffmpeg
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/flac/.svn/entries k3b-kde3-3.5.12/plugins/decoder/flac/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/flac/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/flac/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/flac
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/libsndfile/.svn/entries k3b-kde3-3.5.12/plugins/decoder/libsndfile/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/libsndfile/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/libsndfile/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/libsndfile
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/mp3/.svn/entries k3b-kde3-3.5.12/plugins/decoder/mp3/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/mp3/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/mp3/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/mp3
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/musepack/configure.in.in k3b-kde3-3.5.12/plugins/decoder/musepack/configure.in.in
--- k3b-kde3-3.5.12/plugins/decoder/musepack/configure.in.in	2010-02-03 02:25:42.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/musepack/configure.in.in	2010-09-03 22:55:48.000000000 +0100
@@ -25,6 +25,20 @@
 		],
 		[], [], [])
   ])
+
+  if test "$have_mpc" = "no"; then
+    KDE_CHECK_HEADERS(mpc/mpcdec.h, [
+        AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+                have_mpc=yes
+                MPC_LIBS="-lmpcdec"
+                AC_DEFINE(
+                        MPC_HEADER_FILE,
+                        <mpc/mpcdec.h>,
+                        [The header to include for MPC decoding.])
+                ],
+                [], [], [])
+    ])
+  fi
 	
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(musepack/musepack.h, [
diff -Nru k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/entries k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/musepack
 svn://anonsvn.kde.org/home/kde
 
 
 
-2010-02-03T02:15:56.930182Z
-1084400
+2010-08-17T22:05:47.881169Z
+1164898
 tpearson
 
 
@@ -236,10 +236,10 @@
 
 
 
-2010-02-03T02:25:42.000000Z
-01b4797d40de6c7185c5710a63ecfafa
-2010-02-03T02:15:56.930182Z
-1084400
+2010-09-03T21:55:48.000000Z
+6d72045cb2e67fe61502e08c2e42d976
+2010-08-17T22:05:47.881169Z
+1164898
 tpearson
 
 
@@ -262,7 +262,7 @@
 
 
 
-1117
+1540
 
 k3bmpcdecoder.h
 file
diff -Nru k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/text-base/configure.in.in.svn-base k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/text-base/configure.in.in.svn-base
--- k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/text-base/configure.in.in.svn-base	2010-02-03 02:25:42.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/musepack/.svn/text-base/configure.in.in.svn-base	2010-09-03 22:55:48.000000000 +0100
@@ -25,6 +25,20 @@
 		],
 		[], [], [])
   ])
+
+  if test "$have_mpc" = "no"; then
+    KDE_CHECK_HEADERS(mpc/mpcdec.h, [
+        AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+                have_mpc=yes
+                MPC_LIBS="-lmpcdec"
+                AC_DEFINE(
+                        MPC_HEADER_FILE,
+                        <mpc/mpcdec.h>,
+                        [The header to include for MPC decoding.])
+                ],
+                [], [], [])
+    ])
+  fi
 	
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(musepack/musepack.h, [
diff -Nru k3b-kde3-3.5.12/plugins/decoder/ogg/.svn/entries k3b-kde3-3.5.12/plugins/decoder/ogg/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/ogg/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/ogg/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/ogg
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/.svn/entries k3b-kde3-3.5.12/plugins/decoder/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder
 svn://anonsvn.kde.org/home/kde
 
 
 
-2010-02-03T02:15:56.930182Z
-1084400
+2010-08-17T22:05:47.881169Z
+1164898
 tpearson
 
 
diff -Nru k3b-kde3-3.5.12/plugins/decoder/wave/.svn/entries k3b-kde3-3.5.12/plugins/decoder/wave/.svn/entries
--- k3b-kde3-3.5.12/plugins/decoder/wave/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/decoder/wave/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/decoder/wave
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/encoder/external/.svn/entries k3b-kde3-3.5.12/plugins/encoder/external/.svn/entries
--- k3b-kde3-3.5.12/plugins/encoder/external/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/encoder/external/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/encoder/external
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/encoder/lame/.svn/entries k3b-kde3-3.5.12/plugins/encoder/lame/.svn/entries
--- k3b-kde3-3.5.12/plugins/encoder/lame/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/encoder/lame/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/encoder/lame
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/encoder/ogg/.svn/entries k3b-kde3-3.5.12/plugins/encoder/ogg/.svn/entries
--- k3b-kde3-3.5.12/plugins/encoder/ogg/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/encoder/ogg/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/encoder/ogg
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/encoder/sox/.svn/entries k3b-kde3-3.5.12/plugins/encoder/sox/.svn/entries
--- k3b-kde3-3.5.12/plugins/encoder/sox/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/encoder/sox/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/encoder/sox
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/encoder/.svn/entries k3b-kde3-3.5.12/plugins/encoder/.svn/entries
--- k3b-kde3-3.5.12/plugins/encoder/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/encoder/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/encoder
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/project/audiometainforenamer/.svn/entries k3b-kde3-3.5.12/plugins/project/audiometainforenamer/.svn/entries
--- k3b-kde3-3.5.12/plugins/project/audiometainforenamer/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/project/audiometainforenamer/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/project/audiometainforenamer
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/project/audioprojectcddb/.svn/entries k3b-kde3-3.5.12/plugins/project/audioprojectcddb/.svn/entries
--- k3b-kde3-3.5.12/plugins/project/audioprojectcddb/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/project/audioprojectcddb/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/project/audioprojectcddb
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/project/.svn/entries k3b-kde3-3.5.12/plugins/project/.svn/entries
--- k3b-kde3-3.5.12/plugins/project/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/project/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins/project
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/plugins/.svn/entries k3b-kde3-3.5.12/plugins/.svn/entries
--- k3b-kde3-3.5.12/plugins/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/plugins/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/plugins
 svn://anonsvn.kde.org/home/kde
 
 
 
-2010-02-05T20:06:27.568843Z
-1085718
+2010-08-17T22:05:47.881169Z
+1164898
 tpearson
 
 
diff -Nru k3b-kde3-3.5.12/src/fastscale/.svn/entries k3b-kde3-3.5.12/src/fastscale/.svn/entries
--- k3b-kde3-3.5.12/src/fastscale/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/fastscale/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/fastscale
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/icons/actions/.svn/entries k3b-kde3-3.5.12/src/icons/actions/.svn/entries
--- k3b-kde3-3.5.12/src/icons/actions/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/icons/actions/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/icons/actions
 svn://anonsvn.kde.org/home/kde
 
@@ -128,14 +128,14 @@
 
 952
 
-hi48-action-cdburn.png
+hi48-action-videocd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-a72a7577646fc7df4a593a708b45f101
+ee3ecc14d39324ba0cb2d1fbe3b7163a
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -160,7 +160,7 @@
 
 
 
-4367
+5595
 
 hi48-action-mixedcd.png
 file
@@ -196,14 +196,14 @@
 
 4290
 
-hi48-action-videocd.png
+hi48-action-cdburn.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-ee3ecc14d39324ba0cb2d1fbe3b7163a
+a72a7577646fc7df4a593a708b45f101
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -228,7 +228,7 @@
 
 
 
-5595
+4367
 
 hi32-action-formatdvd.png
 file
@@ -264,14 +264,14 @@
 
 2906
 
-hi16-action-formatdvd.png
+hi16-action-musicbrainz.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-af207d715ace8dc403624c5f03b45c2a
+d21ee7832aad9aad9fd9925bb4e30804
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -296,16 +296,16 @@
 
 
 
-1010
+1851
 
-hi16-action-musicbrainz.png
+hi16-action-formatdvd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-d21ee7832aad9aad9fd9925bb4e30804
+af207d715ace8dc403624c5f03b45c2a
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -330,7 +330,7 @@
 
 
 
-1851
+1010
 
 cr16-action-greenled.png
 file
@@ -366,14 +366,14 @@
 
 537
 
-hisc-action-burn_dvdimage.svgz
+hisc-action-mp3cd.svgz
 file
 
 
 
 
 2010-02-03T02:25:44.000000Z
-8c5edaaaa009da6a4a8a1dd921ef10ed
+56b0099278eec194e2a2109be877036e
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -398,16 +398,16 @@
 
 
 
-8596
+4455
 
-hisc-action-mp3cd.svgz
+hisc-action-burn_dvdimage.svgz
 file
 
 
 
 
 2010-02-03T02:25:44.000000Z
-56b0099278eec194e2a2109be877036e
+8c5edaaaa009da6a4a8a1dd921ef10ed
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -432,18 +432,18 @@
 
 
 
-4455
+8596
 
-hi48-action-formatdvd.png
+hisc-action-emovix.svgz
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-6cd4d357d88604731291cc17f0cdd8a5
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:44.000000Z
+4a26d01ebda1ac2dee76438aa119b2b0
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
 has-props
 
@@ -466,7 +466,7 @@
 
 
 
-5331
+55745
 
 hisc-action-datadvd.svgz
 file
@@ -502,16 +502,16 @@
 
 3160
 
-hisc-action-emovix.svgz
+hi48-action-formatdvd.png
 file
 
 
 
 
-2010-02-03T02:25:44.000000Z
-4a26d01ebda1ac2dee76438aa119b2b0
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+6cd4d357d88604731291cc17f0cdd8a5
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
 has-props
 
@@ -534,7 +534,7 @@
 
 
 
-55745
+5331
 
 cr16-action-yellowinfo.png
 file
@@ -1046,14 +1046,14 @@
 
 4200
 
-hisc-action-videocd.svgz
+hisc-action-mixedcd.svgz
 file
 
 
 
 
 2010-02-03T02:25:44.000000Z
-84604e25e38a5d29ed816a5e25188fce
+1a17e34e86d5911383c7771d4e310f3c
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1078,16 +1078,16 @@
 
 
 
-8587
+6298
 
-hisc-action-mixedcd.svgz
+hisc-action-videocd.svgz
 file
 
 
 
 
 2010-02-03T02:25:44.000000Z
-1a17e34e86d5911383c7771d4e310f3c
+84604e25e38a5d29ed816a5e25188fce
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1112,7 +1112,7 @@
 
 
 
-6298
+8587
 
 hi32-action-videodvd.png
 file
@@ -1148,16 +1148,16 @@
 
 2946
 
-hi32-action-mp3cd.png
+hisc-action-datacd.svgz
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-ead39b63e02bdfa7b1bc70d7ff4eb46d
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:44.000000Z
+021a321021620da3ec76e92aefee0b7a
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
 has-props
 
@@ -1180,7 +1180,7 @@
 
 
 
-2513
+4433
 
 hi32-action-burn_dvdimage.png
 file
@@ -1216,16 +1216,16 @@
 
 2544
 
-hisc-action-datacd.svgz
+hi32-action-mp3cd.png
 file
 
 
 
 
-2010-02-03T02:25:44.000000Z
-021a321021620da3ec76e92aefee0b7a
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+ead39b63e02bdfa7b1bc70d7ff4eb46d
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
 has-props
 
@@ -1248,16 +1248,16 @@
 
 
 
-4433
+2513
 
-hi16-action-burn_dvdimage.png
+hi16-action-mp3cd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-a775e87246d48cc1581de8681a1a7db4
+e5f9bf1a92691a32e79c8244c81e4c0f
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1282,16 +1282,16 @@
 
 
 
-1012
+838
 
-hi16-action-mp3cd.png
+hi16-action-burn_dvdimage.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-e5f9bf1a92691a32e79c8244c81e4c0f
+a775e87246d48cc1581de8681a1a7db4
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1316,7 +1316,7 @@
 
 
 
-838
+1012
 
 hi16-action-emovix.png
 file
@@ -1352,14 +1352,14 @@
 
 979
 
-hi22-action-videocd.png
+hi22-action-cdburn.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-15d71f2a9c7afb70caf33d280eb14029
+9595678f1cdb3db926911d10bf77b498
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1384,7 +1384,7 @@
 
 
 
-1628
+1451
 
 hi22-action-mixedcd.png
 file
@@ -1420,14 +1420,14 @@
 
 1554
 
-hi22-action-cdburn.png
+hi22-action-videocd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-9595678f1cdb3db926911d10bf77b498
+15d71f2a9c7afb70caf33d280eb14029
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1452,16 +1452,16 @@
 
 
 
-1451
+1628
 
-hi48-action-burn_dvdimage.png
+hi48-action-mp3cd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-baa85c62f6437b2dc2fa1153e10a0777
+2bb59d33971dc5dcadd0ee287fcdc57b
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1486,16 +1486,16 @@
 
 
 
-4464
+4352
 
-hi32-action-videocd.png
+hi32-action-mixedcd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-935a219d25e3bb08c7f2ae88ee838724
+900f46c12ff0278a5750dede45bdaabe
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1520,16 +1520,16 @@
 
 
 
-2897
+2491
 
-hi32-action-mixedcd.png
+hi32-action-videocd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-900f46c12ff0278a5750dede45bdaabe
+935a219d25e3bb08c7f2ae88ee838724
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1554,16 +1554,16 @@
 
 
 
-2491
+2897
 
-hi48-action-mp3cd.png
+hi48-action-burn_dvdimage.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-2bb59d33971dc5dcadd0ee287fcdc57b
+baa85c62f6437b2dc2fa1153e10a0777
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1588,16 +1588,16 @@
 
 
 
-4352
+4464
 
-hi48-action-audiocd.png
+hi16-action-videocd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-346d2d258a01565f30dacd7442ca388a
+12140f7eb31574fe90c637088dd8b788
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1622,7 +1622,7 @@
 
 
 
-4034
+1028
 
 hi16-action-mixedcd.png
 file
@@ -1658,14 +1658,14 @@
 
 970
 
-hi16-action-videocd.png
+hi48-action-audiocd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-12140f7eb31574fe90c637088dd8b788
+346d2d258a01565f30dacd7442ca388a
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1690,16 +1690,16 @@
 
 
 
-1028
+4034
 
-hi32-action-cdcopy.png
+hi16-action-burn_cdimage.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-13165c8baeab2bb6a3ca21bfbbf0cbc2
+08d40d02e436ea7815313df268cf89c8
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1724,16 +1724,16 @@
 
 
 
-2289
+909
 
-hi16-action-burn_cdimage.png
+hi32-action-cdcopy.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-08d40d02e436ea7815313df268cf89c8
+13165c8baeab2bb6a3ca21bfbbf0cbc2
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1758,7 +1758,7 @@
 
 
 
-909
+2289
 
 hi16-action-datacd.png
 file
@@ -1896,14 +1896,14 @@
 
 3370
 
-hi22-action-erasecd.png
+hisc-action-burn_cdimage.svgz
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-ca4de60c6e7dad58bf15bbefc9414a5c
+8581f2cd1c273e4bdcdb9101c0736e14
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1928,7 +1928,7 @@
 
 
 
-1504
+7666
 
 hi22-action-cddarip.png
 file
@@ -1964,14 +1964,14 @@
 
 1399
 
-hisc-action-burn_cdimage.svgz
+hi22-action-erasecd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-8581f2cd1c273e4bdcdb9101c0736e14
+ca4de60c6e7dad58bf15bbefc9414a5c
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -1996,16 +1996,16 @@
 
 
 
-7666
+1504
 
-hi32-action-erasecd.png
+hi22-action-datadvd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-209b742d49f17e704665a4bfbbebd8b2
+f181cd1f650f1ee4e3b30e41be5056d3
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -2030,7 +2030,7 @@
 
 
 
-2600
+1411
 
 hi32-action-cddarip.png
 file
@@ -2066,14 +2066,14 @@
 
 2421
 
-hi22-action-datadvd.png
+hi32-action-erasecd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-f181cd1f650f1ee4e3b30e41be5056d3
+209b742d49f17e704665a4bfbbebd8b2
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -2098,16 +2098,16 @@
 
 
 
-1411
+2600
 
-hi32-action-datadvd.png
+hi22-action-dvdcopy.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-a4ea1a7aaf559d9c9a61bf777d3902e4
+e0fc16656897b7b0cc5b03300076277c
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -2132,16 +2132,16 @@
 
 
 
-2282
+1467
 
-hi22-action-dvdcopy.png
+hi32-action-datadvd.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-e0fc16656897b7b0cc5b03300076277c
+a4ea1a7aaf559d9c9a61bf777d3902e4
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -2166,7 +2166,7 @@
 
 
 
-1467
+2282
 
 hi32-action-dvdcopy.png
 file
diff -Nru k3b-kde3-3.5.12/src/icons/.svn/entries k3b-kde3-3.5.12/src/icons/.svn/entries
--- k3b-kde3-3.5.12/src/icons/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/icons/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/icons
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/konqi/.svn/entries k3b-kde3-3.5.12/src/konqi/.svn/entries
--- k3b-kde3-3.5.12/src/konqi/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/konqi/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/konqi
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/mimetypes/.svn/entries k3b-kde3-3.5.12/src/mimetypes/.svn/entries
--- k3b-kde3-3.5.12/src/mimetypes/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/mimetypes/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/mimetypes
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/misc/.svn/entries k3b-kde3-3.5.12/src/misc/.svn/entries
--- k3b-kde3-3.5.12/src/misc/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/misc/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/misc
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/option/.svn/entries k3b-kde3-3.5.12/src/option/.svn/entries
--- k3b-kde3-3.5.12/src/option/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/option/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/option
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-k3bexternalbinoptiontab.h
+base_k3bmiscoptiontab.ui
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-be857daffb2fa55f1c462965b4bb4112
+6c1e79b2eb83458bb75646fa1d12ab0e
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-1101
+15202
 
-base_k3bmiscoptiontab.ui
+k3bexternalbinoptiontab.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-6c1e79b2eb83458bb75646fa1d12ab0e
+be857daffb2fa55f1c462965b4bb4112
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-15202
+1101
 
 base_k3bcddboptiontab.ui
 file
@@ -128,14 +128,14 @@
 
 26678
 
-k3bdevicewidget.cpp
+base_k3bpluginoptiontab.ui
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-36669b21b6af1b2a02c5ecad9534a94c
+6548dfce02624875436d8e899dadc27a
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -160,16 +160,16 @@
 
 
 
-13289
+5153
 
-base_k3bpluginoptiontab.ui
+k3bdevicewidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-6548dfce02624875436d8e899dadc27a
+36669b21b6af1b2a02c5ecad9534a94c
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -194,7 +194,7 @@
 
 
 
-5153
+13289
 
 base_k3bthemeoptiontab.ui
 file
@@ -366,14 +366,14 @@
 
 4140
 
-k3bexternalbinwidget.cpp
+k3bdeviceoptiontab.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-b7653278ea98a20b98ee614c9b38f8a2
+c5972132582947b4dbcc218151a7fc86
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -398,16 +398,16 @@
 
 
 
-10305
+2701
 
-k3bdeviceoptiontab.cpp
+k3bexternalbinwidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-c5972132582947b4dbcc218151a7fc86
+b7653278ea98a20b98ee614c9b38f8a2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -432,7 +432,7 @@
 
 
 
-2701
+10305
 
 k3bmiscoptiontab.h
 file
diff -Nru k3b-kde3-3.5.12/src/pics/73lab/.svn/entries k3b-kde3-3.5.12/src/pics/73lab/.svn/entries
--- k3b-kde3-3.5.12/src/pics/73lab/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/pics/73lab/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/pics/73lab
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-progress_success.png
+dialog_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-519a9bc08a36e44c543fab0a090fbf23
+00bb5975cc6ee9bc51171be8e2584860
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-16096
+5882
 
-dialog_right.png
+progress_success.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-00bb5975cc6ee9bc51171be8e2584860
+519a9bc08a36e44c543fab0a090fbf23
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -92,20 +92,19 @@
 
 
 
-5882
+16096
 
-media_empty.png
+k3b.theme
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-ed753fec790e7354744326a09602ce23
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:46.000000Z
+94752a7ca9b04b1f7576bc9228a91e50
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
-has-props
 
 
 
@@ -126,19 +125,21 @@
 
 
 
-8002
+
+106
 
-k3b.theme
+media_empty.png
 file
 
 
 
 
-2010-02-03T02:25:46.000000Z
-94752a7ca9b04b1f7576bc9228a91e50
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+ed753fec790e7354744326a09602ce23
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
+has-props
 
 
 
@@ -159,8 +160,7 @@
 
 
 
-
-106
+8002
 
 media_none.png
 file
@@ -230,14 +230,14 @@
 
 17516
 
-probing.png
+media_audio.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-aec62c90ef1c07545b957f3e7899e9c8
+fb1a92f69c790cbfece5b24d7eafd909
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -262,16 +262,16 @@
 
 
 
-32981
+7489
 
-media_audio.png
+probing.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-fb1a92f69c790cbfece5b24d7eafd909
+aec62c90ef1c07545b957f3e7899e9c8
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -296,7 +296,7 @@
 
 
 
-7489
+32981
 
 progress_right.png
 file
@@ -332,14 +332,14 @@
 
 1724
 
-project_right.png
+welcome_bg.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-be40cdc8427318d182c5c044a2286829
+8a37e8218de7f5f9727c992aff8e79d7
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -364,16 +364,16 @@
 
 
 
-1724
+37539
 
-welcome_bg.png
+project_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-8a37e8218de7f5f9727c992aff8e79d7
+be40cdc8427318d182c5c044a2286829
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -398,7 +398,7 @@
 
 
 
-37539
+1724
 
 progress_working.png
 file
@@ -434,14 +434,14 @@
 
 13103
 
-media_video.png
+media_mixed.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-5d5e238624406c4c92dd0f0ca785986e
+5bb5436be361f8bd80af009dbd0119fb
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -466,16 +466,16 @@
 
 
 
-7158
+8117
 
-media_mixed.png
+media_video.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-5bb5436be361f8bd80af009dbd0119fb
+5d5e238624406c4c92dd0f0ca785986e
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -500,7 +500,7 @@
 
 
 
-8117
+7158
 
 media_data.png
 file
diff -Nru k3b-kde3-3.5.12/src/pics/crystal/.svn/entries k3b-kde3-3.5.12/src/pics/crystal/.svn/entries
--- k3b-kde3-3.5.12/src/pics/crystal/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/pics/crystal/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/pics/crystal
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-progress_success.png
+dialog_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-52db20edd6c16e356859547627ca63f5
+3c7168baa508e0bf4ff7ac19939ef049
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-6591
+7378
 
-dialog_right.png
+progress_success.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-3c7168baa508e0bf4ff7ac19939ef049
+52db20edd6c16e356859547627ca63f5
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -92,20 +92,19 @@
 
 
 
-7378
+6591
 
-media_empty.png
+k3b.theme
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-6cfcc5493c3172d1a5f634edd6217e80
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:45.000000Z
+b20889081099a34838e5271cb38b2125
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
-has-props
 
 
 
@@ -126,19 +125,21 @@
 
 
 
-7546
+
+115
 
-k3b.theme
+media_empty.png
 file
 
 
 
 
-2010-02-03T02:25:45.000000Z
-b20889081099a34838e5271cb38b2125
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+6cfcc5493c3172d1a5f634edd6217e80
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
+has-props
 
 
 
@@ -159,8 +160,7 @@
 
 
 
-
-115
+7546
 
 media_none.png
 file
@@ -230,14 +230,14 @@
 
 5715
 
-probing.png
+media_audio.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-6967ef73fa54694ad44af62070510675
+8b7b234ad7fec8ed294c03896254039e
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -262,16 +262,16 @@
 
 
 
-31971
+5069
 
-media_audio.png
+probing.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-8b7b234ad7fec8ed294c03896254039e
+6967ef73fa54694ad44af62070510675
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -296,7 +296,7 @@
 
 
 
-5069
+31971
 
 progress_right.png
 file
@@ -332,14 +332,14 @@
 
 1929
 
-project_right.png
+welcome_bg.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-842684275b2d6e06edb98f8b1d63006c
+1e1a5b6362664738cade98d427c666bf
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -364,16 +364,16 @@
 
 
 
-1929
+33104
 
-welcome_bg.png
+project_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-1e1a5b6362664738cade98d427c666bf
+842684275b2d6e06edb98f8b1d63006c
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -398,7 +398,7 @@
 
 
 
-33104
+1929
 
 progress_working.png
 file
@@ -434,14 +434,14 @@
 
 7092
 
-media_video.png
+media_mixed.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-9941f7f79951a3da5b992d3dd7a0e7f6
+6cb492ec51c0ff7a0b8bda0c2696fd3e
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -466,16 +466,16 @@
 
 
 
-6795
+5475
 
-media_mixed.png
+media_video.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-6cb492ec51c0ff7a0b8bda0c2696fd3e
+9941f7f79951a3da5b992d3dd7a0e7f6
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -500,7 +500,7 @@
 
 
 
-5475
+6795
 
 media_data.png
 file
diff -Nru k3b-kde3-3.5.12/src/pics/quant/.svn/entries k3b-kde3-3.5.12/src/pics/quant/.svn/entries
--- k3b-kde3-3.5.12/src/pics/quant/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/pics/quant/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/pics/quant
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-progress_success.png
+dialog_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-504f7ab1b7f04caeffd6a5a31c3d05b8
+1a0c9d6a2a6144c0b5a144132d0ad63f
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-12045
+4365
 
-dialog_right.png
+progress_success.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-1a0c9d6a2a6144c0b5a144132d0ad63f
+504f7ab1b7f04caeffd6a5a31c3d05b8
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -92,20 +92,19 @@
 
 
 
-4365
+12045
 
-media_empty.png
+k3b.theme
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-95543162548010f5fe9e05c3e8120bbc
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:51.000000Z
+e4ac45ecfd972cb429ffae6a046a4bba
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
-has-props
 
 
 
@@ -126,19 +125,21 @@
 
 
 
-1580
+
+168
 
-k3b.theme
+media_empty.png
 file
 
 
 
 
-2010-02-03T02:25:51.000000Z
-e4ac45ecfd972cb429ffae6a046a4bba
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+95543162548010f5fe9e05c3e8120bbc
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
+has-props
 
 
 
@@ -159,8 +160,7 @@
 
 
 
-
-168
+1580
 
 media_none.png
 file
@@ -298,14 +298,14 @@
 
 5549
 
-project_right.png
+welcome_bg.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-19ea9b4241b31c692e64daf04e4e3f85
+439fe9a13b807eb1d78c43a8f43d1d83
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -330,16 +330,16 @@
 
 
 
-5629
+591644
 
-welcome_bg.png
+project_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-439fe9a13b807eb1d78c43a8f43d1d83
+19ea9b4241b31c692e64daf04e4e3f85
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -364,7 +364,7 @@
 
 
 
-591644
+5629
 
 progress_working.png
 file
@@ -400,14 +400,14 @@
 
 11648
 
-media_video.png
+media_mixed.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-e281b46bb912f4f53f38ff94322a4392
+185fa4b65e5bd6f1013a6e74adca0dc8
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -432,16 +432,16 @@
 
 
 
-10158
+3430
 
-media_mixed.png
+media_video.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-185fa4b65e5bd6f1013a6e74adca0dc8
+e281b46bb912f4f53f38ff94322a4392
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -466,7 +466,7 @@
 
 
 
-3430
+10158
 
 media_data.png
 file
diff -Nru k3b-kde3-3.5.12/src/pics/RobsTheme/.svn/entries k3b-kde3-3.5.12/src/pics/RobsTheme/.svn/entries
--- k3b-kde3-3.5.12/src/pics/RobsTheme/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/pics/RobsTheme/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/pics/RobsTheme
 svn://anonsvn.kde.org/home/kde
 
@@ -26,14 +26,14 @@
 
 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
 
-progress_success.png
+dialog_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-d2056f05b815dd00a857463eeb127d16
+60f912f75ecc1522b716f94e750f885f
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -58,16 +58,16 @@
 
 
 
-10253
+2846
 
-dialog_right.png
+progress_success.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-60f912f75ecc1522b716f94e750f885f
+d2056f05b815dd00a857463eeb127d16
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -92,20 +92,19 @@
 
 
 
-2846
+10253
 
-media_empty.png
+k3b.theme
 file
 
 
 
 
-2010-03-24T03:53:09.000000Z
-c11eeec339135c7944d5ce3cf24f4fd4
-2010-03-23T23:21:57.380568Z
-1106812
+2010-02-03T02:25:47.000000Z
+fb295e8b879dadb8548c0851cc68cfdc
+2010-02-03T02:15:56.930182Z
+1084400
 tpearson
-has-props
 
 
 
@@ -126,19 +125,21 @@
 
 
 
-4241
+
+146
 
-k3b.theme
+media_empty.png
 file
 
 
 
 
-2010-02-03T02:25:47.000000Z
-fb295e8b879dadb8548c0851cc68cfdc
-2010-02-03T02:15:56.930182Z
-1084400
+2010-03-24T03:53:09.000000Z
+c11eeec339135c7944d5ce3cf24f4fd4
+2010-03-23T23:21:57.380568Z
+1106812
 tpearson
+has-props
 
 
 
@@ -159,8 +160,7 @@
 
 
 
-
-146
+4241
 
 media_none.png
 file
@@ -298,14 +298,14 @@
 
 2439
 
-project_right.png
+welcome_bg.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-93aaecff717c458639e223e1b4336d7c
+ac5a52128917a63a44382e1d86fa996c
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -330,16 +330,16 @@
 
 
 
-2377
+75489
 
-welcome_bg.png
+project_right.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-ac5a52128917a63a44382e1d86fa996c
+93aaecff717c458639e223e1b4336d7c
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -364,7 +364,7 @@
 
 
 
-75489
+2377
 
 progress_working.png
 file
@@ -400,14 +400,14 @@
 
 6999
 
-media_video.png
+media_mixed.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-e0859d4ab42f0a1141763fa389332486
+a616a2ad4d410231932674b4ffc70e51
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -432,16 +432,16 @@
 
 
 
-4335
+8749
 
-media_mixed.png
+media_video.png
 file
 
 
 
 
 2010-03-24T03:53:09.000000Z
-a616a2ad4d410231932674b4ffc70e51
+e0859d4ab42f0a1141763fa389332486
 2010-03-23T23:21:57.380568Z
 1106812
 tpearson
@@ -466,7 +466,7 @@
 
 
 
-8749
+4335
 
 media_data.png
 file
diff -Nru k3b-kde3-3.5.12/src/pics/.svn/entries k3b-kde3-3.5.12/src/pics/.svn/entries
--- k3b-kde3-3.5.12/src/pics/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/pics/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/pics
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/projects/kostore/.svn/entries k3b-kde3-3.5.12/src/projects/kostore/.svn/entries
--- k3b-kde3-3.5.12/src/projects/kostore/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/projects/kostore/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/projects/kostore
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/projects/.svn/entries k3b-kde3-3.5.12/src/projects/.svn/entries
--- k3b-kde3-3.5.12/src/projects/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/projects/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/projects
 svn://anonsvn.kde.org/home/kde
 
@@ -60,14 +60,14 @@
 
 1110
 
-k3bdataimagesettingswidget.cpp
+k3bmixedview.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-be6109a619c3d0091b006995f0752a93
+c2eac23cc36eaadd2ceb789d8bd72687
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -92,7 +92,7 @@
 
 
 
-12960
+4519
 
 k3bbootimageview.cpp
 file
@@ -128,14 +128,14 @@
 
 7880
 
-k3bmixedview.cpp
+k3bdataimagesettingswidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-c2eac23cc36eaadd2ceb789d8bd72687
+be6109a619c3d0091b006995f0752a93
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -160,7 +160,7 @@
 
 
 
-4519
+12960
 
 k3bvideodvdview.h
 file
@@ -332,14 +332,14 @@
 
 12179
 
-k3bdatafileview.h
+k3bdatavolumedescwidget.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-ef82a696c95a7a5a31951886c87dcb0b
+ad73844327b30d4883c8c73994125e86
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -364,16 +364,16 @@
 
 
 
-2706
+1024
 
-k3bdatavolumedescwidget.h
+k3bdatafileview.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-ad73844327b30d4883c8c73994125e86
+ef82a696c95a7a5a31951886c87dcb0b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -398,7 +398,7 @@
 
 
 
-1024
+2706
 
 k3baudioeditorwidget.cpp
 file
@@ -468,14 +468,14 @@
 
 933
 
-k3bmovixburndialog.h
+k3bencodingconverter.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-2240f159742c502ccb7d3813a3d64015
+a31c38a47dc71eac21d47044449458b2
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -500,16 +500,16 @@
 
 
 
-1502
+2793
 
-k3bencodingconverter.cpp
+k3bmovixburndialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-a31c38a47dc71eac21d47044449458b2
+2240f159742c502ccb7d3813a3d64015
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -534,7 +534,7 @@
 
 
 
-2793
+1502
 
 k3bview.h
 file
@@ -1185,14 +1185,14 @@
 
 1968
 
-k3baudioeditorwidget.h
+k3baudiotrackview.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-871650b1e83908ecaa5792ebd48f203c
+c63406abeee5ac0360cd5714fcde422b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1217,16 +1217,16 @@
 
 
 
-6066
+30007
 
-k3baudiotrackview.cpp
+k3baudioeditorwidget.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-c63406abeee5ac0360cd5714fcde422b
+871650b1e83908ecaa5792ebd48f203c
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1251,16 +1251,16 @@
 
 
 
-30007
+6066
 
-base_k3bdataimagesettings.ui
+k3bprojectburndialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-fcdf41b98e568f77651b45e70c64d982
+f621886a6ac8667d8562673b6065ace8
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1285,16 +1285,16 @@
 
 
 
-12432
+4724
 
-k3baudiotrackaddingdialog.h
+k3bmixedburndialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-dac42c9682b7e56503b7b01c3699bbc6
+c0a131722da7050bc780d1f2dd9fc64b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1319,16 +1319,16 @@
 
 
 
-2558
+1937
 
-k3bmixedburndialog.h
+k3baudiotrackaddingdialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-c0a131722da7050bc780d1f2dd9fc64b
+dac42c9682b7e56503b7b01c3699bbc6
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1353,16 +1353,16 @@
 
 
 
-1937
+2558
 
-k3bprojectburndialog.h
+base_k3bdataimagesettings.ui
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-f621886a6ac8667d8562673b6065ace8
+fcdf41b98e568f77651b45e70c64d982
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1387,16 +1387,16 @@
 
 
 
-4724
+12432
 
-k3bdatadirtreeview.cpp
+k3bencodingconverter.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-08004efba369ea796bb833fdbad88fc6
+6e28dd94f3c3e5ae2bafd94084eb57c4
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1421,16 +1421,16 @@
 
 
 
-14435
+1754
 
-k3bencodingconverter.h
+k3bdatadirtreeview.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-6e28dd94f3c3e5ae2bafd94084eb57c4
+08004efba369ea796bb833fdbad88fc6
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1455,7 +1455,7 @@
 
 
 
-1754
+14435
 
 k3baudiodatasourceviewitem.cpp
 file
@@ -1491,14 +1491,14 @@
 
 2842
 
-k3bdataadvancedimagesettingswidget.cpp
+k3bvcdlistviewitem.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-11528b7f06e56428d82dc358720ea18d
+1c836f15fa7e22284f1ae369ac81cc6d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1523,16 +1523,16 @@
 
 
 
-12406
+1350
 
-k3bvcdlistviewitem.h
+k3bdataadvancedimagesettingswidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-1c836f15fa7e22284f1ae369ac81cc6d
+11528b7f06e56428d82dc358720ea18d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1557,16 +1557,16 @@
 
 
 
-1350
+12406
 
-k3baudiotracktrmlookupdialog.h
+k3bvcdburndialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-433c0a607c06eb5254db75c3ac269c41
+04fcc59fba975566c2572152358e985d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1591,16 +1591,16 @@
 
 
 
-1400
+4057
 
-k3bvcdburndialog.h
+k3baudiotracktrmlookupdialog.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-04fcc59fba975566c2572152358e985d
+433c0a607c06eb5254db75c3ac269c41
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1625,16 +1625,16 @@
 
 
 
-4057
+1400
 
-base_k3bdatavolumedescwidget.ui
+k3bmovixlistview.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-7533db1c24aad4d5431ea48438411431
+0f20abff45ae2d35b068d7f781e78ba1
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1659,16 +1659,16 @@
 
 
 
-13686
+8238
 
-k3bmovixlistview.cpp
+base_k3bdatavolumedescwidget.ui
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-0f20abff45ae2d35b068d7f781e78ba1
+7533db1c24aad4d5431ea48438411431
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1693,7 +1693,7 @@
 
 
 
-8238
+13686
 
 k3bbootimagedialog.h
 file
@@ -1797,14 +1797,14 @@
 
 6154
 
-k3bdatapropertiesdialog.cpp
+k3baudiotrackdialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-7de7bc38a10c35ab757d3257e3d1461c
+903fbde44a18b5d004f57d94e7c73f71
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1829,16 +1829,16 @@
 
 
 
-9878
+2780
 
-k3baudiotrackdialog.cpp
+k3bdatapropertiesdialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-903fbde44a18b5d004f57d94e7c73f71
+7de7bc38a10c35ab757d3257e3d1461c
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1863,7 +1863,7 @@
 
 
 
-2780
+9878
 
 k3bmovixdvdburndialog.cpp
 file
@@ -1899,14 +1899,14 @@
 
 6233
 
-k3baudiotrackplayer.h
+k3bvcdlistview.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-68e273a58b092ecf6d2761f0f0c2e591
+2874cce180b098637cab276f1903dd49
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1931,16 +1931,16 @@
 
 
 
-1950
+2162
 
-k3bvcdlistview.h
+k3baudiotrackplayer.h
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-2874cce180b098637cab276f1903dd49
+68e273a58b092ecf6d2761f0f0c2e591
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -1965,7 +1965,7 @@
 
 
 
-2162
+1950
 
 k3bprojectplugindialog.h
 file
@@ -2001,14 +2001,14 @@
 
 1211
 
-k3baudiotrackaddingdialog.cpp
+k3bprojectburndialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-9f48378e99ca406861ded79178f57759
+e1c4dfb083df4432a8c1f24f2aedd578
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2033,7 +2033,7 @@
 
 
 
-8347
+13903
 
 k3bmixedburndialog.cpp
 file
@@ -2069,14 +2069,14 @@
 
 11646
 
-k3bprojectburndialog.cpp
+k3baudiotrackaddingdialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:52.000000Z
-e1c4dfb083df4432a8c1f24f2aedd578
+9f48378e99ca406861ded79178f57759
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2101,7 +2101,7 @@
 
 
 
-13903
+8347
 
 k3bfillstatusdisplay.cpp
 file
diff -Nru k3b-kde3-3.5.12/src/rip/.svn/entries k3b-kde3-3.5.12/src/rip/.svn/entries
--- k3b-kde3-3.5.12/src/rip/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/rip/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/rip
 svn://anonsvn.kde.org/home/kde
 
@@ -706,14 +706,14 @@
 
 1901
 
-k3bcddbpatternwidget.h
+k3baudiocdview.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-5ab1c6d339e49cb69d6dc76ac5739de5
+8bdb8f0ac019e48f267d45b77ef6ca99
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -738,16 +738,16 @@
 
 
 
-1239
+19809
 
-k3baudiocdview.cpp
+k3bcddbpatternwidget.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-8bdb8f0ac019e48f267d45b77ef6ca99
+5ab1c6d339e49cb69d6dc76ac5739de5
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -772,16 +772,16 @@
 
 
 
-19809
+1239
 
-k3baudioripthread.cpp
+k3baudiocdlistview.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-c97600060dec935c9cbbf28b8ccf8fc5
+009289a90fee96a1e1078e0e8bfc5f83
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -806,16 +806,16 @@
 
 
 
-17134
+1036
 
-k3baudiocdlistview.h
+k3baudioripthread.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-009289a90fee96a1e1078e0e8bfc5f83
+c97600060dec935c9cbbf28b8ccf8fc5
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -840,7 +840,7 @@
 
 
 
-1036
+17134
 
 k3baudioprojectconvertingdialog.cpp
 file
diff -Nru k3b-kde3-3.5.12/src/rip/videodvd/.svn/entries k3b-kde3-3.5.12/src/rip/videodvd/.svn/entries
--- k3b-kde3-3.5.12/src/rip/videodvd/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/rip/videodvd/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/rip/videodvd
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/sounds/.svn/entries k3b-kde3-3.5.12/src/sounds/.svn/entries
--- k3b-kde3-3.5.12/src/sounds/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/sounds/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src/sounds
 svn://anonsvn.kde.org/home/kde
 
diff -Nru k3b-kde3-3.5.12/src/.svn/entries k3b-kde3-3.5.12/src/.svn/entries
--- k3b-kde3-3.5.12/src/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/src/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,7 +1,7 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b/src
 svn://anonsvn.kde.org/home/kde
 
@@ -536,14 +536,14 @@
 
 1185
 
-k3bwidgetshoweffect.h
+k3b.desktop
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-2ab993a90270039095b6b51872344110
+06a327627367da29d73bd28be87c729b
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -568,7 +568,7 @@
 
 
 
-3076
+5227
 
 k3bprojectmanager.h
 file
@@ -604,14 +604,14 @@
 
 2070
 
-k3b.desktop
+k3bwidgetshoweffect.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-06a327627367da29d73bd28be87c729b
+2ab993a90270039095b6b51872344110
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -636,7 +636,7 @@
 
 
 
-5227
+3076
 
 k3bstatusbarmanager.h
 file
@@ -672,6 +672,9 @@
 
 1420
 
+misc
+dir
+
 k3bjobprogressosd.h
 file
 
@@ -706,17 +709,14 @@
 
 2161
 
-misc
-dir
-
-k3bemptydiscwaiter.h
+k3bdatamodewidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-3e47c4bd2f73d3eda31cc861225f9d74
+74a3e1867a428180b00d62b38d8ec529
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -741,16 +741,16 @@
 
 
 
-3452
+2965
 
-k3bdatamodewidget.cpp
+k3bemptydiscwaiter.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-74a3e1867a428180b00d62b38d8ec529
+3e47c4bd2f73d3eda31cc861225f9d74
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -775,7 +775,7 @@
 
 
 
-2965
+3452
 
 k3bmedium.h
 file
@@ -2010,14 +2010,14 @@
 
 1803
 
-k3binteractiondialog.cpp
+k3bdiroperator.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-d467bf53e8d2c881cba7d4e402b65cc9
+a1c86f7b5a9c40b861bfaa86c798801c
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2042,16 +2042,16 @@
 
 
 
-16700
+1762
 
-k3bdiroperator.h
+k3binteractiondialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-a1c86f7b5a9c40b861bfaa86c798801c
+d467bf53e8d2c881cba7d4e402b65cc9
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2076,7 +2076,7 @@
 
 
 
-1762
+16700
 
 k3bdiskinfoview.cpp
 file
@@ -2180,14 +2180,14 @@
 
 2562
 
-k3bapplication.h
+k3bmediacache.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-1bda21e0331cbcb7bda55e3bf0376fc1
+8024dfd91ce96f7e3aa3b4ef45c44568
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2212,16 +2212,16 @@
 
 
 
-3507
+3901
 
-k3bmediacache.h
+k3bapplication.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-8024dfd91ce96f7e3aa3b4ef45c44568
+1bda21e0331cbcb7bda55e3bf0376fc1
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2246,7 +2246,7 @@
 
 
 
-3901
+3507
 
 k3bfileview.cpp
 file
@@ -2455,14 +2455,14 @@
 option
 dir
 
-k3btooltip.cpp
+k3bsplash.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-6319fa51b4275e3d3325fbd2725ce65d
+28a4fd41ca417a2be3b31cab45d2899f
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2487,16 +2487,16 @@
 
 
 
-5034
+3496
 
-k3bsplash.cpp
+k3btooltip.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-28a4fd41ca417a2be3b31cab45d2899f
+6319fa51b4275e3d3325fbd2725ce65d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2521,7 +2521,7 @@
 
 
 
-3496
+5034
 
 mimetypes
 dir
@@ -2560,14 +2560,14 @@
 
 6893
 
-k3bwelcomewidget.cpp
+k3bui.rc
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-a572dd9bdd1f2c4364fc718d57fefc83
+4737cd4fbe46ac2379518bd040bd9d85
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2592,16 +2592,16 @@
 
 
 
-12776
+2279
 
-k3bui.rc
+k3bwelcomewidget.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-4737cd4fbe46ac2379518bd040bd9d85
+a572dd9bdd1f2c4364fc718d57fefc83
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2626,7 +2626,7 @@
 
 
 
-2279
+12776
 
 k3bdebuggingoutputdialog.h
 file
@@ -2696,14 +2696,14 @@
 
 1771
 
-k3bapplication.cpp
+k3bmediacache.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-0c4b3876f4f0fd9e48f790fb4fb97dbc
+b5eba9007ae6491af0ae09dd2733bbdc
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2728,16 +2728,16 @@
 
 
 
-12251
+8787
 
-k3bmediacache.cpp
+k3bapplication.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-b5eba9007ae6491af0ae09dd2733bbdc
+0c4b3876f4f0fd9e48f790fb4fb97dbc
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2762,16 +2762,16 @@
 
 
 
-8787
+12251
 
-k3bmediaselectiondialog.cpp
+k3binterface.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-427e9651115eb857d6cd2224ed18a991
+214fba6b69e3f6161b51f77615981555
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2796,16 +2796,16 @@
 
 
 
-3362
+2372
 
-k3binterface.h
+k3bmediaselectiondialog.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-214fba6b69e3f6161b51f77615981555
+427e9651115eb857d6cd2224ed18a991
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -2830,7 +2830,7 @@
 
 
 
-2372
+3362
 
 k3bthemedlabel.cpp
 file
@@ -3141,14 +3141,14 @@
 
 1284
 
-k3btooltip.h
+k3bsplash.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-452968d628b83551e096dcca31b7f086
+5daa22da2437d696540e2c64b8c65b82
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3173,16 +3173,16 @@
 
 
 
-1793
+994
 
-k3bsplash.h
+k3btooltip.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-5daa22da2437d696540e2c64b8c65b82
+452968d628b83551e096dcca31b7f086
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3207,16 +3207,16 @@
 
 
 
-994
+1793
 
-k3bwidgetshoweffect.cpp
+k3bprojectmanager.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-411bafa92219eaca4cdbeff0cec3e4c5
+de7c998c1f5e0754bdcf0762c0382958
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3241,16 +3241,16 @@
 
 
 
-4261
+18255
 
-k3bprojectmanager.cpp
+k3bwidgetshoweffect.cpp
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-de7c998c1f5e0754bdcf0762c0382958
+411bafa92219eaca4cdbeff0cec3e4c5
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3275,7 +3275,7 @@
 
 
 
-18255
+4261
 
 k3bpassivepopup.h
 file
@@ -3617,6 +3617,9 @@
 
 1827
 
+sounds
+dir
+
 k3bfiletreeview.cpp
 file
 
@@ -3651,7 +3654,7 @@
 
 20476
 
-sounds
+konqi
 dir
 
 k3bappdevicemanager.h
@@ -3688,9 +3691,6 @@
 
 2974
 
-konqi
-dir
-
 k3bdiskinfoview.h
 file
 
@@ -3725,14 +3725,14 @@
 
 1226
 
-k3bservicemenuinstaller.h
+eventsrc
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-580d1b4044d3df9f642efc4bd0cd870d
+88a7149ad4a03ceecf0276e853b2d149
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3757,16 +3757,16 @@
 
 
 
-1343
+14798
 
-eventsrc
+k3bservicemenuinstaller.h
 file
 
 
 
 
 2010-02-03T02:25:54.000000Z
-88a7149ad4a03ceecf0276e853b2d149
+580d1b4044d3df9f642efc4bd0cd870d
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -3791,7 +3791,10 @@
 
 
 
-14798
+1343
+
+rip
+dir
 
 k3bsidepanel.h
 file
@@ -3827,9 +3830,6 @@
 
 1207
 
-rip
-dir
-
 k3bfirstrun.cpp
 file
 
diff -Nru k3b-kde3-3.5.12/.svn/entries k3b-kde3-3.5.12/.svn/entries
--- k3b-kde3-3.5.12/.svn/entries	2010-03-24 03:53:10.000000000 +0000
+++ k3b-kde3-3.5.12/.svn/entries	2010-09-03 22:55:48.000000000 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-1106894
+1171461
 svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b
 svn://anonsvn.kde.org/home/kde
 
 
 
-2010-03-23T23:21:57.380568Z
-1106812
+2010-08-17T22:05:47.881169Z
+1164898
 tpearson
 has-props
 
@@ -97,19 +97,16 @@
 
 65
 
-libk3bdevice
-dir
-
 configure.in
 file
 
 
 
 
-2010-02-03T02:26:06.000000Z
-dca96016b02ff99be432ee50b61c249a
-2010-02-03T02:15:56.930182Z
-1084400
+2010-09-03T21:55:48.000000Z
+4fa3a0725aab864a8d7b44878675fe71
+2010-08-17T20:56:56.703893Z
+1164883
 tpearson
 
 
@@ -132,9 +129,9 @@
 
 
 
-36591
+37014
 
-src
+libk3bdevice
 dir
 
 ChangeLog
@@ -171,6 +168,9 @@
 
 36837
 
+src
+dir
+
 configure.in.in
 file
 
@@ -273,14 +273,20 @@
 
 20403
 
-config.h.in
+k3bsetup
+dir
+
+kioslaves
+dir
+
+RELEASE_HOWTO
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-98120c928e5c91f0096084be02a34eb1
+8f9c64a08e78538fad719fbd341a7b00
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -305,16 +311,16 @@
 
 
 
-8264
+1256
 
-RELEASE_HOWTO
+config.h.in
 file
 
 
 
 
 2010-02-03T02:26:06.000000Z
-8f9c64a08e78538fad719fbd341a7b00
+98120c928e5c91f0096084be02a34eb1
 2010-02-03T02:15:56.930182Z
 1084400
 tpearson
@@ -339,13 +345,7 @@
 
 
 
-1256
-
-kioslaves
-dir
-
-k3bsetup
-dir
+8264
 
 doc
 dir
diff -Nru k3b-kde3-3.5.12/.svn/text-base/configure.in.svn-base k3b-kde3-3.5.12/.svn/text-base/configure.in.svn-base
--- k3b-kde3-3.5.12/.svn/text-base/configure.in.svn-base	2010-02-03 02:25:42.000000000 +0000
+++ k3b-kde3-3.5.12/.svn/text-base/configure.in.svn-base	2010-09-03 22:55:48.000000000 +0100
@@ -781,6 +781,20 @@
 		],
 		[], [], [])
   ])
+
+  if test "$have_mpc" = "no"; then
+    KDE_CHECK_HEADERS(mpc/mpcdec.h, [
+        AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+                have_mpc=yes
+                MPC_LIBS="-lmpcdec"
+                AC_DEFINE(
+                        MPC_HEADER_FILE,
+                        <mpc/mpcdec.h>,
+                        [The header to include for MPC decoding.])
+                ],
+                [], [], [])
+    ])
+  fi
 	
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(musepack/musepack.h, [