From fa7514425a0d5d67bcfb3bbf7e9e1844c0ea1f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 23 Dec 2013 13:09:13 +0100
Subject: [PATCH] Rename kdewidgets => tdewidgets

---
 acinclude.m4             | 8 ++++----
 admin                    | 2 +-
 cmake                    | 2 +-
 kdiff3plugin/po/Makefile | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9340080..ce0f0d5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -606,8 +606,8 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
-            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
-            AC_SUBST(MAKEKDEWIDGETS)
+            KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
+            AC_SUBST(MAKETDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
@@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1821,7 +1821,7 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
 by tdelibs])
diff --git a/admin b/admin
index 9f76866..bae6da3 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 9f768663f33e818a14dff26b403bae12a447a9ec
+Subproject commit bae6da3fa84fa5d9cce73cf89968d61f1766e91d
diff --git a/cmake b/cmake
index b51b691..d29f6d6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b51b691c8b18f5e7cf01689752c9b03a4212bdf6
+Subproject commit d29f6d6b10fe1748c2a5fb1f9f2cdcecc473d354
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index 4e30989..829f22b 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -168,7 +168,7 @@ LIB_XRENDER =
 LN_S = ln -s
 LTLIBOBJS = 
 MAKEINFO = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run makeinfo
-MAKEKDEWIDGETS = 
+MAKETDEWIDGETS = 
 MCOPIDL = ${prefix}/bin/mcopidl
 MEINPROC = ${prefix}/bin/meinproc
 MOC = /usr/share/qt3/bin/moc