Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

4 files changed, 47 insertions, 47 deletions

diff --git a/ubuntu/precise/tdelibs/debian/copyright b/ubuntu/precise/tdelibs/debian/copyright
index 0e7882d18..98a9479a6 100644
--- a/ubuntu/precise/tdelibs/debian/copyright
+++ b/ubuntu/precise/tdelibs/debian/copyright
@@ -15,7 +15,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
 libartskde, interfaces, tdeabc, kate, tdecert, tdeconf_update, tdecore, kded, tdefx,
-tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, tdeio, tdeioslave, kjs,
+tdeprint, tdesu, tdeui, tdewidgets, tdehtml, kimgio, kinit, tdeio, tdeioslave, kjs,
 tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
 LGPL
diff --git a/ubuntu/precise/tdelibs/debian/man/maketdewidgets-trinity.1 b/ubuntu/precise/tdelibs/debian/man/maketdewidgets-trinity.1
index 087c7b575..e2a42792e 100644
--- a/ubuntu/precise/tdelibs/debian/man/maketdewidgets-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/maketdewidgets-trinity.1
@@ -1,5 +1,5 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH MAKEKDEWIDGETS 1 "Jun 2006" "K Desktop Environment" ""
+.TH MAKETDEWIDGETS 1 "Jun 2006" "K Desktop Environment" ""
 .SH NAME
 maketdewidgets
 \- Builds Qt widget plugins from an ini style description file.
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
index cdbc0eb68..c3c0b9135 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
@@ -186,49 +186,49 @@ debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdeactionselector.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdecmodule.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcolorbutton.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcolorcombo.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcombobox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdatepicker.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdatetable.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdatetimewidget.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdatewidget.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdialog.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublenuminput.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublespinbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdualcolorbutton.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/keditlistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontcombo.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontrequester.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kgradientselector.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khistorycombo.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khsselector.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kiconbutton.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kiconview.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kintnuminput.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kintspinbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kkeybutton.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kled.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klineedit.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistview.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpalettetable.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpasswordedit.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kprogress.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpushbutton.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/krestrictedline.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kruler.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ksqueezedtextlabel.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ktextbrowser.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ktextedit.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/ktimewidget.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlcomborequester.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurllabel.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kurlrequester.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdeactionselector.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kactivelabel.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kcharselect.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdecmodule.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kcolorbutton.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kcolorcombo.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kcombobox.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdatepicker.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdatetable.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdatetimewidget.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdatewidget.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdialog.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdoublenuminput.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdoublespinbox.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kdualcolorbutton.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/keditlistbox.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdefontcombo.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdefontrequester.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kgradientselector.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/khistorycombo.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/khsselector.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kiconbutton.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kiconview.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kintnuminput.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kintspinbox.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kkeybutton.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kled.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/klineedit.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdelistbox.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/tdelistview.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kpalettetable.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kpasswordedit.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kprogress.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kpushbutton.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/krestrictedline.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kruler.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/ksqueezedtextlabel.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/ktextbrowser.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/ktextedit.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/ktimewidget.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kurlcomborequester.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kurllabel.png
+debian/tmp/opt/trinity/share/apps/tdewidgets/pics/kurlrequester.png
 debian/tmp/opt/trinity/share/apps/tdehtml/css/html4.css
 debian/tmp/opt/trinity/share/apps/tdehtml/css/quirks.css
 debian/tmp/opt/trinity/share/apps/tdehtml/domain_info
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install
index c836b40b0..af088947e 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity.install
@@ -200,8 +200,8 @@ debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
 debian/tmp/opt/trinity/lib/trinity/libshellscript.so
-debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
-debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.so
+debian/tmp/opt/trinity/lib/trinity/plugins/designer/tdewidgets.la
+debian/tmp/opt/trinity/lib/trinity/plugins/designer/tdewidgets.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.la
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/asteroid.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.la