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

4 files changed, 4 insertions, 4 deletions

diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 7b2a98aa1..10543db0e 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -307,7 +307,7 @@ tdelibs (4:3.5.8-3ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes:
    - --with-distribution="Debian (`lsb_release --codename --short`) $(DEB_VERSION)"
-   - binary-install/tdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
+   - binary-install/tdelibs-data installs abouttde-kubuntu.png.uu and cr*-device-system.png.uu
    - none of libgamin-dev, libfam-dev
    - stop tdelibs4-dev depending on gamin/fam
    - don't install .svgz icons in tdelibs-data.install
@@ -2184,7 +2184,7 @@ tdelibs (4:3.4.0-0ubuntu2) hoary; urgency=low
 
 tdelibs (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Add aboutkde-kubuntu.png.uu konqi image for about kde dialogue
+  * Add abouttde-kubuntu.png.uu konqi image for about kde dialogue
   * Add kubuntu_03_applications_menu_editors_move.diff moving Editors menu entries to Utilities
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 01:04:26 +0000
diff --git a/ubuntu/maverick/tdelibs/debian/icons/aboutkde-kubuntu.png.uu b/ubuntu/maverick/tdelibs/debian/icons/abouttde-kubuntu.png.uu
index 9c8b56292..9c8b56292 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/aboutkde-kubuntu.png.uu
+++ b/ubuntu/maverick/tdelibs/debian/icons/abouttde-kubuntu.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index edc69c220..153082462 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -69,7 +69,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
-#	uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png debian/icons/aboutkde-kubuntu.png.uu
+#	uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/abouttde.png debian/icons/abouttde-kubuntu.png.uu
 
 	uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/16x16/devices/system.png debian/icons/cr16-device-system.png.uu
 	uudecode -o debian/tdelibs-data-trinity/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png debian/icons/cr22-device-system.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 1485494ca..a71b46855 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -183,7 +183,7 @@ debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
 debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
 debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
 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/abouttde.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/tdewidgets/pics/tdeactionselector.png