diff options
859 files changed, 7670 insertions, 7670 deletions
diff --git a/debian/lenny/applications/kaffeine/debian/changelog b/debian/lenny/applications/kaffeine/debian/changelog index ae8921760..3f11ad0ae 100644 --- a/debian/lenny/applications/kaffeine/debian/changelog +++ b/debian/lenny/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/debian/lenny/applications/kaffeine/debian/copyright b/debian/lenny/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/debian/lenny/applications/kaffeine/debian/copyright +++ b/debian/lenny/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/debian/lenny/applications/kmplayer/debian/changelog b/debian/lenny/applications/kmplayer/debian/changelog index 26a6aed53..233e1f465 100644 --- a/debian/lenny/applications/kmplayer/debian/changelog +++ b/debian/lenny/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/changelog b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/changelog +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control b/debian/lenny/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/control +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/lenny/applications/knetworkmanager8/debian/changelog b/debian/lenny/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/changelog +++ b/debian/lenny/applications/knetworkmanager8/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/lenny/applications/knetworkmanager8/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/control +++ b/debian/lenny/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/lenny/applications/knetworkmanager8/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/lenny/applications/knetworkmanager8/debian/control.in +++ b/debian/lenny/applications/knetworkmanager8/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/lenny/applications/knetworkmanager9/debian/control b/debian/lenny/applications/knetworkmanager9/debian/control index c32604bbf..efd256a36 100644 --- a/debian/lenny/applications/knetworkmanager9/debian/control +++ b/debian/lenny/applications/knetworkmanager9/debian/control @@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/lenny/applications/knetworkmanager9/debian/control.in b/debian/lenny/applications/knetworkmanager9/debian/control.in index e54418ea6..a5cefc2bb 100644 --- a/debian/lenny/applications/knetworkmanager9/debian/control.in +++ b/debian/lenny/applications/knetworkmanager9/debian/control.in @@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install index 7bed60e6c..a0e03ae3b 100644 --- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.install +++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.install @@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop -debian/tmp/opt/trinity/share/services/chalkscripting.desktop +debian/tmp/opt/trinity/share/services/chaltdescripting.desktop debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.install b/debian/lenny/applications/koffice/debian/chalk-trinity.install index 4df24b77e..66afcfbba 100644 --- a/debian/lenny/applications/koffice/debian/chalk-trinity.install +++ b/debian/lenny/applications/koffice/debian/chalk-trinity.install @@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so -debian/tmp/opt/trinity/lib/trinity/chalkscripting.la -debian/tmp/opt/trinity/lib/trinity/chalkscripting.so +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la @@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.* debian/tmp/opt/trinity/lib/libchalk_lms_*.so.* debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.* debian/tmp/opt/trinity/lib/libchalkrgb.so.* -debian/tmp/opt/trinity/lib/libchalkscripting.so.* +debian/tmp/opt/trinity/lib/libchaltdescripting.so.* debian/tmp/opt/trinity/lib/libchalkui.so.* debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.* diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..cdf64af56 100644 --- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian +++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1 diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install index 4b80b83ec..f28ee3bef 100644 --- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install +++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install @@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la debian/tmp/opt/trinity/lib/libchalkimage.so debian/tmp/opt/trinity/lib/libchalkrgb.la debian/tmp/opt/trinity/lib/libchalkrgb.so -debian/tmp/opt/trinity/lib/libchalkscripting.la -debian/tmp/opt/trinity/lib/libchalkscripting.so +debian/tmp/opt/trinity/lib/libchaltdescripting.la +debian/tmp/opt/trinity/lib/libchaltdescripting.so debian/tmp/opt/trinity/lib/libchalkui.la debian/tmp/opt/trinity/lib/libchalkui.so debian/tmp/opt/trinity/lib/libkrossapi.la diff --git a/debian/lenny/applications/kpowersave.cmake/debian/changelog b/debian/lenny/applications/kpowersave.cmake/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/lenny/applications/kpowersave.cmake/debian/changelog +++ b/debian/lenny/applications/kpowersave.cmake/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/lenny/applications/kpowersave/debian/changelog b/debian/lenny/applications/kpowersave/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/lenny/applications/kpowersave/debian/changelog +++ b/debian/lenny/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/changelog b/debian/lenny/applications/tde-style-qtcurve/debian/changelog index 3ff72d99c..f7612d81f 100644 --- a/debian/lenny/applications/tde-style-qtcurve/debian/changelog +++ b/debian/lenny/applications/tde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/debian/lenny/libraries/python-trinity/debian/control b/debian/lenny/libraries/python-trinity/debian/control index afacf68ee..cad02055c 100644 --- a/debian/lenny/libraries/python-trinity/debian/control +++ b/debian/lenny/libraries/python-trinity/debian/control @@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-trinity-trinity-dbg Priority: extra @@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/debian/lenny/metapackages/meta-tde/debian/changelog b/debian/lenny/metapackages/meta-tde/debian/changelog index 7c5da1b8f..c41106a4d 100644 --- a/debian/lenny/metapackages/meta-tde/debian/changelog +++ b/debian/lenny/metapackages/meta-tde/debian/changelog @@ -296,7 +296,7 @@ meta-kde (4:2.2) unstable; urgency=low meta-kde (4:2.1.44) unstable; urgency=low - * Fix libkmid | libkmid-alsa dep (Closes: #107585) + * Fix libtdemid | libtdemid-alsa dep (Closes: #107585) -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 @@ -395,7 +395,7 @@ task-kde (4:2.1.30) unstable; urgency=low task-kde (4:2.1.29) unstable; urgency=low - * New depends: kscreensaver, kdebase-audiolibs + * New depends: tdescreensaver, kdebase-audiolibs -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install index cd7b93d85..2ad412a7f 100644 --- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install +++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop -debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 +++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 +++ b/debian/lenny/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/lenny/tdeaddons/debian/konq-plugins-trinity.install b/debian/lenny/tdeaddons/debian/konq-plugins-trinity.install index c74edf4ce..15ec8f99e 100644 --- a/debian/lenny/tdeaddons/debian/konq-plugins-trinity.install +++ b/debian/lenny/tdeaddons/debian/konq-plugins-trinity.install @@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so debian/tmp/opt/trinity/lib/trinity/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer debian/tmp/opt/trinity/share/apps/fsview debian/tmp/opt/trinity/share/apps/imagerotation/orient.py debian/tmp/opt/trinity/share/apps/imagerotation/exif.py -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins debian/tmp/opt/trinity/share/apps/konqiconview debian/tmp/opt/trinity/share/apps/konqlistview debian/tmp/opt/trinity/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/debian/lenny/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/lenny/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/debian/lenny/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/lenny/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/debian/lenny/tdeartwork/debian/changelog b/debian/lenny/tdeartwork/debian/changelog index a3043310e..ddf857174 100644 --- a/debian/lenny/tdeartwork/debian/changelog +++ b/debian/lenny/tdeartwork/debian/changelog @@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since tdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low tdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on tdebase-bin (closes: #203185). + * Made tdescreensaver depend on tdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low tdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low tdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed tdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x. + * Renamed tdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index ee0ae9ba5..b0100a04c 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -13,8 +13,8 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-trinity +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -110,13 +110,13 @@ Description: wallpapers released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-trinity +Package: tdescreensaver-trinity Architecture: any Section: tde -Replaces: kscreensaver-trinity (<< 4:14.0.0) -Breaks: kscreensaver-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-trinity +Package: tdescreensaver-xsavers-trinity Architecture: any Section: tde -Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-trinity +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into Trinity. With this package installed you can select and/or configure @@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with Trinity, see the separate package - kscreensaver-trinity. This package does depend on the xscreensaver package, and + tdescreensaver-trinity. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into Trinity. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-webcollage-trinity +Package: tdescreensaver-xsavers-webcollage-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm +Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity screensaver configuration. @@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-extra-trinity +Package: tdescreensaver-xsavers-extra-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) +Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. diff --git a/debian/lenny/tdeartwork/debian/control.in b/debian/lenny/tdeartwork/debian/control.in index 1721be0bf..4b914794e 100644 --- a/debian/lenny/tdeartwork/debian/control.in +++ b/debian/lenny/tdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: tdeartwork Architecture: all Section: tde -Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: tde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install deleted file mode 100644 index a3a14e04c..000000000 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install deleted file mode 100644 index f11cf310b..000000000 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/lenny/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/debian/lenny/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 index 64a0a5c45..73456139b 100644 --- a/debian/lenny/tdeartwork/debian/man/kpartsaver-trinity.kss.1 +++ b/debian/lenny/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kpartsaver.kss \- Media screen saver for KDE +tdepartsaver.kss \- Media screen saver for KDE .SH SYNOPSIS -.B kpartsaver.kss +.B tdepartsaver.kss .RI "[ " generic-options " ]" [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | \fB\-\-demo\fP ] @@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE This program is part of the official KDE artwork module. .SH OPTIONS Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. .TP \fB\-\-setup\fP Set up the screen saver. diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules index 4e236c044..963f996bc 100755 --- a/debian/lenny/tdeartwork/debian/rules +++ b/debian/lenny/tdeartwork/debian/rules @@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png - cd kscreensaver/kxsconfig/ && ./update_hacks.sh + cd tdescreensaver/kxsconfig/ && ./update_hacks.sh -binary-install/kscreensaver-xsavers-extra-trinity:: - rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop +binary-install/tdescreensaver-xsavers-extra-trinity:: + rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-trinity.install index d65c099dc..012466480 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-trinity.install @@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss debian/tmp/opt/trinity/bin/kswarm.kss debian/tmp/opt/trinity/bin/kfountain.kss debian/tmp/opt/trinity/bin/kgravity.kss -debian/tmp/opt/trinity/bin/kpartsaver.kss +debian/tmp/opt/trinity/bin/tdepartsaver.kss debian/tmp/opt/trinity/bin/kpendulum.kss debian/tmp/opt/trinity/bin/kblob.kss debian/tmp/opt/trinity/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/trinity/share/apps/kfiresaver -debian/tmp/opt/trinity/share/apps/kscreensaver +debian/tmp/opt/trinity/share/apps/tdescreensaver diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-trinity.manpages b/debian/lenny/tdeartwork/debian/tdescreensaver-trinity.manpages index 839491dbc..294e72dd8 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-trinity.manpages +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-trinity.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1 debian/man/kgravity-trinity.kss.1 debian/man/klines-trinity.kss.1 debian/man/klorenz-trinity.kss.1 -debian/man/kpartsaver-trinity.kss.1 +debian/man/tdepartsaver-trinity.kss.1 debian/man/kpendulum-trinity.kss.1 debian/man/kpolygon-trinity.kss.1 debian/man/krotation-trinity.kss.1 diff --git a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install new file mode 100644 index 000000000..e2e812465 --- /dev/null +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-trinity.install index 901f852e1..901f852e1 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-trinity.install diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages index 356af4f32..356af4f32 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages diff --git a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers.README.Debian index 828861775..a41c9ad57 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers.README.Debian +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver-xsavers) only contains hooks for the standard +This package (tdescreensaver-xsavers) only contains hooks for the standard xscreensavers, so that they can be selected and/or configured through the KDE Control Centre. For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. +see the separate package tdescreensaver. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver.README.Debian b/debian/lenny/tdeartwork/debian/tdescreensaver.README.Debian index 68584d330..57a145f54 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver.README.Debian +++ b/debian/lenny/tdeartwork/debian/tdescreensaver.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver) no longer contains the hooks for the standard +This package (tdescreensaver) no longer contains the hooks for the standard xscreensavers. It only contains the additional screensavers that are specifically shipped with KDE. To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. +Centre, install the separate package tdescreensaver-xsavers. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/debian/lenny/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/debian/lenny/tdebase/debian/changelog +++ b/debian/lenny/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/debian/lenny/tdebase/debian/control.in +++ b/debian/lenny/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.install +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/debian/lenny/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.install b/debian/lenny/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/debian/lenny/tdebase/debian/konqueror-trinity.install +++ b/debian/lenny/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index c72887aaa..04b7019e4 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install +++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/debian/lenny/tdebase/debian/kscreensaver-trinity.pam b/debian/lenny/tdebase/debian/tdescreensaver-trinity.pam index 088a00503..9a2c74519 100644 --- a/debian/lenny/tdebase/debian/kscreensaver-trinity.pam +++ b/debian/lenny/tdebase/debian/tdescreensaver-trinity.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver # @include common-auth @include common-account diff --git a/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install index e29ab016c..764c26e42 100644 --- a/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install +++ b/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install @@ -11,7 +11,7 @@ #debian/tmp/opt/trinity/lib/libgtkxparts.so.0 #debian/tmp/opt/trinity/lib/libgtkxparts.so #debian/tmp/opt/trinity/lib/libgtkxparts.la -#debian/tmp/opt/trinity/include/xkparts +#debian/tmp/opt/trinity/include/xtdeparts #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so diff --git a/debian/lenny/tdegraphics/debian/kviewshell-trinity.install b/debian/lenny/tdegraphics/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/debian/lenny/tdegraphics/debian/kviewshell-trinity.install +++ b/debian/lenny/tdegraphics/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian b/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian +++ b/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-trinity-dev.install b/debian/lenny/tdegraphics/debian/tdegraphics-trinity-dev.install index 80d007db5..26f6ba6ea 100644 --- a/debian/lenny/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/debian/lenny/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/kfaximage.h -debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/tdemultipageInterface.h debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/kviewshell/history.h debian/tmp/opt/trinity/include/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/kviewshell/length.h debian/tmp/opt/trinity/include/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog index 60b5c5d56..6a9f72874 100644 --- a/debian/lenny/tdelibs/debian/changelog +++ b/debian/lenny/tdelibs/debian/changelog @@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow tdelibs5-dev co-installable alongside tdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-tdelibs-3.5.6.diff, 47_tdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_tdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_tdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low tdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from tdelibs4-dev + * Remove libtdednssd depend from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in tdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in tdelibs4-dev. - * Add depends on libkdnssd1-avahi from tdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in tdelibs4-dev. + * Add depends on libtdednssd1-avahi from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since + - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/tdelibs4-dev.install: - usr/include/kiobuffer.h - - usr/include/kwallettypes.h + - usr/include/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: tdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low tdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low tdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of tdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of tdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/debian/lenny/tdelibs/debian/copyright b/debian/lenny/tdelibs/debian/copyright index 7c67eaede..945a09ca9 100644 --- a/debian/lenny/tdelibs/debian/copyright +++ b/debian/lenny/tdelibs/debian/copyright @@ -14,9 +14,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx, -tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx, +tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/debian/lenny/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 index b61b06654..56c4f3bc6 100644 --- a/debian/lenny/tdelibs/debian/man/kunittestmodrunner-trinity.1 +++ b/debian/lenny/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 @@ -1,18 +1,18 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" .SH NAME -kunittestmodrunner +tdeunittestmodrunner \- a KDE command\-line application to run KUnitTest modules .SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. .SH OPTIONS .SS Options: .TP .BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] .TP .BR \-\-folder \ [ folder ] Only run tests modules which are found in the folder. Use the query option to select modules. [.] @@ -141,7 +141,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kunittestguimodrunner (1) +.BR tdeunittestguimodrunner (1) .sp 1 .TP .BR http://developer.kde.org diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install index 88bf85c86..9bcd52fc7 100644 --- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install @@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc debian/tmp/etc/trinity/language.codes debian/tmp/etc/trinity/ui/kprintpreviewui.rc debian/tmp/etc/trinity/ui/ui_standards.rc -debian/tmp/opt/trinity/share/applications/tde/kresources.desktop +debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml -debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd @@ -229,22 +229,22 @@ 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/khtml/css/html4.css -debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css -debian/tmp/opt/trinity/share/apps/khtml/domain_info -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml.rc +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 +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/trinity/share/apps/kjava/kjava.jar @@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC debian/tmp/opt/trinity/share/apps/LICENSES/BSD debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2 @@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook debian/tmp/opt/trinity/share/emoticons/Default/angry.png debian/tmp/opt/trinity/share/emoticons/Default/bat.png debian/tmp/opt/trinity/share/emoticons/Default/beer.png @@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio debian/tmp/opt/trinity/share/services/jpeg.kimgio debian/tmp/opt/trinity/share/services/katepart.desktop debian/tmp/opt/trinity/share/services/kbzip2filter.desktop -debian/tmp/opt/trinity/share/services/kcertpart.desktop +debian/tmp/opt/trinity/share/services/tdecertpart.desktop debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop debian/tmp/opt/trinity/share/services/kded/kssld.desktop -debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop +debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop debian/tmp/opt/trinity/share/services/kgzipfilter.desktop -debian/tmp/opt/trinity/share/services/khtml.desktop -debian/tmp/opt/trinity/share/services/khtmlimage.desktop +debian/tmp/opt/trinity/share/services/tdehtml.desktop +debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop debian/tmp/opt/trinity/share/services/kio_uiserver.desktop debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop debian/tmp/opt/trinity/share/services/kmailservice.protocol -debian/tmp/opt/trinity/share/services/kmultipart.desktop +debian/tmp/opt/trinity/share/services/tdemultipart.desktop debian/tmp/opt/trinity/share/services/knotify.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/trinity/share/services/kspell_aspell.desktop -debian/tmp/opt/trinity/share/services/kspell_hspell.desktop -debian/tmp/opt/trinity/share/services/kspell_ispell.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol @@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/trinity/share/servicetypes/kpart.desktop debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/trinity/share/servicetypes/krop.desktop debian/tmp/opt/trinity/share/servicetypes/krwp.desktop debian/tmp/opt/trinity/share/servicetypes/kscan.desktop -debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst index 452b17bfc..c6c9c016f 100644 --- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst +++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/trinity/colors/40\ Colors rm -f /etc/trinity/colors/Royal rm -f /etc/trinity/colors/Web - rm -f /etc/trinity/ktexteditor_autobookmarkerrc + rm -f /etc/trinity/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install index 30baf6aa3..6f7afbc0c 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp debian/tmp/opt/trinity/bin/dcopidlng debian/tmp/opt/trinity/bin/kconfig_compiler debian/tmp/opt/trinity/bin/ksvgtopng -debian/tmp/opt/trinity/bin/kunittestmodrunner +debian/tmp/opt/trinity/bin/tdeunittestmodrunner debian/tmp/opt/trinity/bin/makekdewidgets debian/tmp/opt/trinity/bin/preparetips @@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h debian/tmp/opt/trinity/include/khexedit/zoominterface.h -debian/tmp/opt/trinity/include/khtmldefaults.h -debian/tmp/opt/trinity/include/khtml_events.h -debian/tmp/opt/trinity/include/khtml_part.h -debian/tmp/opt/trinity/include/khtml_settings.h -debian/tmp/opt/trinity/include/khtmlview.h +debian/tmp/opt/trinity/include/tdehtmldefaults.h +debian/tmp/opt/trinity/include/tdehtml_events.h +debian/tmp/opt/trinity/include/tdehtml_part.h +debian/tmp/opt/trinity/include/tdehtml_settings.h +debian/tmp/opt/trinity/include/tdehtmlview.h debian/tmp/opt/trinity/include/khttpproxysocketdevice.h debian/tmp/opt/trinity/include/kicondialog.h debian/tmp/opt/trinity/include/kiconeffect.h @@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h debian/tmp/opt/trinity/include/kimagefilepreview.h debian/tmp/opt/trinity/include/kimageio.h debian/tmp/opt/trinity/include/kimiface.h -debian/tmp/opt/trinity/include/kimproxy.h -debian/tmp/opt/trinity/include/kimproxyiface.h +debian/tmp/opt/trinity/include/tdeimproxy.h +debian/tmp/opt/trinity/include/tdeimproxyiface.h debian/tmp/opt/trinity/include/kinputdialog.h debian/tmp/opt/trinity/include/kinstance.h debian/tmp/opt/trinity/include/kio/authinfo.h @@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h debian/tmp/opt/trinity/include/kio/tdesasl.h debian/tmp/opt/trinity/include/kio/kmdbase.h debian/tmp/opt/trinity/include/kio/kmdcodec.h -debian/tmp/opt/trinity/include/kio/kntlm.h +debian/tmp/opt/trinity/include/kio/tdentlm.h debian/tmp/opt/trinity/include/kio/metainfojob.h debian/tmp/opt/trinity/include/kio/netaccess.h debian/tmp/opt/trinity/include/kio/observer.h @@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h debian/tmp/opt/trinity/include/kmainwindowiface.h debian/tmp/opt/trinity/include/kmanagerselection.h debian/tmp/opt/trinity/include/kmdcodec.h -debian/tmp/opt/trinity/include/kmdichildarea.h -debian/tmp/opt/trinity/include/kmdichildfrmcaption.h -debian/tmp/opt/trinity/include/kmdichildfrm.h -debian/tmp/opt/trinity/include/kmdichildview.h -debian/tmp/opt/trinity/include/kmdidefines.h -debian/tmp/opt/trinity/include/kmdi/global.h -debian/tmp/opt/trinity/include/kmdiiterator.h -debian/tmp/opt/trinity/include/kmdilistiterator.h -debian/tmp/opt/trinity/include/kmdimainfrm.h -debian/tmp/opt/trinity/include/kmdi/mainwindow.h -debian/tmp/opt/trinity/include/kmdinulliterator.h -debian/tmp/opt/trinity/include/kmdi/tabwidget.h -debian/tmp/opt/trinity/include/kmditaskbar.h -debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h -debian/tmp/opt/trinity/include/kmditoolviewaccessor.h -debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h -debian/tmp/opt/trinity/include/kmediaplayer/player.h -debian/tmp/opt/trinity/include/kmediaplayer/view.h +debian/tmp/opt/trinity/include/tdemdichildarea.h +debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h +debian/tmp/opt/trinity/include/tdemdichildfrm.h +debian/tmp/opt/trinity/include/tdemdichildview.h +debian/tmp/opt/trinity/include/tdemdidefines.h +debian/tmp/opt/trinity/include/tdemdi/global.h +debian/tmp/opt/trinity/include/tdemdiiterator.h +debian/tmp/opt/trinity/include/tdemdilistiterator.h +debian/tmp/opt/trinity/include/tdemdimainfrm.h +debian/tmp/opt/trinity/include/tdemdi/mainwindow.h +debian/tmp/opt/trinity/include/tdemdinulliterator.h +debian/tmp/opt/trinity/include/tdemdi/tabwidget.h +debian/tmp/opt/trinity/include/tdemditaskbar.h +debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h +debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h +debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/trinity/include/tdemediaplayer/player.h +debian/tmp/opt/trinity/include/tdemediaplayer/view.h debian/tmp/opt/trinity/include/kmenubar.h debian/tmp/opt/trinity/include/kmessagebox.h debian/tmp/opt/trinity/include/kmimemagic.h @@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h debian/tmp/opt/trinity/include/kmimetype.h debian/tmp/opt/trinity/include/kmimetyperesolver.h debian/tmp/opt/trinity/include/kmountpoint.h -debian/tmp/opt/trinity/include/kmulticastsocketdevice.h -debian/tmp/opt/trinity/include/kmulticastsocket.h -debian/tmp/opt/trinity/include/kmultipledrag.h -debian/tmp/opt/trinity/include/kmultitabbar.h +debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h +debian/tmp/opt/trinity/include/tdemulticastsocket.h +debian/tmp/opt/trinity/include/tdemultipledrag.h +debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/knewstuff/engine.h @@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h debian/tmp/opt/trinity/include/kpanelappmenu.h debian/tmp/opt/trinity/include/kpanelextension.h debian/tmp/opt/trinity/include/kpanelmenu.h -debian/tmp/opt/trinity/include/kparts/browserextension.h -debian/tmp/opt/trinity/include/kparts/browserinterface.h -debian/tmp/opt/trinity/include/kparts/browserrun.h -debian/tmp/opt/trinity/include/kparts/componentfactory.h -debian/tmp/opt/trinity/include/kparts/dockmainwindow.h -debian/tmp/opt/trinity/include/kparts/event.h -debian/tmp/opt/trinity/include/kparts/factory.h -debian/tmp/opt/trinity/include/kparts/genericfactory.h -debian/tmp/opt/trinity/include/kparts/historyprovider.h -debian/tmp/opt/trinity/include/kparts/mainwindow.h -debian/tmp/opt/trinity/include/kparts/part.h -debian/tmp/opt/trinity/include/kparts/partmanager.h -debian/tmp/opt/trinity/include/kparts/plugin.h -debian/tmp/opt/trinity/include/kparts/statusbarextension.h +debian/tmp/opt/trinity/include/tdeparts/browserextension.h +debian/tmp/opt/trinity/include/tdeparts/browserinterface.h +debian/tmp/opt/trinity/include/tdeparts/browserrun.h +debian/tmp/opt/trinity/include/tdeparts/componentfactory.h +debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h +debian/tmp/opt/trinity/include/tdeparts/event.h +debian/tmp/opt/trinity/include/tdeparts/factory.h +debian/tmp/opt/trinity/include/tdeparts/genericfactory.h +debian/tmp/opt/trinity/include/tdeparts/historyprovider.h +debian/tmp/opt/trinity/include/tdeparts/mainwindow.h +debian/tmp/opt/trinity/include/tdeparts/part.h +debian/tmp/opt/trinity/include/tdeparts/partmanager.h +debian/tmp/opt/trinity/include/tdeparts/plugin.h +debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h debian/tmp/opt/trinity/include/kpassdlg.h debian/tmp/opt/trinity/include/kpassivepopup.h debian/tmp/opt/trinity/include/kpixmapeffect.h @@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h debian/tmp/opt/trinity/include/kreplacedialog.h debian/tmp/opt/trinity/include/kreplace.h debian/tmp/opt/trinity/include/kresolver.h -debian/tmp/opt/trinity/include/kresources/configdialog.h -debian/tmp/opt/trinity/include/kresources/configpage.h -debian/tmp/opt/trinity/include/kresources/configwidget.h -debian/tmp/opt/trinity/include/kresources/factory.h -debian/tmp/opt/trinity/include/kresources/manager.h -debian/tmp/opt/trinity/include/kresources/manageriface.h -debian/tmp/opt/trinity/include/kresources/managerimpl.h -debian/tmp/opt/trinity/include/kresources/resource.h -debian/tmp/opt/trinity/include/kresources/selectdialog.h +debian/tmp/opt/trinity/include/tderesources/configdialog.h +debian/tmp/opt/trinity/include/tderesources/configpage.h +debian/tmp/opt/trinity/include/tderesources/configwidget.h +debian/tmp/opt/trinity/include/tderesources/factory.h +debian/tmp/opt/trinity/include/tderesources/manager.h +debian/tmp/opt/trinity/include/tderesources/manageriface.h +debian/tmp/opt/trinity/include/tderesources/managerimpl.h +debian/tmp/opt/trinity/include/tderesources/resource.h +debian/tmp/opt/trinity/include/tderesources/selectdialog.h debian/tmp/opt/trinity/include/krestrictedline.h debian/tmp/opt/trinity/include/kreverseresolver.h debian/tmp/opt/trinity/include/krfcdate.h @@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h debian/tmp/opt/trinity/include/ksavefile.h debian/tmp/opt/trinity/include/kscan.h debian/tmp/opt/trinity/include/ksconfig.h -debian/tmp/opt/trinity/include/kscreensaver.h -debian/tmp/opt/trinity/include/kscreensaver_vroot.h +debian/tmp/opt/trinity/include/tdescreensaver.h +debian/tmp/opt/trinity/include/tdescreensaver_vroot.h debian/tmp/opt/trinity/include/kscrollview.h debian/tmp/opt/trinity/include/kselect.h debian/tmp/opt/trinity/include/kseparator.h @@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h debian/tmp/opt/trinity/include/ksortablevaluelist.h debian/tmp/opt/trinity/include/kspeech.h debian/tmp/opt/trinity/include/kspeechsink.h -debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h -debian/tmp/opt/trinity/include/kspell2/broker.h -debian/tmp/opt/trinity/include/kspell2/configdialog.h -debian/tmp/opt/trinity/include/kspell2/configwidget.h -debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h -debian/tmp/opt/trinity/include/kspell2/dialog.h -debian/tmp/opt/trinity/include/kspell2/dictionary.h -debian/tmp/opt/trinity/include/kspell2/filter.h -debian/tmp/opt/trinity/include/kspell2/highlighter.h -debian/tmp/opt/trinity/include/kspell2/settings.h -debian/tmp/opt/trinity/include/kspelldlg.h -debian/tmp/opt/trinity/include/kspell.h +debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h +debian/tmp/opt/trinity/include/tdespell2/broker.h +debian/tmp/opt/trinity/include/tdespell2/configdialog.h +debian/tmp/opt/trinity/include/tdespell2/configwidget.h +debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h +debian/tmp/opt/trinity/include/tdespell2/dialog.h +debian/tmp/opt/trinity/include/tdespell2/dictionary.h +debian/tmp/opt/trinity/include/tdespell2/filter.h +debian/tmp/opt/trinity/include/tdespell2/highlighter.h +debian/tmp/opt/trinity/include/tdespell2/settings.h +debian/tmp/opt/trinity/include/tdespelldlg.h +debian/tmp/opt/trinity/include/tdespell.h debian/tmp/opt/trinity/include/ksplashscreen.h debian/tmp/opt/trinity/include/ksqueezedtextlabel.h debian/tmp/opt/trinity/include/ksslall.h @@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h debian/tmp/opt/trinity/include/kstyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h -debian/tmp/opt/trinity/include/ksycocaentry.h -debian/tmp/opt/trinity/include/ksycoca.h -debian/tmp/opt/trinity/include/ksycocatype.h +debian/tmp/opt/trinity/include/tdesycocaentry.h +debian/tmp/opt/trinity/include/tdesycoca.h +debian/tmp/opt/trinity/include/tdesycocatype.h debian/tmp/opt/trinity/include/ksyntaxhighlighter.h debian/tmp/opt/trinity/include/ksystemtray.h debian/tmp/opt/trinity/include/ktabbar.h @@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h debian/tmp/opt/trinity/include/ktempfile.h debian/tmp/opt/trinity/include/ktextbrowser.h debian/tmp/opt/trinity/include/ktextedit.h -debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h -debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/configinterface.h -debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/document.h -debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h -debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/editinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h -debian/tmp/opt/trinity/include/ktexteditor/editor.h -debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/markinterface.h -debian/tmp/opt/trinity/include/ktexteditor/plugin.h -debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h -debian/tmp/opt/trinity/include/ktexteditor/printinterface.h -debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h -debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h -debian/tmp/opt/trinity/include/ktexteditor/undointerface.h -debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h -debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/view.h -debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/document.h +debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h +debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h +debian/tmp/opt/trinity/include/tdetexteditor/editor.h +debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/plugin.h +debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h +debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/view.h +debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h debian/tmp/opt/trinity/include/ktimewidget.h debian/tmp/opt/trinity/include/ktimezones.h debian/tmp/opt/trinity/include/ktimezonewidget.h @@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h debian/tmp/opt/trinity/include/ktypelist.h debian/tmp/opt/trinity/include/kuniqueapp.h debian/tmp/opt/trinity/include/kuniqueapplication.h -debian/tmp/opt/trinity/include/kunittest/module.h -debian/tmp/opt/trinity/include/kunittest/runner.h -debian/tmp/opt/trinity/include/kunittest/tester.h +debian/tmp/opt/trinity/include/tdeunittest/module.h +debian/tmp/opt/trinity/include/tdeunittest/runner.h +debian/tmp/opt/trinity/include/tdeunittest/tester.h debian/tmp/opt/trinity/include/kunload.h debian/tmp/opt/trinity/include/kurifilter.h debian/tmp/opt/trinity/include/kurlbar.h @@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h debian/tmp/opt/trinity/include/kuser.h debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h -debian/tmp/opt/trinity/include/kwallet.h -debian/tmp/opt/trinity/include/kwallettypes.h +debian/tmp/opt/trinity/include/tdewallet.h +debian/tmp/opt/trinity/include/tdewallettypes.h debian/tmp/opt/trinity/include/twindowinfo.h debian/tmp/opt/trinity/include/twindowlistmenu.h debian/tmp/opt/trinity/include/twin.h @@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h debian/tmp/opt/trinity/include/kxmlguifactory.h debian/tmp/opt/trinity/include/kxmlgui.h debian/tmp/opt/trinity/include/kzip.h -debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h -debian/tmp/opt/trinity/include/libkrandr/libkrandr.h -debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h -debian/tmp/opt/trinity/include/libkrandr/randr.h -debian/tmp/opt/trinity/include/libkrsync/krsync.h -debian/tmp/opt/trinity/include/libkmid/alsaout.h -debian/tmp/opt/trinity/include/libkmid/dattypes.h -debian/tmp/opt/trinity/include/libkmid/deviceman.h -debian/tmp/opt/trinity/include/libkmid/fmout.h -debian/tmp/opt/trinity/include/libkmid/gusout.h -debian/tmp/opt/trinity/include/libkmid/libkmid.h -debian/tmp/opt/trinity/include/libkmid/midfile.h -debian/tmp/opt/trinity/include/libkmid/midimapper.h -debian/tmp/opt/trinity/include/libkmid/midiout.h -debian/tmp/opt/trinity/include/libkmid/midispec.h -debian/tmp/opt/trinity/include/libkmid/midistat.h -debian/tmp/opt/trinity/include/libkmid/mt32togm.h -debian/tmp/opt/trinity/include/libkmid/notearray.h -debian/tmp/opt/trinity/include/libkmid/player.h -debian/tmp/opt/trinity/include/libkmid/synthout.h -debian/tmp/opt/trinity/include/libkmid/track.h -debian/tmp/opt/trinity/include/libkmid/voiceman.h +debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h +debian/tmp/opt/trinity/include/libtderandr/libtderandr.h +debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h +debian/tmp/opt/trinity/include/libtderandr/randr.h +debian/tmp/opt/trinity/include/libtdersync/tdersync.h +debian/tmp/opt/trinity/include/libtdemid/alsaout.h +debian/tmp/opt/trinity/include/libtdemid/dattypes.h +debian/tmp/opt/trinity/include/libtdemid/deviceman.h +debian/tmp/opt/trinity/include/libtdemid/fmout.h +debian/tmp/opt/trinity/include/libtdemid/gusout.h +debian/tmp/opt/trinity/include/libtdemid/libtdemid.h +debian/tmp/opt/trinity/include/libtdemid/midfile.h +debian/tmp/opt/trinity/include/libtdemid/midimapper.h +debian/tmp/opt/trinity/include/libtdemid/midiout.h +debian/tmp/opt/trinity/include/libtdemid/midispec.h +debian/tmp/opt/trinity/include/libtdemid/midistat.h +debian/tmp/opt/trinity/include/libtdemid/mt32togm.h +debian/tmp/opt/trinity/include/libtdemid/notearray.h +debian/tmp/opt/trinity/include/libtdemid/player.h +debian/tmp/opt/trinity/include/libtdemid/synthout.h +debian/tmp/opt/trinity/include/libtdemid/track.h +debian/tmp/opt/trinity/include/libtdemid/voiceman.h debian/tmp/opt/trinity/include/netwm_def.h debian/tmp/opt/trinity/include/netwm.h debian/tmp/opt/trinity/include/qxembed.h @@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la debian/tmp/opt/trinity/lib/libtdesu.so debian/tmp/opt/trinity/lib/libtdeui.la debian/tmp/opt/trinity/lib/libtdeui.so -debian/tmp/opt/trinity/lib/libkdnssd.la -debian/tmp/opt/trinity/lib/libkdnssd.so -debian/tmp/opt/trinity/lib/libkhtml.la -debian/tmp/opt/trinity/lib/libkhtml.so -debian/tmp/opt/trinity/lib/libkimproxy.la -debian/tmp/opt/trinity/lib/libkimproxy.so +debian/tmp/opt/trinity/lib/libtdednssd.la +debian/tmp/opt/trinity/lib/libtdednssd.so +debian/tmp/opt/trinity/lib/libtdehtml.la +debian/tmp/opt/trinity/lib/libtdehtml.so +debian/tmp/opt/trinity/lib/libtdeimproxy.la +debian/tmp/opt/trinity/lib/libtdeimproxy.so debian/tmp/opt/trinity/lib/libkio.la debian/tmp/opt/trinity/lib/libkio.so debian/tmp/opt/trinity/lib/libkjava.la debian/tmp/opt/trinity/lib/libkjava.so debian/tmp/opt/trinity/lib/libkjs.la debian/tmp/opt/trinity/lib/libkjs.so -debian/tmp/opt/trinity/lib/libkmdi2.la -debian/tmp/opt/trinity/lib/libkmdi2.so -debian/tmp/opt/trinity/lib/libkmdi.la -debian/tmp/opt/trinity/lib/libkmdi.so -debian/tmp/opt/trinity/lib/libkmediaplayer.la -debian/tmp/opt/trinity/lib/libkmediaplayer.so -debian/tmp/opt/trinity/lib/libkmid.la -debian/tmp/opt/trinity/lib/libkmid.so +debian/tmp/opt/trinity/lib/libtdemdi2.la +debian/tmp/opt/trinity/lib/libtdemdi2.so +debian/tmp/opt/trinity/lib/libtdemdi.la +debian/tmp/opt/trinity/lib/libtdemdi.so +debian/tmp/opt/trinity/lib/libtdemediaplayer.la +debian/tmp/opt/trinity/lib/libtdemediaplayer.so +debian/tmp/opt/trinity/lib/libtdemid.la +debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libknewstuff.so -debian/tmp/opt/trinity/lib/libkntlm.la -debian/tmp/opt/trinity/lib/libkntlm.so -debian/tmp/opt/trinity/lib/libkparts.la -debian/tmp/opt/trinity/lib/libkparts.so -debian/tmp/opt/trinity/lib/libkrandr.la -debian/tmp/opt/trinity/lib/libkrandr.so -debian/tmp/opt/trinity/lib/libkrsync.la -debian/tmp/opt/trinity/lib/libkrsync.so -debian/tmp/opt/trinity/lib/libkresources.la -debian/tmp/opt/trinity/lib/libkresources.so -debian/tmp/opt/trinity/lib/libkscreensaver.la -debian/tmp/opt/trinity/lib/libkscreensaver.so -debian/tmp/opt/trinity/lib/libkscript.la -debian/tmp/opt/trinity/lib/libkscript.so -debian/tmp/opt/trinity/lib/libkspell2.la -debian/tmp/opt/trinity/lib/libkspell2.so -debian/tmp/opt/trinity/lib/libkspell.la -debian/tmp/opt/trinity/lib/libkspell.so -debian/tmp/opt/trinity/lib/libktexteditor.la -debian/tmp/opt/trinity/lib/libktexteditor.so -debian/tmp/opt/trinity/lib/libkunittest.la -debian/tmp/opt/trinity/lib/libkunittest.so -debian/tmp/opt/trinity/lib/libkutils.la -debian/tmp/opt/trinity/lib/libkutils.so -debian/tmp/opt/trinity/lib/libkwalletbackend.la -debian/tmp/opt/trinity/lib/libkwalletbackend.so -debian/tmp/opt/trinity/lib/libkwalletclient.la -debian/tmp/opt/trinity/lib/libkwalletclient.so +debian/tmp/opt/trinity/lib/libtdentlm.la +debian/tmp/opt/trinity/lib/libtdentlm.so +debian/tmp/opt/trinity/lib/libtdeparts.la +debian/tmp/opt/trinity/lib/libtdeparts.so +debian/tmp/opt/trinity/lib/libtderandr.la +debian/tmp/opt/trinity/lib/libtderandr.so +debian/tmp/opt/trinity/lib/libtdersync.la +debian/tmp/opt/trinity/lib/libtdersync.so +debian/tmp/opt/trinity/lib/libtderesources.la +debian/tmp/opt/trinity/lib/libtderesources.so +debian/tmp/opt/trinity/lib/libtdescreensaver.la +debian/tmp/opt/trinity/lib/libtdescreensaver.so +debian/tmp/opt/trinity/lib/libtdescript.la +debian/tmp/opt/trinity/lib/libtdescript.so +debian/tmp/opt/trinity/lib/libtdespell2.la +debian/tmp/opt/trinity/lib/libtdespell2.so +debian/tmp/opt/trinity/lib/libtdespell.la +debian/tmp/opt/trinity/lib/libtdespell.so +debian/tmp/opt/trinity/lib/libtdetexteditor.la +debian/tmp/opt/trinity/lib/libtdetexteditor.so +debian/tmp/opt/trinity/lib/libtdeunittest.la +debian/tmp/opt/trinity/lib/libtdeunittest.so +debian/tmp/opt/trinity/lib/libtdeutils.la +debian/tmp/opt/trinity/lib/libtdeutils.so +debian/tmp/opt/trinity/lib/libtdewalletbackend.la +debian/tmp/opt/trinity/lib/libtdewalletbackend.so +debian/tmp/opt/trinity/lib/libtdewalletclient.la +debian/tmp/opt/trinity/lib/libtdewalletclient.so debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages index af14a7e71..e5756a2db 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-trinity.1 ./debian/man/ksvgtopng-trinity.1 -./debian/man/kunittestmodrunner-trinity.1 +./debian/man/tdeunittestmodrunner-trinity.1 ./debian/man/makekdewidgets-trinity.1 ./debian/man/preparetips-trinity.1 diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install index 80a4b789c..4d1bb325b 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install @@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so debian/tmp/opt/trinity/lib/trinity/kcmshell.la debian/tmp/opt/trinity/lib/trinity/kcmshell.so debian/tmp/opt/trinity/lib/trinity/kconf_update.la @@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so debian/tmp/opt/trinity/lib/trinity/kded_kssld.la debian/tmp/opt/trinity/lib/trinity/kded_kssld.so -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so debian/tmp/opt/trinity/lib/trinity/kded.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so @@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so debian/tmp/opt/trinity/lib/trinity/kimg_dds.la debian/tmp/opt/trinity/lib/trinity/kimg_dds.so debian/tmp/opt/trinity/lib/trinity/kimg_eps.la @@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la debian/tmp/opt/trinity/lib/trinity/klauncher.so debian/tmp/opt/trinity/lib/trinity/knotify.la debian/tmp/opt/trinity/lib/trinity/knotify.so -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so debian/tmp/opt/trinity/lib/trinity/libkatepart.la debian/tmp/opt/trinity/lib/trinity/libkatepart.so -debian/tmp/opt/trinity/lib/trinity/libkcertpart.la -debian/tmp/opt/trinity/lib/trinity/libkcertpart.so +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so -debian/tmp/opt/trinity/lib/trinity/libkmultipart.la -debian/tmp/opt/trinity/lib/trinity/libkmultipart.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +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 @@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0 debian/tmp/opt/trinity/lib/libtdeui.so.4 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0 -debian/tmp/opt/trinity/lib/libkdnssd.so.1 -debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/trinity/lib/libkhtml.so.4 -debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdednssd.so.1 +debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdehtml.so.4 +debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/trinity/lib/libkio.so.4 debian/tmp/opt/trinity/lib/libkio.so.4.2.0 debian/tmp/opt/trinity/lib/libkjava.so.1 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0 debian/tmp/opt/trinity/lib/libkjs.so.1 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0 -debian/tmp/opt/trinity/lib/libkmdi2.so.1 -debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmdi.so.1 -debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/trinity/lib/libkmid.so.0 -debian/tmp/opt/trinity/lib/libkmid.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemdi.so.1 +debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0 -debian/tmp/opt/trinity/lib/libkparts.so.2 -debian/tmp/opt/trinity/lib/libkparts.so.2.1.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95 -debian/tmp/opt/trinity/lib/libkrsync.so.0 -debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1 -debian/tmp/opt/trinity/lib/libkresources.so.1 -debian/tmp/opt/trinity/lib/libkresources.so.1.2.0 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/trinity/lib/libkscript.so.0 -debian/tmp/opt/trinity/lib/libkscript.so.0.0.0 -debian/tmp/opt/trinity/lib/libkspell2.so.1 -debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkspell.so.4 -debian/tmp/opt/trinity/lib/libkspell.so.4.2.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/trinity/lib/libkunittest.so.1 -debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0 -debian/tmp/opt/trinity/lib/libkutils.so.1 -debian/tmp/opt/trinity/lib/libkutils.so.1.2.0 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/trinity/lib/libtdentlm.so.0 +debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeparts.so.2 +debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdersync.so.0 +debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdespell2.so.1 +debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdespell.so.4 +debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeutils.so.1 +debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/kfile_elf.desktop diff --git a/debian/lenny/tdemultimedia/debian/changelog b/debian/lenny/tdemultimedia/debian/changelog index 37b689f66..70dc106df 100644 --- a/debian/lenny/tdemultimedia/debian/changelog +++ b/debian/lenny/tdemultimedia/debian/changelog @@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low tdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low tdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low tdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low tdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low tdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low tdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking tdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/debian/lenny/tdemultimedia/debian/control b/debian/lenny/tdemultimedia/debian/control index cf85ef6b0..42f607611 100644 --- a/debian/lenny/tdemultimedia/debian/control +++ b/debian/lenny/tdemultimedia/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdemultimedia-trinity (<< 4:14.0.0) Breaks: kdemultimedia-trinity (<< 4:14.0.0) -Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) +Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,7 +31,7 @@ Section: devel Architecture: any Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) -Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) +Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module Development files and headers for the Trinity multimedia module. @@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of Trinity, as a component of the KDE multimedia module. See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information. -Package: kmid-trinity +Package: tdemid-trinity Section: sound Architecture: any -Replaces: kmid-trinity (<< 4:14.0.0) -Breaks: kmid-trinity (<< 4:14.0.0) +Replaces: tdemid-trinity (<< 4:14.0.0) +Breaks: tdemid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity diff --git a/debian/lenny/tdemultimedia/debian/control.in b/debian/lenny/tdemultimedia/debian/control.in index 7b20cca6d..4bf762241 100644 --- a/debian/lenny/tdemultimedia/debian/control.in +++ b/debian/lenny/tdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdemultimedia Section: tde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: tdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: tdemultimedia-dev Section: devel Architecture: any -Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'tdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdemultimedia/debian/copyright b/debian/lenny/tdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/debian/lenny/tdemultimedia/debian/copyright +++ b/debian/lenny/tdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/debian/wheezy/tdemultimedia/debian/icons/kmid-16.xpm b/debian/lenny/tdemultimedia/debian/icons/tdemid-16.xpm index 0a510090a..64ad03b59 100644 --- a/debian/wheezy/tdemultimedia/debian/icons/kmid-16.xpm +++ b/debian/lenny/tdemultimedia/debian/icons/tdemid-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid-16[] = { +static char *tdemid-16[] = { /* columns rows colors chars-per-pixel */ "16 16 104 2", " c black", diff --git a/debian/lenny/tdemultimedia/debian/icons/kmid.xpm b/debian/lenny/tdemultimedia/debian/icons/tdemid.xpm index fb669aa72..c4cbb3bf1 100644 --- a/debian/lenny/tdemultimedia/debian/icons/kmid.xpm +++ b/debian/lenny/tdemultimedia/debian/icons/tdemid.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid[] = { +static char *tdemid[] = { /* columns rows colors chars-per-pixel */ "32 32 213 2", " c black", diff --git a/debian/lenny/tdemultimedia/debian/kmid-trinity.install b/debian/lenny/tdemultimedia/debian/kmid-trinity.install deleted file mode 100644 index e77e1784a..000000000 --- a/debian/lenny/tdemultimedia/debian/kmid-trinity.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/trinity/bin/kmid -debian/tmp/opt/trinity/lib/trinity/libkmidpart.la -debian/tmp/opt/trinity/lib/trinity/libkmidpart.so -debian/tmp/opt/trinity/lib/libkmidlib.so.0 -debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/trinity/share/applications/tde/kmid.desktop -debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb -debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb -debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/trinity/share/pixmaps -debian/icons/kmid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdemultimedia/debian/kmid-trinity.menu b/debian/lenny/tdemultimedia/debian/kmid-trinity.menu deleted file mode 100644 index ca828ea94..000000000 --- a/debian/lenny/tdemultimedia/debian/kmid-trinity.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="TDE"\ - title="KMid"\ - icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\ - command="/opt/trinity/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/debian/lenny/tdemultimedia/debian/man/kaboodle-trinity.1 b/debian/lenny/tdemultimedia/debian/man/kaboodle-trinity.1 index 76f29a181..2e9e5704d 100644 --- a/debian/lenny/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/debian/lenny/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules index 1e7e0647c..58e944e5d 100755 --- a/debian/lenny/tdemultimedia/debian/rules +++ b/debian/lenny/tdemultimedia/debian/rules @@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ +PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/lenny/tdemultimedia/debian/tdemid-trinity.install b/debian/lenny/tdemultimedia/debian/tdemid-trinity.install new file mode 100644 index 000000000..c36f2d16a --- /dev/null +++ b/debian/lenny/tdemultimedia/debian/tdemid-trinity.install @@ -0,0 +1,40 @@ +debian/tmp/opt/trinity/bin/tdemid +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so +debian/tmp/opt/trinity/lib/libtdemidlib.so.0 +debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop +debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb +debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/trinity/share/pixmaps +debian/icons/tdemid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdemultimedia/debian/tdemid-trinity.menu b/debian/lenny/tdemultimedia/debian/tdemid-trinity.menu new file mode 100644 index 000000000..5f3ec9248 --- /dev/null +++ b/debian/lenny/tdemultimedia/debian/tdemid-trinity.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="TDE"\ + title="KMid"\ + icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\ + command="/opt/trinity/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index 0d5dc5893..000000000 --- a/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html - diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..e4d54da22 --- /dev/null +++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: tdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html +Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html + diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install index 4edb170bf..97d3eb309 100644 --- a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la debian/tmp/opt/trinity/lib/libtdeinit_krec.la debian/tmp/opt/trinity/lib/libtdeinit_noatun.la -debian/tmp/opt/trinity/lib/libkmidlib.la -debian/tmp/opt/trinity/lib/libkmidlib.so +debian/tmp/opt/trinity/lib/libtdemidlib.la +debian/tmp/opt/trinity/lib/libtdemidlib.so debian/tmp/opt/trinity/lib/libmpeg.la debian/tmp/opt/trinity/lib/libmpeg.so debian/tmp/opt/trinity/lib/libnoatun.la diff --git a/debian/lenny/tdenetwork/debian/changelog b/debian/lenny/tdenetwork/debian/changelog index 43b1aadd7..4510420ac 100644 --- a/debian/lenny/tdenetwork/debian/changelog +++ b/debian/lenny/tdenetwork/debian/changelog @@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to tdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in tdelibs) + * Add tdednssd to tdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in tdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control index a1a2dcb2b..a95cc81a7 100644 --- a/debian/lenny/tdenetwork/debian/control +++ b/debian/lenny/tdenetwork/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdenetwork-trinity (<< 4:14.0.0) Breaks: kdenetwork-trinity (<< 4:14.0.0) -Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) +Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) Description: network-related apps from the official Trinity release @@ -331,11 +331,11 @@ Description: LAN information server for Trinity This package is part of Trinity, as a component of the KDE network module. See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information. -Package: kdnssd-trinity +Package: tdednssd-trinity Section: net Architecture: any -Replaces: kdnssd-trinity (<< 4:14.0.0) -Breaks: kdnssd-trinity (<< 4:14.0.0) +Replaces: tdednssd-trinity (<< 4:14.0.0) +Breaks: tdednssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf diff --git a/debian/lenny/tdenetwork/debian/control.in b/debian/lenny/tdenetwork/debian/control.in index 1c7fc62f9..7c7dfdc41 100644 --- a/debian/lenny/tdenetwork/debian/control.in +++ b/debian/lenny/tdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdenetwork Section: tde Architecture: all -Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: tdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'tdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdenetwork/debian/kget-trinity.install b/debian/lenny/tdenetwork/debian/kget-trinity.install index 9a1ac79f5..d2a0707c9 100644 --- a/debian/lenny/tdenetwork/debian/kget-trinity.install +++ b/debian/lenny/tdenetwork/debian/kget-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/kget -debian/tmp/opt/trinity/lib/trinity/khtml_kget.la -debian/tmp/opt/trinity/lib/trinity/khtml_kget.so +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so debian/tmp/opt/trinity/share/applications/tde/kget.desktop debian/tmp/opt/trinity/share/apps/kget/eventsrc debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png debian/tmp/opt/trinity/share/apps/kget/pics/try5.png debian/tmp/opt/trinity/share/apps/kget/pics/try6.png debian/tmp/opt/trinity/share/apps/kget/pics/try7.png -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules index 2579d07e3..0ee562691 100755 --- a/debian/lenny/tdenetwork/debian/rules +++ b/debian/lenny/tdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/debian/lenny/tdenetwork/debian/kdnssd-trinity.install b/debian/lenny/tdenetwork/debian/tdednssd-trinity.install index 8d6a52c6b..8d6a52c6b 100644 --- a/debian/lenny/tdenetwork/debian/kdnssd-trinity.install +++ b/debian/lenny/tdenetwork/debian/tdednssd-trinity.install diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog index 09dc0dfc3..268556215 100644 --- a/debian/lenny/tdepim/debian/changelog +++ b/debian/lenny/tdepim/debian/changelog @@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for tdepim-kresources + * Increase version number on Replaces for tdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low tdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package tdepim-kresources. + * Split tderesources into new package tdepim-tderesources. * Split tdepimmacros.h into new package libtdepim1-dev, and make all the other -dev packages depend on it. diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control index 6a2e4385d..1c544b5f5 100644 --- a/debian/lenny/tdepim/debian/control +++ b/debian/lenny/tdepim/debian/control @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0) Breaks: kdepim-trinity (<< 4:14.0.0) -Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) +Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -52,7 +52,7 @@ Section: devel Architecture: any Replaces: kdepim-trinity-dev (<< 4:14.0.0) Breaks: kdepim-trinity-dev (<< 4:14.0.0) -Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) +Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. . @@ -116,7 +116,7 @@ Architecture: any Replaces: kaddressbook-trinity (<< 4:14.0.0) Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity +Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves This package is part of Trinity, and a component of the KDE PIM module. See the 'kde-trinity' and 'tdepim-trinity' packages for more information. -Package: tdepim-kresources-trinity +Package: tdepim-tderesources-trinity Section: tde Architecture: any -Replaces: kdepim-kresources-trinity (<< 4:14.0.0) -Breaks: kdepim-kresources-trinity (<< 4:14.0.0) +Replaces: kdepim-tderesources-trinity (<< 4:14.0.0) +Breaks: kdepim-tderesources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -321,7 +321,7 @@ Architecture: any Replaces: knotes-trinity (<< 4:14.0.0) Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/lenny/tdepim/debian/control.in b/debian/lenny/tdepim/debian/control.in index 3b45c48d0..4c48dcbef 100644 --- a/debian/lenny/tdepim/debian/control.in +++ b/debian/lenny/tdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources, tdebase-kio-plugins +Suggests: tdepim-tderesources, tdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'tdepim' packages for more information. -Package: tdepim-kresources +Package: tdepim-tderesources Section: tde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: tde Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -441,7 +441,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.install b/debian/lenny/tdepim/debian/kaddressbook-trinity.install index 748b6e9a7..eac493c1b 100644 --- a/debian/lenny/tdepim/debian/kaddressbook-trinity.install +++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.install @@ -29,7 +29,7 @@ /opt/trinity/share/services/kabldapconfig.desktop /opt/trinity/share/services/kaddressbook /opt/trinity/share/services/kontact/kaddressbookplugin.desktop -/opt/trinity/share/services/kresources/kabc/imap.desktop +/opt/trinity/share/services/tderesources/kabc/imap.desktop /opt/trinity/share/services/ldifvcardthumbnail.desktop /opt/trinity/share/servicetypes/dcopaddressbook.desktop /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/debian/lenny/tdepim/debian/knotes-trinity.install b/debian/lenny/tdepim/debian/knotes-trinity.install index 97956b197..8f65af5e3 100644 --- a/debian/lenny/tdepim/debian/knotes-trinity.install +++ b/debian/lenny/tdepim/debian/knotes-trinity.install @@ -15,9 +15,9 @@ /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png -/opt/trinity/share/services/kresources/knotes/imap.desktop -/opt/trinity/share/services/kresources/knotes/local.desktop -/opt/trinity/share/services/kresources/knotes_manager.desktop +/opt/trinity/share/services/tderesources/knotes/imap.desktop +/opt/trinity/share/services/tderesources/knotes/local.desktop +/opt/trinity/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/trinity/share/pixmaps ../icons/knotes-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdepim/debian/libkcal2b-trinity.install b/debian/lenny/tdepim/debian/libkcal2b-trinity.install index ca6e71652..211c15b4d 100644 --- a/debian/lenny/tdepim/debian/libkcal2b-trinity.install +++ b/debian/lenny/tdepim/debian/libkcal2b-trinity.install @@ -13,9 +13,9 @@ /opt/trinity/lib/libkholidays.so.1 /opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/share/apps/libkholidays -/opt/trinity/share/services/kresources/kcal/imap.desktop -/opt/trinity/share/services/kresources/kcal/kabc.desktop -/opt/trinity/share/services/kresources/kcal/local.desktop -/opt/trinity/share/services/kresources/kcal/localdir.desktop -/opt/trinity/share/services/kresources/kcal/remote.desktop -/opt/trinity/share/services/kresources/kcal_manager.desktop +/opt/trinity/share/services/tderesources/kcal/imap.desktop +/opt/trinity/share/services/tderesources/kcal/kabc.desktop +/opt/trinity/share/services/tderesources/kcal/local.desktop +/opt/trinity/share/services/tderesources/kcal/localdir.desktop +/opt/trinity/share/services/tderesources/kcal/remote.desktop +/opt/trinity/share/services/tderesources/kcal_manager.desktop diff --git a/debian/lenny/tdepim/debian/libtdepim1a-trinity.install b/debian/lenny/tdepim/debian/libtdepim1a-trinity.install index 6a17101ae..e018f4bdf 100644 --- a/debian/lenny/tdepim/debian/libtdepim1a-trinity.install +++ b/debian/lenny/tdepim/debian/libtdepim1a-trinity.install @@ -1,7 +1,7 @@ /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/share/apps/tdepimwidgets diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules index 0e1c5356b..96073e510 100755 --- a/debian/lenny/tdepim/debian/rules +++ b/debian/lenny/tdepim/debian/rules @@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ -dDepends # Since -u args go first in dpkg-shlibdeps call ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends -#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \ +#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ # -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/debian/wheezy/tdepim/debian/tdepim-kresources-trinity.install b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install index 588b690b1..bcf0991b5 100644 --- a/debian/wheezy/tdepim/debian/tdepim-kresources-trinity.install +++ b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install @@ -74,31 +74,31 @@ /opt/trinity/lib/libkslox.so.0.0.0 /opt/trinity/lib/libgwsoap.so.0 /opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/trinity/share/services/kresources/kabc/kolab.desktop -/opt/trinity/share/services/kresources/kabc/scalix.desktop -/opt/trinity/share/services/kresources/kcal/exchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/trinity/share/services/kresources/kcal/kolab.desktop -/opt/trinity/share/services/kresources/kcal/scalix.desktop -/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/trinity/share/services/kresources/knotes/kolabresource.desktop -/opt/trinity/share/services/kresources/knotes/scalix.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kabc/kolab.desktop +/opt/trinity/share/services/tderesources/kabc/scalix.desktop +/opt/trinity/share/services/tderesources/kcal/exchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kcal/kolab.desktop +/opt/trinity/share/services/tderesources/kcal/scalix.desktop +/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/trinity/share/services/tderesources/knotes/kolabresource.desktop +/opt/trinity/share/services/tderesources/knotes/scalix.desktop /opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl /opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/debian/lenny/tdesdk/debian/changelog b/debian/lenny/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/debian/lenny/tdesdk/debian/changelog +++ b/debian/lenny/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/debian/lenny/tdesdk/debian/control +++ b/debian/lenny/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of Trinity, and a component of the KDE SDK module. diff --git a/debian/lenny/tdesdk/debian/control.in b/debian/lenny/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/debian/lenny/tdesdk/debian/control.in +++ b/debian/lenny/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.install b/debian/lenny/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.install +++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdesdk/debian/kunittest-trinity.docs b/debian/lenny/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/debian/lenny/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/debian/lenny/tdesdk/debian/kunittest-trinity.install b/debian/lenny/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/debian/lenny/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/lenny/tdesdk/debian/not-installed.list b/debian/lenny/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/debian/lenny/tdesdk/debian/not-installed.list +++ b/debian/lenny/tdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules index b7a449e9e..c2f1232d9 100755 --- a/debian/lenny/tdesdk/debian/rules +++ b/debian/lenny/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/debian/lenny/tdesdk/debian/tdeunittest-trinity.docs b/debian/lenny/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/debian/lenny/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/debian/lenny/tdesdk/debian/tdeunittest-trinity.install b/debian/lenny/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/debian/lenny/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h diff --git a/debian/lenny/tdeutils/debian/changelog b/debian/lenny/tdeutils/debian/changelog index b3d3af82b..71992aefe 100644 --- a/debian/lenny/tdeutils/debian/changelog +++ b/debian/lenny/tdeutils/debian/changelog @@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 23132b0e0..956b68ea3 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -343,11 +343,11 @@ Description: timer utility for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kwalletmanager-trinity +Package: tdewalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-trinity (<< 4:14.0.0) -Breaks: kwalletmanager-trinity (<< 4:14.0.0) +Replaces: tdewalletmanager-trinity (<< 4:14.0.0) +Breaks: tdewalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity diff --git a/debian/lenny/tdeutils/debian/control.in b/debian/lenny/tdeutils/debian/control.in index f1d64bd00..f86496f4d 100644 --- a/debian/lenny/tdeutils/debian/control.in +++ b/debian/lenny/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install b/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install deleted file mode 100644 index 1ba37d2e3..000000000 --- a/debian/lenny/tdeutils/debian/kwalletmanager-trinity.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/trinity/bin/kwalletmanager -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so -debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png -debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/services/kwallet_config.desktop -debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop diff --git a/debian/lenny/tdeutils/debian/man/kcharselect-trinity.1 b/debian/lenny/tdeutils/debian/man/kcharselect-trinity.1 index 15d1c35d9..d6ba31cf5 100644 --- a/debian/lenny/tdeutils/debian/man/kcharselect-trinity.1 +++ b/debian/lenny/tdeutils/debian/man/kcharselect-trinity.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/wheezy/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/debian/lenny/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet index 6331a925f..d87ba35e0 100644 --- a/debian/wheezy/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet +++ b/debian/lenny/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet @@ -1,10 +1,10 @@ -Document: tdeutils-doc-html-kwallet +Document: tdeutils-doc-html-tdewallet Title: KWallet Handbook Author: George Staikos, Lauri Watts Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. Section: Tools Format: HTML -Index: /usr/share/doc/tde/HTML/en/kwallet/index.html -Files: /usr/share/doc/tde/HTML/en/kwallet/*.html +Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html diff --git a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install index 17d66276d..a04353048 100644 --- a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tdemultiformlistbox.h +debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h +debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h debian/tmp/opt/trinity/include/ksim/chart.h debian/tmp/opt/trinity/include/ksim/common.h debian/tmp/opt/trinity/include/ksim/ksimconfig.h diff --git a/debian/lenny/tdeutils/debian/tdewalletmanager-trinity.install b/debian/lenny/tdeutils/debian/tdewalletmanager-trinity.install new file mode 100644 index 000000000..6e75bf792 --- /dev/null +++ b/debian/lenny/tdeutils/debian/tdewalletmanager-trinity.install @@ -0,0 +1,31 @@ +debian/tmp/opt/trinity/bin/tdewalletmanager +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so +debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png +debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/services/tdewallet_config.desktop +debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop diff --git a/debian/squeeze/applications/kaffeine/debian/changelog b/debian/squeeze/applications/kaffeine/debian/changelog index ae8921760..3f11ad0ae 100644 --- a/debian/squeeze/applications/kaffeine/debian/changelog +++ b/debian/squeeze/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/debian/squeeze/applications/kaffeine/debian/copyright b/debian/squeeze/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/debian/squeeze/applications/kaffeine/debian/copyright +++ b/debian/squeeze/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/debian/squeeze/applications/kmplayer/debian/changelog b/debian/squeeze/applications/kmplayer/debian/changelog index 26a6aed53..233e1f465 100644 --- a/debian/squeeze/applications/kmplayer/debian/changelog +++ b/debian/squeeze/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog b/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/squeeze/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/squeeze/applications/knetworkmanager8/debian/changelog b/debian/squeeze/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/debian/squeeze/applications/knetworkmanager8/debian/changelog +++ b/debian/squeeze/applications/knetworkmanager8/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control b/debian/squeeze/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/debian/squeeze/applications/knetworkmanager8/debian/control +++ b/debian/squeeze/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control.in b/debian/squeeze/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/squeeze/applications/knetworkmanager8/debian/control.in +++ b/debian/squeeze/applications/knetworkmanager8/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/squeeze/applications/knetworkmanager9/debian/control b/debian/squeeze/applications/knetworkmanager9/debian/control index c32604bbf..efd256a36 100644 --- a/debian/squeeze/applications/knetworkmanager9/debian/control +++ b/debian/squeeze/applications/knetworkmanager9/debian/control @@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/squeeze/applications/knetworkmanager9/debian/control.in b/debian/squeeze/applications/knetworkmanager9/debian/control.in index e54418ea6..a5cefc2bb 100644 --- a/debian/squeeze/applications/knetworkmanager9/debian/control.in +++ b/debian/squeeze/applications/knetworkmanager9/debian/control.in @@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install index 7bed60e6c..a0e03ae3b 100644 --- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install +++ b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install @@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop -debian/tmp/opt/trinity/share/services/chalkscripting.desktop +debian/tmp/opt/trinity/share/services/chaltdescripting.desktop debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-trinity.install index 4df24b77e..66afcfbba 100644 --- a/debian/squeeze/applications/koffice/debian/chalk-trinity.install +++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.install @@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so -debian/tmp/opt/trinity/lib/trinity/chalkscripting.la -debian/tmp/opt/trinity/lib/trinity/chalkscripting.so +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la @@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.* debian/tmp/opt/trinity/lib/libchalk_lms_*.so.* debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.* debian/tmp/opt/trinity/lib/libchalkrgb.so.* -debian/tmp/opt/trinity/lib/libchalkscripting.so.* +debian/tmp/opt/trinity/lib/libchaltdescripting.so.* debian/tmp/opt/trinity/lib/libchalkui.so.* debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.* diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..cdf64af56 100644 --- a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian +++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1 diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install index 4b80b83ec..f28ee3bef 100644 --- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install +++ b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install @@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la debian/tmp/opt/trinity/lib/libchalkimage.so debian/tmp/opt/trinity/lib/libchalkrgb.la debian/tmp/opt/trinity/lib/libchalkrgb.so -debian/tmp/opt/trinity/lib/libchalkscripting.la -debian/tmp/opt/trinity/lib/libchalkscripting.so +debian/tmp/opt/trinity/lib/libchaltdescripting.la +debian/tmp/opt/trinity/lib/libchaltdescripting.so debian/tmp/opt/trinity/lib/libchalkui.la debian/tmp/opt/trinity/lib/libchalkui.so debian/tmp/opt/trinity/lib/libkrossapi.la diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/changelog b/debian/squeeze/applications/kpowersave.cmake/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/squeeze/applications/kpowersave.cmake/debian/changelog +++ b/debian/squeeze/applications/kpowersave.cmake/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/squeeze/applications/kpowersave/debian/changelog b/debian/squeeze/applications/kpowersave/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/squeeze/applications/kpowersave/debian/changelog +++ b/debian/squeeze/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/changelog b/debian/squeeze/applications/tde-style-qtcurve/debian/changelog index 3ff72d99c..f7612d81f 100644 --- a/debian/squeeze/applications/tde-style-qtcurve/debian/changelog +++ b/debian/squeeze/applications/tde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control index afacf68ee..cad02055c 100644 --- a/debian/squeeze/libraries/python-trinity/debian/control +++ b/debian/squeeze/libraries/python-trinity/debian/control @@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-trinity-trinity-dbg Priority: extra @@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/debian/squeeze/metapackages/meta-tde/debian/changelog b/debian/squeeze/metapackages/meta-tde/debian/changelog index 7c5da1b8f..c41106a4d 100644 --- a/debian/squeeze/metapackages/meta-tde/debian/changelog +++ b/debian/squeeze/metapackages/meta-tde/debian/changelog @@ -296,7 +296,7 @@ meta-kde (4:2.2) unstable; urgency=low meta-kde (4:2.1.44) unstable; urgency=low - * Fix libkmid | libkmid-alsa dep (Closes: #107585) + * Fix libtdemid | libtdemid-alsa dep (Closes: #107585) -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 @@ -395,7 +395,7 @@ task-kde (4:2.1.30) unstable; urgency=low task-kde (4:2.1.29) unstable; urgency=low - * New depends: kscreensaver, kdebase-audiolibs + * New depends: tdescreensaver, kdebase-audiolibs -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 diff --git a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install index cd7b93d85..2ad412a7f 100644 --- a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install +++ b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop -debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop diff --git a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 +++ b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 +++ b/debian/squeeze/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/squeeze/tdeaddons/debian/konq-plugins-trinity.install b/debian/squeeze/tdeaddons/debian/konq-plugins-trinity.install index c74edf4ce..15ec8f99e 100644 --- a/debian/squeeze/tdeaddons/debian/konq-plugins-trinity.install +++ b/debian/squeeze/tdeaddons/debian/konq-plugins-trinity.install @@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so debian/tmp/opt/trinity/lib/trinity/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer debian/tmp/opt/trinity/share/apps/fsview debian/tmp/opt/trinity/share/apps/imagerotation/orient.py debian/tmp/opt/trinity/share/apps/imagerotation/exif.py -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins debian/tmp/opt/trinity/share/apps/konqiconview debian/tmp/opt/trinity/share/apps/konqlistview debian/tmp/opt/trinity/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/debian/squeeze/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/squeeze/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/debian/squeeze/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/squeeze/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/debian/squeeze/tdeartwork/debian/changelog b/debian/squeeze/tdeartwork/debian/changelog index a3043310e..ddf857174 100644 --- a/debian/squeeze/tdeartwork/debian/changelog +++ b/debian/squeeze/tdeartwork/debian/changelog @@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since tdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low tdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on tdebase-bin (closes: #203185). + * Made tdescreensaver depend on tdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low tdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low tdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed tdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x. + * Renamed tdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index ee0ae9ba5..b0100a04c 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -13,8 +13,8 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-trinity +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -110,13 +110,13 @@ Description: wallpapers released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-trinity +Package: tdescreensaver-trinity Architecture: any Section: tde -Replaces: kscreensaver-trinity (<< 4:14.0.0) -Breaks: kscreensaver-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-trinity +Package: tdescreensaver-xsavers-trinity Architecture: any Section: tde -Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-trinity +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into Trinity. With this package installed you can select and/or configure @@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with Trinity, see the separate package - kscreensaver-trinity. This package does depend on the xscreensaver package, and + tdescreensaver-trinity. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into Trinity. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-webcollage-trinity +Package: tdescreensaver-xsavers-webcollage-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm +Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity screensaver configuration. @@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-extra-trinity +Package: tdescreensaver-xsavers-extra-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) +Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. diff --git a/debian/squeeze/tdeartwork/debian/control.in b/debian/squeeze/tdeartwork/debian/control.in index 1721be0bf..4b914794e 100644 --- a/debian/squeeze/tdeartwork/debian/control.in +++ b/debian/squeeze/tdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: tdeartwork Architecture: all Section: tde -Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: tde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install deleted file mode 100644 index a3a14e04c..000000000 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install deleted file mode 100644 index f11cf310b..000000000 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/squeeze/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/debian/squeeze/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 index 64a0a5c45..73456139b 100644 --- a/debian/squeeze/tdeartwork/debian/man/kpartsaver-trinity.kss.1 +++ b/debian/squeeze/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kpartsaver.kss \- Media screen saver for KDE +tdepartsaver.kss \- Media screen saver for KDE .SH SYNOPSIS -.B kpartsaver.kss +.B tdepartsaver.kss .RI "[ " generic-options " ]" [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | \fB\-\-demo\fP ] @@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE This program is part of the official KDE artwork module. .SH OPTIONS Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. .TP \fB\-\-setup\fP Set up the screen saver. diff --git a/debian/squeeze/tdeartwork/debian/rules b/debian/squeeze/tdeartwork/debian/rules index 4e236c044..963f996bc 100755 --- a/debian/squeeze/tdeartwork/debian/rules +++ b/debian/squeeze/tdeartwork/debian/rules @@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png - cd kscreensaver/kxsconfig/ && ./update_hacks.sh + cd tdescreensaver/kxsconfig/ && ./update_hacks.sh -binary-install/kscreensaver-xsavers-extra-trinity:: - rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop +binary-install/tdescreensaver-xsavers-extra-trinity:: + rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-trinity.install index d65c099dc..012466480 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.install +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-trinity.install @@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss debian/tmp/opt/trinity/bin/kswarm.kss debian/tmp/opt/trinity/bin/kfountain.kss debian/tmp/opt/trinity/bin/kgravity.kss -debian/tmp/opt/trinity/bin/kpartsaver.kss +debian/tmp/opt/trinity/bin/tdepartsaver.kss debian/tmp/opt/trinity/bin/kpendulum.kss debian/tmp/opt/trinity/bin/kblob.kss debian/tmp/opt/trinity/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/trinity/share/apps/kfiresaver -debian/tmp/opt/trinity/share/apps/kscreensaver +debian/tmp/opt/trinity/share/apps/tdescreensaver diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-trinity.manpages b/debian/squeeze/tdeartwork/debian/tdescreensaver-trinity.manpages index 839491dbc..294e72dd8 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-trinity.manpages +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-trinity.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1 debian/man/kgravity-trinity.kss.1 debian/man/klines-trinity.kss.1 debian/man/klorenz-trinity.kss.1 -debian/man/kpartsaver-trinity.kss.1 +debian/man/tdepartsaver-trinity.kss.1 debian/man/kpendulum-trinity.kss.1 debian/man/kpolygon-trinity.kss.1 debian/man/krotation-trinity.kss.1 diff --git a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install new file mode 100644 index 000000000..e2e812465 --- /dev/null +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-trinity.install index 901f852e1..901f852e1 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-trinity.install diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages index 356af4f32..356af4f32 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages diff --git a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers.README.Debian index 828861775..a41c9ad57 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver-xsavers.README.Debian +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver-xsavers) only contains hooks for the standard +This package (tdescreensaver-xsavers) only contains hooks for the standard xscreensavers, so that they can be selected and/or configured through the KDE Control Centre. For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. +see the separate package tdescreensaver. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver.README.Debian b/debian/squeeze/tdeartwork/debian/tdescreensaver.README.Debian index 68584d330..57a145f54 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver.README.Debian +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver) no longer contains the hooks for the standard +This package (tdescreensaver) no longer contains the hooks for the standard xscreensavers. It only contains the additional screensavers that are specifically shipped with KDE. To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. +Centre, install the separate package tdescreensaver-xsavers. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/debian/squeeze/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/debian/squeeze/tdebase/debian/changelog b/debian/squeeze/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/debian/squeeze/tdebase/debian/changelog +++ b/debian/squeeze/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/debian/squeeze/tdebase/debian/control.in +++ b/debian/squeeze/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.install b/debian/squeeze/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/debian/squeeze/tdebase/debian/kcontrol-trinity.install +++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian +++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/debian/squeeze/tdebase/debian/konqueror-nsplugins-trinity.install b/debian/squeeze/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/debian/squeeze/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/debian/squeeze/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.install b/debian/squeeze/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/debian/squeeze/tdebase/debian/konqueror-trinity.install +++ b/debian/squeeze/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index c72887aaa..04b7019e4 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install +++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/debian/squeeze/tdebase/debian/kscreensaver-trinity.pam b/debian/squeeze/tdebase/debian/tdescreensaver-trinity.pam index 088a00503..9a2c74519 100644 --- a/debian/squeeze/tdebase/debian/kscreensaver-trinity.pam +++ b/debian/squeeze/tdebase/debian/tdescreensaver-trinity.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver # @include common-auth @include common-account diff --git a/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install index e29ab016c..764c26e42 100644 --- a/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install +++ b/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install @@ -11,7 +11,7 @@ #debian/tmp/opt/trinity/lib/libgtkxparts.so.0 #debian/tmp/opt/trinity/lib/libgtkxparts.so #debian/tmp/opt/trinity/lib/libgtkxparts.la -#debian/tmp/opt/trinity/include/xkparts +#debian/tmp/opt/trinity/include/xtdeparts #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so diff --git a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.install b/debian/squeeze/tdegraphics/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.install +++ b/debian/squeeze/tdegraphics/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian b/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian +++ b/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-trinity-dev.install b/debian/squeeze/tdegraphics/debian/tdegraphics-trinity-dev.install index 80d007db5..26f6ba6ea 100644 --- a/debian/squeeze/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/debian/squeeze/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/kfaximage.h -debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/tdemultipageInterface.h debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/kviewshell/history.h debian/tmp/opt/trinity/include/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/kviewshell/length.h debian/tmp/opt/trinity/include/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog index 60b5c5d56..6a9f72874 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow tdelibs5-dev co-installable alongside tdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-tdelibs-3.5.6.diff, 47_tdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_tdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_tdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low tdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from tdelibs4-dev + * Remove libtdednssd depend from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in tdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in tdelibs4-dev. - * Add depends on libkdnssd1-avahi from tdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in tdelibs4-dev. + * Add depends on libtdednssd1-avahi from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since + - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/tdelibs4-dev.install: - usr/include/kiobuffer.h - - usr/include/kwallettypes.h + - usr/include/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: tdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low tdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low tdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of tdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of tdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/debian/squeeze/tdelibs/debian/copyright b/debian/squeeze/tdelibs/debian/copyright index 7c67eaede..945a09ca9 100644 --- a/debian/squeeze/tdelibs/debian/copyright +++ b/debian/squeeze/tdelibs/debian/copyright @@ -14,9 +14,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx, -tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx, +tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/debian/wheezy/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 index b61b06654..56c4f3bc6 100644 --- a/debian/wheezy/tdelibs/debian/man/kunittestmodrunner-trinity.1 +++ b/debian/squeeze/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 @@ -1,18 +1,18 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" .SH NAME -kunittestmodrunner +tdeunittestmodrunner \- a KDE command\-line application to run KUnitTest modules .SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. .SH OPTIONS .SS Options: .TP .BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] .TP .BR \-\-folder \ [ folder ] Only run tests modules which are found in the folder. Use the query option to select modules. [.] @@ -141,7 +141,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kunittestguimodrunner (1) +.BR tdeunittestguimodrunner (1) .sp 1 .TP .BR http://developer.kde.org diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install index 88bf85c86..9bcd52fc7 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install @@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc debian/tmp/etc/trinity/language.codes debian/tmp/etc/trinity/ui/kprintpreviewui.rc debian/tmp/etc/trinity/ui/ui_standards.rc -debian/tmp/opt/trinity/share/applications/tde/kresources.desktop +debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml -debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd @@ -229,22 +229,22 @@ 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/khtml/css/html4.css -debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css -debian/tmp/opt/trinity/share/apps/khtml/domain_info -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml.rc +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 +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/trinity/share/apps/kjava/kjava.jar @@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC debian/tmp/opt/trinity/share/apps/LICENSES/BSD debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2 @@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook debian/tmp/opt/trinity/share/emoticons/Default/angry.png debian/tmp/opt/trinity/share/emoticons/Default/bat.png debian/tmp/opt/trinity/share/emoticons/Default/beer.png @@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio debian/tmp/opt/trinity/share/services/jpeg.kimgio debian/tmp/opt/trinity/share/services/katepart.desktop debian/tmp/opt/trinity/share/services/kbzip2filter.desktop -debian/tmp/opt/trinity/share/services/kcertpart.desktop +debian/tmp/opt/trinity/share/services/tdecertpart.desktop debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop debian/tmp/opt/trinity/share/services/kded/kssld.desktop -debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop +debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop debian/tmp/opt/trinity/share/services/kgzipfilter.desktop -debian/tmp/opt/trinity/share/services/khtml.desktop -debian/tmp/opt/trinity/share/services/khtmlimage.desktop +debian/tmp/opt/trinity/share/services/tdehtml.desktop +debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop debian/tmp/opt/trinity/share/services/kio_uiserver.desktop debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop debian/tmp/opt/trinity/share/services/kmailservice.protocol -debian/tmp/opt/trinity/share/services/kmultipart.desktop +debian/tmp/opt/trinity/share/services/tdemultipart.desktop debian/tmp/opt/trinity/share/services/knotify.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/trinity/share/services/kspell_aspell.desktop -debian/tmp/opt/trinity/share/services/kspell_hspell.desktop -debian/tmp/opt/trinity/share/services/kspell_ispell.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol @@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/trinity/share/servicetypes/kpart.desktop debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/trinity/share/servicetypes/krop.desktop debian/tmp/opt/trinity/share/servicetypes/krwp.desktop debian/tmp/opt/trinity/share/servicetypes/kscan.desktop -debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.preinst b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.preinst index 452b17bfc..c6c9c016f 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.preinst +++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/trinity/colors/40\ Colors rm -f /etc/trinity/colors/Royal rm -f /etc/trinity/colors/Web - rm -f /etc/trinity/ktexteditor_autobookmarkerrc + rm -f /etc/trinity/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 30baf6aa3..6f7afbc0c 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp debian/tmp/opt/trinity/bin/dcopidlng debian/tmp/opt/trinity/bin/kconfig_compiler debian/tmp/opt/trinity/bin/ksvgtopng -debian/tmp/opt/trinity/bin/kunittestmodrunner +debian/tmp/opt/trinity/bin/tdeunittestmodrunner debian/tmp/opt/trinity/bin/makekdewidgets debian/tmp/opt/trinity/bin/preparetips @@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h debian/tmp/opt/trinity/include/khexedit/zoominterface.h -debian/tmp/opt/trinity/include/khtmldefaults.h -debian/tmp/opt/trinity/include/khtml_events.h -debian/tmp/opt/trinity/include/khtml_part.h -debian/tmp/opt/trinity/include/khtml_settings.h -debian/tmp/opt/trinity/include/khtmlview.h +debian/tmp/opt/trinity/include/tdehtmldefaults.h +debian/tmp/opt/trinity/include/tdehtml_events.h +debian/tmp/opt/trinity/include/tdehtml_part.h +debian/tmp/opt/trinity/include/tdehtml_settings.h +debian/tmp/opt/trinity/include/tdehtmlview.h debian/tmp/opt/trinity/include/khttpproxysocketdevice.h debian/tmp/opt/trinity/include/kicondialog.h debian/tmp/opt/trinity/include/kiconeffect.h @@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h debian/tmp/opt/trinity/include/kimagefilepreview.h debian/tmp/opt/trinity/include/kimageio.h debian/tmp/opt/trinity/include/kimiface.h -debian/tmp/opt/trinity/include/kimproxy.h -debian/tmp/opt/trinity/include/kimproxyiface.h +debian/tmp/opt/trinity/include/tdeimproxy.h +debian/tmp/opt/trinity/include/tdeimproxyiface.h debian/tmp/opt/trinity/include/kinputdialog.h debian/tmp/opt/trinity/include/kinstance.h debian/tmp/opt/trinity/include/kio/authinfo.h @@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h debian/tmp/opt/trinity/include/kio/tdesasl.h debian/tmp/opt/trinity/include/kio/kmdbase.h debian/tmp/opt/trinity/include/kio/kmdcodec.h -debian/tmp/opt/trinity/include/kio/kntlm.h +debian/tmp/opt/trinity/include/kio/tdentlm.h debian/tmp/opt/trinity/include/kio/metainfojob.h debian/tmp/opt/trinity/include/kio/netaccess.h debian/tmp/opt/trinity/include/kio/observer.h @@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h debian/tmp/opt/trinity/include/kmainwindowiface.h debian/tmp/opt/trinity/include/kmanagerselection.h debian/tmp/opt/trinity/include/kmdcodec.h -debian/tmp/opt/trinity/include/kmdichildarea.h -debian/tmp/opt/trinity/include/kmdichildfrmcaption.h -debian/tmp/opt/trinity/include/kmdichildfrm.h -debian/tmp/opt/trinity/include/kmdichildview.h -debian/tmp/opt/trinity/include/kmdidefines.h -debian/tmp/opt/trinity/include/kmdi/global.h -debian/tmp/opt/trinity/include/kmdiiterator.h -debian/tmp/opt/trinity/include/kmdilistiterator.h -debian/tmp/opt/trinity/include/kmdimainfrm.h -debian/tmp/opt/trinity/include/kmdi/mainwindow.h -debian/tmp/opt/trinity/include/kmdinulliterator.h -debian/tmp/opt/trinity/include/kmdi/tabwidget.h -debian/tmp/opt/trinity/include/kmditaskbar.h -debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h -debian/tmp/opt/trinity/include/kmditoolviewaccessor.h -debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h -debian/tmp/opt/trinity/include/kmediaplayer/player.h -debian/tmp/opt/trinity/include/kmediaplayer/view.h +debian/tmp/opt/trinity/include/tdemdichildarea.h +debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h +debian/tmp/opt/trinity/include/tdemdichildfrm.h +debian/tmp/opt/trinity/include/tdemdichildview.h +debian/tmp/opt/trinity/include/tdemdidefines.h +debian/tmp/opt/trinity/include/tdemdi/global.h +debian/tmp/opt/trinity/include/tdemdiiterator.h +debian/tmp/opt/trinity/include/tdemdilistiterator.h +debian/tmp/opt/trinity/include/tdemdimainfrm.h +debian/tmp/opt/trinity/include/tdemdi/mainwindow.h +debian/tmp/opt/trinity/include/tdemdinulliterator.h +debian/tmp/opt/trinity/include/tdemdi/tabwidget.h +debian/tmp/opt/trinity/include/tdemditaskbar.h +debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h +debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h +debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/trinity/include/tdemediaplayer/player.h +debian/tmp/opt/trinity/include/tdemediaplayer/view.h debian/tmp/opt/trinity/include/kmenubar.h debian/tmp/opt/trinity/include/kmessagebox.h debian/tmp/opt/trinity/include/kmimemagic.h @@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h debian/tmp/opt/trinity/include/kmimetype.h debian/tmp/opt/trinity/include/kmimetyperesolver.h debian/tmp/opt/trinity/include/kmountpoint.h -debian/tmp/opt/trinity/include/kmulticastsocketdevice.h -debian/tmp/opt/trinity/include/kmulticastsocket.h -debian/tmp/opt/trinity/include/kmultipledrag.h -debian/tmp/opt/trinity/include/kmultitabbar.h +debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h +debian/tmp/opt/trinity/include/tdemulticastsocket.h +debian/tmp/opt/trinity/include/tdemultipledrag.h +debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/knewstuff/engine.h @@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h debian/tmp/opt/trinity/include/kpanelappmenu.h debian/tmp/opt/trinity/include/kpanelextension.h debian/tmp/opt/trinity/include/kpanelmenu.h -debian/tmp/opt/trinity/include/kparts/browserextension.h -debian/tmp/opt/trinity/include/kparts/browserinterface.h -debian/tmp/opt/trinity/include/kparts/browserrun.h -debian/tmp/opt/trinity/include/kparts/componentfactory.h -debian/tmp/opt/trinity/include/kparts/dockmainwindow.h -debian/tmp/opt/trinity/include/kparts/event.h -debian/tmp/opt/trinity/include/kparts/factory.h -debian/tmp/opt/trinity/include/kparts/genericfactory.h -debian/tmp/opt/trinity/include/kparts/historyprovider.h -debian/tmp/opt/trinity/include/kparts/mainwindow.h -debian/tmp/opt/trinity/include/kparts/part.h -debian/tmp/opt/trinity/include/kparts/partmanager.h -debian/tmp/opt/trinity/include/kparts/plugin.h -debian/tmp/opt/trinity/include/kparts/statusbarextension.h +debian/tmp/opt/trinity/include/tdeparts/browserextension.h +debian/tmp/opt/trinity/include/tdeparts/browserinterface.h +debian/tmp/opt/trinity/include/tdeparts/browserrun.h +debian/tmp/opt/trinity/include/tdeparts/componentfactory.h +debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h +debian/tmp/opt/trinity/include/tdeparts/event.h +debian/tmp/opt/trinity/include/tdeparts/factory.h +debian/tmp/opt/trinity/include/tdeparts/genericfactory.h +debian/tmp/opt/trinity/include/tdeparts/historyprovider.h +debian/tmp/opt/trinity/include/tdeparts/mainwindow.h +debian/tmp/opt/trinity/include/tdeparts/part.h +debian/tmp/opt/trinity/include/tdeparts/partmanager.h +debian/tmp/opt/trinity/include/tdeparts/plugin.h +debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h debian/tmp/opt/trinity/include/kpassdlg.h debian/tmp/opt/trinity/include/kpassivepopup.h debian/tmp/opt/trinity/include/kpixmapeffect.h @@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h debian/tmp/opt/trinity/include/kreplacedialog.h debian/tmp/opt/trinity/include/kreplace.h debian/tmp/opt/trinity/include/kresolver.h -debian/tmp/opt/trinity/include/kresources/configdialog.h -debian/tmp/opt/trinity/include/kresources/configpage.h -debian/tmp/opt/trinity/include/kresources/configwidget.h -debian/tmp/opt/trinity/include/kresources/factory.h -debian/tmp/opt/trinity/include/kresources/manager.h -debian/tmp/opt/trinity/include/kresources/manageriface.h -debian/tmp/opt/trinity/include/kresources/managerimpl.h -debian/tmp/opt/trinity/include/kresources/resource.h -debian/tmp/opt/trinity/include/kresources/selectdialog.h +debian/tmp/opt/trinity/include/tderesources/configdialog.h +debian/tmp/opt/trinity/include/tderesources/configpage.h +debian/tmp/opt/trinity/include/tderesources/configwidget.h +debian/tmp/opt/trinity/include/tderesources/factory.h +debian/tmp/opt/trinity/include/tderesources/manager.h +debian/tmp/opt/trinity/include/tderesources/manageriface.h +debian/tmp/opt/trinity/include/tderesources/managerimpl.h +debian/tmp/opt/trinity/include/tderesources/resource.h +debian/tmp/opt/trinity/include/tderesources/selectdialog.h debian/tmp/opt/trinity/include/krestrictedline.h debian/tmp/opt/trinity/include/kreverseresolver.h debian/tmp/opt/trinity/include/krfcdate.h @@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h debian/tmp/opt/trinity/include/ksavefile.h debian/tmp/opt/trinity/include/kscan.h debian/tmp/opt/trinity/include/ksconfig.h -debian/tmp/opt/trinity/include/kscreensaver.h -debian/tmp/opt/trinity/include/kscreensaver_vroot.h +debian/tmp/opt/trinity/include/tdescreensaver.h +debian/tmp/opt/trinity/include/tdescreensaver_vroot.h debian/tmp/opt/trinity/include/kscrollview.h debian/tmp/opt/trinity/include/kselect.h debian/tmp/opt/trinity/include/kseparator.h @@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h debian/tmp/opt/trinity/include/ksortablevaluelist.h debian/tmp/opt/trinity/include/kspeech.h debian/tmp/opt/trinity/include/kspeechsink.h -debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h -debian/tmp/opt/trinity/include/kspell2/broker.h -debian/tmp/opt/trinity/include/kspell2/configdialog.h -debian/tmp/opt/trinity/include/kspell2/configwidget.h -debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h -debian/tmp/opt/trinity/include/kspell2/dialog.h -debian/tmp/opt/trinity/include/kspell2/dictionary.h -debian/tmp/opt/trinity/include/kspell2/filter.h -debian/tmp/opt/trinity/include/kspell2/highlighter.h -debian/tmp/opt/trinity/include/kspell2/settings.h -debian/tmp/opt/trinity/include/kspelldlg.h -debian/tmp/opt/trinity/include/kspell.h +debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h +debian/tmp/opt/trinity/include/tdespell2/broker.h +debian/tmp/opt/trinity/include/tdespell2/configdialog.h +debian/tmp/opt/trinity/include/tdespell2/configwidget.h +debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h +debian/tmp/opt/trinity/include/tdespell2/dialog.h +debian/tmp/opt/trinity/include/tdespell2/dictionary.h +debian/tmp/opt/trinity/include/tdespell2/filter.h +debian/tmp/opt/trinity/include/tdespell2/highlighter.h +debian/tmp/opt/trinity/include/tdespell2/settings.h +debian/tmp/opt/trinity/include/tdespelldlg.h +debian/tmp/opt/trinity/include/tdespell.h debian/tmp/opt/trinity/include/ksplashscreen.h debian/tmp/opt/trinity/include/ksqueezedtextlabel.h debian/tmp/opt/trinity/include/ksslall.h @@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h debian/tmp/opt/trinity/include/kstyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h -debian/tmp/opt/trinity/include/ksycocaentry.h -debian/tmp/opt/trinity/include/ksycoca.h -debian/tmp/opt/trinity/include/ksycocatype.h +debian/tmp/opt/trinity/include/tdesycocaentry.h +debian/tmp/opt/trinity/include/tdesycoca.h +debian/tmp/opt/trinity/include/tdesycocatype.h debian/tmp/opt/trinity/include/ksyntaxhighlighter.h debian/tmp/opt/trinity/include/ksystemtray.h debian/tmp/opt/trinity/include/ktabbar.h @@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h debian/tmp/opt/trinity/include/ktempfile.h debian/tmp/opt/trinity/include/ktextbrowser.h debian/tmp/opt/trinity/include/ktextedit.h -debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h -debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/configinterface.h -debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/document.h -debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h -debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/editinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h -debian/tmp/opt/trinity/include/ktexteditor/editor.h -debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/markinterface.h -debian/tmp/opt/trinity/include/ktexteditor/plugin.h -debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h -debian/tmp/opt/trinity/include/ktexteditor/printinterface.h -debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h -debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h -debian/tmp/opt/trinity/include/ktexteditor/undointerface.h -debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h -debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/view.h -debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/document.h +debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h +debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h +debian/tmp/opt/trinity/include/tdetexteditor/editor.h +debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/plugin.h +debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h +debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/view.h +debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h debian/tmp/opt/trinity/include/ktimewidget.h debian/tmp/opt/trinity/include/ktimezones.h debian/tmp/opt/trinity/include/ktimezonewidget.h @@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h debian/tmp/opt/trinity/include/ktypelist.h debian/tmp/opt/trinity/include/kuniqueapp.h debian/tmp/opt/trinity/include/kuniqueapplication.h -debian/tmp/opt/trinity/include/kunittest/module.h -debian/tmp/opt/trinity/include/kunittest/runner.h -debian/tmp/opt/trinity/include/kunittest/tester.h +debian/tmp/opt/trinity/include/tdeunittest/module.h +debian/tmp/opt/trinity/include/tdeunittest/runner.h +debian/tmp/opt/trinity/include/tdeunittest/tester.h debian/tmp/opt/trinity/include/kunload.h debian/tmp/opt/trinity/include/kurifilter.h debian/tmp/opt/trinity/include/kurlbar.h @@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h debian/tmp/opt/trinity/include/kuser.h debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h -debian/tmp/opt/trinity/include/kwallet.h -debian/tmp/opt/trinity/include/kwallettypes.h +debian/tmp/opt/trinity/include/tdewallet.h +debian/tmp/opt/trinity/include/tdewallettypes.h debian/tmp/opt/trinity/include/twindowinfo.h debian/tmp/opt/trinity/include/twindowlistmenu.h debian/tmp/opt/trinity/include/twin.h @@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h debian/tmp/opt/trinity/include/kxmlguifactory.h debian/tmp/opt/trinity/include/kxmlgui.h debian/tmp/opt/trinity/include/kzip.h -debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h -debian/tmp/opt/trinity/include/libkrandr/libkrandr.h -debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h -debian/tmp/opt/trinity/include/libkrandr/randr.h -debian/tmp/opt/trinity/include/libkrsync/krsync.h -debian/tmp/opt/trinity/include/libkmid/alsaout.h -debian/tmp/opt/trinity/include/libkmid/dattypes.h -debian/tmp/opt/trinity/include/libkmid/deviceman.h -debian/tmp/opt/trinity/include/libkmid/fmout.h -debian/tmp/opt/trinity/include/libkmid/gusout.h -debian/tmp/opt/trinity/include/libkmid/libkmid.h -debian/tmp/opt/trinity/include/libkmid/midfile.h -debian/tmp/opt/trinity/include/libkmid/midimapper.h -debian/tmp/opt/trinity/include/libkmid/midiout.h -debian/tmp/opt/trinity/include/libkmid/midispec.h -debian/tmp/opt/trinity/include/libkmid/midistat.h -debian/tmp/opt/trinity/include/libkmid/mt32togm.h -debian/tmp/opt/trinity/include/libkmid/notearray.h -debian/tmp/opt/trinity/include/libkmid/player.h -debian/tmp/opt/trinity/include/libkmid/synthout.h -debian/tmp/opt/trinity/include/libkmid/track.h -debian/tmp/opt/trinity/include/libkmid/voiceman.h +debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h +debian/tmp/opt/trinity/include/libtderandr/libtderandr.h +debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h +debian/tmp/opt/trinity/include/libtderandr/randr.h +debian/tmp/opt/trinity/include/libtdersync/tdersync.h +debian/tmp/opt/trinity/include/libtdemid/alsaout.h +debian/tmp/opt/trinity/include/libtdemid/dattypes.h +debian/tmp/opt/trinity/include/libtdemid/deviceman.h +debian/tmp/opt/trinity/include/libtdemid/fmout.h +debian/tmp/opt/trinity/include/libtdemid/gusout.h +debian/tmp/opt/trinity/include/libtdemid/libtdemid.h +debian/tmp/opt/trinity/include/libtdemid/midfile.h +debian/tmp/opt/trinity/include/libtdemid/midimapper.h +debian/tmp/opt/trinity/include/libtdemid/midiout.h +debian/tmp/opt/trinity/include/libtdemid/midispec.h +debian/tmp/opt/trinity/include/libtdemid/midistat.h +debian/tmp/opt/trinity/include/libtdemid/mt32togm.h +debian/tmp/opt/trinity/include/libtdemid/notearray.h +debian/tmp/opt/trinity/include/libtdemid/player.h +debian/tmp/opt/trinity/include/libtdemid/synthout.h +debian/tmp/opt/trinity/include/libtdemid/track.h +debian/tmp/opt/trinity/include/libtdemid/voiceman.h debian/tmp/opt/trinity/include/netwm_def.h debian/tmp/opt/trinity/include/netwm.h debian/tmp/opt/trinity/include/qxembed.h @@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la debian/tmp/opt/trinity/lib/libtdesu.so debian/tmp/opt/trinity/lib/libtdeui.la debian/tmp/opt/trinity/lib/libtdeui.so -debian/tmp/opt/trinity/lib/libkdnssd.la -debian/tmp/opt/trinity/lib/libkdnssd.so -debian/tmp/opt/trinity/lib/libkhtml.la -debian/tmp/opt/trinity/lib/libkhtml.so -debian/tmp/opt/trinity/lib/libkimproxy.la -debian/tmp/opt/trinity/lib/libkimproxy.so +debian/tmp/opt/trinity/lib/libtdednssd.la +debian/tmp/opt/trinity/lib/libtdednssd.so +debian/tmp/opt/trinity/lib/libtdehtml.la +debian/tmp/opt/trinity/lib/libtdehtml.so +debian/tmp/opt/trinity/lib/libtdeimproxy.la +debian/tmp/opt/trinity/lib/libtdeimproxy.so debian/tmp/opt/trinity/lib/libkio.la debian/tmp/opt/trinity/lib/libkio.so debian/tmp/opt/trinity/lib/libkjava.la debian/tmp/opt/trinity/lib/libkjava.so debian/tmp/opt/trinity/lib/libkjs.la debian/tmp/opt/trinity/lib/libkjs.so -debian/tmp/opt/trinity/lib/libkmdi2.la -debian/tmp/opt/trinity/lib/libkmdi2.so -debian/tmp/opt/trinity/lib/libkmdi.la -debian/tmp/opt/trinity/lib/libkmdi.so -debian/tmp/opt/trinity/lib/libkmediaplayer.la -debian/tmp/opt/trinity/lib/libkmediaplayer.so -debian/tmp/opt/trinity/lib/libkmid.la -debian/tmp/opt/trinity/lib/libkmid.so +debian/tmp/opt/trinity/lib/libtdemdi2.la +debian/tmp/opt/trinity/lib/libtdemdi2.so +debian/tmp/opt/trinity/lib/libtdemdi.la +debian/tmp/opt/trinity/lib/libtdemdi.so +debian/tmp/opt/trinity/lib/libtdemediaplayer.la +debian/tmp/opt/trinity/lib/libtdemediaplayer.so +debian/tmp/opt/trinity/lib/libtdemid.la +debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libknewstuff.so -debian/tmp/opt/trinity/lib/libkntlm.la -debian/tmp/opt/trinity/lib/libkntlm.so -debian/tmp/opt/trinity/lib/libkparts.la -debian/tmp/opt/trinity/lib/libkparts.so -debian/tmp/opt/trinity/lib/libkrandr.la -debian/tmp/opt/trinity/lib/libkrandr.so -debian/tmp/opt/trinity/lib/libkrsync.la -debian/tmp/opt/trinity/lib/libkrsync.so -debian/tmp/opt/trinity/lib/libkresources.la -debian/tmp/opt/trinity/lib/libkresources.so -debian/tmp/opt/trinity/lib/libkscreensaver.la -debian/tmp/opt/trinity/lib/libkscreensaver.so -debian/tmp/opt/trinity/lib/libkscript.la -debian/tmp/opt/trinity/lib/libkscript.so -debian/tmp/opt/trinity/lib/libkspell2.la -debian/tmp/opt/trinity/lib/libkspell2.so -debian/tmp/opt/trinity/lib/libkspell.la -debian/tmp/opt/trinity/lib/libkspell.so -debian/tmp/opt/trinity/lib/libktexteditor.la -debian/tmp/opt/trinity/lib/libktexteditor.so -debian/tmp/opt/trinity/lib/libkunittest.la -debian/tmp/opt/trinity/lib/libkunittest.so -debian/tmp/opt/trinity/lib/libkutils.la -debian/tmp/opt/trinity/lib/libkutils.so -debian/tmp/opt/trinity/lib/libkwalletbackend.la -debian/tmp/opt/trinity/lib/libkwalletbackend.so -debian/tmp/opt/trinity/lib/libkwalletclient.la -debian/tmp/opt/trinity/lib/libkwalletclient.so +debian/tmp/opt/trinity/lib/libtdentlm.la +debian/tmp/opt/trinity/lib/libtdentlm.so +debian/tmp/opt/trinity/lib/libtdeparts.la +debian/tmp/opt/trinity/lib/libtdeparts.so +debian/tmp/opt/trinity/lib/libtderandr.la +debian/tmp/opt/trinity/lib/libtderandr.so +debian/tmp/opt/trinity/lib/libtdersync.la +debian/tmp/opt/trinity/lib/libtdersync.so +debian/tmp/opt/trinity/lib/libtderesources.la +debian/tmp/opt/trinity/lib/libtderesources.so +debian/tmp/opt/trinity/lib/libtdescreensaver.la +debian/tmp/opt/trinity/lib/libtdescreensaver.so +debian/tmp/opt/trinity/lib/libtdescript.la +debian/tmp/opt/trinity/lib/libtdescript.so +debian/tmp/opt/trinity/lib/libtdespell2.la +debian/tmp/opt/trinity/lib/libtdespell2.so +debian/tmp/opt/trinity/lib/libtdespell.la +debian/tmp/opt/trinity/lib/libtdespell.so +debian/tmp/opt/trinity/lib/libtdetexteditor.la +debian/tmp/opt/trinity/lib/libtdetexteditor.so +debian/tmp/opt/trinity/lib/libtdeunittest.la +debian/tmp/opt/trinity/lib/libtdeunittest.so +debian/tmp/opt/trinity/lib/libtdeutils.la +debian/tmp/opt/trinity/lib/libtdeutils.so +debian/tmp/opt/trinity/lib/libtdewalletbackend.la +debian/tmp/opt/trinity/lib/libtdewalletbackend.so +debian/tmp/opt/trinity/lib/libtdewalletclient.la +debian/tmp/opt/trinity/lib/libtdewalletclient.so debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages index af14a7e71..e5756a2db 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-trinity.1 ./debian/man/ksvgtopng-trinity.1 -./debian/man/kunittestmodrunner-trinity.1 +./debian/man/tdeunittestmodrunner-trinity.1 ./debian/man/makekdewidgets-trinity.1 ./debian/man/preparetips-trinity.1 diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install index 80a4b789c..4d1bb325b 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install @@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so debian/tmp/opt/trinity/lib/trinity/kcmshell.la debian/tmp/opt/trinity/lib/trinity/kcmshell.so debian/tmp/opt/trinity/lib/trinity/kconf_update.la @@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so debian/tmp/opt/trinity/lib/trinity/kded_kssld.la debian/tmp/opt/trinity/lib/trinity/kded_kssld.so -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so debian/tmp/opt/trinity/lib/trinity/kded.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so @@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so debian/tmp/opt/trinity/lib/trinity/kimg_dds.la debian/tmp/opt/trinity/lib/trinity/kimg_dds.so debian/tmp/opt/trinity/lib/trinity/kimg_eps.la @@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la debian/tmp/opt/trinity/lib/trinity/klauncher.so debian/tmp/opt/trinity/lib/trinity/knotify.la debian/tmp/opt/trinity/lib/trinity/knotify.so -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so debian/tmp/opt/trinity/lib/trinity/libkatepart.la debian/tmp/opt/trinity/lib/trinity/libkatepart.so -debian/tmp/opt/trinity/lib/trinity/libkcertpart.la -debian/tmp/opt/trinity/lib/trinity/libkcertpart.so +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so -debian/tmp/opt/trinity/lib/trinity/libkmultipart.la -debian/tmp/opt/trinity/lib/trinity/libkmultipart.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +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 @@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0 debian/tmp/opt/trinity/lib/libtdeui.so.4 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0 -debian/tmp/opt/trinity/lib/libkdnssd.so.1 -debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/trinity/lib/libkhtml.so.4 -debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdednssd.so.1 +debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdehtml.so.4 +debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/trinity/lib/libkio.so.4 debian/tmp/opt/trinity/lib/libkio.so.4.2.0 debian/tmp/opt/trinity/lib/libkjava.so.1 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0 debian/tmp/opt/trinity/lib/libkjs.so.1 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0 -debian/tmp/opt/trinity/lib/libkmdi2.so.1 -debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmdi.so.1 -debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/trinity/lib/libkmid.so.0 -debian/tmp/opt/trinity/lib/libkmid.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemdi.so.1 +debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0 -debian/tmp/opt/trinity/lib/libkparts.so.2 -debian/tmp/opt/trinity/lib/libkparts.so.2.1.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95 -debian/tmp/opt/trinity/lib/libkrsync.so.0 -debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1 -debian/tmp/opt/trinity/lib/libkresources.so.1 -debian/tmp/opt/trinity/lib/libkresources.so.1.2.0 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/trinity/lib/libkscript.so.0 -debian/tmp/opt/trinity/lib/libkscript.so.0.0.0 -debian/tmp/opt/trinity/lib/libkspell2.so.1 -debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkspell.so.4 -debian/tmp/opt/trinity/lib/libkspell.so.4.2.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/trinity/lib/libkunittest.so.1 -debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0 -debian/tmp/opt/trinity/lib/libkutils.so.1 -debian/tmp/opt/trinity/lib/libkutils.so.1.2.0 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/trinity/lib/libtdentlm.so.0 +debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeparts.so.2 +debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdersync.so.0 +debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdespell2.so.1 +debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdespell.so.4 +debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeutils.so.1 +debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/kfile_elf.desktop diff --git a/debian/squeeze/tdemultimedia/debian/changelog b/debian/squeeze/tdemultimedia/debian/changelog index 37b689f66..70dc106df 100644 --- a/debian/squeeze/tdemultimedia/debian/changelog +++ b/debian/squeeze/tdemultimedia/debian/changelog @@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low tdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low tdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low tdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low tdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low tdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low tdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking tdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control index cf85ef6b0..42f607611 100644 --- a/debian/squeeze/tdemultimedia/debian/control +++ b/debian/squeeze/tdemultimedia/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdemultimedia-trinity (<< 4:14.0.0) Breaks: kdemultimedia-trinity (<< 4:14.0.0) -Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) +Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,7 +31,7 @@ Section: devel Architecture: any Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) -Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) +Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module Development files and headers for the Trinity multimedia module. @@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of Trinity, as a component of the KDE multimedia module. See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information. -Package: kmid-trinity +Package: tdemid-trinity Section: sound Architecture: any -Replaces: kmid-trinity (<< 4:14.0.0) -Breaks: kmid-trinity (<< 4:14.0.0) +Replaces: tdemid-trinity (<< 4:14.0.0) +Breaks: tdemid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity diff --git a/debian/squeeze/tdemultimedia/debian/control.in b/debian/squeeze/tdemultimedia/debian/control.in index 7b20cca6d..4bf762241 100644 --- a/debian/squeeze/tdemultimedia/debian/control.in +++ b/debian/squeeze/tdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdemultimedia Section: tde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: tdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: tdemultimedia-dev Section: devel Architecture: any -Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'tdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdemultimedia/debian/copyright b/debian/squeeze/tdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/debian/squeeze/tdemultimedia/debian/copyright +++ b/debian/squeeze/tdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/debian/lenny/tdemultimedia/debian/icons/kmid-16.xpm b/debian/squeeze/tdemultimedia/debian/icons/tdemid-16.xpm index 0a510090a..64ad03b59 100644 --- a/debian/lenny/tdemultimedia/debian/icons/kmid-16.xpm +++ b/debian/squeeze/tdemultimedia/debian/icons/tdemid-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid-16[] = { +static char *tdemid-16[] = { /* columns rows colors chars-per-pixel */ "16 16 104 2", " c black", diff --git a/debian/wheezy/tdemultimedia/debian/icons/kmid.xpm b/debian/squeeze/tdemultimedia/debian/icons/tdemid.xpm index fb669aa72..c4cbb3bf1 100644 --- a/debian/wheezy/tdemultimedia/debian/icons/kmid.xpm +++ b/debian/squeeze/tdemultimedia/debian/icons/tdemid.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid[] = { +static char *tdemid[] = { /* columns rows colors chars-per-pixel */ "32 32 213 2", " c black", diff --git a/debian/squeeze/tdemultimedia/debian/kmid-trinity.install b/debian/squeeze/tdemultimedia/debian/kmid-trinity.install deleted file mode 100644 index e77e1784a..000000000 --- a/debian/squeeze/tdemultimedia/debian/kmid-trinity.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/trinity/bin/kmid -debian/tmp/opt/trinity/lib/trinity/libkmidpart.la -debian/tmp/opt/trinity/lib/trinity/libkmidpart.so -debian/tmp/opt/trinity/lib/libkmidlib.so.0 -debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/trinity/share/applications/tde/kmid.desktop -debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb -debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb -debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/trinity/share/pixmaps -debian/icons/kmid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu b/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu deleted file mode 100644 index ca828ea94..000000000 --- a/debian/squeeze/tdemultimedia/debian/kmid-trinity.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="TDE"\ - title="KMid"\ - icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\ - command="/opt/trinity/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1 b/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1 index 76f29a181..2e9e5704d 100644 --- a/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/debian/squeeze/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules index 1e7e0647c..58e944e5d 100755 --- a/debian/squeeze/tdemultimedia/debian/rules +++ b/debian/squeeze/tdemultimedia/debian/rules @@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ +PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install new file mode 100644 index 000000000..c36f2d16a --- /dev/null +++ b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.install @@ -0,0 +1,40 @@ +debian/tmp/opt/trinity/bin/tdemid +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so +debian/tmp/opt/trinity/lib/libtdemidlib.so.0 +debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop +debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb +debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/trinity/share/pixmaps +debian/icons/tdemid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu new file mode 100644 index 000000000..5f3ec9248 --- /dev/null +++ b/debian/squeeze/tdemultimedia/debian/tdemid-trinity.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="TDE"\ + title="KMid"\ + icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\ + command="/opt/trinity/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index 0d5dc5893..000000000 --- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html - diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..e4d54da22 --- /dev/null +++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: tdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html +Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html + diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install index 4edb170bf..97d3eb309 100644 --- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la debian/tmp/opt/trinity/lib/libtdeinit_krec.la debian/tmp/opt/trinity/lib/libtdeinit_noatun.la -debian/tmp/opt/trinity/lib/libkmidlib.la -debian/tmp/opt/trinity/lib/libkmidlib.so +debian/tmp/opt/trinity/lib/libtdemidlib.la +debian/tmp/opt/trinity/lib/libtdemidlib.so debian/tmp/opt/trinity/lib/libmpeg.la debian/tmp/opt/trinity/lib/libmpeg.so debian/tmp/opt/trinity/lib/libnoatun.la diff --git a/debian/squeeze/tdenetwork/debian/changelog b/debian/squeeze/tdenetwork/debian/changelog index 43b1aadd7..4510420ac 100644 --- a/debian/squeeze/tdenetwork/debian/changelog +++ b/debian/squeeze/tdenetwork/debian/changelog @@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to tdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in tdelibs) + * Add tdednssd to tdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in tdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control index a1a2dcb2b..a95cc81a7 100644 --- a/debian/squeeze/tdenetwork/debian/control +++ b/debian/squeeze/tdenetwork/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdenetwork-trinity (<< 4:14.0.0) Breaks: kdenetwork-trinity (<< 4:14.0.0) -Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) +Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) Description: network-related apps from the official Trinity release @@ -331,11 +331,11 @@ Description: LAN information server for Trinity This package is part of Trinity, as a component of the KDE network module. See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information. -Package: kdnssd-trinity +Package: tdednssd-trinity Section: net Architecture: any -Replaces: kdnssd-trinity (<< 4:14.0.0) -Breaks: kdnssd-trinity (<< 4:14.0.0) +Replaces: tdednssd-trinity (<< 4:14.0.0) +Breaks: tdednssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf diff --git a/debian/squeeze/tdenetwork/debian/control.in b/debian/squeeze/tdenetwork/debian/control.in index 1c7fc62f9..7c7dfdc41 100644 --- a/debian/squeeze/tdenetwork/debian/control.in +++ b/debian/squeeze/tdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdenetwork Section: tde Architecture: all -Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: tdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'tdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdenetwork/debian/kget-trinity.install b/debian/squeeze/tdenetwork/debian/kget-trinity.install index 9a1ac79f5..d2a0707c9 100644 --- a/debian/squeeze/tdenetwork/debian/kget-trinity.install +++ b/debian/squeeze/tdenetwork/debian/kget-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/kget -debian/tmp/opt/trinity/lib/trinity/khtml_kget.la -debian/tmp/opt/trinity/lib/trinity/khtml_kget.so +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so debian/tmp/opt/trinity/share/applications/tde/kget.desktop debian/tmp/opt/trinity/share/apps/kget/eventsrc debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png debian/tmp/opt/trinity/share/apps/kget/pics/try5.png debian/tmp/opt/trinity/share/apps/kget/pics/try6.png debian/tmp/opt/trinity/share/apps/kget/pics/try7.png -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules index 2579d07e3..0ee562691 100755 --- a/debian/squeeze/tdenetwork/debian/rules +++ b/debian/squeeze/tdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/debian/squeeze/tdenetwork/debian/kdnssd-trinity.install b/debian/squeeze/tdenetwork/debian/tdednssd-trinity.install index 8d6a52c6b..8d6a52c6b 100644 --- a/debian/squeeze/tdenetwork/debian/kdnssd-trinity.install +++ b/debian/squeeze/tdenetwork/debian/tdednssd-trinity.install diff --git a/debian/squeeze/tdepim/debian/changelog b/debian/squeeze/tdepim/debian/changelog index 09dc0dfc3..268556215 100644 --- a/debian/squeeze/tdepim/debian/changelog +++ b/debian/squeeze/tdepim/debian/changelog @@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for tdepim-kresources + * Increase version number on Replaces for tdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low tdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package tdepim-kresources. + * Split tderesources into new package tdepim-tderesources. * Split tdepimmacros.h into new package libtdepim1-dev, and make all the other -dev packages depend on it. diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control index 6a2e4385d..1c544b5f5 100644 --- a/debian/squeeze/tdepim/debian/control +++ b/debian/squeeze/tdepim/debian/control @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0) Breaks: kdepim-trinity (<< 4:14.0.0) -Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) +Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -52,7 +52,7 @@ Section: devel Architecture: any Replaces: kdepim-trinity-dev (<< 4:14.0.0) Breaks: kdepim-trinity-dev (<< 4:14.0.0) -Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) +Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. . @@ -116,7 +116,7 @@ Architecture: any Replaces: kaddressbook-trinity (<< 4:14.0.0) Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity +Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves This package is part of Trinity, and a component of the KDE PIM module. See the 'kde-trinity' and 'tdepim-trinity' packages for more information. -Package: tdepim-kresources-trinity +Package: tdepim-tderesources-trinity Section: tde Architecture: any -Replaces: kdepim-kresources-trinity (<< 4:14.0.0) -Breaks: kdepim-kresources-trinity (<< 4:14.0.0) +Replaces: kdepim-tderesources-trinity (<< 4:14.0.0) +Breaks: kdepim-tderesources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -321,7 +321,7 @@ Architecture: any Replaces: knotes-trinity (<< 4:14.0.0) Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/squeeze/tdepim/debian/control.in b/debian/squeeze/tdepim/debian/control.in index 3b45c48d0..4c48dcbef 100644 --- a/debian/squeeze/tdepim/debian/control.in +++ b/debian/squeeze/tdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources, tdebase-kio-plugins +Suggests: tdepim-tderesources, tdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'tdepim' packages for more information. -Package: tdepim-kresources +Package: tdepim-tderesources Section: tde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: tde Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -441,7 +441,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/squeeze/tdepim/debian/kaddressbook-trinity.install b/debian/squeeze/tdepim/debian/kaddressbook-trinity.install index 748b6e9a7..eac493c1b 100644 --- a/debian/squeeze/tdepim/debian/kaddressbook-trinity.install +++ b/debian/squeeze/tdepim/debian/kaddressbook-trinity.install @@ -29,7 +29,7 @@ /opt/trinity/share/services/kabldapconfig.desktop /opt/trinity/share/services/kaddressbook /opt/trinity/share/services/kontact/kaddressbookplugin.desktop -/opt/trinity/share/services/kresources/kabc/imap.desktop +/opt/trinity/share/services/tderesources/kabc/imap.desktop /opt/trinity/share/services/ldifvcardthumbnail.desktop /opt/trinity/share/servicetypes/dcopaddressbook.desktop /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/debian/squeeze/tdepim/debian/knotes-trinity.install b/debian/squeeze/tdepim/debian/knotes-trinity.install index 97956b197..8f65af5e3 100644 --- a/debian/squeeze/tdepim/debian/knotes-trinity.install +++ b/debian/squeeze/tdepim/debian/knotes-trinity.install @@ -15,9 +15,9 @@ /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png -/opt/trinity/share/services/kresources/knotes/imap.desktop -/opt/trinity/share/services/kresources/knotes/local.desktop -/opt/trinity/share/services/kresources/knotes_manager.desktop +/opt/trinity/share/services/tderesources/knotes/imap.desktop +/opt/trinity/share/services/tderesources/knotes/local.desktop +/opt/trinity/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/trinity/share/pixmaps ../icons/knotes-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdepim/debian/libkcal2b-trinity.install b/debian/squeeze/tdepim/debian/libkcal2b-trinity.install index ca6e71652..211c15b4d 100644 --- a/debian/squeeze/tdepim/debian/libkcal2b-trinity.install +++ b/debian/squeeze/tdepim/debian/libkcal2b-trinity.install @@ -13,9 +13,9 @@ /opt/trinity/lib/libkholidays.so.1 /opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/share/apps/libkholidays -/opt/trinity/share/services/kresources/kcal/imap.desktop -/opt/trinity/share/services/kresources/kcal/kabc.desktop -/opt/trinity/share/services/kresources/kcal/local.desktop -/opt/trinity/share/services/kresources/kcal/localdir.desktop -/opt/trinity/share/services/kresources/kcal/remote.desktop -/opt/trinity/share/services/kresources/kcal_manager.desktop +/opt/trinity/share/services/tderesources/kcal/imap.desktop +/opt/trinity/share/services/tderesources/kcal/kabc.desktop +/opt/trinity/share/services/tderesources/kcal/local.desktop +/opt/trinity/share/services/tderesources/kcal/localdir.desktop +/opt/trinity/share/services/tderesources/kcal/remote.desktop +/opt/trinity/share/services/tderesources/kcal_manager.desktop diff --git a/debian/squeeze/tdepim/debian/libtdepim1a-trinity.install b/debian/squeeze/tdepim/debian/libtdepim1a-trinity.install index 6a17101ae..e018f4bdf 100644 --- a/debian/squeeze/tdepim/debian/libtdepim1a-trinity.install +++ b/debian/squeeze/tdepim/debian/libtdepim1a-trinity.install @@ -1,7 +1,7 @@ /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/share/apps/tdepimwidgets diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules index 0e1c5356b..96073e510 100755 --- a/debian/squeeze/tdepim/debian/rules +++ b/debian/squeeze/tdepim/debian/rules @@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ -dDepends # Since -u args go first in dpkg-shlibdeps call ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends -#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \ +#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ # -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/debian/lenny/tdepim/debian/tdepim-kresources-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install index 588b690b1..bcf0991b5 100644 --- a/debian/lenny/tdepim/debian/tdepim-kresources-trinity.install +++ b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install @@ -74,31 +74,31 @@ /opt/trinity/lib/libkslox.so.0.0.0 /opt/trinity/lib/libgwsoap.so.0 /opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/trinity/share/services/kresources/kabc/kolab.desktop -/opt/trinity/share/services/kresources/kabc/scalix.desktop -/opt/trinity/share/services/kresources/kcal/exchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/trinity/share/services/kresources/kcal/kolab.desktop -/opt/trinity/share/services/kresources/kcal/scalix.desktop -/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/trinity/share/services/kresources/knotes/kolabresource.desktop -/opt/trinity/share/services/kresources/knotes/scalix.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kabc/kolab.desktop +/opt/trinity/share/services/tderesources/kabc/scalix.desktop +/opt/trinity/share/services/tderesources/kcal/exchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kcal/kolab.desktop +/opt/trinity/share/services/tderesources/kcal/scalix.desktop +/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/trinity/share/services/tderesources/knotes/kolabresource.desktop +/opt/trinity/share/services/tderesources/knotes/scalix.desktop /opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl /opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/debian/squeeze/tdesdk/debian/changelog +++ b/debian/squeeze/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/debian/squeeze/tdesdk/debian/control +++ b/debian/squeeze/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of Trinity, and a component of the KDE SDK module. diff --git a/debian/squeeze/tdesdk/debian/control.in b/debian/squeeze/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/debian/squeeze/tdesdk/debian/control.in +++ b/debian/squeeze/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install +++ b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.docs b/debian/squeeze/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/debian/squeeze/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.install b/debian/squeeze/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/debian/squeeze/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/squeeze/tdesdk/debian/not-installed.list b/debian/squeeze/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/debian/squeeze/tdesdk/debian/not-installed.list +++ b/debian/squeeze/tdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules index 36d49b7c7..2e37f4326 100755 --- a/debian/squeeze/tdesdk/debian/rules +++ b/debian/squeeze/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h diff --git a/debian/squeeze/tdeutils/debian/changelog b/debian/squeeze/tdeutils/debian/changelog index b3d3af82b..71992aefe 100644 --- a/debian/squeeze/tdeutils/debian/changelog +++ b/debian/squeeze/tdeutils/debian/changelog @@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control index 23132b0e0..956b68ea3 100644 --- a/debian/squeeze/tdeutils/debian/control +++ b/debian/squeeze/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -343,11 +343,11 @@ Description: timer utility for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kwalletmanager-trinity +Package: tdewalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-trinity (<< 4:14.0.0) -Breaks: kwalletmanager-trinity (<< 4:14.0.0) +Replaces: tdewalletmanager-trinity (<< 4:14.0.0) +Breaks: tdewalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity diff --git a/debian/squeeze/tdeutils/debian/control.in b/debian/squeeze/tdeutils/debian/control.in index f1d64bd00..f86496f4d 100644 --- a/debian/squeeze/tdeutils/debian/control.in +++ b/debian/squeeze/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install b/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install deleted file mode 100644 index 1ba37d2e3..000000000 --- a/debian/squeeze/tdeutils/debian/kwalletmanager-trinity.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/trinity/bin/kwalletmanager -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so -debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png -debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/services/kwallet_config.desktop -debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop diff --git a/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1 b/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1 index 15d1c35d9..d6ba31cf5 100644 --- a/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1 +++ b/debian/squeeze/tdeutils/debian/man/kcharselect-trinity.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet index 6331a925f..d87ba35e0 100644 --- a/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet +++ b/debian/squeeze/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet @@ -1,10 +1,10 @@ -Document: tdeutils-doc-html-kwallet +Document: tdeutils-doc-html-tdewallet Title: KWallet Handbook Author: George Staikos, Lauri Watts Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. Section: Tools Format: HTML -Index: /usr/share/doc/tde/HTML/en/kwallet/index.html -Files: /usr/share/doc/tde/HTML/en/kwallet/*.html +Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install index 17d66276d..a04353048 100644 --- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tdemultiformlistbox.h +debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h +debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h debian/tmp/opt/trinity/include/ksim/chart.h debian/tmp/opt/trinity/include/ksim/common.h debian/tmp/opt/trinity/include/ksim/ksimconfig.h diff --git a/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install b/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install new file mode 100644 index 000000000..6e75bf792 --- /dev/null +++ b/debian/squeeze/tdeutils/debian/tdewalletmanager-trinity.install @@ -0,0 +1,31 @@ +debian/tmp/opt/trinity/bin/tdewalletmanager +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so +debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png +debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/services/tdewallet_config.desktop +debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop diff --git a/debian/wheezy/applications/kaffeine/debian/changelog b/debian/wheezy/applications/kaffeine/debian/changelog index ae8921760..3f11ad0ae 100644 --- a/debian/wheezy/applications/kaffeine/debian/changelog +++ b/debian/wheezy/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/debian/wheezy/applications/kaffeine/debian/copyright b/debian/wheezy/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/debian/wheezy/applications/kaffeine/debian/copyright +++ b/debian/wheezy/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/debian/wheezy/applications/kmplayer/debian/changelog b/debian/wheezy/applications/kmplayer/debian/changelog index 26a6aed53..233e1f465 100644 --- a/debian/wheezy/applications/kmplayer/debian/changelog +++ b/debian/wheezy/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog b/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/control b/debian/wheezy/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/control +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in b/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in +++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/wheezy/applications/knetworkmanager8/debian/changelog b/debian/wheezy/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/debian/wheezy/applications/knetworkmanager8/debian/changelog +++ b/debian/wheezy/applications/knetworkmanager8/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/debian/wheezy/applications/knetworkmanager8/debian/control b/debian/wheezy/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/debian/wheezy/applications/knetworkmanager8/debian/control +++ b/debian/wheezy/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/wheezy/applications/knetworkmanager8/debian/control.in b/debian/wheezy/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/debian/wheezy/applications/knetworkmanager8/debian/control.in +++ b/debian/wheezy/applications/knetworkmanager8/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/debian/wheezy/applications/knetworkmanager9/debian/control b/debian/wheezy/applications/knetworkmanager9/debian/control index c32604bbf..efd256a36 100644 --- a/debian/wheezy/applications/knetworkmanager9/debian/control +++ b/debian/wheezy/applications/knetworkmanager9/debian/control @@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/wheezy/applications/knetworkmanager9/debian/control.in b/debian/wheezy/applications/knetworkmanager9/debian/control.in index e54418ea6..a5cefc2bb 100644 --- a/debian/wheezy/applications/knetworkmanager9/debian/control.in +++ b/debian/wheezy/applications/knetworkmanager9/debian/control.in @@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install b/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install index 7bed60e6c..a0e03ae3b 100644 --- a/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install +++ b/debian/wheezy/applications/koffice/debian/chalk-data-trinity.install @@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop -debian/tmp/opt/trinity/share/services/chalkscripting.desktop +debian/tmp/opt/trinity/share/services/chaltdescripting.desktop debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.install b/debian/wheezy/applications/koffice/debian/chalk-trinity.install index 4df24b77e..66afcfbba 100644 --- a/debian/wheezy/applications/koffice/debian/chalk-trinity.install +++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.install @@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so -debian/tmp/opt/trinity/lib/trinity/chalkscripting.la -debian/tmp/opt/trinity/lib/trinity/chalkscripting.so +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la @@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.* debian/tmp/opt/trinity/lib/libchalk_lms_*.so.* debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.* debian/tmp/opt/trinity/lib/libchalkrgb.so.* -debian/tmp/opt/trinity/lib/libchalkscripting.so.* +debian/tmp/opt/trinity/lib/libchaltdescripting.so.* debian/tmp/opt/trinity/lib/libchalkui.so.* debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.* diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..cdf64af56 100644 --- a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian +++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1 diff --git a/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install b/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install index 4b80b83ec..f28ee3bef 100644 --- a/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install +++ b/debian/wheezy/applications/koffice/debian/koffice-dev-trinity.install @@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la debian/tmp/opt/trinity/lib/libchalkimage.so debian/tmp/opt/trinity/lib/libchalkrgb.la debian/tmp/opt/trinity/lib/libchalkrgb.so -debian/tmp/opt/trinity/lib/libchalkscripting.la -debian/tmp/opt/trinity/lib/libchalkscripting.so +debian/tmp/opt/trinity/lib/libchaltdescripting.la +debian/tmp/opt/trinity/lib/libchaltdescripting.so debian/tmp/opt/trinity/lib/libchalkui.la debian/tmp/opt/trinity/lib/libchalkui.so debian/tmp/opt/trinity/lib/libkrossapi.la diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/changelog b/debian/wheezy/applications/kpowersave.cmake/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/wheezy/applications/kpowersave.cmake/debian/changelog +++ b/debian/wheezy/applications/kpowersave.cmake/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/wheezy/applications/kpowersave/debian/changelog b/debian/wheezy/applications/kpowersave/debian/changelog index c23417124..2d09c1e65 100644 --- a/debian/wheezy/applications/kpowersave/debian/changelog +++ b/debian/wheezy/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/changelog b/debian/wheezy/applications/tde-style-qtcurve/debian/changelog index 3ff72d99c..f7612d81f 100644 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/changelog +++ b/debian/wheezy/applications/tde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/debian/wheezy/libraries/python-trinity/debian/control b/debian/wheezy/libraries/python-trinity/debian/control index afacf68ee..cad02055c 100644 --- a/debian/wheezy/libraries/python-trinity/debian/control +++ b/debian/wheezy/libraries/python-trinity/debian/control @@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-trinity-trinity-dbg Priority: extra @@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/debian/wheezy/metapackages/meta-tde/debian/changelog b/debian/wheezy/metapackages/meta-tde/debian/changelog index 7c5da1b8f..c41106a4d 100644 --- a/debian/wheezy/metapackages/meta-tde/debian/changelog +++ b/debian/wheezy/metapackages/meta-tde/debian/changelog @@ -296,7 +296,7 @@ meta-kde (4:2.2) unstable; urgency=low meta-kde (4:2.1.44) unstable; urgency=low - * Fix libkmid | libkmid-alsa dep (Closes: #107585) + * Fix libtdemid | libtdemid-alsa dep (Closes: #107585) -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 @@ -395,7 +395,7 @@ task-kde (4:2.1.30) unstable; urgency=low task-kde (4:2.1.29) unstable; urgency=low - * New depends: kscreensaver, kdebase-audiolibs + * New depends: tdescreensaver, kdebase-audiolibs -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 diff --git a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install index cd7b93d85..2ad412a7f 100644 --- a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install +++ b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop -debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop diff --git a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 +++ b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 +++ b/debian/wheezy/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/debian/wheezy/tdeaddons/debian/konq-plugins-trinity.install b/debian/wheezy/tdeaddons/debian/konq-plugins-trinity.install index c74edf4ce..15ec8f99e 100644 --- a/debian/wheezy/tdeaddons/debian/konq-plugins-trinity.install +++ b/debian/wheezy/tdeaddons/debian/konq-plugins-trinity.install @@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so debian/tmp/opt/trinity/lib/trinity/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer debian/tmp/opt/trinity/share/apps/fsview debian/tmp/opt/trinity/share/apps/imagerotation/orient.py debian/tmp/opt/trinity/share/apps/imagerotation/exif.py -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins debian/tmp/opt/trinity/share/apps/konqiconview debian/tmp/opt/trinity/share/apps/konqlistview debian/tmp/opt/trinity/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/wheezy/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/debian/wheezy/tdeartwork/debian/changelog b/debian/wheezy/tdeartwork/debian/changelog index a3043310e..ddf857174 100644 --- a/debian/wheezy/tdeartwork/debian/changelog +++ b/debian/wheezy/tdeartwork/debian/changelog @@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since tdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low tdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on tdebase-bin (closes: #203185). + * Made tdescreensaver depend on tdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low tdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low tdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed tdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x. + * Renamed tdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control index ee0ae9ba5..b0100a04c 100644 --- a/debian/wheezy/tdeartwork/debian/control +++ b/debian/wheezy/tdeartwork/debian/control @@ -13,8 +13,8 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-trinity +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -110,13 +110,13 @@ Description: wallpapers released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-trinity +Package: tdescreensaver-trinity Architecture: any Section: tde -Replaces: kscreensaver-trinity (<< 4:14.0.0) -Breaks: kscreensaver-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-trinity +Package: tdescreensaver-xsavers-trinity Architecture: any Section: tde -Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-trinity +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into Trinity. With this package installed you can select and/or configure @@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with Trinity, see the separate package - kscreensaver-trinity. This package does depend on the xscreensaver package, and + tdescreensaver-trinity. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into Trinity. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-webcollage-trinity +Package: tdescreensaver-xsavers-webcollage-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm +Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity screensaver configuration. @@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-extra-trinity +Package: tdescreensaver-xsavers-extra-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) +Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. diff --git a/debian/wheezy/tdeartwork/debian/control.in b/debian/wheezy/tdeartwork/debian/control.in index 1721be0bf..4b914794e 100644 --- a/debian/wheezy/tdeartwork/debian/control.in +++ b/debian/wheezy/tdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: tdeartwork Architecture: all Section: tde -Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: tde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install deleted file mode 100644 index a3a14e04c..000000000 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install deleted file mode 100644 index f11cf310b..000000000 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/wheezy/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/debian/wheezy/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 index 64a0a5c45..73456139b 100644 --- a/debian/wheezy/tdeartwork/debian/man/kpartsaver-trinity.kss.1 +++ b/debian/wheezy/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kpartsaver.kss \- Media screen saver for KDE +tdepartsaver.kss \- Media screen saver for KDE .SH SYNOPSIS -.B kpartsaver.kss +.B tdepartsaver.kss .RI "[ " generic-options " ]" [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | \fB\-\-demo\fP ] @@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE This program is part of the official KDE artwork module. .SH OPTIONS Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. .TP \fB\-\-setup\fP Set up the screen saver. diff --git a/debian/wheezy/tdeartwork/debian/rules b/debian/wheezy/tdeartwork/debian/rules index 4e236c044..963f996bc 100755 --- a/debian/wheezy/tdeartwork/debian/rules +++ b/debian/wheezy/tdeartwork/debian/rules @@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png - cd kscreensaver/kxsconfig/ && ./update_hacks.sh + cd tdescreensaver/kxsconfig/ && ./update_hacks.sh -binary-install/kscreensaver-xsavers-extra-trinity:: - rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop +binary-install/tdescreensaver-xsavers-extra-trinity:: + rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.install index d65c099dc..012466480 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver-trinity.install +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.install @@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss debian/tmp/opt/trinity/bin/kswarm.kss debian/tmp/opt/trinity/bin/kfountain.kss debian/tmp/opt/trinity/bin/kgravity.kss -debian/tmp/opt/trinity/bin/kpartsaver.kss +debian/tmp/opt/trinity/bin/tdepartsaver.kss debian/tmp/opt/trinity/bin/kpendulum.kss debian/tmp/opt/trinity/bin/kblob.kss debian/tmp/opt/trinity/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/trinity/share/apps/kfiresaver -debian/tmp/opt/trinity/share/apps/kscreensaver +debian/tmp/opt/trinity/share/apps/tdescreensaver diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.manpages b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.manpages index 839491dbc..294e72dd8 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-trinity.manpages +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-trinity.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1 debian/man/kgravity-trinity.kss.1 debian/man/klines-trinity.kss.1 debian/man/klorenz-trinity.kss.1 -debian/man/kpartsaver-trinity.kss.1 +debian/man/tdepartsaver-trinity.kss.1 debian/man/kpendulum-trinity.kss.1 debian/man/kpolygon-trinity.kss.1 debian/man/krotation-trinity.kss.1 diff --git a/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install new file mode 100644 index 000000000..e2e812465 --- /dev/null +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.install index 901f852e1..901f852e1 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.install diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages index 356af4f32..356af4f32 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages diff --git a/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers.README.Debian index 828861775..a41c9ad57 100644 --- a/debian/wheezy/tdeartwork/debian/kscreensaver-xsavers.README.Debian +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver-xsavers) only contains hooks for the standard +This package (tdescreensaver-xsavers) only contains hooks for the standard xscreensavers, so that they can be selected and/or configured through the KDE Control Centre. For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. +see the separate package tdescreensaver. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/lenny/tdeartwork/debian/kscreensaver.README.Debian b/debian/wheezy/tdeartwork/debian/tdescreensaver.README.Debian index 68584d330..57a145f54 100644 --- a/debian/lenny/tdeartwork/debian/kscreensaver.README.Debian +++ b/debian/wheezy/tdeartwork/debian/tdescreensaver.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver) no longer contains the hooks for the standard +This package (tdescreensaver) no longer contains the hooks for the standard xscreensavers. It only contains the additional screensavers that are specifically shipped with KDE. To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. +Centre, install the separate package tdescreensaver-xsavers. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/debian/wheezy/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/debian/wheezy/tdebase/debian/changelog b/debian/wheezy/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/debian/wheezy/tdebase/debian/changelog +++ b/debian/wheezy/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/debian/wheezy/tdebase/debian/control.in b/debian/wheezy/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/debian/wheezy/tdebase/debian/control.in +++ b/debian/wheezy/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.install b/debian/wheezy/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/debian/wheezy/tdebase/debian/kcontrol-trinity.install +++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian b/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian +++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/debian/wheezy/tdebase/debian/konqueror-nsplugins-trinity.install b/debian/wheezy/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/debian/wheezy/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/debian/wheezy/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/debian/wheezy/tdebase/debian/konqueror-trinity.install b/debian/wheezy/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/debian/wheezy/tdebase/debian/konqueror-trinity.install +++ b/debian/wheezy/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules index c72887aaa..04b7019e4 100755 --- a/debian/wheezy/tdebase/debian/rules +++ b/debian/wheezy/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install +++ b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/debian/wheezy/tdebase/debian/kscreensaver-trinity.pam b/debian/wheezy/tdebase/debian/tdescreensaver-trinity.pam index 088a00503..9a2c74519 100644 --- a/debian/wheezy/tdebase/debian/kscreensaver-trinity.pam +++ b/debian/wheezy/tdebase/debian/tdescreensaver-trinity.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver # @include common-auth @include common-account diff --git a/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install index e29ab016c..764c26e42 100644 --- a/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install +++ b/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install @@ -11,7 +11,7 @@ #debian/tmp/opt/trinity/lib/libgtkxparts.so.0 #debian/tmp/opt/trinity/lib/libgtkxparts.so #debian/tmp/opt/trinity/lib/libgtkxparts.la -#debian/tmp/opt/trinity/include/xkparts +#debian/tmp/opt/trinity/include/xtdeparts #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so diff --git a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.install b/debian/wheezy/tdegraphics/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.install +++ b/debian/wheezy/tdegraphics/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian b/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian +++ b/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/debian/wheezy/tdegraphics/debian/tdegraphics-trinity-dev.install b/debian/wheezy/tdegraphics/debian/tdegraphics-trinity-dev.install index 80d007db5..26f6ba6ea 100644 --- a/debian/wheezy/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/debian/wheezy/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/kfaximage.h -debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/tdemultipageInterface.h debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/kviewshell/history.h debian/tmp/opt/trinity/include/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/kviewshell/length.h debian/tmp/opt/trinity/include/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/debian/wheezy/tdelibs/debian/changelog b/debian/wheezy/tdelibs/debian/changelog index 60b5c5d56..6a9f72874 100644 --- a/debian/wheezy/tdelibs/debian/changelog +++ b/debian/wheezy/tdelibs/debian/changelog @@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow tdelibs5-dev co-installable alongside tdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-tdelibs-3.5.6.diff, 47_tdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_tdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_tdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low tdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from tdelibs4-dev + * Remove libtdednssd depend from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in tdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in tdelibs4-dev. - * Add depends on libkdnssd1-avahi from tdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in tdelibs4-dev. + * Add depends on libtdednssd1-avahi from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since + - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/tdelibs4-dev.install: - usr/include/kiobuffer.h - - usr/include/kwallettypes.h + - usr/include/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: tdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low tdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low tdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of tdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of tdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/debian/wheezy/tdelibs/debian/copyright b/debian/wheezy/tdelibs/debian/copyright index 7c67eaede..945a09ca9 100644 --- a/debian/wheezy/tdelibs/debian/copyright +++ b/debian/wheezy/tdelibs/debian/copyright @@ -14,9 +14,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx, -tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx, +tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/kunittestmodrunner-kde3.1 b/debian/wheezy/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 index b61b06654..56c4f3bc6 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/man/kunittestmodrunner-kde3.1 +++ b/debian/wheezy/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 @@ -1,18 +1,18 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" .SH NAME -kunittestmodrunner +tdeunittestmodrunner \- a KDE command\-line application to run KUnitTest modules .SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. .SH OPTIONS .SS Options: .TP .BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] .TP .BR \-\-folder \ [ folder ] Only run tests modules which are found in the folder. Use the query option to select modules. [.] @@ -141,7 +141,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kunittestguimodrunner (1) +.BR tdeunittestguimodrunner (1) .sp 1 .TP .BR http://developer.kde.org diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install index 88bf85c86..9bcd52fc7 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install @@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc debian/tmp/etc/trinity/language.codes debian/tmp/etc/trinity/ui/kprintpreviewui.rc debian/tmp/etc/trinity/ui/ui_standards.rc -debian/tmp/opt/trinity/share/applications/tde/kresources.desktop +debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml -debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd @@ -229,22 +229,22 @@ 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/khtml/css/html4.css -debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css -debian/tmp/opt/trinity/share/apps/khtml/domain_info -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml.rc +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 +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/trinity/share/apps/kjava/kjava.jar @@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC debian/tmp/opt/trinity/share/apps/LICENSES/BSD debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2 @@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook debian/tmp/opt/trinity/share/emoticons/Default/angry.png debian/tmp/opt/trinity/share/emoticons/Default/bat.png debian/tmp/opt/trinity/share/emoticons/Default/beer.png @@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio debian/tmp/opt/trinity/share/services/jpeg.kimgio debian/tmp/opt/trinity/share/services/katepart.desktop debian/tmp/opt/trinity/share/services/kbzip2filter.desktop -debian/tmp/opt/trinity/share/services/kcertpart.desktop +debian/tmp/opt/trinity/share/services/tdecertpart.desktop debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop debian/tmp/opt/trinity/share/services/kded/kssld.desktop -debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop +debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop debian/tmp/opt/trinity/share/services/kgzipfilter.desktop -debian/tmp/opt/trinity/share/services/khtml.desktop -debian/tmp/opt/trinity/share/services/khtmlimage.desktop +debian/tmp/opt/trinity/share/services/tdehtml.desktop +debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop debian/tmp/opt/trinity/share/services/kio_uiserver.desktop debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop debian/tmp/opt/trinity/share/services/kmailservice.protocol -debian/tmp/opt/trinity/share/services/kmultipart.desktop +debian/tmp/opt/trinity/share/services/tdemultipart.desktop debian/tmp/opt/trinity/share/services/knotify.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/trinity/share/services/kspell_aspell.desktop -debian/tmp/opt/trinity/share/services/kspell_hspell.desktop -debian/tmp/opt/trinity/share/services/kspell_ispell.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol @@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/trinity/share/servicetypes/kpart.desktop debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/trinity/share/servicetypes/krop.desktop debian/tmp/opt/trinity/share/servicetypes/krwp.desktop debian/tmp/opt/trinity/share/servicetypes/kscan.desktop -debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.preinst b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.preinst index 452b17bfc..c6c9c016f 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.preinst +++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/trinity/colors/40\ Colors rm -f /etc/trinity/colors/Royal rm -f /etc/trinity/colors/Web - rm -f /etc/trinity/ktexteditor_autobookmarkerrc + rm -f /etc/trinity/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install index 30baf6aa3..6f7afbc0c 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp debian/tmp/opt/trinity/bin/dcopidlng debian/tmp/opt/trinity/bin/kconfig_compiler debian/tmp/opt/trinity/bin/ksvgtopng -debian/tmp/opt/trinity/bin/kunittestmodrunner +debian/tmp/opt/trinity/bin/tdeunittestmodrunner debian/tmp/opt/trinity/bin/makekdewidgets debian/tmp/opt/trinity/bin/preparetips @@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h debian/tmp/opt/trinity/include/khexedit/zoominterface.h -debian/tmp/opt/trinity/include/khtmldefaults.h -debian/tmp/opt/trinity/include/khtml_events.h -debian/tmp/opt/trinity/include/khtml_part.h -debian/tmp/opt/trinity/include/khtml_settings.h -debian/tmp/opt/trinity/include/khtmlview.h +debian/tmp/opt/trinity/include/tdehtmldefaults.h +debian/tmp/opt/trinity/include/tdehtml_events.h +debian/tmp/opt/trinity/include/tdehtml_part.h +debian/tmp/opt/trinity/include/tdehtml_settings.h +debian/tmp/opt/trinity/include/tdehtmlview.h debian/tmp/opt/trinity/include/khttpproxysocketdevice.h debian/tmp/opt/trinity/include/kicondialog.h debian/tmp/opt/trinity/include/kiconeffect.h @@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h debian/tmp/opt/trinity/include/kimagefilepreview.h debian/tmp/opt/trinity/include/kimageio.h debian/tmp/opt/trinity/include/kimiface.h -debian/tmp/opt/trinity/include/kimproxy.h -debian/tmp/opt/trinity/include/kimproxyiface.h +debian/tmp/opt/trinity/include/tdeimproxy.h +debian/tmp/opt/trinity/include/tdeimproxyiface.h debian/tmp/opt/trinity/include/kinputdialog.h debian/tmp/opt/trinity/include/kinstance.h debian/tmp/opt/trinity/include/kio/authinfo.h @@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h debian/tmp/opt/trinity/include/kio/tdesasl.h debian/tmp/opt/trinity/include/kio/kmdbase.h debian/tmp/opt/trinity/include/kio/kmdcodec.h -debian/tmp/opt/trinity/include/kio/kntlm.h +debian/tmp/opt/trinity/include/kio/tdentlm.h debian/tmp/opt/trinity/include/kio/metainfojob.h debian/tmp/opt/trinity/include/kio/netaccess.h debian/tmp/opt/trinity/include/kio/observer.h @@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h debian/tmp/opt/trinity/include/kmainwindowiface.h debian/tmp/opt/trinity/include/kmanagerselection.h debian/tmp/opt/trinity/include/kmdcodec.h -debian/tmp/opt/trinity/include/kmdichildarea.h -debian/tmp/opt/trinity/include/kmdichildfrmcaption.h -debian/tmp/opt/trinity/include/kmdichildfrm.h -debian/tmp/opt/trinity/include/kmdichildview.h -debian/tmp/opt/trinity/include/kmdidefines.h -debian/tmp/opt/trinity/include/kmdi/global.h -debian/tmp/opt/trinity/include/kmdiiterator.h -debian/tmp/opt/trinity/include/kmdilistiterator.h -debian/tmp/opt/trinity/include/kmdimainfrm.h -debian/tmp/opt/trinity/include/kmdi/mainwindow.h -debian/tmp/opt/trinity/include/kmdinulliterator.h -debian/tmp/opt/trinity/include/kmdi/tabwidget.h -debian/tmp/opt/trinity/include/kmditaskbar.h -debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h -debian/tmp/opt/trinity/include/kmditoolviewaccessor.h -debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h -debian/tmp/opt/trinity/include/kmediaplayer/player.h -debian/tmp/opt/trinity/include/kmediaplayer/view.h +debian/tmp/opt/trinity/include/tdemdichildarea.h +debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h +debian/tmp/opt/trinity/include/tdemdichildfrm.h +debian/tmp/opt/trinity/include/tdemdichildview.h +debian/tmp/opt/trinity/include/tdemdidefines.h +debian/tmp/opt/trinity/include/tdemdi/global.h +debian/tmp/opt/trinity/include/tdemdiiterator.h +debian/tmp/opt/trinity/include/tdemdilistiterator.h +debian/tmp/opt/trinity/include/tdemdimainfrm.h +debian/tmp/opt/trinity/include/tdemdi/mainwindow.h +debian/tmp/opt/trinity/include/tdemdinulliterator.h +debian/tmp/opt/trinity/include/tdemdi/tabwidget.h +debian/tmp/opt/trinity/include/tdemditaskbar.h +debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h +debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h +debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/trinity/include/tdemediaplayer/player.h +debian/tmp/opt/trinity/include/tdemediaplayer/view.h debian/tmp/opt/trinity/include/kmenubar.h debian/tmp/opt/trinity/include/kmessagebox.h debian/tmp/opt/trinity/include/kmimemagic.h @@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h debian/tmp/opt/trinity/include/kmimetype.h debian/tmp/opt/trinity/include/kmimetyperesolver.h debian/tmp/opt/trinity/include/kmountpoint.h -debian/tmp/opt/trinity/include/kmulticastsocketdevice.h -debian/tmp/opt/trinity/include/kmulticastsocket.h -debian/tmp/opt/trinity/include/kmultipledrag.h -debian/tmp/opt/trinity/include/kmultitabbar.h +debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h +debian/tmp/opt/trinity/include/tdemulticastsocket.h +debian/tmp/opt/trinity/include/tdemultipledrag.h +debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/knewstuff/engine.h @@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h debian/tmp/opt/trinity/include/kpanelappmenu.h debian/tmp/opt/trinity/include/kpanelextension.h debian/tmp/opt/trinity/include/kpanelmenu.h -debian/tmp/opt/trinity/include/kparts/browserextension.h -debian/tmp/opt/trinity/include/kparts/browserinterface.h -debian/tmp/opt/trinity/include/kparts/browserrun.h -debian/tmp/opt/trinity/include/kparts/componentfactory.h -debian/tmp/opt/trinity/include/kparts/dockmainwindow.h -debian/tmp/opt/trinity/include/kparts/event.h -debian/tmp/opt/trinity/include/kparts/factory.h -debian/tmp/opt/trinity/include/kparts/genericfactory.h -debian/tmp/opt/trinity/include/kparts/historyprovider.h -debian/tmp/opt/trinity/include/kparts/mainwindow.h -debian/tmp/opt/trinity/include/kparts/part.h -debian/tmp/opt/trinity/include/kparts/partmanager.h -debian/tmp/opt/trinity/include/kparts/plugin.h -debian/tmp/opt/trinity/include/kparts/statusbarextension.h +debian/tmp/opt/trinity/include/tdeparts/browserextension.h +debian/tmp/opt/trinity/include/tdeparts/browserinterface.h +debian/tmp/opt/trinity/include/tdeparts/browserrun.h +debian/tmp/opt/trinity/include/tdeparts/componentfactory.h +debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h +debian/tmp/opt/trinity/include/tdeparts/event.h +debian/tmp/opt/trinity/include/tdeparts/factory.h +debian/tmp/opt/trinity/include/tdeparts/genericfactory.h +debian/tmp/opt/trinity/include/tdeparts/historyprovider.h +debian/tmp/opt/trinity/include/tdeparts/mainwindow.h +debian/tmp/opt/trinity/include/tdeparts/part.h +debian/tmp/opt/trinity/include/tdeparts/partmanager.h +debian/tmp/opt/trinity/include/tdeparts/plugin.h +debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h debian/tmp/opt/trinity/include/kpassdlg.h debian/tmp/opt/trinity/include/kpassivepopup.h debian/tmp/opt/trinity/include/kpixmapeffect.h @@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h debian/tmp/opt/trinity/include/kreplacedialog.h debian/tmp/opt/trinity/include/kreplace.h debian/tmp/opt/trinity/include/kresolver.h -debian/tmp/opt/trinity/include/kresources/configdialog.h -debian/tmp/opt/trinity/include/kresources/configpage.h -debian/tmp/opt/trinity/include/kresources/configwidget.h -debian/tmp/opt/trinity/include/kresources/factory.h -debian/tmp/opt/trinity/include/kresources/manager.h -debian/tmp/opt/trinity/include/kresources/manageriface.h -debian/tmp/opt/trinity/include/kresources/managerimpl.h -debian/tmp/opt/trinity/include/kresources/resource.h -debian/tmp/opt/trinity/include/kresources/selectdialog.h +debian/tmp/opt/trinity/include/tderesources/configdialog.h +debian/tmp/opt/trinity/include/tderesources/configpage.h +debian/tmp/opt/trinity/include/tderesources/configwidget.h +debian/tmp/opt/trinity/include/tderesources/factory.h +debian/tmp/opt/trinity/include/tderesources/manager.h +debian/tmp/opt/trinity/include/tderesources/manageriface.h +debian/tmp/opt/trinity/include/tderesources/managerimpl.h +debian/tmp/opt/trinity/include/tderesources/resource.h +debian/tmp/opt/trinity/include/tderesources/selectdialog.h debian/tmp/opt/trinity/include/krestrictedline.h debian/tmp/opt/trinity/include/kreverseresolver.h debian/tmp/opt/trinity/include/krfcdate.h @@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h debian/tmp/opt/trinity/include/ksavefile.h debian/tmp/opt/trinity/include/kscan.h debian/tmp/opt/trinity/include/ksconfig.h -debian/tmp/opt/trinity/include/kscreensaver.h -debian/tmp/opt/trinity/include/kscreensaver_vroot.h +debian/tmp/opt/trinity/include/tdescreensaver.h +debian/tmp/opt/trinity/include/tdescreensaver_vroot.h debian/tmp/opt/trinity/include/kscrollview.h debian/tmp/opt/trinity/include/kselect.h debian/tmp/opt/trinity/include/kseparator.h @@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h debian/tmp/opt/trinity/include/ksortablevaluelist.h debian/tmp/opt/trinity/include/kspeech.h debian/tmp/opt/trinity/include/kspeechsink.h -debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h -debian/tmp/opt/trinity/include/kspell2/broker.h -debian/tmp/opt/trinity/include/kspell2/configdialog.h -debian/tmp/opt/trinity/include/kspell2/configwidget.h -debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h -debian/tmp/opt/trinity/include/kspell2/dialog.h -debian/tmp/opt/trinity/include/kspell2/dictionary.h -debian/tmp/opt/trinity/include/kspell2/filter.h -debian/tmp/opt/trinity/include/kspell2/highlighter.h -debian/tmp/opt/trinity/include/kspell2/settings.h -debian/tmp/opt/trinity/include/kspelldlg.h -debian/tmp/opt/trinity/include/kspell.h +debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h +debian/tmp/opt/trinity/include/tdespell2/broker.h +debian/tmp/opt/trinity/include/tdespell2/configdialog.h +debian/tmp/opt/trinity/include/tdespell2/configwidget.h +debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h +debian/tmp/opt/trinity/include/tdespell2/dialog.h +debian/tmp/opt/trinity/include/tdespell2/dictionary.h +debian/tmp/opt/trinity/include/tdespell2/filter.h +debian/tmp/opt/trinity/include/tdespell2/highlighter.h +debian/tmp/opt/trinity/include/tdespell2/settings.h +debian/tmp/opt/trinity/include/tdespelldlg.h +debian/tmp/opt/trinity/include/tdespell.h debian/tmp/opt/trinity/include/ksplashscreen.h debian/tmp/opt/trinity/include/ksqueezedtextlabel.h debian/tmp/opt/trinity/include/ksslall.h @@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h debian/tmp/opt/trinity/include/kstyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h -debian/tmp/opt/trinity/include/ksycocaentry.h -debian/tmp/opt/trinity/include/ksycoca.h -debian/tmp/opt/trinity/include/ksycocatype.h +debian/tmp/opt/trinity/include/tdesycocaentry.h +debian/tmp/opt/trinity/include/tdesycoca.h +debian/tmp/opt/trinity/include/tdesycocatype.h debian/tmp/opt/trinity/include/ksyntaxhighlighter.h debian/tmp/opt/trinity/include/ksystemtray.h debian/tmp/opt/trinity/include/ktabbar.h @@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h debian/tmp/opt/trinity/include/ktempfile.h debian/tmp/opt/trinity/include/ktextbrowser.h debian/tmp/opt/trinity/include/ktextedit.h -debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h -debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/configinterface.h -debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/document.h -debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h -debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/editinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h -debian/tmp/opt/trinity/include/ktexteditor/editor.h -debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/markinterface.h -debian/tmp/opt/trinity/include/ktexteditor/plugin.h -debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h -debian/tmp/opt/trinity/include/ktexteditor/printinterface.h -debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h -debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h -debian/tmp/opt/trinity/include/ktexteditor/undointerface.h -debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h -debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/view.h -debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/document.h +debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h +debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h +debian/tmp/opt/trinity/include/tdetexteditor/editor.h +debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/plugin.h +debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h +debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/view.h +debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h debian/tmp/opt/trinity/include/ktimewidget.h debian/tmp/opt/trinity/include/ktimezones.h debian/tmp/opt/trinity/include/ktimezonewidget.h @@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h debian/tmp/opt/trinity/include/ktypelist.h debian/tmp/opt/trinity/include/kuniqueapp.h debian/tmp/opt/trinity/include/kuniqueapplication.h -debian/tmp/opt/trinity/include/kunittest/module.h -debian/tmp/opt/trinity/include/kunittest/runner.h -debian/tmp/opt/trinity/include/kunittest/tester.h +debian/tmp/opt/trinity/include/tdeunittest/module.h +debian/tmp/opt/trinity/include/tdeunittest/runner.h +debian/tmp/opt/trinity/include/tdeunittest/tester.h debian/tmp/opt/trinity/include/kunload.h debian/tmp/opt/trinity/include/kurifilter.h debian/tmp/opt/trinity/include/kurlbar.h @@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h debian/tmp/opt/trinity/include/kuser.h debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h -debian/tmp/opt/trinity/include/kwallet.h -debian/tmp/opt/trinity/include/kwallettypes.h +debian/tmp/opt/trinity/include/tdewallet.h +debian/tmp/opt/trinity/include/tdewallettypes.h debian/tmp/opt/trinity/include/twindowinfo.h debian/tmp/opt/trinity/include/twindowlistmenu.h debian/tmp/opt/trinity/include/twin.h @@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h debian/tmp/opt/trinity/include/kxmlguifactory.h debian/tmp/opt/trinity/include/kxmlgui.h debian/tmp/opt/trinity/include/kzip.h -debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h -debian/tmp/opt/trinity/include/libkrandr/libkrandr.h -debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h -debian/tmp/opt/trinity/include/libkrandr/randr.h -debian/tmp/opt/trinity/include/libkrsync/krsync.h -debian/tmp/opt/trinity/include/libkmid/alsaout.h -debian/tmp/opt/trinity/include/libkmid/dattypes.h -debian/tmp/opt/trinity/include/libkmid/deviceman.h -debian/tmp/opt/trinity/include/libkmid/fmout.h -debian/tmp/opt/trinity/include/libkmid/gusout.h -debian/tmp/opt/trinity/include/libkmid/libkmid.h -debian/tmp/opt/trinity/include/libkmid/midfile.h -debian/tmp/opt/trinity/include/libkmid/midimapper.h -debian/tmp/opt/trinity/include/libkmid/midiout.h -debian/tmp/opt/trinity/include/libkmid/midispec.h -debian/tmp/opt/trinity/include/libkmid/midistat.h -debian/tmp/opt/trinity/include/libkmid/mt32togm.h -debian/tmp/opt/trinity/include/libkmid/notearray.h -debian/tmp/opt/trinity/include/libkmid/player.h -debian/tmp/opt/trinity/include/libkmid/synthout.h -debian/tmp/opt/trinity/include/libkmid/track.h -debian/tmp/opt/trinity/include/libkmid/voiceman.h +debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h +debian/tmp/opt/trinity/include/libtderandr/libtderandr.h +debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h +debian/tmp/opt/trinity/include/libtderandr/randr.h +debian/tmp/opt/trinity/include/libtdersync/tdersync.h +debian/tmp/opt/trinity/include/libtdemid/alsaout.h +debian/tmp/opt/trinity/include/libtdemid/dattypes.h +debian/tmp/opt/trinity/include/libtdemid/deviceman.h +debian/tmp/opt/trinity/include/libtdemid/fmout.h +debian/tmp/opt/trinity/include/libtdemid/gusout.h +debian/tmp/opt/trinity/include/libtdemid/libtdemid.h +debian/tmp/opt/trinity/include/libtdemid/midfile.h +debian/tmp/opt/trinity/include/libtdemid/midimapper.h +debian/tmp/opt/trinity/include/libtdemid/midiout.h +debian/tmp/opt/trinity/include/libtdemid/midispec.h +debian/tmp/opt/trinity/include/libtdemid/midistat.h +debian/tmp/opt/trinity/include/libtdemid/mt32togm.h +debian/tmp/opt/trinity/include/libtdemid/notearray.h +debian/tmp/opt/trinity/include/libtdemid/player.h +debian/tmp/opt/trinity/include/libtdemid/synthout.h +debian/tmp/opt/trinity/include/libtdemid/track.h +debian/tmp/opt/trinity/include/libtdemid/voiceman.h debian/tmp/opt/trinity/include/netwm_def.h debian/tmp/opt/trinity/include/netwm.h debian/tmp/opt/trinity/include/qxembed.h @@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la debian/tmp/opt/trinity/lib/libtdesu.so debian/tmp/opt/trinity/lib/libtdeui.la debian/tmp/opt/trinity/lib/libtdeui.so -debian/tmp/opt/trinity/lib/libkdnssd.la -debian/tmp/opt/trinity/lib/libkdnssd.so -debian/tmp/opt/trinity/lib/libkhtml.la -debian/tmp/opt/trinity/lib/libkhtml.so -debian/tmp/opt/trinity/lib/libkimproxy.la -debian/tmp/opt/trinity/lib/libkimproxy.so +debian/tmp/opt/trinity/lib/libtdednssd.la +debian/tmp/opt/trinity/lib/libtdednssd.so +debian/tmp/opt/trinity/lib/libtdehtml.la +debian/tmp/opt/trinity/lib/libtdehtml.so +debian/tmp/opt/trinity/lib/libtdeimproxy.la +debian/tmp/opt/trinity/lib/libtdeimproxy.so debian/tmp/opt/trinity/lib/libkio.la debian/tmp/opt/trinity/lib/libkio.so debian/tmp/opt/trinity/lib/libkjava.la debian/tmp/opt/trinity/lib/libkjava.so debian/tmp/opt/trinity/lib/libkjs.la debian/tmp/opt/trinity/lib/libkjs.so -debian/tmp/opt/trinity/lib/libkmdi2.la -debian/tmp/opt/trinity/lib/libkmdi2.so -debian/tmp/opt/trinity/lib/libkmdi.la -debian/tmp/opt/trinity/lib/libkmdi.so -debian/tmp/opt/trinity/lib/libkmediaplayer.la -debian/tmp/opt/trinity/lib/libkmediaplayer.so -debian/tmp/opt/trinity/lib/libkmid.la -debian/tmp/opt/trinity/lib/libkmid.so +debian/tmp/opt/trinity/lib/libtdemdi2.la +debian/tmp/opt/trinity/lib/libtdemdi2.so +debian/tmp/opt/trinity/lib/libtdemdi.la +debian/tmp/opt/trinity/lib/libtdemdi.so +debian/tmp/opt/trinity/lib/libtdemediaplayer.la +debian/tmp/opt/trinity/lib/libtdemediaplayer.so +debian/tmp/opt/trinity/lib/libtdemid.la +debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libknewstuff.so -debian/tmp/opt/trinity/lib/libkntlm.la -debian/tmp/opt/trinity/lib/libkntlm.so -debian/tmp/opt/trinity/lib/libkparts.la -debian/tmp/opt/trinity/lib/libkparts.so -debian/tmp/opt/trinity/lib/libkrandr.la -debian/tmp/opt/trinity/lib/libkrandr.so -debian/tmp/opt/trinity/lib/libkrsync.la -debian/tmp/opt/trinity/lib/libkrsync.so -debian/tmp/opt/trinity/lib/libkresources.la -debian/tmp/opt/trinity/lib/libkresources.so -debian/tmp/opt/trinity/lib/libkscreensaver.la -debian/tmp/opt/trinity/lib/libkscreensaver.so -debian/tmp/opt/trinity/lib/libkscript.la -debian/tmp/opt/trinity/lib/libkscript.so -debian/tmp/opt/trinity/lib/libkspell2.la -debian/tmp/opt/trinity/lib/libkspell2.so -debian/tmp/opt/trinity/lib/libkspell.la -debian/tmp/opt/trinity/lib/libkspell.so -debian/tmp/opt/trinity/lib/libktexteditor.la -debian/tmp/opt/trinity/lib/libktexteditor.so -debian/tmp/opt/trinity/lib/libkunittest.la -debian/tmp/opt/trinity/lib/libkunittest.so -debian/tmp/opt/trinity/lib/libkutils.la -debian/tmp/opt/trinity/lib/libkutils.so -debian/tmp/opt/trinity/lib/libkwalletbackend.la -debian/tmp/opt/trinity/lib/libkwalletbackend.so -debian/tmp/opt/trinity/lib/libkwalletclient.la -debian/tmp/opt/trinity/lib/libkwalletclient.so +debian/tmp/opt/trinity/lib/libtdentlm.la +debian/tmp/opt/trinity/lib/libtdentlm.so +debian/tmp/opt/trinity/lib/libtdeparts.la +debian/tmp/opt/trinity/lib/libtdeparts.so +debian/tmp/opt/trinity/lib/libtderandr.la +debian/tmp/opt/trinity/lib/libtderandr.so +debian/tmp/opt/trinity/lib/libtdersync.la +debian/tmp/opt/trinity/lib/libtdersync.so +debian/tmp/opt/trinity/lib/libtderesources.la +debian/tmp/opt/trinity/lib/libtderesources.so +debian/tmp/opt/trinity/lib/libtdescreensaver.la +debian/tmp/opt/trinity/lib/libtdescreensaver.so +debian/tmp/opt/trinity/lib/libtdescript.la +debian/tmp/opt/trinity/lib/libtdescript.so +debian/tmp/opt/trinity/lib/libtdespell2.la +debian/tmp/opt/trinity/lib/libtdespell2.so +debian/tmp/opt/trinity/lib/libtdespell.la +debian/tmp/opt/trinity/lib/libtdespell.so +debian/tmp/opt/trinity/lib/libtdetexteditor.la +debian/tmp/opt/trinity/lib/libtdetexteditor.so +debian/tmp/opt/trinity/lib/libtdeunittest.la +debian/tmp/opt/trinity/lib/libtdeunittest.so +debian/tmp/opt/trinity/lib/libtdeutils.la +debian/tmp/opt/trinity/lib/libtdeutils.so +debian/tmp/opt/trinity/lib/libtdewalletbackend.la +debian/tmp/opt/trinity/lib/libtdewalletbackend.so +debian/tmp/opt/trinity/lib/libtdewalletclient.la +debian/tmp/opt/trinity/lib/libtdewalletclient.so debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so diff --git a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.manpages b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.manpages index af14a7e71..e5756a2db 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.manpages +++ b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-trinity.1 ./debian/man/ksvgtopng-trinity.1 -./debian/man/kunittestmodrunner-trinity.1 +./debian/man/tdeunittestmodrunner-trinity.1 ./debian/man/makekdewidgets-trinity.1 ./debian/man/preparetips-trinity.1 diff --git a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install index 80a4b789c..4d1bb325b 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install @@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so debian/tmp/opt/trinity/lib/trinity/kcmshell.la debian/tmp/opt/trinity/lib/trinity/kcmshell.so debian/tmp/opt/trinity/lib/trinity/kconf_update.la @@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so debian/tmp/opt/trinity/lib/trinity/kded_kssld.la debian/tmp/opt/trinity/lib/trinity/kded_kssld.so -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so debian/tmp/opt/trinity/lib/trinity/kded.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so @@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so debian/tmp/opt/trinity/lib/trinity/kimg_dds.la debian/tmp/opt/trinity/lib/trinity/kimg_dds.so debian/tmp/opt/trinity/lib/trinity/kimg_eps.la @@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la debian/tmp/opt/trinity/lib/trinity/klauncher.so debian/tmp/opt/trinity/lib/trinity/knotify.la debian/tmp/opt/trinity/lib/trinity/knotify.so -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so debian/tmp/opt/trinity/lib/trinity/libkatepart.la debian/tmp/opt/trinity/lib/trinity/libkatepart.so -debian/tmp/opt/trinity/lib/trinity/libkcertpart.la -debian/tmp/opt/trinity/lib/trinity/libkcertpart.so +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so -debian/tmp/opt/trinity/lib/trinity/libkmultipart.la -debian/tmp/opt/trinity/lib/trinity/libkmultipart.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +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 @@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0 debian/tmp/opt/trinity/lib/libtdeui.so.4 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0 -debian/tmp/opt/trinity/lib/libkdnssd.so.1 -debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/trinity/lib/libkhtml.so.4 -debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdednssd.so.1 +debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdehtml.so.4 +debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/trinity/lib/libkio.so.4 debian/tmp/opt/trinity/lib/libkio.so.4.2.0 debian/tmp/opt/trinity/lib/libkjava.so.1 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0 debian/tmp/opt/trinity/lib/libkjs.so.1 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0 -debian/tmp/opt/trinity/lib/libkmdi2.so.1 -debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmdi.so.1 -debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/trinity/lib/libkmid.so.0 -debian/tmp/opt/trinity/lib/libkmid.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemdi.so.1 +debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0 -debian/tmp/opt/trinity/lib/libkparts.so.2 -debian/tmp/opt/trinity/lib/libkparts.so.2.1.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95 -debian/tmp/opt/trinity/lib/libkrsync.so.0 -debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1 -debian/tmp/opt/trinity/lib/libkresources.so.1 -debian/tmp/opt/trinity/lib/libkresources.so.1.2.0 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/trinity/lib/libkscript.so.0 -debian/tmp/opt/trinity/lib/libkscript.so.0.0.0 -debian/tmp/opt/trinity/lib/libkspell2.so.1 -debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkspell.so.4 -debian/tmp/opt/trinity/lib/libkspell.so.4.2.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/trinity/lib/libkunittest.so.1 -debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0 -debian/tmp/opt/trinity/lib/libkutils.so.1 -debian/tmp/opt/trinity/lib/libkutils.so.1.2.0 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/trinity/lib/libtdentlm.so.0 +debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeparts.so.2 +debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdersync.so.0 +debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdespell2.so.1 +debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdespell.so.4 +debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeutils.so.1 +debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/kfile_elf.desktop diff --git a/debian/wheezy/tdemultimedia/debian/changelog b/debian/wheezy/tdemultimedia/debian/changelog index 37b689f66..70dc106df 100644 --- a/debian/wheezy/tdemultimedia/debian/changelog +++ b/debian/wheezy/tdemultimedia/debian/changelog @@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low tdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low tdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low tdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low tdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low tdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low tdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking tdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/debian/wheezy/tdemultimedia/debian/control b/debian/wheezy/tdemultimedia/debian/control index cf85ef6b0..42f607611 100644 --- a/debian/wheezy/tdemultimedia/debian/control +++ b/debian/wheezy/tdemultimedia/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdemultimedia-trinity (<< 4:14.0.0) Breaks: kdemultimedia-trinity (<< 4:14.0.0) -Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) +Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,7 +31,7 @@ Section: devel Architecture: any Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) -Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) +Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module Development files and headers for the Trinity multimedia module. @@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of Trinity, as a component of the KDE multimedia module. See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information. -Package: kmid-trinity +Package: tdemid-trinity Section: sound Architecture: any -Replaces: kmid-trinity (<< 4:14.0.0) -Breaks: kmid-trinity (<< 4:14.0.0) +Replaces: tdemid-trinity (<< 4:14.0.0) +Breaks: tdemid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity diff --git a/debian/wheezy/tdemultimedia/debian/control.in b/debian/wheezy/tdemultimedia/debian/control.in index 7b20cca6d..4bf762241 100644 --- a/debian/wheezy/tdemultimedia/debian/control.in +++ b/debian/wheezy/tdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdemultimedia Section: tde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: tdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: tdemultimedia-dev Section: devel Architecture: any -Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'tdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/wheezy/tdemultimedia/debian/copyright b/debian/wheezy/tdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/debian/wheezy/tdemultimedia/debian/copyright +++ b/debian/wheezy/tdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/icons/kmid-16.xpm b/debian/wheezy/tdemultimedia/debian/icons/tdemid-16.xpm index 0a510090a..64ad03b59 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/icons/kmid-16.xpm +++ b/debian/wheezy/tdemultimedia/debian/icons/tdemid-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid-16[] = { +static char *tdemid-16[] = { /* columns rows colors chars-per-pixel */ "16 16 104 2", " c black", diff --git a/debian/squeeze/tdemultimedia/debian/icons/kmid.xpm b/debian/wheezy/tdemultimedia/debian/icons/tdemid.xpm index fb669aa72..c4cbb3bf1 100644 --- a/debian/squeeze/tdemultimedia/debian/icons/kmid.xpm +++ b/debian/wheezy/tdemultimedia/debian/icons/tdemid.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid[] = { +static char *tdemid[] = { /* columns rows colors chars-per-pixel */ "32 32 213 2", " c black", diff --git a/debian/wheezy/tdemultimedia/debian/kmid-trinity.install b/debian/wheezy/tdemultimedia/debian/kmid-trinity.install deleted file mode 100644 index e77e1784a..000000000 --- a/debian/wheezy/tdemultimedia/debian/kmid-trinity.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/trinity/bin/kmid -debian/tmp/opt/trinity/lib/trinity/libkmidpart.la -debian/tmp/opt/trinity/lib/trinity/libkmidpart.so -debian/tmp/opt/trinity/lib/libkmidlib.so.0 -debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/trinity/share/applications/tde/kmid.desktop -debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb -debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb -debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/trinity/share/pixmaps -debian/icons/kmid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdemultimedia/debian/kmid-trinity.menu b/debian/wheezy/tdemultimedia/debian/kmid-trinity.menu deleted file mode 100644 index ca828ea94..000000000 --- a/debian/wheezy/tdemultimedia/debian/kmid-trinity.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="TDE"\ - title="KMid"\ - icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\ - command="/opt/trinity/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/debian/wheezy/tdemultimedia/debian/man/kaboodle-trinity.1 b/debian/wheezy/tdemultimedia/debian/man/kaboodle-trinity.1 index 76f29a181..2e9e5704d 100644 --- a/debian/wheezy/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/debian/wheezy/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/wheezy/tdemultimedia/debian/rules b/debian/wheezy/tdemultimedia/debian/rules index 1e7e0647c..58e944e5d 100755 --- a/debian/wheezy/tdemultimedia/debian/rules +++ b/debian/wheezy/tdemultimedia/debian/rules @@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ +PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/wheezy/tdemultimedia/debian/tdemid-trinity.install b/debian/wheezy/tdemultimedia/debian/tdemid-trinity.install new file mode 100644 index 000000000..c36f2d16a --- /dev/null +++ b/debian/wheezy/tdemultimedia/debian/tdemid-trinity.install @@ -0,0 +1,40 @@ +debian/tmp/opt/trinity/bin/tdemid +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so +debian/tmp/opt/trinity/lib/libtdemidlib.so.0 +debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop +debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb +debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/trinity/share/pixmaps +debian/icons/tdemid-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdemultimedia/debian/tdemid-trinity.menu b/debian/wheezy/tdemultimedia/debian/tdemid-trinity.menu new file mode 100644 index 000000000..5f3ec9248 --- /dev/null +++ b/debian/wheezy/tdemultimedia/debian/tdemid-trinity.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="TDE"\ + title="KMid"\ + icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\ + command="/opt/trinity/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index 0d5dc5893..000000000 --- a/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html - diff --git a/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..e4d54da22 --- /dev/null +++ b/debian/wheezy/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: tdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html +Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html + diff --git a/debian/wheezy/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/wheezy/tdemultimedia/debian/tdemultimedia-trinity-dev.install index 4edb170bf..97d3eb309 100644 --- a/debian/wheezy/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/debian/wheezy/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la debian/tmp/opt/trinity/lib/libtdeinit_krec.la debian/tmp/opt/trinity/lib/libtdeinit_noatun.la -debian/tmp/opt/trinity/lib/libkmidlib.la -debian/tmp/opt/trinity/lib/libkmidlib.so +debian/tmp/opt/trinity/lib/libtdemidlib.la +debian/tmp/opt/trinity/lib/libtdemidlib.so debian/tmp/opt/trinity/lib/libmpeg.la debian/tmp/opt/trinity/lib/libmpeg.so debian/tmp/opt/trinity/lib/libnoatun.la diff --git a/debian/wheezy/tdenetwork/debian/changelog b/debian/wheezy/tdenetwork/debian/changelog index 43b1aadd7..4510420ac 100644 --- a/debian/wheezy/tdenetwork/debian/changelog +++ b/debian/wheezy/tdenetwork/debian/changelog @@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to tdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in tdelibs) + * Add tdednssd to tdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in tdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/debian/wheezy/tdenetwork/debian/control b/debian/wheezy/tdenetwork/debian/control index a1a2dcb2b..a95cc81a7 100644 --- a/debian/wheezy/tdenetwork/debian/control +++ b/debian/wheezy/tdenetwork/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdenetwork-trinity (<< 4:14.0.0) Breaks: kdenetwork-trinity (<< 4:14.0.0) -Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) +Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) Description: network-related apps from the official Trinity release @@ -331,11 +331,11 @@ Description: LAN information server for Trinity This package is part of Trinity, as a component of the KDE network module. See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information. -Package: kdnssd-trinity +Package: tdednssd-trinity Section: net Architecture: any -Replaces: kdnssd-trinity (<< 4:14.0.0) -Breaks: kdnssd-trinity (<< 4:14.0.0) +Replaces: tdednssd-trinity (<< 4:14.0.0) +Breaks: tdednssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf diff --git a/debian/wheezy/tdenetwork/debian/control.in b/debian/wheezy/tdenetwork/debian/control.in index 1c7fc62f9..7c7dfdc41 100644 --- a/debian/wheezy/tdenetwork/debian/control.in +++ b/debian/wheezy/tdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdenetwork Section: tde Architecture: all -Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: tdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'tdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/wheezy/tdenetwork/debian/kget-trinity.install b/debian/wheezy/tdenetwork/debian/kget-trinity.install index 9a1ac79f5..d2a0707c9 100644 --- a/debian/wheezy/tdenetwork/debian/kget-trinity.install +++ b/debian/wheezy/tdenetwork/debian/kget-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/kget -debian/tmp/opt/trinity/lib/trinity/khtml_kget.la -debian/tmp/opt/trinity/lib/trinity/khtml_kget.so +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so debian/tmp/opt/trinity/share/applications/tde/kget.desktop debian/tmp/opt/trinity/share/apps/kget/eventsrc debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png debian/tmp/opt/trinity/share/apps/kget/pics/try5.png debian/tmp/opt/trinity/share/apps/kget/pics/try6.png debian/tmp/opt/trinity/share/apps/kget/pics/try7.png -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/debian/wheezy/tdenetwork/debian/rules b/debian/wheezy/tdenetwork/debian/rules index 2579d07e3..0ee562691 100755 --- a/debian/wheezy/tdenetwork/debian/rules +++ b/debian/wheezy/tdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/debian/wheezy/tdenetwork/debian/kdnssd-trinity.install b/debian/wheezy/tdenetwork/debian/tdednssd-trinity.install index 8d6a52c6b..8d6a52c6b 100644 --- a/debian/wheezy/tdenetwork/debian/kdnssd-trinity.install +++ b/debian/wheezy/tdenetwork/debian/tdednssd-trinity.install diff --git a/debian/wheezy/tdepim/debian/changelog b/debian/wheezy/tdepim/debian/changelog index 09dc0dfc3..268556215 100644 --- a/debian/wheezy/tdepim/debian/changelog +++ b/debian/wheezy/tdepim/debian/changelog @@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for tdepim-kresources + * Increase version number on Replaces for tdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low tdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package tdepim-kresources. + * Split tderesources into new package tdepim-tderesources. * Split tdepimmacros.h into new package libtdepim1-dev, and make all the other -dev packages depend on it. diff --git a/debian/wheezy/tdepim/debian/control b/debian/wheezy/tdepim/debian/control index 6a2e4385d..1c544b5f5 100644 --- a/debian/wheezy/tdepim/debian/control +++ b/debian/wheezy/tdepim/debian/control @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0) Breaks: kdepim-trinity (<< 4:14.0.0) -Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) +Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -52,7 +52,7 @@ Section: devel Architecture: any Replaces: kdepim-trinity-dev (<< 4:14.0.0) Breaks: kdepim-trinity-dev (<< 4:14.0.0) -Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) +Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. . @@ -116,7 +116,7 @@ Architecture: any Replaces: kaddressbook-trinity (<< 4:14.0.0) Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity +Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves This package is part of Trinity, and a component of the KDE PIM module. See the 'kde-trinity' and 'tdepim-trinity' packages for more information. -Package: tdepim-kresources-trinity +Package: tdepim-tderesources-trinity Section: tde Architecture: any -Replaces: kdepim-kresources-trinity (<< 4:14.0.0) -Breaks: kdepim-kresources-trinity (<< 4:14.0.0) +Replaces: kdepim-tderesources-trinity (<< 4:14.0.0) +Breaks: kdepim-tderesources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -321,7 +321,7 @@ Architecture: any Replaces: knotes-trinity (<< 4:14.0.0) Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/wheezy/tdepim/debian/control.in b/debian/wheezy/tdepim/debian/control.in index 3b45c48d0..4c48dcbef 100644 --- a/debian/wheezy/tdepim/debian/control.in +++ b/debian/wheezy/tdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources, tdebase-kio-plugins +Suggests: tdepim-tderesources, tdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'tdepim' packages for more information. -Package: tdepim-kresources +Package: tdepim-tderesources Section: tde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: tde Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -441,7 +441,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/debian/wheezy/tdepim/debian/kaddressbook-trinity.install b/debian/wheezy/tdepim/debian/kaddressbook-trinity.install index 748b6e9a7..eac493c1b 100644 --- a/debian/wheezy/tdepim/debian/kaddressbook-trinity.install +++ b/debian/wheezy/tdepim/debian/kaddressbook-trinity.install @@ -29,7 +29,7 @@ /opt/trinity/share/services/kabldapconfig.desktop /opt/trinity/share/services/kaddressbook /opt/trinity/share/services/kontact/kaddressbookplugin.desktop -/opt/trinity/share/services/kresources/kabc/imap.desktop +/opt/trinity/share/services/tderesources/kabc/imap.desktop /opt/trinity/share/services/ldifvcardthumbnail.desktop /opt/trinity/share/servicetypes/dcopaddressbook.desktop /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/debian/wheezy/tdepim/debian/knotes-trinity.install b/debian/wheezy/tdepim/debian/knotes-trinity.install index 97956b197..8f65af5e3 100644 --- a/debian/wheezy/tdepim/debian/knotes-trinity.install +++ b/debian/wheezy/tdepim/debian/knotes-trinity.install @@ -15,9 +15,9 @@ /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png -/opt/trinity/share/services/kresources/knotes/imap.desktop -/opt/trinity/share/services/kresources/knotes/local.desktop -/opt/trinity/share/services/kresources/knotes_manager.desktop +/opt/trinity/share/services/tderesources/knotes/imap.desktop +/opt/trinity/share/services/tderesources/knotes/local.desktop +/opt/trinity/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/trinity/share/pixmaps ../icons/knotes-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdepim/debian/libkcal2b-trinity.install b/debian/wheezy/tdepim/debian/libkcal2b-trinity.install index ca6e71652..211c15b4d 100644 --- a/debian/wheezy/tdepim/debian/libkcal2b-trinity.install +++ b/debian/wheezy/tdepim/debian/libkcal2b-trinity.install @@ -13,9 +13,9 @@ /opt/trinity/lib/libkholidays.so.1 /opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/share/apps/libkholidays -/opt/trinity/share/services/kresources/kcal/imap.desktop -/opt/trinity/share/services/kresources/kcal/kabc.desktop -/opt/trinity/share/services/kresources/kcal/local.desktop -/opt/trinity/share/services/kresources/kcal/localdir.desktop -/opt/trinity/share/services/kresources/kcal/remote.desktop -/opt/trinity/share/services/kresources/kcal_manager.desktop +/opt/trinity/share/services/tderesources/kcal/imap.desktop +/opt/trinity/share/services/tderesources/kcal/kabc.desktop +/opt/trinity/share/services/tderesources/kcal/local.desktop +/opt/trinity/share/services/tderesources/kcal/localdir.desktop +/opt/trinity/share/services/tderesources/kcal/remote.desktop +/opt/trinity/share/services/tderesources/kcal_manager.desktop diff --git a/debian/wheezy/tdepim/debian/libtdepim1a-trinity.install b/debian/wheezy/tdepim/debian/libtdepim1a-trinity.install index 6a17101ae..e018f4bdf 100644 --- a/debian/wheezy/tdepim/debian/libtdepim1a-trinity.install +++ b/debian/wheezy/tdepim/debian/libtdepim1a-trinity.install @@ -1,7 +1,7 @@ /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/share/apps/tdepimwidgets diff --git a/debian/wheezy/tdepim/debian/rules b/debian/wheezy/tdepim/debian/rules index 0e1c5356b..96073e510 100755 --- a/debian/wheezy/tdepim/debian/rules +++ b/debian/wheezy/tdepim/debian/rules @@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ -dDepends # Since -u args go first in dpkg-shlibdeps call ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends -#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \ +#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ # -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/debian/squeeze/tdepim/debian/tdepim-kresources-trinity.install b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install index 588b690b1..bcf0991b5 100644 --- a/debian/squeeze/tdepim/debian/tdepim-kresources-trinity.install +++ b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install @@ -74,31 +74,31 @@ /opt/trinity/lib/libkslox.so.0.0.0 /opt/trinity/lib/libgwsoap.so.0 /opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/trinity/share/services/kresources/kabc/kolab.desktop -/opt/trinity/share/services/kresources/kabc/scalix.desktop -/opt/trinity/share/services/kresources/kcal/exchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/trinity/share/services/kresources/kcal/kolab.desktop -/opt/trinity/share/services/kresources/kcal/scalix.desktop -/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/trinity/share/services/kresources/knotes/kolabresource.desktop -/opt/trinity/share/services/kresources/knotes/scalix.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kabc/kolab.desktop +/opt/trinity/share/services/tderesources/kabc/scalix.desktop +/opt/trinity/share/services/tderesources/kcal/exchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kcal/kolab.desktop +/opt/trinity/share/services/tderesources/kcal/scalix.desktop +/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/trinity/share/services/tderesources/knotes/kolabresource.desktop +/opt/trinity/share/services/tderesources/knotes/scalix.desktop /opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl /opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/debian/wheezy/tdesdk/debian/changelog b/debian/wheezy/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/debian/wheezy/tdesdk/debian/changelog +++ b/debian/wheezy/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/debian/wheezy/tdesdk/debian/control b/debian/wheezy/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/debian/wheezy/tdesdk/debian/control +++ b/debian/wheezy/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of Trinity, and a component of the KDE SDK module. diff --git a/debian/wheezy/tdesdk/debian/control.in b/debian/wheezy/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/debian/wheezy/tdesdk/debian/control.in +++ b/debian/wheezy/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.install b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.install +++ b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdesdk/debian/kunittest-trinity.docs b/debian/wheezy/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/debian/wheezy/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/debian/wheezy/tdesdk/debian/kunittest-trinity.install b/debian/wheezy/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/debian/wheezy/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/wheezy/tdesdk/debian/not-installed.list b/debian/wheezy/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/debian/wheezy/tdesdk/debian/not-installed.list +++ b/debian/wheezy/tdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. diff --git a/debian/wheezy/tdesdk/debian/rules b/debian/wheezy/tdesdk/debian/rules index 36d49b7c7..2e37f4326 100755 --- a/debian/wheezy/tdesdk/debian/rules +++ b/debian/wheezy/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/debian/wheezy/tdesdk/debian/tdeunittest-trinity.docs b/debian/wheezy/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/debian/wheezy/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/debian/wheezy/tdesdk/debian/tdeunittest-trinity.install b/debian/wheezy/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/debian/wheezy/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h diff --git a/debian/wheezy/tdeutils/debian/changelog b/debian/wheezy/tdeutils/debian/changelog index b3d3af82b..71992aefe 100644 --- a/debian/wheezy/tdeutils/debian/changelog +++ b/debian/wheezy/tdeutils/debian/changelog @@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/debian/wheezy/tdeutils/debian/control b/debian/wheezy/tdeutils/debian/control index 23132b0e0..956b68ea3 100644 --- a/debian/wheezy/tdeutils/debian/control +++ b/debian/wheezy/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -343,11 +343,11 @@ Description: timer utility for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kwalletmanager-trinity +Package: tdewalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-trinity (<< 4:14.0.0) -Breaks: kwalletmanager-trinity (<< 4:14.0.0) +Replaces: tdewalletmanager-trinity (<< 4:14.0.0) +Breaks: tdewalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity diff --git a/debian/wheezy/tdeutils/debian/control.in b/debian/wheezy/tdeutils/debian/control.in index f1d64bd00..f86496f4d 100644 --- a/debian/wheezy/tdeutils/debian/control.in +++ b/debian/wheezy/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/wheezy/tdeutils/debian/kwalletmanager-trinity.install b/debian/wheezy/tdeutils/debian/kwalletmanager-trinity.install deleted file mode 100644 index 1ba37d2e3..000000000 --- a/debian/wheezy/tdeutils/debian/kwalletmanager-trinity.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/trinity/bin/kwalletmanager -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so -debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png -debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/services/kwallet_config.desktop -debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop diff --git a/debian/wheezy/tdeutils/debian/man/kcharselect-trinity.1 b/debian/wheezy/tdeutils/debian/man/kcharselect-trinity.1 index 15d1c35d9..d6ba31cf5 100644 --- a/debian/wheezy/tdeutils/debian/man/kcharselect-trinity.1 +++ b/debian/wheezy/tdeutils/debian/man/kcharselect-trinity.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/debian/lenny/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/debian/wheezy/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet index 6331a925f..d87ba35e0 100644 --- a/debian/lenny/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet +++ b/debian/wheezy/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet @@ -1,10 +1,10 @@ -Document: tdeutils-doc-html-kwallet +Document: tdeutils-doc-html-tdewallet Title: KWallet Handbook Author: George Staikos, Lauri Watts Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. Section: Tools Format: HTML -Index: /usr/share/doc/tde/HTML/en/kwallet/index.html -Files: /usr/share/doc/tde/HTML/en/kwallet/*.html +Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html diff --git a/debian/wheezy/tdeutils/debian/tdeutils-trinity-dev.install b/debian/wheezy/tdeutils/debian/tdeutils-trinity-dev.install index 17d66276d..a04353048 100644 --- a/debian/wheezy/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/wheezy/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tdemultiformlistbox.h +debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h +debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h debian/tmp/opt/trinity/include/ksim/chart.h debian/tmp/opt/trinity/include/ksim/common.h debian/tmp/opt/trinity/include/ksim/ksimconfig.h diff --git a/debian/wheezy/tdeutils/debian/tdewalletmanager-trinity.install b/debian/wheezy/tdeutils/debian/tdewalletmanager-trinity.install new file mode 100644 index 000000000..6e75bf792 --- /dev/null +++ b/debian/wheezy/tdeutils/debian/tdewalletmanager-trinity.install @@ -0,0 +1,31 @@ +debian/tmp/opt/trinity/bin/tdewalletmanager +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so +debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png +debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/services/tdewallet_config.desktop +debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop diff --git a/ubuntu/lucid_automake/applications/kaffeine/debian/changelog b/ubuntu/lucid_automake/applications/kaffeine/debian/changelog index b2693cf00..9e8f190d9 100644 --- a/ubuntu/lucid_automake/applications/kaffeine/debian/changelog +++ b/ubuntu/lucid_automake/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/ubuntu/lucid_automake/applications/kaffeine/debian/copyright b/ubuntu/lucid_automake/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/ubuntu/lucid_automake/applications/kaffeine/debian/copyright +++ b/ubuntu/lucid_automake/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/changelog b/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/changelog index e7bed7c93..bf4ab2d57 100644 --- a/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/changelog +++ b/ubuntu/lucid_automake/applications/kde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ kde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/ubuntu/lucid_automake/applications/kmplayer/debian/changelog b/ubuntu/lucid_automake/applications/kmplayer/debian/changelog index 77b777a17..269c7bd93 100644 --- a/ubuntu/lucid_automake/applications/kmplayer/debian/changelog +++ b/ubuntu/lucid_automake/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog b/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog index 5cdaa89d6..24a76ba33 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control index 3ac6a66b3..9ede20c9e 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control @@ -25,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] diff --git a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in index 32aa6dea9..d17a8b5ab 100644 --- a/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in +++ b/ubuntu/lucid_automake/applications/knetworkmanager/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] diff --git a/ubuntu/lucid_automake/applications/kpowersave/debian/changelog b/ubuntu/lucid_automake/applications/kpowersave/debian/changelog index 8239733cc..a8a184c7b 100644 --- a/ubuntu/lucid_automake/applications/kpowersave/debian/changelog +++ b/ubuntu/lucid_automake/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install index 6615ebbbc..d419ed082 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/opt/kde3/share/applications/kde/kcmkttsd.desktop debian/tmp/opt/kde3/share/applications/kde/kttsmgr.desktop -debian/tmp/opt/kde3/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/kde3/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/kde3/share/apps/kttsd/festivalint/voices debian/tmp/opt/kde3/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/kde3/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/kde3/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/kde3/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/kde3/share/services/kttsd.desktop debian/tmp/opt/kde3/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/kde3/share/services/kttsd_alsaplugin.desktop diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 index 732718a5d..d49436bad 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/kde/kcmkttsd.desktop debian/tmp/usr/share/applications/kde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 index 732718a5d..d49436bad 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/kde/kcmkttsd.desktop debian/tmp/usr/share/applications/kde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/lucid_automake/kdeaddons/debian/konq-plugins-kde3.install b/ubuntu/lucid_automake/kdeaddons/debian/konq-plugins-kde3.install index 49791eb3d..fe7b891f3 100644 --- a/ubuntu/lucid_automake/kdeaddons/debian/konq-plugins-kde3.install +++ b/ubuntu/lucid_automake/kdeaddons/debian/konq-plugins-kde3.install @@ -30,8 +30,8 @@ debian/tmp/opt/kde3/lib/kde3/libdomtreeviewerplugin.la debian/tmp/opt/kde3/lib/kde3/libdomtreeviewerplugin.so debian/tmp/opt/kde3/lib/kde3/libfsviewpart.la debian/tmp/opt/kde3/lib/kde3/libfsviewpart.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlsettingsplugin.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlsettingsplugin.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlsettingsplugin.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlsettingsplugin.so debian/tmp/opt/kde3/lib/kde3/kcm_kuick.la debian/tmp/opt/kde3/lib/kde3/kcm_kuick.so debian/tmp/opt/kde3/lib/kde3/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/kde3/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/kde3/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/kde3/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/kde3/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/kde3/share/apps/domtreeviewer debian/tmp/opt/kde3/share/apps/fsview debian/tmp/opt/kde3/share/apps/imagerotation/orient.py debian/tmp/opt/kde3/share/apps/imagerotation/exif.py -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins debian/tmp/opt/kde3/share/apps/konqiconview debian/tmp/opt/kde3/share/apps/konqlistview debian/tmp/opt/kde3/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/imgallery/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/ubuntu/lucid_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/lucid_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/lucid_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/ubuntu/lucid_automake/kdeartwork/debian/changelog b/ubuntu/lucid_automake/kdeartwork/debian/changelog index 584f51a60..00c10b7fe 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/changelog +++ b/ubuntu/lucid_automake/kdeartwork/debian/changelog @@ -33,13 +33,13 @@ kdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low kdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 kdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ kdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low kdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ kdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make kdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make kdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ kdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ kdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low kdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ kdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ kdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ kdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ kdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since kdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ kdeartwork (4:3.2.0-1) unstable; urgency=low kdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on kdebase-bin (closes: #203185). + * Made tdescreensaver depend on kdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ kdeartwork (4:3.1.2-1) unstable; urgency=low kdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ kdeartwork (4:3.1.0-2) unstable; urgency=low kdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed kdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x. + * Renamed kdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since kdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/ubuntu/lucid_automake/kdeartwork/debian/control b/ubuntu/lucid_automake/kdeartwork/debian/control index e96e7673f..9fab8bfe0 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/control +++ b/ubuntu/lucid_automake/kdeartwork/debian/control @@ -11,8 +11,8 @@ Standards-Version: 3.8.3 Package: kdeartwork-kde3 Architecture: all Section: kde -Depends: kdeartwork-misc-kde3 (>= ${Source-Version}), kdeartwork-emoticons-kde3 (>= ${Source-Version}), kdeartwork-style-kde3 (>= ${Source-Version}), kdeartwork-theme-icon-kde3 (>= ${Source-Version}), kdeartwork-theme-window-kde3 (>= ${Source-Version}), kdewallpapers-kde3 (>= ${Source-Version}), kscreensaver-kde3 (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-kde3 +Depends: kdeartwork-misc-kde3 (>= ${Source-Version}), kdeartwork-emoticons-kde3 (>= ${Source-Version}), kdeartwork-style-kde3 (>= ${Source-Version}), kdeartwork-theme-icon-kde3 (>= ${Source-Version}), kdeartwork-theme-window-kde3 (>= ${Source-Version}), kdewallpapers-kde3 (>= ${Source-Version}), tdescreensaver-kde3 (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-kde3 Description: themes, styles and more from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE3 This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-kde3 +Package: tdescreensaver-kde3 Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-kde3-bin -Recommends: kwin-kde3, kscreensaver-xsavers-kde3 (= ${Source-Version}) +Recommends: kwin-kde3, tdescreensaver-xsavers-kde3 (= ${Source-Version}) Description: additional screen savers released with KDE3 This package contains the screen savers for KDE3. They can be tested and selected within the Appearance and Themes section of the KDE3 Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE3 . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-kde3 +Package: tdescreensaver-xsavers-kde3 Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-kde3-bin, xscreensaver-data -Recommends: kwin-kde3, kscreensaver-kde3 (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-kde3 +Recommends: kwin-kde3, tdescreensaver-kde3 (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-kde3 Description: KDE3 hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE3. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE3 hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE3, see the separate package - kscreensaver-kde3. This package does depend on the xscreensaver package, and + tdescreensaver-kde3. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE3. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-webcollage-kde3 +Package: tdescreensaver-xsavers-webcollage-kde3 Architecture: all Section: kde -Depends: kscreensaver-xsavers-extra-kde3, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers-extra-kde3, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE3 hook This package give access to the webcollage screensaver through the KDE3 screensaver configuration. @@ -153,17 +153,17 @@ Description: webcollage screensaver KDE3 hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-extra-kde3 +Package: tdescreensaver-xsavers-extra-kde3 Architecture: all Section: kde -Depends: ${shlibs:Depends}, kscreensaver-xsavers-kde3, xscreensaver-data-extra, xscreensaver-gl-extra -Recommends: kwin-kde3, kscreensaver-kde3 (= ${Source-Version}) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-kde3, xscreensaver-data-extra, xscreensaver-gl-extra +Recommends: kwin-kde3, tdescreensaver-kde3 (= ${Source-Version}) Description: KDE3 hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into KDE3. With this package installed you can select and/or configure @@ -172,7 +172,7 @@ Description: KDE3 hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. diff --git a/ubuntu/lucid_automake/kdeartwork/debian/control.in b/ubuntu/lucid_automake/kdeartwork/debian/control.in index c12a75d6d..10451f02a 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/control.in +++ b/ubuntu/lucid_automake/kdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: kdeartwork Architecture: all Section: kde -Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: kwin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: kwin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: kde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install deleted file mode 100644 index 5111c9cd6..000000000 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install +++ /dev/null @@ -1,149 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/anemone.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/apple2.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/attraction.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/barcode.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blaster.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boing.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boxed.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bsod.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bumps.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cage.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/carousel.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/celtic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/compass.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/coral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/critical.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/crystal.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/demon.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/discrete.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/drift.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/eruption.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flag.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flame.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flow.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/forest.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/goop.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/grav.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/halftone.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/halo.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/helix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/ifs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/interference.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/juggle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/julia.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/klein.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lament.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/laser.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lightning.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lisa.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lissie.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/loop.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/maze.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/menger.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/moire2.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/moire.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/mountain.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/munch.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/noof.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pacman.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pedal.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/petri.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pinion.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pong.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/providence.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pyro.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/qix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rocks.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rotor.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rubik.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sballs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/slip.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sphere.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/spiral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/squiral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/stairs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/starfish.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/starwars.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/strange.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/substrate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/t3d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/tangram.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/triangle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/truchet.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/twang.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vines.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/wander.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/worm.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xflame.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xjack.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/zoom.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install deleted file mode 100644 index f11cf310b..000000000 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/man/kpartsaver-kde3.kss.1 b/ubuntu/lucid_automake/kdeartwork/debian/man/tdepartsaver-kde3.kss.1 index 64a0a5c45..73456139b 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/man/kpartsaver-kde3.kss.1 +++ b/ubuntu/lucid_automake/kdeartwork/debian/man/tdepartsaver-kde3.kss.1 @@ -16,9 +16,9 @@ .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kpartsaver.kss \- Media screen saver for KDE +tdepartsaver.kss \- Media screen saver for KDE .SH SYNOPSIS -.B kpartsaver.kss +.B tdepartsaver.kss .RI "[ " generic-options " ]" [ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | \fB\-\-demo\fP ] @@ -28,7 +28,7 @@ kpartsaver.kss \- Media screen saver for KDE This program is part of the official KDE artwork module. .SH OPTIONS Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. .TP \fB\-\-setup\fP Set up the screen saver. diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-kde3.install index 0117cf4ad..77669bc4f 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-kde3.install +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-kde3.install @@ -14,7 +14,7 @@ debian/tmp/opt/kde3/bin/kclock.kss debian/tmp/opt/kde3/bin/kswarm.kss debian/tmp/opt/kde3/bin/kfountain.kss debian/tmp/opt/kde3/bin/kgravity.kss -debian/tmp/opt/kde3/bin/kpartsaver.kss +debian/tmp/opt/kde3/bin/tdepartsaver.kss debian/tmp/opt/kde3/bin/kpendulum.kss debian/tmp/opt/kde3/bin/kblob.kss debian/tmp/opt/kde3/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/kde3/share/apps/kfiresaver -debian/tmp/opt/kde3/share/apps/kscreensaver +debian/tmp/opt/kde3/share/apps/tdescreensaver diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-kde3.manpages b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-kde3.manpages index 948eb83b5..34217fba1 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-kde3.manpages +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-kde3.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-kde3.kss.1 debian/man/kgravity-kde3.kss.1 debian/man/klines-kde3.kss.1 debian/man/klorenz-kde3.kss.1 -debian/man/kpartsaver-kde3.kss.1 +debian/man/tdepartsaver-kde3.kss.1 debian/man/kpendulum-kde3.kss.1 debian/man/kpolygon-kde3.kss.1 debian/man/krotation-kde3.kss.1 diff --git a/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install new file mode 100644 index 000000000..6749db234 --- /dev/null +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install @@ -0,0 +1,149 @@ +tdescreensaver/kxsconfig/ScreenSavers/anemone.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/antmaze.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/apollonian.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/apple2.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/atlantis.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/attraction.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/barcode.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blaster.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blitspin.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blocktube.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boing.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bouboule.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boxed.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boxfit.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bsod.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bubbles.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bumps.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cage.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/carousel.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/ccurve.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/celtic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cloudlife.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/compass.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/coral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/crackberg.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/critical.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/crystal.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cubenetic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cynosure.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/dangerball.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/decayscreen.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/deluxe.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/demon.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/discrete.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/drift.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/epicycle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/eruption.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/euler2d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/extrusion.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fadeplot.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fireworkx.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flag.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flame.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flow.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fluidballs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fontglide.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/forest.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glforestfire.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glplanet.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/goop.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/grav.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/greynetic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/halftone.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/halo.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/helix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hopalong.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hyperball.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hypercube.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/ifs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/imsmap.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/interference.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/intermomentary.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/jigsaw.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/juggle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/julia.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/klein.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/kumppa.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lament.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/laser.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lightning.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lisa.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lissie.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lmorph.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/loop.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/maze.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/memscroller.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/menger.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/mismunch.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/moire2.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/moire.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/mountain.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/munch.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/nerverot.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/noof.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/noseguy.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pacman.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pedal.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/penetrate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/petri.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/phosphor.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/piecewise.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pinion.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/polyominoes.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pong.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/providence.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pyro.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/qix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rocks.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rorschach.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rotor.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rubik.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sballs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sierpinski.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/slip.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/speedmine.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sphere.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/spiral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/spotlight.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sproingies.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/squiral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/stairs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/starfish.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/starwars.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/strange.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/substrate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/t3d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/tangram.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/thornbird.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/timetunnel.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/triangle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/truchet.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/twang.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vermiculate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vines.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/wander.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/whirlygig.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/worm.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/wormhole.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xflame.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xjack.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xmatrix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xspirograph.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xsublim.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xteevee.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/zoom.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.install index 6af54c8d2..6af54c8d2 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.install +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.install diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.manpages b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.manpages index cf97247c4..cf97247c4 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.manpages +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.manpages diff --git a/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers.README.Debian index 828861775..a41c9ad57 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-xsavers.README.Debian +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver-xsavers) only contains hooks for the standard +This package (tdescreensaver-xsavers) only contains hooks for the standard xscreensavers, so that they can be selected and/or configured through the KDE Control Centre. For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. +see the separate package tdescreensaver. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/debian/squeeze/tdeartwork/debian/kscreensaver.README.Debian b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver.README.Debian index 68584d330..57a145f54 100644 --- a/debian/squeeze/tdeartwork/debian/kscreensaver.README.Debian +++ b/ubuntu/lucid_automake/kdeartwork/debian/tdescreensaver.README.Debian @@ -1,11 +1,11 @@ KDE Screensavers for Debian =========================== -This package (kscreensaver) no longer contains the hooks for the standard +This package (tdescreensaver) no longer contains the hooks for the standard xscreensavers. It only contains the additional screensavers that are specifically shipped with KDE. To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. +Centre, install the separate package tdescreensaver-xsavers. -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES index ab3d75478..bad62816c 100644 --- a/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/lucid_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/kdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/kdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/ubuntu/lucid_automake/kdebase/debian/changelog b/ubuntu/lucid_automake/kdebase/debian/changelog index 48d83199c..fe73757c3 100644 --- a/ubuntu/lucid_automake/kdebase/debian/changelog +++ b/ubuntu/lucid_automake/kdebase/debian/changelog @@ -1,7 +1,7 @@ kdebase-kde3 (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ kdebase-kde3 (4:3.5.10-2ubuntu2) karmic; urgency=low kdebase-kde3 (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $kdehome=$HOME/.kde so we should use $kdehome instead of $HOME/$kdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low kdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ kdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ kdebase (4:3.5.2-0ubuntu26) dapper; urgency=low kdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low kdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old kdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ kdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/ubuntu/lucid_automake/kdebase/debian/control b/ubuntu/lucid_automake/kdebase/debian/control index dfae80fa1..9705d7db1 100644 --- a/ubuntu/lucid_automake/kdebase/debian/control +++ b/ubuntu/lucid_automake/kdebase/debian/control @@ -106,7 +106,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-kde3, gdb Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), tdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) -Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 4:3.3.2-1b) +Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), tdescreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/lucid_automake/kdebase/debian/control.in b/ubuntu/lucid_automake/kdebase/debian/control.in index 61d7197f8..8566b8000 100644 --- a/ubuntu/lucid_automake/kdebase/debian/control.in +++ b/ubuntu/lucid_automake/kdebase/debian/control.in @@ -98,7 +98,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: kdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install index cb7900105..6e080d0ee 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install @@ -6,7 +6,7 @@ debian/tmp/opt/kde3/bin/kfontinst debian/tmp/opt/kde3/bin/kfontview debian/tmp/opt/kde3/bin/kinfocenter debian/tmp/opt/kde3/bin/klocaldomainurifilterhelper -debian/tmp/opt/kde3/bin/krandrtray +debian/tmp/opt/kde3/bin/tderandrtray debian/tmp/opt/kde3/bin/krdb debian/tmp/opt/kde3/lib/kde3/fontthumbnail.la debian/tmp/opt/kde3/lib/kde3/fontthumbnail.so @@ -54,8 +54,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_kded.la debian/tmp/opt/kde3/lib/kde3/kcm_kded.so debian/tmp/opt/kde3/lib/kde3/kcm_tdm.la debian/tmp/opt/kde3/lib/kde3/kcm_tdm.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.so +debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.so debian/tmp/opt/kde3/lib/kde3/kcm_kicker.la @@ -152,7 +152,7 @@ debian/tmp/opt/kde3/share/applications/kde/interrupts.desktop debian/tmp/opt/kde3/share/applications/kde/ioports.desktop debian/tmp/opt/kde3/share/applications/kde/ioslaveinfo.desktop debian/tmp/opt/kde3/share/applications/kde/joystick.desktop -debian/tmp/opt/kde3/share/applications/kde/kcm_kdnssd.desktop +debian/tmp/opt/kde3/share/applications/kde/kcm_tdednssd.desktop debian/tmp/opt/kde3/share/applications/kde/kcmaccess.desktop debian/tmp/opt/kde3/share/applications/kde/kcmcss.desktop debian/tmp/opt/kde3/share/applications/kde/kcmfontinst.desktop @@ -168,11 +168,11 @@ debian/tmp/opt/kde3/share/applications/kde/KControl.desktop debian/tmp/opt/kde3/share/applications/kde/tdm.desktop debian/tmp/opt/kde3/share/applications/kde/keys.desktop debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_behavior.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_fonts.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_java_js.desktop -debian/tmp/opt/kde3/share/applications/kde/krandrtray.desktop -debian/tmp/opt/kde3/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_behavior.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_fonts.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_java_js.desktop +debian/tmp/opt/kde3/share/applications/kde/tderandrtray.desktop +debian/tmp/opt/kde3/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/kde3/share/applications/kde/kthememanager.desktop debian/tmp/opt/kde3/share/applications/kde/iccconfig.desktop debian/tmp/opt/kde3/share/applications/kde/lanbrowser.desktop @@ -212,7 +212,7 @@ debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.lintian b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.lintian index 3c7f407c6..f8b102033 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.lintian +++ b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libkdeinit_tderandrinithack.so usr/lib/libkdeinit_tderandrinithack.so diff --git a/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install index d6dc0841f..1fca22e59 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install @@ -211,10 +211,10 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook @@ -345,7 +345,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -449,7 +449,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/licq.png @@ -551,7 +551,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/locale.png @@ -636,7 +636,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/licq.png @@ -780,7 +780,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/licq.png @@ -876,7 +876,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/ubuntu/lucid_automake/kdebase/debian/konqueror-kde3.install b/ubuntu/lucid_automake/kdebase/debian/konqueror-kde3.install index 6e81691f0..815c0fb8d 100644 --- a/ubuntu/lucid_automake/kdebase/debian/konqueror-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/konqueror-kde3.install @@ -35,8 +35,8 @@ debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.la debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.so debian/tmp/opt/kde3/lib/kde3/konqueror.la debian/tmp/opt/kde3/lib/kde3/konqueror.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.so debian/tmp/opt/kde3/lib/libkdeinit_keditbookmarks.so debian/tmp/opt/kde3/lib/libkdeinit_kfmclient.so debian/tmp/opt/kde3/lib/libkdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/kde3/share/applications/kde/kfmclient.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_dir.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_html.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_war.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_filter.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_filter.desktop debian/tmp/opt/kde3/share/applications/kde/konqbrowser.desktop debian/tmp/opt/kde3/share/applications/kde/konquerorsu.desktop debian/tmp/opt/kde3/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/kde3/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/kde3/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/kde3/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/kde3/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/kde3/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/ubuntu/lucid_automake/kdebase/debian/konqueror-nsplugins-kde3.install b/ubuntu/lucid_automake/kdebase/debian/konqueror-nsplugins-kde3.install index 5da82a048..0dd136ca8 100644 --- a/ubuntu/lucid_automake/kdebase/debian/konqueror-nsplugins-kde3.install +++ b/ubuntu/lucid_automake/kdebase/debian/konqueror-nsplugins-kde3.install @@ -4,5 +4,5 @@ debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.la debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.so debian/tmp/opt/kde3/lib/kde3/libnsplugin.la debian/tmp/opt/kde3/lib/kde3/libnsplugin.so -debian/tmp/opt/kde3/share/applications/kde/khtml_plugins.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_plugins.desktop debian/tmp/opt/kde3/share/apps/plugin/nspluginpart.rc diff --git a/ubuntu/lucid_automake/kdebase/debian/rules b/ubuntu/lucid_automake/kdebase/debian/rules index 6a3938cba..814abbacf 100755 --- a/ubuntu/lucid_automake/kdebase/debian/rules +++ b/ubuntu/lucid_automake/kdebase/debian/rules @@ -17,7 +17,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde-kde3 --prefix=/opt/kde3 \ - --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ + --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=tdescreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ --with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --with-sudo-kdesu-backend \ --enable-closure @@ -254,7 +254,7 @@ binary-install/klipper-kde3:: binary-install/kdebase-kde3-bin:: install -p -D -m644 debian/kcheckpass-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kcheckpass-kde3 - install -p -D -m644 debian/kscreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kscreensaver-kde3 + install -p -D -m644 debian/tdescreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/tdescreensaver-kde3 mkdir -p debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-kde3-bin/etc/X11/Xsession.d/80ubuntu-kde3-xmodmap diff --git a/ubuntu/lucid_automake/kdebase/debian/kscreensaver-kde3.pam b/ubuntu/lucid_automake/kdebase/debian/tdescreensaver-kde3.pam index 088a00503..9a2c74519 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kscreensaver-kde3.pam +++ b/ubuntu/lucid_automake/kdebase/debian/tdescreensaver-kde3.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver # @include common-auth @include common-account diff --git a/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install b/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install index 081a99fd4..373e36eb4 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install +++ b/ubuntu/lucid_automake/kdegraphics/debian/kdegraphics-dev-kde3.install @@ -149,7 +149,7 @@ debian/tmp/opt/kde3/include/tde/dom/SVGWindow.h debian/tmp/opt/kde3/include/tde/dom/SVGZoomAndPan.h debian/tmp/opt/kde3/include/tde/dom/SVGZoomEvent.h debian/tmp/opt/kde3/include/tde/kfaximage.h -debian/tmp/opt/kde3/include/tde/kmultipageInterface.h +debian/tmp/opt/kde3/include/tde/tdemultipageInterface.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasFactory.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasItem.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/kde3/include/tde/kviewshell/documentRenderer.h debian/tmp/opt/kde3/include/tde/kviewshell/documentWidget.h debian/tmp/opt/kde3/include/tde/kviewshell/history.h debian/tmp/opt/kde3/include/tde/kviewshell/hyperlink.h -debian/tmp/opt/kde3/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/kde3/include/tde/kviewshell/tdemultipage.h debian/tmp/opt/kde3/include/tde/kviewshell/length.h debian/tmp/opt/kde3/include/tde/kviewshell/pageNumber.h debian/tmp/opt/kde3/include/tde/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/kde3/lib/libkghostviewlib.la debian/tmp/opt/kde3/lib/libkghostviewlib.so debian/tmp/opt/kde3/lib/libkimageviewer.la debian/tmp/opt/kde3/lib/libkimageviewer.so -debian/tmp/opt/kde3/lib/libkmultipage.la -debian/tmp/opt/kde3/lib/libkmultipage.so +debian/tmp/opt/kde3/lib/libtdemultipage.la +debian/tmp/opt/kde3/lib/libtdemultipage.so debian/tmp/opt/kde3/lib/libkpovmodeler.la debian/tmp/opt/kde3/lib/libkpovmodeler.so debian/tmp/opt/kde3/lib/libksvg.la diff --git a/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.install b/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.install index d4f22ce8c..931c107ef 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.install +++ b/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.install @@ -7,8 +7,8 @@ debian/tmp/opt/kde3/lib/kde3/emptymultipagepart.la debian/tmp/opt/kde3/lib/kde3/emptymultipagepart.so debian/tmp/opt/kde3/lib/kde3/kviewerpart.la debian/tmp/opt/kde3/lib/kde3/kviewerpart.so -debian/tmp/opt/kde3/lib/libkmultipage.so.0 -debian/tmp/opt/kde3/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdemultipage.so.0 +debian/tmp/opt/kde3/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/kde3/share/apps/djvumultipage.rc debian/tmp/opt/kde3/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/kde3/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/kde3/share/services/emptymultipage.desktop debian/tmp/opt/kde3/share/services/djvumultipage.desktop -debian/tmp/opt/kde3/share/servicetypes/kmultipage.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.lintian b/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.lintian index 0957e32c5..ce2a034a2 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.lintian +++ b/ubuntu/lucid_automake/kdegraphics/debian/kviewshell-kde3.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/kde3/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index cddcdd7f6..9e8cbd7fc 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -388,7 +388,7 @@ kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow kdelibs5-dev co-installable alongside kdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-kdelibs-3.5.6.diff, 47_kdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ kdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low kdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_kdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_kdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ kdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ kdelibs (4:3.5.3-1) unstable; urgency=low kdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ kdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy kdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ kdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except kdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ kdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low kdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 kdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 kdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ kdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ kdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low kdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from kdelibs4-dev + * Remove libtdednssd depend from kdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 kdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in kdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 kdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in kdelibs4-dev. - * Add depends on libkdnssd1-avahi from kdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in kdelibs4-dev. + * Add depends on libtdednssd1-avahi from kdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ kdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low kdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ kdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ kdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low kdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since + - post-3.3.1-kdelibs-tdehtml.diff and post-3.3.1-kdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/kdelibs4-dev.install: - usr/include/tde/kiobuffer.h - - usr/include/tde/kwallettypes.h + - usr/include/tde/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ kdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-kdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-kdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-kdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ kdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: kdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ kdelibs (4:2.1.1-4) unstable; urgency=low kdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ kdelibs (4:2.1.0.1-3) unstable; urgency=low kdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ kdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of kdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of kdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/ubuntu/lucid_automake/kdelibs/debian/copyright b/ubuntu/lucid_automake/kdelibs/debian/copyright index e9c6d2cf8..1cae772e1 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/copyright +++ b/ubuntu/lucid_automake/kdelibs/debian/copyright @@ -12,9 +12,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx, -kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, kdecore, kded, kdefx, +kdeprint, kdesu, kdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install index 56fa28d05..80a04ea76 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install @@ -15,7 +15,7 @@ debian/tmp/etc/kde3/kthemestylerc debian/tmp/etc/kde3/language.codes debian/tmp/etc/kde3/ui/kprintpreviewui.rc debian/tmp/etc/kde3/ui/ui_standards.rc -debian/tmp/opt/kde3/share/applications/kde/kresources.desktop +debian/tmp/opt/kde3/share/applications/kde/tderesources.desktop debian/tmp/opt/kde3/share/apps/dcopidlng/Ast.pm debian/tmp/opt/kde3/share/apps/dcopidlng/Iter.pm debian/tmp/opt/kde3/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/kde3/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/kde3/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/kde3/share/apps/katepart/scripts/sort.js debian/tmp/opt/kde3/share/apps/katepart/syntax/*.xml -debian/tmp/opt/kde3/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/kde3/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/kde3/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/kde3/share/apps/kconf_update/kded.upd debian/tmp/opt/kde3/share/apps/kconf_update/kdeprintrc.upd @@ -229,22 +229,22 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/ktimewidget.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurlcomborequester.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurllabel.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurlrequester.png -debian/tmp/opt/kde3/share/apps/khtml/css/html4.css -debian/tmp/opt/kde3/share/apps/khtml/css/quirks.css -debian/tmp/opt/kde3/share/apps/khtml/domain_info -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/kde3/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/kde3/share/apps/khtml/khtml.rc +debian/tmp/opt/kde3/share/apps/tdehtml/css/html4.css +debian/tmp/opt/kde3/share/apps/tdehtml/css/quirks.css +debian/tmp/opt/kde3/share/apps/tdehtml/domain_info +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/kde3/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/kde3/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/kde3/share/apps/kjava/kjava.jar @@ -1713,10 +1713,10 @@ debian/tmp/opt/kde3/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/kde3/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/kde3/share/apps/LICENSES/ARTISTIC debian/tmp/opt/kde3/share/apps/LICENSES/BSD debian/tmp/opt/kde3/share/apps/LICENSES/GPL_V2 @@ -1779,9 +1779,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/web-docbottom.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/web-doctop.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/x11-license.html debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/xml.dcl -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/index.docbook debian/tmp/opt/kde3/share/emoticons/Default/angry.png debian/tmp/opt/kde3/share/emoticons/Default/bat.png debian/tmp/opt/kde3/share/emoticons/Default/beer.png @@ -1919,7 +1919,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2342,7 +2342,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2705,7 +2705,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3078,7 +3078,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3302,7 +3302,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3484,7 +3484,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3567,35 +3567,35 @@ debian/tmp/opt/kde3/share/services/jp2.kimgio debian/tmp/opt/kde3/share/services/jpeg.kimgio debian/tmp/opt/kde3/share/services/katepart.desktop debian/tmp/opt/kde3/share/services/kbzip2filter.desktop -debian/tmp/opt/kde3/share/services/kcertpart.desktop +debian/tmp/opt/kde3/share/services/tdecertpart.desktop debian/tmp/opt/kde3/share/services/kded/kcookiejar.desktop debian/tmp/opt/kde3/share/services/kded/kdeprintd.desktop debian/tmp/opt/kde3/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/kde3/share/services/kded/kpasswdserver.desktop debian/tmp/opt/kde3/share/services/kded/kssld.desktop -debian/tmp/opt/kde3/share/services/kded/kwalletd.desktop +debian/tmp/opt/kde3/share/services/kded/tdewalletd.desktop debian/tmp/opt/kde3/share/services/kded/proxyscout.desktop debian/tmp/opt/kde3/share/services/kgzipfilter.desktop -debian/tmp/opt/kde3/share/services/khtml.desktop -debian/tmp/opt/kde3/share/services/khtmlimage.desktop +debian/tmp/opt/kde3/share/services/tdehtml.desktop +debian/tmp/opt/kde3/share/services/tdehtmlimage.desktop debian/tmp/opt/kde3/share/services/kio_uiserver.desktop debian/tmp/opt/kde3/share/services/kjavaappletviewer.desktop debian/tmp/opt/kde3/share/services/kmailservice.protocol -debian/tmp/opt/kde3/share/services/kmultipart.desktop +debian/tmp/opt/kde3/share/services/tdemultipart.desktop debian/tmp/opt/kde3/share/services/knotify.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/file.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/net.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/kde3/share/services/kspell_aspell.desktop -debian/tmp/opt/kde3/share/services/kspell_hspell.desktop -debian/tmp/opt/kde3/share/services/kspell_ispell.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/kde3/share/services/tdespell_aspell.desktop +debian/tmp/opt/kde3/share/services/tdespell_hspell.desktop +debian/tmp/opt/kde3/share/services/tdespell_ispell.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/kde3/share/services/metainfo.protocol debian/tmp/opt/kde3/share/services/mms.protocol debian/tmp/opt/kde3/share/services/mmst.protocol @@ -3634,21 +3634,21 @@ debian/tmp/opt/kde3/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/kde3/share/servicetypes/kdatatool.desktop debian/tmp/opt/kde3/share/servicetypes/kdedmodule.desktop debian/tmp/opt/kde3/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/kde3/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/kde3/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/kde3/share/servicetypes/kpart.desktop debian/tmp/opt/kde3/share/servicetypes/kplugininfo.desktop debian/tmp/opt/kde3/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/kde3/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/kde3/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/kde3/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/kde3/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/kde3/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/kde3/share/servicetypes/krop.desktop debian/tmp/opt/kde3/share/servicetypes/krwp.desktop debian/tmp/opt/kde3/share/servicetypes/kscan.desktop -debian/tmp/opt/kde3/share/servicetypes/kspellclient.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/kde3/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/kde3/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/kde3/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/kde3/share/servicetypes/scriptinterface.desktop diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.preinst b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.preinst index cbc832186..3f9403736 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.preinst +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/kde3/colors/40\ Colors rm -f /etc/kde3/colors/Royal rm -f /etc/kde3/colors/Web - rm -f /etc/kde3/ktexteditor_autobookmarkerrc + rm -f /etc/kde3/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 04f837902..e8cf99c68 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/kde3/bin/dcopidl2cpp debian/tmp/opt/kde3/bin/dcopidlng debian/tmp/opt/kde3/bin/kconfig_compiler debian/tmp/opt/kde3/bin/ksvgtopng -debian/tmp/opt/kde3/bin/kunittestmodrunner +debian/tmp/opt/kde3/bin/tdeunittestmodrunner debian/tmp/opt/kde3/bin/makekdewidgets debian/tmp/opt/kde3/bin/preparetips @@ -289,11 +289,11 @@ debian/tmp/opt/kde3/include/tde/khexedit/charcolumninterface.h debian/tmp/opt/kde3/include/tde/khexedit/clipboardinterface.h debian/tmp/opt/kde3/include/tde/khexedit/valuecolumninterface.h debian/tmp/opt/kde3/include/tde/khexedit/zoominterface.h -debian/tmp/opt/kde3/include/tde/khtmldefaults.h -debian/tmp/opt/kde3/include/tde/khtml_events.h -debian/tmp/opt/kde3/include/tde/khtml_part.h -debian/tmp/opt/kde3/include/tde/khtml_settings.h -debian/tmp/opt/kde3/include/tde/khtmlview.h +debian/tmp/opt/kde3/include/tde/tdehtmldefaults.h +debian/tmp/opt/kde3/include/tde/tdehtml_events.h +debian/tmp/opt/kde3/include/tde/tdehtml_part.h +debian/tmp/opt/kde3/include/tde/tdehtml_settings.h +debian/tmp/opt/kde3/include/tde/tdehtmlview.h debian/tmp/opt/kde3/include/tde/khttpproxysocketdevice.h debian/tmp/opt/kde3/include/tde/kicondialog.h debian/tmp/opt/kde3/include/tde/kiconeffect.h @@ -306,8 +306,8 @@ debian/tmp/opt/kde3/include/tde/kimageeffect.h debian/tmp/opt/kde3/include/tde/kimagefilepreview.h debian/tmp/opt/kde3/include/tde/kimageio.h debian/tmp/opt/kde3/include/tde/kimiface.h -debian/tmp/opt/kde3/include/tde/kimproxy.h -debian/tmp/opt/kde3/include/tde/kimproxyiface.h +debian/tmp/opt/kde3/include/tde/tdeimproxy.h +debian/tmp/opt/kde3/include/tde/tdeimproxyiface.h debian/tmp/opt/kde3/include/tde/kinputdialog.h debian/tmp/opt/kde3/include/tde/kinstance.h debian/tmp/opt/kde3/include/tde/kio/authinfo.h @@ -327,7 +327,7 @@ debian/tmp/opt/kde3/include/tde/kio/job.h debian/tmp/opt/kde3/include/tde/kio/kdesasl.h debian/tmp/opt/kde3/include/tde/kio/kmdbase.h debian/tmp/opt/kde3/include/tde/kio/kmdcodec.h -debian/tmp/opt/kde3/include/tde/kio/kntlm.h +debian/tmp/opt/kde3/include/tde/kio/tdentlm.h debian/tmp/opt/kde3/include/tde/kio/metainfojob.h debian/tmp/opt/kde3/include/tde/kio/netaccess.h debian/tmp/opt/kde3/include/tde/kio/observer.h @@ -386,24 +386,24 @@ debian/tmp/opt/kde3/include/tde/kmainwindow.h debian/tmp/opt/kde3/include/tde/kmainwindowiface.h debian/tmp/opt/kde3/include/tde/kmanagerselection.h debian/tmp/opt/kde3/include/tde/kmdcodec.h -debian/tmp/opt/kde3/include/tde/kmdichildarea.h -debian/tmp/opt/kde3/include/tde/kmdichildfrmcaption.h -debian/tmp/opt/kde3/include/tde/kmdichildfrm.h -debian/tmp/opt/kde3/include/tde/kmdichildview.h -debian/tmp/opt/kde3/include/tde/kmdidefines.h -debian/tmp/opt/kde3/include/tde/kmdi/global.h -debian/tmp/opt/kde3/include/tde/kmdiiterator.h -debian/tmp/opt/kde3/include/tde/kmdilistiterator.h -debian/tmp/opt/kde3/include/tde/kmdimainfrm.h -debian/tmp/opt/kde3/include/tde/kmdi/mainwindow.h -debian/tmp/opt/kde3/include/tde/kmdinulliterator.h -debian/tmp/opt/kde3/include/tde/kmdi/tabwidget.h -debian/tmp/opt/kde3/include/tde/kmditaskbar.h -debian/tmp/opt/kde3/include/tde/kmdi/toolviewaccessor.h -debian/tmp/opt/kde3/include/tde/kmditoolviewaccessor.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/playerdcopobject.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/player.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/view.h +debian/tmp/opt/kde3/include/tde/tdemdichildarea.h +debian/tmp/opt/kde3/include/tde/tdemdichildfrmcaption.h +debian/tmp/opt/kde3/include/tde/tdemdichildfrm.h +debian/tmp/opt/kde3/include/tde/tdemdichildview.h +debian/tmp/opt/kde3/include/tde/tdemdidefines.h +debian/tmp/opt/kde3/include/tde/tdemdi/global.h +debian/tmp/opt/kde3/include/tde/tdemdiiterator.h +debian/tmp/opt/kde3/include/tde/tdemdilistiterator.h +debian/tmp/opt/kde3/include/tde/tdemdimainfrm.h +debian/tmp/opt/kde3/include/tde/tdemdi/mainwindow.h +debian/tmp/opt/kde3/include/tde/tdemdinulliterator.h +debian/tmp/opt/kde3/include/tde/tdemdi/tabwidget.h +debian/tmp/opt/kde3/include/tde/tdemditaskbar.h +debian/tmp/opt/kde3/include/tde/tdemdi/toolviewaccessor.h +debian/tmp/opt/kde3/include/tde/tdemditoolviewaccessor.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/player.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/view.h debian/tmp/opt/kde3/include/tde/kmenubar.h debian/tmp/opt/kde3/include/tde/kmessagebox.h debian/tmp/opt/kde3/include/tde/kmimemagic.h @@ -412,10 +412,10 @@ debian/tmp/opt/kde3/include/tde/kmimetypechooser.h debian/tmp/opt/kde3/include/tde/kmimetype.h debian/tmp/opt/kde3/include/tde/kmimetyperesolver.h debian/tmp/opt/kde3/include/tde/kmountpoint.h -debian/tmp/opt/kde3/include/tde/kmulticastsocketdevice.h -debian/tmp/opt/kde3/include/tde/kmulticastsocket.h -debian/tmp/opt/kde3/include/tde/kmultipledrag.h -debian/tmp/opt/kde3/include/tde/kmultitabbar.h +debian/tmp/opt/kde3/include/tde/tdemulticastsocketdevice.h +debian/tmp/opt/kde3/include/tde/tdemulticastsocket.h +debian/tmp/opt/kde3/include/tde/tdemultipledrag.h +debian/tmp/opt/kde3/include/tde/tdemultitabbar.h debian/tmp/opt/kde3/include/tde/knetworkinterface.h debian/tmp/opt/kde3/include/tde/knewstuff/downloaddialog.h debian/tmp/opt/kde3/include/tde/knewstuff/engine.h @@ -440,20 +440,20 @@ debian/tmp/opt/kde3/include/tde/kpanelapplet.h debian/tmp/opt/kde3/include/tde/kpanelappmenu.h debian/tmp/opt/kde3/include/tde/kpanelextension.h debian/tmp/opt/kde3/include/tde/kpanelmenu.h -debian/tmp/opt/kde3/include/tde/kparts/browserextension.h -debian/tmp/opt/kde3/include/tde/kparts/browserinterface.h -debian/tmp/opt/kde3/include/tde/kparts/browserrun.h -debian/tmp/opt/kde3/include/tde/kparts/componentfactory.h -debian/tmp/opt/kde3/include/tde/kparts/dockmainwindow.h -debian/tmp/opt/kde3/include/tde/kparts/event.h -debian/tmp/opt/kde3/include/tde/kparts/factory.h -debian/tmp/opt/kde3/include/tde/kparts/genericfactory.h -debian/tmp/opt/kde3/include/tde/kparts/historyprovider.h -debian/tmp/opt/kde3/include/tde/kparts/mainwindow.h -debian/tmp/opt/kde3/include/tde/kparts/part.h -debian/tmp/opt/kde3/include/tde/kparts/partmanager.h -debian/tmp/opt/kde3/include/tde/kparts/plugin.h -debian/tmp/opt/kde3/include/tde/kparts/statusbarextension.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserextension.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserinterface.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserrun.h +debian/tmp/opt/kde3/include/tde/tdeparts/componentfactory.h +debian/tmp/opt/kde3/include/tde/tdeparts/dockmainwindow.h +debian/tmp/opt/kde3/include/tde/tdeparts/event.h +debian/tmp/opt/kde3/include/tde/tdeparts/factory.h +debian/tmp/opt/kde3/include/tde/tdeparts/genericfactory.h +debian/tmp/opt/kde3/include/tde/tdeparts/historyprovider.h +debian/tmp/opt/kde3/include/tde/tdeparts/mainwindow.h +debian/tmp/opt/kde3/include/tde/tdeparts/part.h +debian/tmp/opt/kde3/include/tde/tdeparts/partmanager.h +debian/tmp/opt/kde3/include/tde/tdeparts/plugin.h +debian/tmp/opt/kde3/include/tde/tdeparts/statusbarextension.h debian/tmp/opt/kde3/include/tde/kpassdlg.h debian/tmp/opt/kde3/include/tde/kpassivepopup.h debian/tmp/opt/kde3/include/tde/kpixmapeffect.h @@ -488,15 +488,15 @@ debian/tmp/opt/kde3/include/tde/kremoteencoding.h debian/tmp/opt/kde3/include/tde/kreplacedialog.h debian/tmp/opt/kde3/include/tde/kreplace.h debian/tmp/opt/kde3/include/tde/kresolver.h -debian/tmp/opt/kde3/include/tde/kresources/configdialog.h -debian/tmp/opt/kde3/include/tde/kresources/configpage.h -debian/tmp/opt/kde3/include/tde/kresources/configwidget.h -debian/tmp/opt/kde3/include/tde/kresources/factory.h -debian/tmp/opt/kde3/include/tde/kresources/manager.h -debian/tmp/opt/kde3/include/tde/kresources/manageriface.h -debian/tmp/opt/kde3/include/tde/kresources/managerimpl.h -debian/tmp/opt/kde3/include/tde/kresources/resource.h -debian/tmp/opt/kde3/include/tde/kresources/selectdialog.h +debian/tmp/opt/kde3/include/tde/tderesources/configdialog.h +debian/tmp/opt/kde3/include/tde/tderesources/configpage.h +debian/tmp/opt/kde3/include/tde/tderesources/configwidget.h +debian/tmp/opt/kde3/include/tde/tderesources/factory.h +debian/tmp/opt/kde3/include/tde/tderesources/manager.h +debian/tmp/opt/kde3/include/tde/tderesources/manageriface.h +debian/tmp/opt/kde3/include/tde/tderesources/managerimpl.h +debian/tmp/opt/kde3/include/tde/tderesources/resource.h +debian/tmp/opt/kde3/include/tde/tderesources/selectdialog.h debian/tmp/opt/kde3/include/tde/krestrictedline.h debian/tmp/opt/kde3/include/tde/kreverseresolver.h debian/tmp/opt/kde3/include/tde/krfcdate.h @@ -508,8 +508,8 @@ debian/tmp/opt/kde3/include/tde/ksambashare.h debian/tmp/opt/kde3/include/tde/ksavefile.h debian/tmp/opt/kde3/include/tde/kscan.h debian/tmp/opt/kde3/include/tde/ksconfig.h -debian/tmp/opt/kde3/include/tde/kscreensaver.h -debian/tmp/opt/kde3/include/tde/kscreensaver_vroot.h +debian/tmp/opt/kde3/include/tde/tdescreensaver.h +debian/tmp/opt/kde3/include/tde/tdescreensaver_vroot.h debian/tmp/opt/kde3/include/tde/kscrollview.h debian/tmp/opt/kde3/include/tde/kselect.h debian/tmp/opt/kde3/include/tde/kseparator.h @@ -541,18 +541,18 @@ debian/tmp/opt/kde3/include/tde/ksockssocketdevice.h debian/tmp/opt/kde3/include/tde/ksortablevaluelist.h debian/tmp/opt/kde3/include/tde/kspeech.h debian/tmp/opt/kde3/include/tde/kspeechsink.h -debian/tmp/opt/kde3/include/tde/kspell2/backgroundchecker.h -debian/tmp/opt/kde3/include/tde/kspell2/broker.h -debian/tmp/opt/kde3/include/tde/kspell2/configdialog.h -debian/tmp/opt/kde3/include/tde/kspell2/configwidget.h -debian/tmp/opt/kde3/include/tde/kspell2/defaultdictionary.h -debian/tmp/opt/kde3/include/tde/kspell2/dialog.h -debian/tmp/opt/kde3/include/tde/kspell2/dictionary.h -debian/tmp/opt/kde3/include/tde/kspell2/filter.h -debian/tmp/opt/kde3/include/tde/kspell2/highlighter.h -debian/tmp/opt/kde3/include/tde/kspell2/settings.h -debian/tmp/opt/kde3/include/tde/kspelldlg.h -debian/tmp/opt/kde3/include/tde/kspell.h +debian/tmp/opt/kde3/include/tde/tdespell2/backgroundchecker.h +debian/tmp/opt/kde3/include/tde/tdespell2/broker.h +debian/tmp/opt/kde3/include/tde/tdespell2/configdialog.h +debian/tmp/opt/kde3/include/tde/tdespell2/configwidget.h +debian/tmp/opt/kde3/include/tde/tdespell2/defaultdictionary.h +debian/tmp/opt/kde3/include/tde/tdespell2/dialog.h +debian/tmp/opt/kde3/include/tde/tdespell2/dictionary.h +debian/tmp/opt/kde3/include/tde/tdespell2/filter.h +debian/tmp/opt/kde3/include/tde/tdespell2/highlighter.h +debian/tmp/opt/kde3/include/tde/tdespell2/settings.h +debian/tmp/opt/kde3/include/tde/tdespelldlg.h +debian/tmp/opt/kde3/include/tde/tdespell.h debian/tmp/opt/kde3/include/tde/ksplashscreen.h debian/tmp/opt/kde3/include/tde/ksqueezedtextlabel.h debian/tmp/opt/kde3/include/tde/ksslall.h @@ -591,9 +591,9 @@ debian/tmp/opt/kde3/include/tde/kstringvalidator.h debian/tmp/opt/kde3/include/tde/kstyle.h debian/tmp/opt/kde3/include/tde/ksvgiconengine.h debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h -debian/tmp/opt/kde3/include/tde/ksycocaentry.h -debian/tmp/opt/kde3/include/tde/ksycoca.h -debian/tmp/opt/kde3/include/tde/ksycocatype.h +debian/tmp/opt/kde3/include/tde/tdesycocaentry.h +debian/tmp/opt/kde3/include/tde/tdesycoca.h +debian/tmp/opt/kde3/include/tde/tdesycocatype.h debian/tmp/opt/kde3/include/tde/ksyntaxhighlighter.h debian/tmp/opt/kde3/include/tde/ksystemtray.h debian/tmp/opt/kde3/include/tde/ktabbar.h @@ -604,39 +604,39 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h debian/tmp/opt/kde3/include/tde/ktempfile.h debian/tmp/opt/kde3/include/tde/ktextbrowser.h debian/tmp/opt/kde3/include/tde/ktextedit.h -debian/tmp/opt/kde3/include/tde/ktexteditor/blockselectioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/clipboardinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/codecompletioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/configinterfaceextension.h -debian/tmp/opt/kde3/include/tde/ktexteditor/configinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/cursorinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/document.h -debian/tmp/opt/kde3/include/tde/ktexteditor/documentinfo.h -debian/tmp/opt/kde3/include/tde/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editinterfaceext.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editorchooser.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editor.h -debian/tmp/opt/kde3/include/tde/ktexteditor/encodinginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/highlightinginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/markinterfaceextension.h -debian/tmp/opt/kde3/include/tde/ktexteditor/markinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/plugin.h -debian/tmp/opt/kde3/include/tde/ktexteditor/popupmenuinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/printinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/searchinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/templateinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/texthintinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/undointerface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/variableinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/viewcursorinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/view.h -debian/tmp/opt/kde3/include/tde/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/wordwrapinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/cursorinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/document.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/documentinfo.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editinterfaceext.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editorchooser.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editor.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/encodinginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/highlightinginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/markinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/plugin.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/printinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/searchinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/templateinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/texthintinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/undointerface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/variableinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/view.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/wordwrapinterface.h debian/tmp/opt/kde3/include/tde/ktimewidget.h debian/tmp/opt/kde3/include/tde/ktimezones.h debian/tmp/opt/kde3/include/tde/ktimezonewidget.h @@ -649,9 +649,9 @@ debian/tmp/opt/kde3/include/tde/ktrader.h debian/tmp/opt/kde3/include/tde/ktypelist.h debian/tmp/opt/kde3/include/tde/kuniqueapp.h debian/tmp/opt/kde3/include/tde/kuniqueapplication.h -debian/tmp/opt/kde3/include/tde/kunittest/module.h -debian/tmp/opt/kde3/include/tde/kunittest/runner.h -debian/tmp/opt/kde3/include/tde/kunittest/tester.h +debian/tmp/opt/kde3/include/tde/tdeunittest/module.h +debian/tmp/opt/kde3/include/tde/tdeunittest/runner.h +debian/tmp/opt/kde3/include/tde/tdeunittest/tester.h debian/tmp/opt/kde3/include/tde/kunload.h debian/tmp/opt/kde3/include/tde/kurifilter.h debian/tmp/opt/kde3/include/tde/kurlbar.h @@ -666,8 +666,8 @@ debian/tmp/opt/kde3/include/tde/kurlrequester.h debian/tmp/opt/kde3/include/tde/kuser.h debian/tmp/opt/kde3/include/tde/kuserprofile.h debian/tmp/opt/kde3/include/tde/kvmallocator.h -debian/tmp/opt/kde3/include/tde/kwallet.h -debian/tmp/opt/kde3/include/tde/kwallettypes.h +debian/tmp/opt/kde3/include/tde/tdewallet.h +debian/tmp/opt/kde3/include/tde/tdewallettypes.h debian/tmp/opt/kde3/include/tde/kwindowinfo.h debian/tmp/opt/kde3/include/tde/kwindowlistmenu.h debian/tmp/opt/kde3/include/tde/kwin.h @@ -681,27 +681,27 @@ debian/tmp/opt/kde3/include/tde/kxmlguiclient.h debian/tmp/opt/kde3/include/tde/kxmlguifactory.h debian/tmp/opt/kde3/include/tde/kxmlgui.h debian/tmp/opt/kde3/include/tde/kzip.h -debian/tmp/opt/kde3/include/tde/libkrandr/ktimerdialog.h -debian/tmp/opt/kde3/include/tde/libkrandr/libkrandr.h -debian/tmp/opt/kde3/include/tde/libkrandr/lowlevel_randr.h -debian/tmp/opt/kde3/include/tde/libkrandr/randr.h -debian/tmp/opt/kde3/include/tde/libkmid/alsaout.h -debian/tmp/opt/kde3/include/tde/libkmid/dattypes.h -debian/tmp/opt/kde3/include/tde/libkmid/deviceman.h -debian/tmp/opt/kde3/include/tde/libkmid/fmout.h -debian/tmp/opt/kde3/include/tde/libkmid/gusout.h -debian/tmp/opt/kde3/include/tde/libkmid/libkmid.h -debian/tmp/opt/kde3/include/tde/libkmid/midfile.h -debian/tmp/opt/kde3/include/tde/libkmid/midimapper.h -debian/tmp/opt/kde3/include/tde/libkmid/midiout.h -debian/tmp/opt/kde3/include/tde/libkmid/midispec.h -debian/tmp/opt/kde3/include/tde/libkmid/midistat.h -debian/tmp/opt/kde3/include/tde/libkmid/mt32togm.h -debian/tmp/opt/kde3/include/tde/libkmid/notearray.h -debian/tmp/opt/kde3/include/tde/libkmid/player.h -debian/tmp/opt/kde3/include/tde/libkmid/synthout.h -debian/tmp/opt/kde3/include/tde/libkmid/track.h -debian/tmp/opt/kde3/include/tde/libkmid/voiceman.h +debian/tmp/opt/kde3/include/tde/libtderandr/ktimerdialog.h +debian/tmp/opt/kde3/include/tde/libtderandr/libtderandr.h +debian/tmp/opt/kde3/include/tde/libtderandr/lowlevel_randr.h +debian/tmp/opt/kde3/include/tde/libtderandr/randr.h +debian/tmp/opt/kde3/include/tde/libtdemid/alsaout.h +debian/tmp/opt/kde3/include/tde/libtdemid/dattypes.h +debian/tmp/opt/kde3/include/tde/libtdemid/deviceman.h +debian/tmp/opt/kde3/include/tde/libtdemid/fmout.h +debian/tmp/opt/kde3/include/tde/libtdemid/gusout.h +debian/tmp/opt/kde3/include/tde/libtdemid/libtdemid.h +debian/tmp/opt/kde3/include/tde/libtdemid/midfile.h +debian/tmp/opt/kde3/include/tde/libtdemid/midimapper.h +debian/tmp/opt/kde3/include/tde/libtdemid/midiout.h +debian/tmp/opt/kde3/include/tde/libtdemid/midispec.h +debian/tmp/opt/kde3/include/tde/libtdemid/midistat.h +debian/tmp/opt/kde3/include/tde/libtdemid/mt32togm.h +debian/tmp/opt/kde3/include/tde/libtdemid/notearray.h +debian/tmp/opt/kde3/include/tde/libtdemid/player.h +debian/tmp/opt/kde3/include/tde/libtdemid/synthout.h +debian/tmp/opt/kde3/include/tde/libtdemid/track.h +debian/tmp/opt/kde3/include/tde/libtdemid/voiceman.h debian/tmp/opt/kde3/include/tde/netwm_def.h debian/tmp/opt/kde3/include/tde/netwm.h debian/tmp/opt/kde3/include/tde/qxembed.h @@ -771,54 +771,54 @@ debian/tmp/opt/kde3/lib/libkdesu.la debian/tmp/opt/kde3/lib/libkdesu.so debian/tmp/opt/kde3/lib/libkdeui.la debian/tmp/opt/kde3/lib/libkdeui.so -debian/tmp/opt/kde3/lib/libkdnssd.la -debian/tmp/opt/kde3/lib/libkdnssd.so -debian/tmp/opt/kde3/lib/libkhtml.la -debian/tmp/opt/kde3/lib/libkhtml.so -debian/tmp/opt/kde3/lib/libkimproxy.la -debian/tmp/opt/kde3/lib/libkimproxy.so +debian/tmp/opt/kde3/lib/libtdednssd.la +debian/tmp/opt/kde3/lib/libtdednssd.so +debian/tmp/opt/kde3/lib/libtdehtml.la +debian/tmp/opt/kde3/lib/libtdehtml.so +debian/tmp/opt/kde3/lib/libtdeimproxy.la +debian/tmp/opt/kde3/lib/libtdeimproxy.so debian/tmp/opt/kde3/lib/libkio.la debian/tmp/opt/kde3/lib/libkio.so debian/tmp/opt/kde3/lib/libkjava.la debian/tmp/opt/kde3/lib/libkjava.so debian/tmp/opt/kde3/lib/libkjs.la debian/tmp/opt/kde3/lib/libkjs.so -debian/tmp/opt/kde3/lib/libkmdi2.la -debian/tmp/opt/kde3/lib/libkmdi2.so -debian/tmp/opt/kde3/lib/libkmdi.la -debian/tmp/opt/kde3/lib/libkmdi.so -debian/tmp/opt/kde3/lib/libkmediaplayer.la -debian/tmp/opt/kde3/lib/libkmediaplayer.so -debian/tmp/opt/kde3/lib/libkmid.la -debian/tmp/opt/kde3/lib/libkmid.so +debian/tmp/opt/kde3/lib/libtdemdi2.la +debian/tmp/opt/kde3/lib/libtdemdi2.so +debian/tmp/opt/kde3/lib/libtdemdi.la +debian/tmp/opt/kde3/lib/libtdemdi.so +debian/tmp/opt/kde3/lib/libtdemediaplayer.la +debian/tmp/opt/kde3/lib/libtdemediaplayer.so +debian/tmp/opt/kde3/lib/libtdemid.la +debian/tmp/opt/kde3/lib/libtdemid.so debian/tmp/opt/kde3/lib/libknewstuff.la debian/tmp/opt/kde3/lib/libknewstuff.so -debian/tmp/opt/kde3/lib/libkntlm.la -debian/tmp/opt/kde3/lib/libkntlm.so -debian/tmp/opt/kde3/lib/libkparts.la -debian/tmp/opt/kde3/lib/libkparts.so -debian/tmp/opt/kde3/lib/libkrandr.la -debian/tmp/opt/kde3/lib/libkrandr.so -debian/tmp/opt/kde3/lib/libkresources.la -debian/tmp/opt/kde3/lib/libkresources.so -debian/tmp/opt/kde3/lib/libkscreensaver.la -debian/tmp/opt/kde3/lib/libkscreensaver.so -debian/tmp/opt/kde3/lib/libkscript.la -debian/tmp/opt/kde3/lib/libkscript.so -debian/tmp/opt/kde3/lib/libkspell2.la -debian/tmp/opt/kde3/lib/libkspell2.so -debian/tmp/opt/kde3/lib/libkspell.la -debian/tmp/opt/kde3/lib/libkspell.so -debian/tmp/opt/kde3/lib/libktexteditor.la -debian/tmp/opt/kde3/lib/libktexteditor.so -debian/tmp/opt/kde3/lib/libkunittest.la -debian/tmp/opt/kde3/lib/libkunittest.so -debian/tmp/opt/kde3/lib/libkutils.la -debian/tmp/opt/kde3/lib/libkutils.so -debian/tmp/opt/kde3/lib/libkwalletbackend.la -debian/tmp/opt/kde3/lib/libkwalletbackend.so -debian/tmp/opt/kde3/lib/libkwalletclient.la -debian/tmp/opt/kde3/lib/libkwalletclient.so +debian/tmp/opt/kde3/lib/libtdentlm.la +debian/tmp/opt/kde3/lib/libtdentlm.so +debian/tmp/opt/kde3/lib/libtdeparts.la +debian/tmp/opt/kde3/lib/libtdeparts.so +debian/tmp/opt/kde3/lib/libtderandr.la +debian/tmp/opt/kde3/lib/libtderandr.so +debian/tmp/opt/kde3/lib/libtderesources.la +debian/tmp/opt/kde3/lib/libtderesources.so +debian/tmp/opt/kde3/lib/libtdescreensaver.la +debian/tmp/opt/kde3/lib/libtdescreensaver.so +debian/tmp/opt/kde3/lib/libtdescript.la +debian/tmp/opt/kde3/lib/libtdescript.so +debian/tmp/opt/kde3/lib/libtdespell2.la +debian/tmp/opt/kde3/lib/libtdespell2.so +debian/tmp/opt/kde3/lib/libtdespell.la +debian/tmp/opt/kde3/lib/libtdespell.so +debian/tmp/opt/kde3/lib/libtdetexteditor.la +debian/tmp/opt/kde3/lib/libtdetexteditor.so +debian/tmp/opt/kde3/lib/libtdeunittest.la +debian/tmp/opt/kde3/lib/libtdeunittest.so +debian/tmp/opt/kde3/lib/libtdeutils.la +debian/tmp/opt/kde3/lib/libtdeutils.so +debian/tmp/opt/kde3/lib/libtdewalletbackend.la +debian/tmp/opt/kde3/lib/libtdewalletbackend.so +debian/tmp/opt/kde3/lib/libtdewalletclient.la +debian/tmp/opt/kde3/lib/libtdewalletclient.so debian/tmp/opt/kde3/lib/libvcard.la debian/tmp/opt/kde3/lib/libvcard.so diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages index 07fa5ba29..5f25ea10f 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-kde3.1 ./debian/man/ksvgtopng-kde3.1 -./debian/man/kunittestmodrunner-kde3.1 +./debian/man/tdeunittestmodrunner-kde3.1 ./debian/man/makekdewidgets-kde3.1 ./debian/man/preparetips-kde3.1 diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4c2a-kde3.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4c2a-kde3.install index 6abd9b10b..52850bab8 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4c2a-kde3.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4c2a-kde3.install @@ -72,8 +72,8 @@ debian/tmp/opt/kde3/lib/kde3/kbuildsycoca.la debian/tmp/opt/kde3/lib/kde3/kbuildsycoca.so debian/tmp/opt/kde3/lib/kde3/kbzip2filter.la debian/tmp/opt/kde3/lib/kde3/kbzip2filter.so -debian/tmp/opt/kde3/lib/kde3/kcm_kresources.la -debian/tmp/opt/kde3/lib/kde3/kcm_kresources.so +debian/tmp/opt/kde3/lib/kde3/kcm_tderesources.la +debian/tmp/opt/kde3/lib/kde3/kcm_tderesources.so debian/tmp/opt/kde3/lib/kde3/kcmshell.la debian/tmp/opt/kde3/lib/kde3/kcmshell.so debian/tmp/opt/kde3/lib/kde3/kconf_update.la @@ -90,8 +90,8 @@ debian/tmp/opt/kde3/lib/kde3/kded_kpasswdserver.la debian/tmp/opt/kde3/lib/kde3/kded_kpasswdserver.so debian/tmp/opt/kde3/lib/kde3/kded_kssld.la debian/tmp/opt/kde3/lib/kde3/kded_kssld.so -debian/tmp/opt/kde3/lib/kde3/kded_kwalletd.la -debian/tmp/opt/kde3/lib/kde3/kded_kwalletd.so +debian/tmp/opt/kde3/lib/kde3/kded_tdewalletd.la +debian/tmp/opt/kde3/lib/kde3/kded_tdewalletd.so debian/tmp/opt/kde3/lib/kde3/kded.la debian/tmp/opt/kde3/lib/kde3/kded_proxyscout.la debian/tmp/opt/kde3/lib/kde3/kded_proxyscout.so @@ -112,8 +112,8 @@ debian/tmp/opt/kde3/lib/kde3/kfileaudiopreview.la debian/tmp/opt/kde3/lib/kde3/kfileaudiopreview.so debian/tmp/opt/kde3/lib/kde3/kgzipfilter.la debian/tmp/opt/kde3/lib/kde3/kgzipfilter.so -debian/tmp/opt/kde3/lib/kde3/khtmlimagepart.la -debian/tmp/opt/kde3/lib/kde3/khtmlimagepart.so +debian/tmp/opt/kde3/lib/kde3/tdehtmlimagepart.la +debian/tmp/opt/kde3/lib/kde3/tdehtmlimagepart.so debian/tmp/opt/kde3/lib/kde3/kimg_dds.la debian/tmp/opt/kde3/lib/kde3/kimg_dds.so debian/tmp/opt/kde3/lib/kde3/kimg_eps.la @@ -164,34 +164,34 @@ debian/tmp/opt/kde3/lib/kde3/klauncher.la debian/tmp/opt/kde3/lib/kde3/klauncher.so debian/tmp/opt/kde3/lib/kde3/knotify.la debian/tmp/opt/kde3/lib/kde3/knotify.so -debian/tmp/opt/kde3/lib/kde3/kspell_aspell.la -debian/tmp/opt/kde3/lib/kde3/kspell_aspell.so -debian/tmp/opt/kde3/lib/kde3/kspell_hspell.la -debian/tmp/opt/kde3/lib/kde3/kspell_hspell.so -debian/tmp/opt/kde3/lib/kde3/kspell_ispell.la -debian/tmp/opt/kde3/lib/kde3/kspell_ispell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_aspell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_aspell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_hspell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_hspell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_ispell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_ispell.so debian/tmp/opt/kde3/lib/kde3/kstyle_highcontrast_config.la debian/tmp/opt/kde3/lib/kde3/kstyle_highcontrast_config.so debian/tmp/opt/kde3/lib/kde3/kstyle_plastik_config.la debian/tmp/opt/kde3/lib/kde3/kstyle_plastik_config.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_docwordcompletion.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_docwordcompletion.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_insertfile.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_insertfile.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_isearch.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_isearch.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kdatatool.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kdatatool.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_docwordcompletion.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_docwordcompletion.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_insertfile.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_insertfile.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_isearch.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_isearch.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kdatatool.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kdatatool.so debian/tmp/opt/kde3/lib/kde3/libkatepart.la debian/tmp/opt/kde3/lib/kde3/libkatepart.so -debian/tmp/opt/kde3/lib/kde3/libkcertpart.la -debian/tmp/opt/kde3/lib/kde3/libkcertpart.so +debian/tmp/opt/kde3/lib/kde3/libtdecertpart.la +debian/tmp/opt/kde3/lib/kde3/libtdecertpart.so debian/tmp/opt/kde3/lib/kde3/libkdeprint_management_module.la debian/tmp/opt/kde3/lib/kde3/libkdeprint_management_module.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlpart.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlpart.so -debian/tmp/opt/kde3/lib/kde3/libkmultipart.la -debian/tmp/opt/kde3/lib/kde3/libkmultipart.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlpart.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlpart.so +debian/tmp/opt/kde3/lib/kde3/libtdemultipart.la +debian/tmp/opt/kde3/lib/kde3/libtdemultipart.so debian/tmp/opt/kde3/lib/kde3/libshellscript.la debian/tmp/opt/kde3/lib/kde3/libshellscript.so debian/tmp/opt/kde3/lib/kde3/plugins/designer/kdewidgets.la @@ -259,53 +259,53 @@ debian/tmp/opt/kde3/lib/libkdesu.so.4 debian/tmp/opt/kde3/lib/libkdesu.so.4.2.0 debian/tmp/opt/kde3/lib/libkdeui.so.4 debian/tmp/opt/kde3/lib/libkdeui.so.4.2.0 -debian/tmp/opt/kde3/lib/libkdnssd.so.1 -debian/tmp/opt/kde3/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/kde3/lib/libkhtml.so.4 -debian/tmp/opt/kde3/lib/libkhtml.so.4.2.0 -debian/tmp/opt/kde3/lib/libkimproxy.so.0 -debian/tmp/opt/kde3/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdednssd.so.1 +debian/tmp/opt/kde3/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdehtml.so.4 +debian/tmp/opt/kde3/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdeimproxy.so.0 +debian/tmp/opt/kde3/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/kde3/lib/libkio.so.4 debian/tmp/opt/kde3/lib/libkio.so.4.2.0 debian/tmp/opt/kde3/lib/libkjava.so.1 debian/tmp/opt/kde3/lib/libkjava.so.1.0.0 debian/tmp/opt/kde3/lib/libkjs.so.1 debian/tmp/opt/kde3/lib/libkjs.so.1.2.0 -debian/tmp/opt/kde3/lib/libkmdi2.so.1 -debian/tmp/opt/kde3/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/kde3/lib/libkmdi.so.1 -debian/tmp/opt/kde3/lib/libkmdi.so.1.0.0 -debian/tmp/opt/kde3/lib/libkmediaplayer.so.0 -debian/tmp/opt/kde3/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/kde3/lib/libkmid.so.0 -debian/tmp/opt/kde3/lib/libkmid.so.0.0.95 +debian/tmp/opt/kde3/lib/libtdemdi2.so.1 +debian/tmp/opt/kde3/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdemdi.so.1 +debian/tmp/opt/kde3/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdemediaplayer.so.0 +debian/tmp/opt/kde3/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdemid.so.0 +debian/tmp/opt/kde3/lib/libtdemid.so.0.0.95 debian/tmp/opt/kde3/lib/libknewstuff.so.1 debian/tmp/opt/kde3/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/kde3/lib/libkntlm.so.0 -debian/tmp/opt/kde3/lib/libkntlm.so.0.0.0 -debian/tmp/opt/kde3/lib/libkparts.so.2 -debian/tmp/opt/kde3/lib/libkparts.so.2.1.0 -debian/tmp/opt/kde3/lib/libkrandr.so.0 -debian/tmp/opt/kde3/lib/libkrandr.so.0.0.95 -debian/tmp/opt/kde3/lib/libkresources.so.1 -debian/tmp/opt/kde3/lib/libkresources.so.1.2.0 -debian/tmp/opt/kde3/lib/libkscreensaver.so.4 -debian/tmp/opt/kde3/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/kde3/lib/libkscript.so.0 -debian/tmp/opt/kde3/lib/libkscript.so.0.0.0 -debian/tmp/opt/kde3/lib/libkspell2.so.1 -debian/tmp/opt/kde3/lib/libkspell2.so.1.0.0 -debian/tmp/opt/kde3/lib/libkspell.so.4 -debian/tmp/opt/kde3/lib/libkspell.so.4.2.0 -debian/tmp/opt/kde3/lib/libktexteditor.so.0 -debian/tmp/opt/kde3/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/kde3/lib/libkunittest.so.1 -debian/tmp/opt/kde3/lib/libkunittest.so.1.0.0 -debian/tmp/opt/kde3/lib/libkutils.so.1 -debian/tmp/opt/kde3/lib/libkutils.so.1.2.0 -debian/tmp/opt/kde3/lib/libkwalletbackend.so.1 -debian/tmp/opt/kde3/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/kde3/lib/libkwalletclient.so.1 -debian/tmp/opt/kde3/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/kde3/lib/libtdentlm.so.0 +debian/tmp/opt/kde3/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdeparts.so.2 +debian/tmp/opt/kde3/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/kde3/lib/libtderandr.so.0 +debian/tmp/opt/kde3/lib/libtderandr.so.0.0.95 +debian/tmp/opt/kde3/lib/libtderesources.so.1 +debian/tmp/opt/kde3/lib/libtderesources.so.1.2.0 +debian/tmp/opt/kde3/lib/libtdescreensaver.so.4 +debian/tmp/opt/kde3/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdescript.so.0 +debian/tmp/opt/kde3/lib/libtdescript.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdespell2.so.1 +debian/tmp/opt/kde3/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdespell.so.4 +debian/tmp/opt/kde3/lib/libtdespell.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdetexteditor.so.0 +debian/tmp/opt/kde3/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdeunittest.so.1 +debian/tmp/opt/kde3/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdeutils.so.1 +debian/tmp/opt/kde3/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/kde3/lib/libtdewalletbackend.so.1 +debian/tmp/opt/kde3/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdewalletclient.so.1 +debian/tmp/opt/kde3/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/kde3/lib/libvcard.so.0 debian/tmp/opt/kde3/lib/libvcard.so.0.0.0 diff --git a/debian/squeeze/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/ubuntu/lucid_automake/kdelibs/debian/man/tdeunittestmodrunner-kde3.1 index b61b06654..56c4f3bc6 100644 --- a/debian/squeeze/tdelibs/debian/man/kunittestmodrunner-trinity.1 +++ b/ubuntu/lucid_automake/kdelibs/debian/man/tdeunittestmodrunner-kde3.1 @@ -1,18 +1,18 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand .TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" .SH NAME -kunittestmodrunner +tdeunittestmodrunner \- a KDE command\-line application to run KUnitTest modules .SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. .SH OPTIONS .SS Options: .TP .BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] .TP .BR \-\-folder \ [ folder ] Only run tests modules which are found in the folder. Use the query option to select modules. [.] @@ -141,7 +141,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kunittestguimodrunner (1) +.BR tdeunittestguimodrunner (1) .sp 1 .TP .BR http://developer.kde.org diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff index d5b892428..2bdd698e6 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff +++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff @@ -4,9 +4,9 @@ find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ echo ./kdecore/kde-config.cpp.in >> files ;\ -- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ +- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \ - : > kde.pot ;\ -+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; ++ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot - $(XGETTEXT) common_texts.cpp -o kde.pot rm -f dirs diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/changelog b/ubuntu/lucid_automake/kdemultimedia/debian/changelog index c85c9a19c..8f03dd4d3 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/changelog +++ b/ubuntu/lucid_automake/kdemultimedia/debian/changelog @@ -584,7 +584,7 @@ kdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low kdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from kdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from kdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ kdemultimedia (4:3.1.5-1) unstable; urgency=low kdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends kdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ kdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ kdemultimedia (4:2.0-final-6) unstable; urgency=low kdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ kdemultimedia (4:2.0-final-4) unstable; urgency=low kdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ kdemultimedia (4:2.0-final-0) unstable; urgency=low kdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ kdemultimedia (4:2.0-20001002-0) unstable; urgency=low kdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ kdemultimedia (4:2.0-20000911-1) unstable; urgency=low kdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking kdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/control b/ubuntu/lucid_automake/kdemultimedia/debian/control index 78993ae49..86260f791 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/control +++ b/ubuntu/lucid_automake/kdemultimedia/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdemultimedia-kde3 Section: kde Architecture: all -Depends: artsbuilder-kde3 (>= ${Source-Version}), juk-kde3 (>= ${Source-Version}), kaboodle-kde3 (>= ${Source-Version}), kaudiocreator-kde3 (>= ${Source-Version}), kdemultimedia-kappfinder-data-kde3 (>= ${Source-Version}), kdemultimedia-kfile-plugins-kde3 (>= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (>= ${Source-Version}), kmid-kde3 (>= ${Source-Version}), kmix-kde3 (>= ${Source-Version}), krec-kde3 (>= ${Source-Version}), kscd-kde3 (>= ${Source-Version}), libarts1-akode-kde3 (>= ${Source-Version}), libarts1-audiofile-kde3 (>= ${Source-Version}), libarts1-mpeglib-kde3 (>= ${Source-Version}), libarts1-xine-kde3 (>= ${Source-Version}), mpeglib-kde3 (>= ${Source-Version}), noatun-kde3 (>= ${Source-Version}) +Depends: artsbuilder-kde3 (>= ${Source-Version}), juk-kde3 (>= ${Source-Version}), kaboodle-kde3 (>= ${Source-Version}), kaudiocreator-kde3 (>= ${Source-Version}), kdemultimedia-kappfinder-data-kde3 (>= ${Source-Version}), kdemultimedia-kfile-plugins-kde3 (>= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (>= ${Source-Version}), tdemid-kde3 (>= ${Source-Version}), kmix-kde3 (>= ${Source-Version}), krec-kde3 (>= ${Source-Version}), kscd-kde3 (>= ${Source-Version}), libarts1-akode-kde3 (>= ${Source-Version}), libarts1-audiofile-kde3 (>= ${Source-Version}), libarts1-mpeglib-kde3 (>= ${Source-Version}), libarts1-xine-kde3 (>= ${Source-Version}), mpeglib-kde3 (>= ${Source-Version}), noatun-kde3 (>= ${Source-Version}) Suggests: kdemultimedia-kde3-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE3 release Package: kdemultimedia-kde3-dev Section: devel Architecture: any -Depends: kdelibs4-kde3-dev (>= 4:3.5.7), artsbuilder-kde3 (= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (= ${Source-Version}), kmid-kde3 (= ${Source-Version}), kmix-kde3 (= ${Source-Version}), krec-kde3 (= ${Source-Version}), kscd-kde3 (= ${Source-Version}), libarts1-akode-kde3 (= ${Source-Version}), libarts1-mpeglib-kde3 (= ${Source-Version}), libkcddb1-kde3 (= ${Source-Version}), mpeglib-kde3 (= ${Source-Version}), noatun-kde3 (= ${Source-Version}) +Depends: kdelibs4-kde3-dev (>= 4:3.5.7), artsbuilder-kde3 (= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (= ${Source-Version}), tdemid-kde3 (= ${Source-Version}), kmix-kde3 (= ${Source-Version}), krec-kde3 (= ${Source-Version}), kscd-kde3 (= ${Source-Version}), libarts1-akode-kde3 (= ${Source-Version}), libarts1-mpeglib-kde3 (= ${Source-Version}), libkcddb1-kde3 (= ${Source-Version}), mpeglib-kde3 (= ${Source-Version}), noatun-kde3 (= ${Source-Version}) Conflicts: libmpeg-kde3-dev Replaces: artsbuilder-kde3 (<< 4:3.0.0), mpeglib-kde3 (<< 4:3.0.0), noatun-kde3 (<< 4:3.0.0) Description: development files for the KDE3 multimedia module @@ -153,7 +153,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE3, as a component of the KDE multimedia module. See the 'kde-kde3' and 'kdemultimedia-kde3' packages for more information. -Package: kmid-kde3 +Package: tdemid-kde3 Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/control.in b/ubuntu/lucid_automake/kdemultimedia/debian/control.in index b5db28208..06bc49583 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/control.in +++ b/ubuntu/lucid_automake/kdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdemultimedia Section: kde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: kdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: kdemultimedia-dev Section: devel Architecture: any -Depends: kdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: kdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'kdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/copyright b/ubuntu/lucid_automake/kdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/copyright +++ b/ubuntu/lucid_automake/kdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/debian/squeeze/tdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/lucid_automake/kdemultimedia/debian/icons/tdemid-16.xpm index 0a510090a..64ad03b59 100644 --- a/debian/squeeze/tdemultimedia/debian/icons/kmid-16.xpm +++ b/ubuntu/lucid_automake/kdemultimedia/debian/icons/tdemid-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid-16[] = { +static char *tdemid-16[] = { /* columns rows colors chars-per-pixel */ "16 16 104 2", " c black", diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/icons/kmid.xpm b/ubuntu/lucid_automake/kdemultimedia/debian/icons/tdemid.xpm index fb669aa72..c4cbb3bf1 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/icons/kmid.xpm +++ b/ubuntu/lucid_automake/kdemultimedia/debian/icons/tdemid.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kmid[] = { +static char *tdemid[] = { /* columns rows colors chars-per-pixel */ "32 32 213 2", " c black", diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index a1e53644a..000000000 --- a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/kde3/share/doc/kde/HTML/en/kmid/index.html -Files: /opt/kde3/share/doc/kde/HTML/en/kmid/*.html - diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..65f65f552 --- /dev/null +++ b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: kdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/kde3/share/doc/kde/HTML/en/tdemid/index.html +Files: /opt/kde3/share/doc/kde/HTML/en/tdemid/*.html + diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install index 9c0473a9d..de5103f60 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install +++ b/ubuntu/lucid_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/kde3/lib/libkdeinit_kmix.la debian/tmp/opt/kde3/lib/libkdeinit_kmixctrl.la debian/tmp/opt/kde3/lib/libkdeinit_krec.la debian/tmp/opt/kde3/lib/libkdeinit_noatun.la -debian/tmp/opt/kde3/lib/libkmidlib.la -debian/tmp/opt/kde3/lib/libkmidlib.so +debian/tmp/opt/kde3/lib/libtdemidlib.la +debian/tmp/opt/kde3/lib/libtdemidlib.so debian/tmp/opt/kde3/lib/libmpeg.la debian/tmp/opt/kde3/lib/libmpeg.so debian/tmp/opt/kde3/lib/libnoatun.la diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.install b/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.install deleted file mode 100644 index 023555e35..000000000 --- a/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/kde3/bin/kmid -debian/tmp/opt/kde3/lib/kde3/libkmidpart.la -debian/tmp/opt/kde3/lib/kde3/libkmidpart.so -debian/tmp/opt/kde3/lib/libkmidlib.so.0 -debian/tmp/opt/kde3/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/kde3/share/applications/kde/kmid.desktop -debian/tmp/opt/kde3/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/kde3/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/kde3/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/kde3/share/apps/kmid/OFortuna.kar -debian/tmp/opt/kde3/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/kde3/share/apps/kmid/fm/drums.sb -debian/tmp/opt/kde3/share/apps/kmid/fm/std.o3 -debian/tmp/opt/kde3/share/apps/kmid/fm/std.sb -debian/tmp/opt/kde3/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/kde3/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/kde3/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/kde3/share/apps/kmid/kmidui.rc -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/kde3/share/apps/kmid/maps/gm.map -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/index.docbook -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/kde3/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/kde3/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/kde3/share/pixmaps -debian/icons/kmid-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.menu b/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.menu deleted file mode 100644 index 8eda5a912..000000000 --- a/ubuntu/lucid_automake/kdemultimedia/debian/kmid-kde3.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="KDE"\ - title="KMid"\ - icon32x32="/opt/kde3/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/kde3/share/pixmaps/kmid-16.xpm"\ - command="/opt/kde3/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 index ef2e440bd..01da7f1a9 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 +++ b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/rules b/ubuntu/lucid_automake/kdemultimedia/debian/rules index 49741de4f..f65e9727b 100755 --- a/ubuntu/lucid_automake/kdemultimedia/debian/rules +++ b/ubuntu/lucid_automake/kdemultimedia/debian/rules @@ -23,12 +23,12 @@ DOC_HTML_PRUNE := kcontrol-kde3 DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-kde3-dbg -PACKAGES_WITH_LIBS := artsbuilder-kde3 kdemultimedia-kio-plugins-kde3 kmid-kde3 kmix-kde3 krec-kde3 \ +PACKAGES_WITH_LIBS := artsbuilder-kde3 kdemultimedia-kio-plugins-kde3 tdemid-kde3 kmix-kde3 krec-kde3 \ libarts1-akode-kde3 libarts1-audiofile-kde3 libarts1-mpeglib-kde3 libarts1-xine-kde3 \ libkcddb1-kde3 mpeglib-kde3 noatun-kde3 DEB_DH_MAKESHLIBS_ARGS_artsbuilder-kde3 := -V'artsbuilder-kde3 (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kmid-kde3 := -V'kmid-kde3 (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_tdemid-kde3 := -V'tdemid-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libkcddb1-kde3 := -V'libkcddb1-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_mpeglib-kde3 := -V'mpeglib-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_noatun-kde3 := -V'noatun-kde3 (>= 4:3.5.8-1)' diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.install b/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.install new file mode 100644 index 000000000..2ecf98ab0 --- /dev/null +++ b/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.install @@ -0,0 +1,40 @@ +debian/tmp/opt/kde3/bin/tdemid +debian/tmp/opt/kde3/lib/kde3/libtdemidpart.la +debian/tmp/opt/kde3/lib/kde3/libtdemidpart.so +debian/tmp/opt/kde3/lib/libtdemidlib.so.0 +debian/tmp/opt/kde3/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/kde3/share/applications/kde/tdemid.desktop +debian/tmp/opt/kde3/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/kde3/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/kde3/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/kde3/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/kde3/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/kde3/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/kde3/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/kde3/share/apps/tdemid/fm/std.sb +debian/tmp/opt/kde3/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/kde3/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/kde3/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/kde3/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/gm.map +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/index.docbook +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/kde3/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/kde3/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/kde3/share/pixmaps +debian/icons/tdemid-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.menu b/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.menu new file mode 100644 index 000000000..74f641ac8 --- /dev/null +++ b/ubuntu/lucid_automake/kdemultimedia/debian/tdemid-kde3.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="KDE"\ + title="KMid"\ + icon32x32="/opt/kde3/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/kde3/share/pixmaps/tdemid-16.xpm"\ + command="/opt/kde3/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/ubuntu/lucid_automake/kdenetwork/debian/changelog b/ubuntu/lucid_automake/kdenetwork/debian/changelog index 3071b84f0..ad53bebbb 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/changelog +++ b/ubuntu/lucid_automake/kdenetwork/debian/changelog @@ -173,10 +173,10 @@ kdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ kdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low kdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ kdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ kdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 kdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ kdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low kdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to kdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in kdelibs) + * Add tdednssd to kdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in kdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 kdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/ubuntu/lucid_automake/kdenetwork/debian/control b/ubuntu/lucid_automake/kdenetwork/debian/control index 1312b67ae..bbc88d951 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/control +++ b/ubuntu/lucid_automake/kdenetwork/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdenetwork-kde3 Section: kde Architecture: all -Depends: dcoprss-kde3 (>= ${Source-Version}), kdenetwork-kfile-plugins-kde3 (>= ${Source-Version}), kdict-kde3 (>= ${Source-Version}), kdnssd-kde3 (>= ${Source-Version}), kget-kde3 (>= ${Source-Version}), knewsticker-kde3 (>= ${Source-Version}), kopete-kde3 (>= ${Source-Version}), kpf-kde3 (>= ${Source-Version}), kppp-kde3 (>= ${Source-Version}), krdc-kde3 (>= ${Source-Version}), krfb-kde3 (>= ${Source-Version}), ksirc-kde3 (>= ${Source-Version}), kwifimanager-kde3 (>= ${Source-Version}), librss1-kde3 (>= ${Source-Version}) +Depends: dcoprss-kde3 (>= ${Source-Version}), kdenetwork-kfile-plugins-kde3 (>= ${Source-Version}), kdict-kde3 (>= ${Source-Version}), tdednssd-kde3 (>= ${Source-Version}), kget-kde3 (>= ${Source-Version}), knewsticker-kde3 (>= ${Source-Version}), kopete-kde3 (>= ${Source-Version}), kpf-kde3 (>= ${Source-Version}), kppp-kde3 (>= ${Source-Version}), krdc-kde3 (>= ${Source-Version}), krfb-kde3 (>= ${Source-Version}), ksirc-kde3 (>= ${Source-Version}), kwifimanager-kde3 (>= ${Source-Version}), librss1-kde3 (>= ${Source-Version}) Recommends: kdenetwork-filesharing-kde3 (>= ${Source-Version}), ktalkd-kde3 (>= ${Source-Version}), lisa-kde3 (>= ${Source-Version}) Suggests: kdenetwork-kde3-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE3 release @@ -297,7 +297,7 @@ Description: LAN information server for KDE3 This package is part of KDE3, as a component of the KDE network module. See the 'kde-kde3' and 'kdenetwork-kde3' packages for more information. -Package: kdnssd-kde3 +Package: tdednssd-kde3 Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdenetwork/debian/control.in b/ubuntu/lucid_automake/kdenetwork/debian/control.in index dd546016b..a54dbaef3 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/control.in +++ b/ubuntu/lucid_automake/kdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdenetwork Section: kde Architecture: all -Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: kdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'kdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kget-kde3.install b/ubuntu/lucid_automake/kdenetwork/debian/kget-kde3.install index 6b44400f5..919781fca 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/kget-kde3.install +++ b/ubuntu/lucid_automake/kdenetwork/debian/kget-kde3.install @@ -1,6 +1,6 @@ debian/tmp/opt/kde3/bin/kget -debian/tmp/opt/kde3/lib/kde3/khtml_kget.la -debian/tmp/opt/kde3/lib/kde3/khtml_kget.so +debian/tmp/opt/kde3/lib/kde3/tdehtml_kget.la +debian/tmp/opt/kde3/lib/kde3/tdehtml_kget.so debian/tmp/opt/kde3/share/applications/kde/kget.desktop debian/tmp/opt/kde3/share/apps/kget/eventsrc debian/tmp/opt/kde3/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/kde3/share/apps/kget/pics/try4.png debian/tmp/opt/kde3/share/apps/kget/pics/try5.png debian/tmp/opt/kde3/share/apps/kget/pics/try6.png debian/tmp/opt/kde3/share/apps/kget/pics/try7.png -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/kde3/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/kget4.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/kget5.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/ubuntu/lucid_automake/kdenetwork/debian/rules b/ubuntu/lucid_automake/kdenetwork/debian/rules index 3f1d50b69..576c41049 100755 --- a/ubuntu/lucid_automake/kdenetwork/debian/rules +++ b/ubuntu/lucid_automake/kdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kdnssd-kde3.install b/ubuntu/lucid_automake/kdenetwork/debian/tdednssd-kde3.install index b99338125..b99338125 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/kdnssd-kde3.install +++ b/ubuntu/lucid_automake/kdenetwork/debian/tdednssd-kde3.install diff --git a/ubuntu/lucid_automake/kdepim/debian/changelog b/ubuntu/lucid_automake/kdepim/debian/changelog index 026234536..9584314c7 100644 --- a/ubuntu/lucid_automake/kdepim/debian/changelog +++ b/ubuntu/lucid_automake/kdepim/debian/changelog @@ -1035,7 +1035,7 @@ kdepim (4:3.5.0-0ubuntu4) dapper; urgency=low kdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for kdepim-kresources + * Increase version number on Replaces for kdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ kdepim (4:3.4.1-2) UNRELEASED; urgency=low kdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package kdepim-kresources. + * Split tderesources into new package kdepim-tderesources. * Split kdepimmacros.h into new package libkdepim1-dev, and make all the other -dev packages depend on it. diff --git a/ubuntu/lucid_automake/kdepim/debian/control b/ubuntu/lucid_automake/kdepim/debian/control index c8a3c4b47..93393d030 100644 --- a/ubuntu/lucid_automake/kdepim/debian/control +++ b/ubuntu/lucid_automake/kdepim/debian/control @@ -20,7 +20,7 @@ Standards-Version: 3.8.3 Package: kdepim-kde3 Section: kde Architecture: all -Depends: akregator-kde3 (>= ${Source-Version}), kaddressbook-kde3 (>= ${Source-Version}), kalarm-kde3 (>= ${Source-Version}), kandy-kde3 (>= ${Source-Version}), karm-kde3 (>= ${Source-Version}), kdepim-kfile-plugins-kde3 (>= ${Source-Version}), kdepim-kio-plugins-kde3 (>= ${Source-Version}), kdepim-kresources-kde3 (>= ${Source-Version}), kdepim-wizards-kde3 (>= ${Source-Version}), kitchensync-kde3 (>= ${Source-Version}), kleopatra-kde3 (>= ${Source-Version}), kmail-kde3 (>= ${Source-Version}), kmailcvt-kde3 (>= ${Source-Version}), knode-kde3 (>= ${Source-Version}), knotes-kde3 (>= ${Source-Version}), konsolekalendar-kde3 (>= ${Source-Version}), kontact-kde3 (>= ${Source-Version}), korganizer-kde3 (>= ${Source-Version}), korn-kde3 (>= ${Source-Version}), kpilot-kde3 (>= ${Source-Version}), ktnef-kde3 (>= ${Source-Version}), libindex0-kde3 (>= ${Source-Version}), libkcal2b-kde3 (>= ${Source-Version}), libkdepim1a-kde3 (>= ${Source-Version}), libkgantt0-kde3 (>= ${Source-Version}), libkleopatra1-kde3 (>= ${Source-Version}), libkpimexchange1-kde3 (>= ${Source-Version}), libkpimidentities1-kde3 (>= ${Source-Version}), libksieve0-kde3 (>= ${Source-Version}), libktnef1-kde3 (>= ${Source-Version}), libmimelib1c2a-kde3 (>= ${Source-Version}) +Depends: akregator-kde3 (>= ${Source-Version}), kaddressbook-kde3 (>= ${Source-Version}), kalarm-kde3 (>= ${Source-Version}), kandy-kde3 (>= ${Source-Version}), karm-kde3 (>= ${Source-Version}), kdepim-kfile-plugins-kde3 (>= ${Source-Version}), kdepim-kio-plugins-kde3 (>= ${Source-Version}), kdepim-tderesources-kde3 (>= ${Source-Version}), kdepim-wizards-kde3 (>= ${Source-Version}), kitchensync-kde3 (>= ${Source-Version}), kleopatra-kde3 (>= ${Source-Version}), kmail-kde3 (>= ${Source-Version}), kmailcvt-kde3 (>= ${Source-Version}), knode-kde3 (>= ${Source-Version}), knotes-kde3 (>= ${Source-Version}), konsolekalendar-kde3 (>= ${Source-Version}), kontact-kde3 (>= ${Source-Version}), korganizer-kde3 (>= ${Source-Version}), korn-kde3 (>= ${Source-Version}), kpilot-kde3 (>= ${Source-Version}), ktnef-kde3 (>= ${Source-Version}), libindex0-kde3 (>= ${Source-Version}), libkcal2b-kde3 (>= ${Source-Version}), libkdepim1a-kde3 (>= ${Source-Version}), libkgantt0-kde3 (>= ${Source-Version}), libkleopatra1-kde3 (>= ${Source-Version}), libkpimexchange1-kde3 (>= ${Source-Version}), libkpimidentities1-kde3 (>= ${Source-Version}), libksieve0-kde3 (>= ${Source-Version}), libktnef1-kde3 (>= ${Source-Version}), libmimelib1c2a-kde3 (>= ${Source-Version}) Suggests: kdepim-kde3-doc-html Description: Personal Information Management apps from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: debugging symbols for kdepim-kde3 Package: kdepim-kde3-dev Section: devel Architecture: any -Depends: kaddressbook-kde3 (= ${Source-Version}), kalarm-kde3 (= ${Source-Version}), kdepim-kresources-kde3 (= ${Source-Version}), kmail-kde3 (= ${Source-Version}), knotes-kde3 (= ${Source-Version}), kontact-kde3 (= ${Source-Version}), korganizer-kde3 (= ${Source-Version}), kpilot-kde3 (= ${Source-Version}), libkpimidentities1-kde3 (= ${Source-Version}), libkcal2-kde3-dev (= ${Source-Version}), libkdepim1-kde3-dev (= ${Source-Version}), libkgantt0-kde3-dev (= ${Source-Version}), libkleopatra1-kde3-dev (= ${Source-Version}), libkpimexchange1-kde3-dev (= ${Source-Version}), libksieve0-kde3-dev (= ${Source-Version}), libktnef1-kde3-dev (= ${Source-Version}), libmimelib1-kde3-dev (= ${Source-Version}) +Depends: kaddressbook-kde3 (= ${Source-Version}), kalarm-kde3 (= ${Source-Version}), kdepim-tderesources-kde3 (= ${Source-Version}), kmail-kde3 (= ${Source-Version}), knotes-kde3 (= ${Source-Version}), kontact-kde3 (= ${Source-Version}), korganizer-kde3 (= ${Source-Version}), kpilot-kde3 (= ${Source-Version}), libkpimidentities1-kde3 (= ${Source-Version}), libkcal2-kde3-dev (= ${Source-Version}), libkdepim1-kde3-dev (= ${Source-Version}), libkgantt0-kde3-dev (= ${Source-Version}), libkleopatra1-kde3-dev (= ${Source-Version}), libkpimexchange1-kde3-dev (= ${Source-Version}), libksieve0-kde3-dev (= ${Source-Version}), libktnef1-kde3-dev (= ${Source-Version}), libmimelib1-kde3-dev (= ${Source-Version}) Replaces: libkcal2-kde3-dev (<< 4:3.4.1), libmimelib1-kde3-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile kdepim applications. @@ -105,7 +105,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Conflicts: kontact-kde3 (<< 4:3.5.7-1ubuntu5) -Suggests: kdepim-kresources-kde3, kdebase-kio-plugins-kde3 +Suggests: kdepim-tderesources-kde3, kdebase-kio-plugins-kde3 Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -188,7 +188,7 @@ Description: KDE3 pim I/O Slaves This package is part of KDE3, and a component of the KDE PIM module. See the 'kde-kde3' and 'kdepim-kde3' packages for more information. -Package: kdepim-kresources-kde3 +Package: kdepim-tderesources-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} @@ -293,7 +293,7 @@ Package: knotes-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources-kde3 +Suggests: kdepim-tderesources-kde3 Replaces: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Conflicts: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Description: KDE3 sticky notes @@ -444,7 +444,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-kde3, libkcal2a-kde3 Replaces: libkcal2a-kde3 -Suggests: kdepim-kresources-kde3 +Suggests: kdepim-tderesources-kde3 Description: KDE3 calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/lucid_automake/kdepim/debian/control.in b/ubuntu/lucid_automake/kdepim/debian/control.in index 6588fcdf7..69227af4d 100644 --- a/ubuntu/lucid_automake/kdepim/debian/control.in +++ b/ubuntu/lucid_automake/kdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: kdepim Section: kde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-tderesources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: kdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for kdepim Package: kdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile kdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources, kdebase-kio-plugins +Suggests: kdepim-tderesources, kdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'kdepim' packages for more information. -Package: kdepim-kresources +Package: kdepim-tderesources Section: kde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: kde Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources +Suggests: kdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -455,7 +455,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: kdepim-kresources +Suggests: kdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install b/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install index 72f58b3d7..2541f63e1 100644 --- a/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install +++ b/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install @@ -29,7 +29,7 @@ /opt/kde3/share/services/kabldapconfig.desktop /opt/kde3/share/services/kaddressbook /opt/kde3/share/services/kontact/kaddressbookplugin.desktop -/opt/kde3/share/services/kresources/kabc/imap.desktop +/opt/kde3/share/services/tderesources/kabc/imap.desktop /opt/kde3/share/services/ldifvcardthumbnail.desktop /opt/kde3/share/servicetypes/dcopaddressbook.desktop /opt/kde3/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/ubuntu/lucid_automake/kdepim/debian/kdepim-kresources-kde3.install b/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install index 43c46b288..6daf3e055 100644 --- a/ubuntu/lucid_automake/kdepim/debian/kdepim-kresources-kde3.install +++ b/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install @@ -74,31 +74,31 @@ /opt/kde3/lib/libkslox.so.0.0.0 /opt/kde3/lib/libgwsoap.so.0 /opt/kde3/lib/libgwsoap.so.0.0.0 -/opt/kde3/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/kde3/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/kde3/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/kde3/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/kde3/share/services/kresources/kabc/kabc_ox.desktop -/opt/kde3/share/services/kresources/kabc/kabc_slox.desktop -/opt/kde3/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/kde3/share/services/kresources/kabc/kolab.desktop -/opt/kde3/share/services/kresources/kabc/scalix.desktop -/opt/kde3/share/services/kresources/kcal/exchange.desktop -/opt/kde3/share/services/kresources/kcal/kcal_caldav.desktop -/opt/kde3/share/services/kresources/kabc/kabc_carddav.desktop -/opt/kde3/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/kde3/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/kde3/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/kde3/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/kde3/share/services/kresources/kcal/kcal_ox.desktop -/opt/kde3/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/kde3/share/services/kresources/kcal/kcal_slox.desktop -/opt/kde3/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/kde3/share/services/kresources/kcal/kolab.desktop -/opt/kde3/share/services/kresources/kcal/scalix.desktop -/opt/kde3/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/kde3/share/services/kresources/knotes/kolabresource.desktop -/opt/kde3/share/services/kresources/knotes/scalix.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_ox.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_slox.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/kde3/share/services/tderesources/kabc/kolab.desktop +/opt/kde3/share/services/tderesources/kabc/scalix.desktop +/opt/kde3/share/services/tderesources/kcal/exchange.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_ox.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_slox.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/kde3/share/services/tderesources/kcal/kolab.desktop +/opt/kde3/share/services/tderesources/kcal/scalix.desktop +/opt/kde3/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/kde3/share/services/tderesources/knotes/kolabresource.desktop +/opt/kde3/share/services/tderesources/knotes/scalix.desktop /opt/kde3/share/apps/kconf_update/upgrade-resourcetype.pl /opt/kde3/share/apps/kconf_update/kolab-resource.upd diff --git a/ubuntu/lucid_automake/kdepim/debian/knotes-kde3.install b/ubuntu/lucid_automake/kdepim/debian/knotes-kde3.install index 151ce3b3f..ba4860491 100644 --- a/ubuntu/lucid_automake/kdepim/debian/knotes-kde3.install +++ b/ubuntu/lucid_automake/kdepim/debian/knotes-kde3.install @@ -12,9 +12,9 @@ /opt/kde3/share/icons/hicolor/32x32/apps/knotes.png /opt/kde3/share/icons/hicolor/48x48/apps/knotes.png /opt/kde3/share/icons/hicolor/64x64/apps/knotes.png -/opt/kde3/share/services/kresources/knotes/imap.desktop -/opt/kde3/share/services/kresources/knotes/local.desktop -/opt/kde3/share/services/kresources/knotes_manager.desktop +/opt/kde3/share/services/tderesources/knotes/imap.desktop +/opt/kde3/share/services/tderesources/knotes/local.desktop +/opt/kde3/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/kde3/share/pixmaps ../icons/knotes-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdepim/debian/libkcal2b-kde3.install b/ubuntu/lucid_automake/kdepim/debian/libkcal2b-kde3.install index c830b6ed3..e4bbff59b 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkcal2b-kde3.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkcal2b-kde3.install @@ -13,9 +13,9 @@ /opt/kde3/lib/libkholidays.so.1 /opt/kde3/lib/libkholidays.so.1.0.0 /opt/kde3/share/apps/libkholidays -/opt/kde3/share/services/kresources/kcal/imap.desktop -/opt/kde3/share/services/kresources/kcal/kabc.desktop -/opt/kde3/share/services/kresources/kcal/local.desktop -/opt/kde3/share/services/kresources/kcal/localdir.desktop -/opt/kde3/share/services/kresources/kcal/remote.desktop -/opt/kde3/share/services/kresources/kcal_manager.desktop +/opt/kde3/share/services/tderesources/kcal/imap.desktop +/opt/kde3/share/services/tderesources/kcal/kabc.desktop +/opt/kde3/share/services/tderesources/kcal/local.desktop +/opt/kde3/share/services/tderesources/kcal/localdir.desktop +/opt/kde3/share/services/tderesources/kcal/remote.desktop +/opt/kde3/share/services/tderesources/kcal_manager.desktop diff --git a/ubuntu/lucid_automake/kdepim/debian/libkdepim1a-kde3.install b/ubuntu/lucid_automake/kdepim/debian/libkdepim1a-kde3.install index 11801fae3..5069a3d0d 100644 --- a/ubuntu/lucid_automake/kdepim/debian/libkdepim1a-kde3.install +++ b/ubuntu/lucid_automake/kdepim/debian/libkdepim1a-kde3.install @@ -1,7 +1,7 @@ /opt/kde3/lib/kde3/plugins/designer/kdepimwidgets.la /opt/kde3/lib/kde3/plugins/designer/kdepimwidgets.so -/opt/kde3/lib/kde3/plugins/designer/kpartsdesignerplugin.la -/opt/kde3/lib/kde3/plugins/designer/kpartsdesignerplugin.so +/opt/kde3/lib/kde3/plugins/designer/tdepartsdesignerplugin.la +/opt/kde3/lib/kde3/plugins/designer/tdepartsdesignerplugin.so /opt/kde3/lib/libkdepim.so.1 /opt/kde3/lib/libkdepim.so.1.0.0 /opt/kde3/share/apps/kdepimwidgets diff --git a/ubuntu/lucid_automake/kdepim/debian/rules b/ubuntu/lucid_automake/kdepim/debian/rules index 07e167879..a1492b72b 100755 --- a/ubuntu/lucid_automake/kdepim/debian/rules +++ b/ubuntu/lucid_automake/kdepim/debian/rules @@ -44,7 +44,7 @@ DEB_DH_MAKESHLIBS_ARGS_libksieve0-kde3 := -V'libksieve0-kde3 (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libktnef1-kde3 := -V'libktnef1-kde3 (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a-kde3 := -V'libmimelib1c2a-kde3 (>= $(shlibs_ver))' -#PACKAGES_WITH_LIBS := akregator-kde3 kaddressbook-kde3 kalarm-kde3 kdepim-kresources-kde3 \ +#PACKAGES_WITH_LIBS := akregator-kde3 kaddressbook-kde3 kalarm-kde3 kdepim-tderesources-kde3 \ # kdepim-wizards-kde3 kitchensync-kde3 kleopatra-kde3 kmail-kde3 knode-kde3 knotes-kde3 kode-kde3 kontact-kde3 \ # korganizer-kde3 kpilot-kde3 ksync-kde3 ktnef-kde3 libindex0-kde3 libkcal2b-kde3 libkdenetwork2-kde3 \ # libkdepim1a-kde3 libkgantt0-kde3 libkleopatra1-kde3 libkmime2-kde3 libkpimexchange1-kde3 \ @@ -64,10 +64,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-kde3 := \ -dDepends # Since -u args go first in dpkg-shlibdeps call # Move kaddressbook-kde3 dependency (from libkabc_xmlrpc.so) to Recommends -DEB_DH_SHLIBDEPS_ARGS_kdepim-kresources-kde3 := \ +DEB_DH_SHLIBDEPS_ARGS_kdepim-tderesources-kde3 := \ -Xopt/lib/kde3/libkabc_xmlrpc.so.1 \ -- -dRecommends \ - debian/kdepim-kresources/opt/kde3/lib/libkabc_xmlrpc.so.1.* \ + debian/kdepim-tderesources/opt/kde3/lib/libkabc_xmlrpc.so.1.* \ -dDepends # Move kaddressbook dependency of libkcal2b-kde3 to Recommends diff --git a/ubuntu/lucid_automake/kdesdk/debian/changelog b/ubuntu/lucid_automake/kdesdk/debian/changelog index e089652fe..8f5ffa359 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/changelog +++ b/ubuntu/lucid_automake/kdesdk/debian/changelog @@ -222,9 +222,9 @@ kdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest + * Add Suggests: kdelibs4-doc to tdeunittest. kdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian kdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ kdesdk (4:3.5.0-1) alioth; urgency=low * Add a kdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and kdesdk-kio-plugins, which splits + * New packages: tdeunittest, and kdesdk-kio-plugins, which splits out the svn ioslave from kdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/ubuntu/lucid_automake/kdesdk/debian/control b/ubuntu/lucid_automake/kdesdk/debian/control index 995f4136f..3efde280c 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/control +++ b/ubuntu/lucid_automake/kdesdk/debian/control @@ -14,7 +14,7 @@ Standards-Version: 3.8.3 Package: kdesdk-kde3 Architecture: all Section: kde -Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) +Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), tdeunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html Description: software development kit from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -373,17 +373,17 @@ Description: subversion ioslave for KDE3 This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kunittest-kde3 +Package: tdeunittest-kde3 Architecture: any Section: devel Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: kdelibs4-kde3-doc Description: unit testing library for KDE3 KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE3, and a component of the KDE SDK module. diff --git a/ubuntu/lucid_automake/kdesdk/debian/control.in b/ubuntu/lucid_automake/kdesdk/debian/control.in index fb2d6cec3..3b80525fe 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/control.in +++ b/ubuntu/lucid_automake/kdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: kdesdk Architecture: all Section: kde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: kdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/ubuntu/lucid_automake/kdesdk/debian/kbugbuster-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kbugbuster-kde3.install index ab97c654a..74efdd0a5 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/kbugbuster-kde3.install +++ b/ubuntu/lucid_automake/kdesdk/debian/kbugbuster-kde3.install @@ -18,5 +18,5 @@ debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/kde3/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/kde3/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.docs deleted file mode 100644 index 029481923..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install deleted file mode 100644 index 0be1336e4..000000000 --- a/ubuntu/lucid_automake/kdesdk/debian/kunittest-kde3.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/kde3/bin/kunittestmod -debian/tmp/opt/kde3/bin/kunittestguimodrunner -debian/tmp/opt/kde3/lib/libkunittestgui.la -debian/tmp/opt/kde3/lib/libkunittestgui.so -debian/tmp/opt/kde3/lib/libkunittestgui.so.0 -debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h diff --git a/ubuntu/lucid_automake/kdesdk/debian/not-installed.list b/ubuntu/lucid_automake/kdesdk/debian/not-installed.list index f801ede2f..b35fe772b 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/not-installed.list +++ b/ubuntu/lucid_automake/kdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian kdebindings packages. diff --git a/ubuntu/lucid_automake/kdesdk/debian/rules b/ubuntu/lucid_automake/kdesdk/debian/rules index 1a91a4065..64c2cd3e0 100755 --- a/ubuntu/lucid_automake/kdesdk/debian/rules +++ b/ubuntu/lucid_automake/kdesdk/debian/rules @@ -16,12 +16,12 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-kde3-dbg DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib -PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 kunittest-kde3 libcvsservice0-kde3 umbrello-kde3 +PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 tdeunittest-kde3 libcvsservice0-kde3 umbrello-kde3 DEB_DH_MAKESHLIBS_ARGS_kbabel-kde3 := -V'kbabel-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kompare-kde3 := -V'kompare-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kspy-kde3 := -V'kspy-kde3 (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kunittest-kde3 := -V'kunittest-kde3 (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_tdeunittest-kde3 := -V'tdeunittest-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-kde3 := -V'libcvsservice0-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3 := -V'umbrello-kde3 (>= 4:3.5.8-1)' diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.docs b/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.install new file mode 100644 index 000000000..700fbe390 --- /dev/null +++ b/ubuntu/lucid_automake/kdesdk/debian/tdeunittest-kde3.install @@ -0,0 +1,7 @@ +debian/tmp/opt/kde3/bin/tdeunittestmod +debian/tmp/opt/kde3/bin/tdeunittestguimodrunner +debian/tmp/opt/kde3/lib/libtdeunittestgui.la +debian/tmp/opt/kde3/lib/libtdeunittestgui.so +debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0 +debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/kde3/include/tde/tdeunittest/runnergui.h diff --git a/ubuntu/lucid_automake/kdeutils/debian/changelog b/ubuntu/lucid_automake/kdeutils/debian/changelog index b06bdfc1c..b39959d16 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/changelog +++ b/ubuntu/lucid_automake/kdeutils/debian/changelog @@ -268,7 +268,7 @@ kdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ kdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ kdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ kdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low kdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/ubuntu/lucid_automake/kdeutils/debian/control b/ubuntu/lucid_automake/kdeutils/debian/control index 4e3a97f28..036f5dd40 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/control +++ b/ubuntu/lucid_automake/kdeutils/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: kdeutils-kde3 Section: kde Architecture: all -Depends: ark-kde3 (>= ${Source-Version}), kcalc-kde3 (>= ${Source-Version}), kcharselect-kde3 (>= ${Source-Version}), kdelirc-kde3 (>= ${Source-Version}), kdessh-kde3 (>= ${Source-Version}), kdf-kde3 (>= ${Source-Version}), kedit-kde3 (>= ${Source-Version}), kfloppy-kde3 (>= ${Source-Version}), kgpg-kde3 (>= ${Source-Version}), khexedit-kde3 (>= ${Source-Version}), kjots-kde3 (>= ${Source-Version}), klaptopdaemon-kde3 (>= ${Source-Version}) | kpowersave-kde3, kmilo-kde3 (>= ${Source-Version}), kregexpeditor-kde3 (>= ${Source-Version}), ksim-kde3 (>= ${Source-Version}), ktimer-kde3 (>= ${Source-Version}), kwalletmanager-kde3 (>= ${Source-Version}), superkaramba-kde3 (>= ${Source-Version}) +Depends: ark-kde3 (>= ${Source-Version}), kcalc-kde3 (>= ${Source-Version}), kcharselect-kde3 (>= ${Source-Version}), kdelirc-kde3 (>= ${Source-Version}), kdessh-kde3 (>= ${Source-Version}), kdf-kde3 (>= ${Source-Version}), kedit-kde3 (>= ${Source-Version}), kfloppy-kde3 (>= ${Source-Version}), kgpg-kde3 (>= ${Source-Version}), khexedit-kde3 (>= ${Source-Version}), kjots-kde3 (>= ${Source-Version}), klaptopdaemon-kde3 (>= ${Source-Version}) | kpowersave-kde3, kmilo-kde3 (>= ${Source-Version}), kregexpeditor-kde3 (>= ${Source-Version}), ksim-kde3 (>= ${Source-Version}), ktimer-kde3 (>= ${Source-Version}), tdewalletmanager-kde3 (>= ${Source-Version}), superkaramba-kde3 (>= ${Source-Version}) Suggests: kdeutils-kde3-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -303,7 +303,7 @@ Description: timer utility for KDE3 This package is part of KDE3, as a component of the KDE utilities module. See the 'kde-kde3' and 'kdeutils-kde3' packages for more information. -Package: kwalletmanager-kde3 +Package: tdewalletmanager-kde3 Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdeutils/debian/control.in b/ubuntu/lucid_automake/kdeutils/debian/control.in index e6b817419..f70d7d150 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/control.in +++ b/ubuntu/lucid_automake/kdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: kdeutils Section: kde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: kdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'kdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-doc-html.doc-base.tdewallet index 294aa088d..799164f38 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet +++ b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-doc-html.doc-base.tdewallet @@ -1,10 +1,10 @@ -Document: kdeutils-doc-html-kwallet +Document: kdeutils-doc-html-tdewallet Title: KWallet Handbook Author: George Staikos, Lauri Watts Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. Section: Tools Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwallet/index.html -Files: /usr/share/doc/kde/HTML/en/kwallet/*.html +Index: /usr/share/doc/kde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/kde/HTML/en/tdewallet/*.html diff --git a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install index f7092a5fd..c81036c7e 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install +++ b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/kde3/include/tde/kmultiformlistbox.h -debian/tmp/opt/kde3/include/tde/kmultiformlistboxentry.h -debian/tmp/opt/kde3/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistbox.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistboxentry.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistboxfactory.h debian/tmp/opt/kde3/include/tde/ksim/chart.h debian/tmp/opt/kde3/include/tde/ksim/common.h debian/tmp/opt/kde3/include/tde/ksim/ksimconfig.h diff --git a/ubuntu/lucid_automake/kdeutils/debian/kwalletmanager-kde3.install b/ubuntu/lucid_automake/kdeutils/debian/kwalletmanager-kde3.install deleted file mode 100644 index 7e960c43b..000000000 --- a/ubuntu/lucid_automake/kdeutils/debian/kwalletmanager-kde3.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/kde3/bin/kwalletmanager -debian/tmp/opt/kde3/lib/kde3/kcm_kwallet.la -debian/tmp/opt/kde3/lib/kde3/kcm_kwallet.so -debian/tmp/opt/kde3/share/applications/kde/kwalletconfig.desktop -debian/tmp/opt/kde3/share/applications/kde/kwalletmanager.desktop -debian/tmp/opt/kde3/share/applications/kde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/kde3/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit2.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit3.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/password1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/password2.png -debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/services/kwallet_config.desktop -debian/tmp/opt/kde3/share/services/kwalletmanager_show.desktop diff --git a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 index 63429d234..0143c7995 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 +++ b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/lucid_automake/kdeutils/debian/tdewalletmanager-kde3.install b/ubuntu/lucid_automake/kdeutils/debian/tdewalletmanager-kde3.install new file mode 100644 index 000000000..14453f55b --- /dev/null +++ b/ubuntu/lucid_automake/kdeutils/debian/tdewalletmanager-kde3.install @@ -0,0 +1,31 @@ +debian/tmp/opt/kde3/bin/tdewalletmanager +debian/tmp/opt/kde3/lib/kde3/kcm_tdewallet.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdewallet.so +debian/tmp/opt/kde3/share/applications/kde/tdewalletconfig.desktop +debian/tmp/opt/kde3/share/applications/kde/tdewalletmanager.desktop +debian/tmp/opt/kde3/share/applications/kde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/kde3/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/password1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/password2.png +debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/services/tdewallet_config.desktop +debian/tmp/opt/kde3/share/services/tdewalletmanager_show.desktop diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/control b/ubuntu/lucid_automake/libraries/python-kde3/debian/control index da397514b..4e1d87d9d 100644 --- a/ubuntu/lucid_automake/libraries/python-kde3/debian/control +++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/control @@ -18,7 +18,7 @@ Conflicts: python-kde3-kde3 Description: KDE3 bindings for Python [KDE3] Python binding module that provides wide access to the KDE3 API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-kde3-kde3-dbg Priority: extra @@ -28,7 +28,7 @@ XB-Python-Version: ${python:Versions} Description: KDE3 bindings for Python (debug extensions) [KDE3] Python binding module that provides wide access to the KDE3 API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/maverick/applications/kaffeine/debian/changelog index ae8921760..3f11ad0ae 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/changelog +++ b/ubuntu/maverick/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/ubuntu/maverick/applications/kaffeine/debian/copyright b/ubuntu/maverick/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/copyright +++ b/ubuntu/maverick/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/maverick/applications/kmplayer/debian/changelog index 26a6aed53..233e1f465 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/changelog +++ b/ubuntu/maverick/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in +++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control b/ubuntu/maverick/applications/knetworkmanager9/debian/control index c32604bbf..efd256a36 100644 --- a/ubuntu/maverick/applications/knetworkmanager9/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager9/debian/control @@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in b/ubuntu/maverick/applications/knetworkmanager9/debian/control.in index e54418ea6..a5cefc2bb 100644 --- a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in +++ b/ubuntu/maverick/applications/knetworkmanager9/debian/control.in @@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install index 7bed60e6c..a0e03ae3b 100644 --- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install @@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop -debian/tmp/opt/trinity/share/services/chalkscripting.desktop +debian/tmp/opt/trinity/share/services/chaltdescripting.desktop debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install index 4df24b77e..66afcfbba 100644 --- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install @@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so -debian/tmp/opt/trinity/lib/trinity/chalkscripting.la -debian/tmp/opt/trinity/lib/trinity/chalkscripting.so +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la @@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.* debian/tmp/opt/trinity/lib/libchalk_lms_*.so.* debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.* debian/tmp/opt/trinity/lib/libchalkrgb.so.* -debian/tmp/opt/trinity/lib/libchalkscripting.so.* +debian/tmp/opt/trinity/lib/libchaltdescripting.so.* debian/tmp/opt/trinity/lib/libchalkui.so.* debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.* diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..cdf64af56 100644 --- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian +++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1 diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install index 4b80b83ec..f28ee3bef 100644 --- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install @@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la debian/tmp/opt/trinity/lib/libchalkimage.so debian/tmp/opt/trinity/lib/libchalkrgb.la debian/tmp/opt/trinity/lib/libchalkrgb.so -debian/tmp/opt/trinity/lib/libchalkscripting.la -debian/tmp/opt/trinity/lib/libchalkscripting.so +debian/tmp/opt/trinity/lib/libchaltdescripting.la +debian/tmp/opt/trinity/lib/libchaltdescripting.so debian/tmp/opt/trinity/lib/libchalkui.la debian/tmp/opt/trinity/lib/libchalkui.so debian/tmp/opt/trinity/lib/libkrossapi.la diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog index c23417124..2d09c1e65 100644 --- a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog +++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/maverick/applications/kpowersave/debian/changelog b/ubuntu/maverick/applications/kpowersave/debian/changelog index c23417124..2d09c1e65 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/changelog +++ b/ubuntu/maverick/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog index 3ff72d99c..f7612d81f 100644 --- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile index fa069e33a..9cb53d701 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile @@ -136,8 +136,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
- install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+ install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
@@ -149,8 +149,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
- install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+ install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog index a44775158..7504e67fc 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog @@ -240,7 +240,7 @@ kubuntu-default-settings (1:7.10-27) gutsy; urgency=low kubuntu-default-settings (1:7.10-26) gutsy; urgency=low - * Fixed khtmlrc, now uses easylist instead of filterset.g. Fixes LP: + * Fixed tdehtmlrc, now uses easylist instead of filterset.g. Fixes LP: #99535 -- Anthony Mercatante <tonio@ubuntu.com> Sat, 29 Sep 2007 11:41:52 +0200 @@ -1110,7 +1110,7 @@ kubuntu-default-settings (1:6.10-13) edgy; urgency=low kubuntu-default-settings (1:6.10-12) edgy; urgency=low - * Improved khtmlrc for better adblock filters + * Improved tdehtmlrc for better adblock filters -- Anthony Mercatante <tonio@ubuntu.com> Mon, 20 Aug 2006 20:55:01 +0200 @@ -1423,7 +1423,7 @@ kubuntu-default-settings (1:6.04-12) dapper; urgency=low kubuntu-default-settings (1:6.04-11) dapper; urgency=low - * Added khtmlrc with a disabled list of filters for adblock + * Added tdehtmlrc with a disabled list of filters for adblock * Changed log directory for konversation, from $HOME to $HOME/.kde/share/apps/konversation/logs * knemorc improved with different iconsets depending the kind of connection. @@ -1444,7 +1444,7 @@ kubuntu-default-settings (1:6.04-10) dapper; urgency=low konversation and keep tabs arround the focus * Added dirfilterplugin.rc to make usage of dirfilter in konqueror's filemanagement profile by default - * Added kwalletrc and kdewallet.kwl for confortable default config on new profiles + * Added tdewalletrc and kdewallet.kwl for confortable default config on new profiles * Changed kdeprintrc to use localhost as default CUPS server -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 28 Feb 2006 15:38:52 +0000 @@ -1507,10 +1507,10 @@ kubuntu-default-settings (1:6.04-5) dapper; urgency=low * Added ark_part.rc, ark_part_readonly.rc, gvimagepart.rc, part.rc in folder kpart-rc-files, with integration set to "contextToolBar" * Updated konquerorrc, setting contextToolBar's "NewLine" value to "true" - (doesn't work if set in kparts' configuration files while clicking another tab and + (doesn't work if set in tdeparts' configuration files while clicking another tab and coming back) MediumFontSize set to 10 - * Added khtml_browser.rc, removing DOM entries in the konq's "view" menu + * Added tdehtml_browser.rc, removing DOM entries in the konq's "view" menu * Updated filemagement profile, adding Sidebar by default * Added x-tar.desktop, x-tarz.desktop, x-tbz.desktop, x-tgz.desktop, x-zip.desktop in folder mimelnk, with blanked "LocalProtocol" value, to remove tar and zip diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc index 10fd37bab..f952dff62 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc @@ -6,4 +6,4 @@ Session Exit=discard Startup Session=new [Kate Document Defaults] -KTextEditor Plugin ktexteditor_isearch=true +KTextEditor Plugin tdetexteditor_isearch=true diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc index 326194cb6..d0dce217c 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc @@ -1,5 +1,5 @@ [Auto Allow] -kdewallet=kwalletmanager +kdewallet=tdewalletmanager [Auto Deny] kdewallet= diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc index 326194cb6..d0dce217c 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc @@ -1,5 +1,5 @@ [Auto Allow] -kdewallet=kwalletmanager +kdewallet=tdewalletmanager [Auto Deny] kdewallet= diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc index da8f97f73..a45167843 100755 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="8"> +<kpartgui name="ark_tdeparts" version="8"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc index 888d12e8d..df2c4f29f 100755 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="7"> +<kpartgui name="ark_tdeparts" version="7"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc index 2eab2a321..069870b55 100755 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="khtmlpart" version="19"> +<kpartgui name="tdehtmlpart" version="19"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="saveBackground" /> diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl Binary files differindex 485b2e683..485b2e683 100755 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/kdewallet.kwl diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile index d10e3ae5f..ce104d8b2 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile @@ -276,8 +276,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
- install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+ install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
@@ -289,8 +289,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
- install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+ install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control index fc6c05a4f..324b8502f 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-ii-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, kdnssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity -Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc index aae3f8a04..ac761b181 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc @@ -148,13 +148,13 @@ stock["gtk-dnd"]={ { "22x22/mimetypes/empty.png" } } stock["gtk-dnd-multiple"]={ - { "22x22/mimetypes/kmultiple.png", *, *, "gtk-large-toolbar" }, - { "32x32/mimetypes/kmultiple.png", *, *, "gtk-dnd" }, - { "32x32/mimetypes/kmultiple.png", *, *, "gtk-dialog" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-button" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-menu" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-small-toolbar" }, - { "22x22/mimetypes/kmultiple.png" } + { "22x22/mimetypes/tdemultiple.png", *, *, "gtk-large-toolbar" }, + { "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dnd" }, + { "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dialog" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-button" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-menu" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-small-toolbar" }, + { "22x22/mimetypes/tdemultiple.png" } } stock["gtk-execute"]={ { "22x22/actions/exec.png", *, *, "gtk-large-toolbar" }, diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc index 10fd37bab..f952dff62 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc @@ -6,4 +6,4 @@ Session Exit=discard Startup Session=new [Kate Document Defaults] -KTextEditor Plugin ktexteditor_isearch=true +KTextEditor Plugin tdetexteditor_isearch=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc index 326194cb6..d0dce217c 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc @@ -1,5 +1,5 @@ [Auto Allow] -kdewallet=kwalletmanager +kdewallet=tdewalletmanager [Auto Deny] kdewallet= diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc index 326194cb6..d0dce217c 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc @@ -1,5 +1,5 @@ [Auto Allow] -kdewallet=kwalletmanager +kdewallet=tdewalletmanager [Auto Deny] kdewallet= diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc index da8f97f73..a45167843 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="8"> +<kpartgui name="ark_tdeparts" version="8"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc index 888d12e8d..df2c4f29f 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="7"> +<kpartgui name="ark_tdeparts" version="7"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc index 2eab2a321..069870b55 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="khtmlpart" version="19"> +<kpartgui name="tdehtmlpart" version="19"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="saveBackground" /> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/kdewallet.kwl Binary files differindex 485b2e683..485b2e683 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/kdewallet.kwl diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile index 54be145df..482b9e6fc 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile @@ -275,8 +275,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
- install -m644 kpart-rc-files/khtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/khtml/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+ install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
@@ -288,8 +288,8 @@ install: mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
- install -m644 kwallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwallet/"
+ mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+ install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control index ecd25e6b0..428413a12 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, kdnssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity -Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Recommends: firefox, thunderbird, synaptic, kio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings Description: Redmond default settings and artwork for the Kubuntu Trinity desktop diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc index aae3f8a04..ac761b181 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc @@ -148,13 +148,13 @@ stock["gtk-dnd"]={ { "22x22/mimetypes/empty.png" } } stock["gtk-dnd-multiple"]={ - { "22x22/mimetypes/kmultiple.png", *, *, "gtk-large-toolbar" }, - { "32x32/mimetypes/kmultiple.png", *, *, "gtk-dnd" }, - { "32x32/mimetypes/kmultiple.png", *, *, "gtk-dialog" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-button" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-menu" }, - { "16x16/mimetypes/kmultiple.png", *, *, "gtk-small-toolbar" }, - { "22x22/mimetypes/kmultiple.png" } + { "22x22/mimetypes/tdemultiple.png", *, *, "gtk-large-toolbar" }, + { "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dnd" }, + { "32x32/mimetypes/tdemultiple.png", *, *, "gtk-dialog" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-button" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-menu" }, + { "16x16/mimetypes/tdemultiple.png", *, *, "gtk-small-toolbar" }, + { "22x22/mimetypes/tdemultiple.png" } } stock["gtk-execute"]={ { "22x22/actions/exec.png", *, *, "gtk-large-toolbar" }, diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc index 10fd37bab..f952dff62 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc @@ -6,4 +6,4 @@ Session Exit=discard Startup Session=new [Kate Document Defaults] -KTextEditor Plugin ktexteditor_isearch=true +KTextEditor Plugin tdetexteditor_isearch=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc deleted file mode 100644 index 326194cb6..000000000 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc +++ /dev/null @@ -1,18 +0,0 @@ -[Auto Allow] -kdewallet=kwalletmanager - -[Auto Deny] -kdewallet= - -[Wallet] -Close When Idle=false -Close on Screensaver=false -Default Wallet=kdewallet -Enabled=true -First Use=false -Idle Timeout=10 -Launch Manager=true -Leave Manager Open=false -Leave Open=true -Prompt on Open=true -Use One Wallet=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc new file mode 100644 index 000000000..d0dce217c --- /dev/null +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc @@ -0,0 +1,18 @@ +[Auto Allow] +kdewallet=tdewalletmanager + +[Auto Deny] +kdewallet= + +[Wallet] +Close When Idle=false +Close on Screensaver=false +Default Wallet=kdewallet +Enabled=true +First Use=false +Idle Timeout=10 +Launch Manager=true +Leave Manager Open=false +Leave Open=true +Prompt on Open=true +Use One Wallet=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc deleted file mode 100644 index 326194cb6..000000000 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc +++ /dev/null @@ -1,18 +0,0 @@ -[Auto Allow] -kdewallet=kwalletmanager - -[Auto Deny] -kdewallet= - -[Wallet] -Close When Idle=false -Close on Screensaver=false -Default Wallet=kdewallet -Enabled=true -First Use=false -Idle Timeout=10 -Launch Manager=true -Leave Manager Open=false -Leave Open=true -Prompt on Open=true -Use One Wallet=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc index 6a64b58be..6a64b58be 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc new file mode 100644 index 000000000..d0dce217c --- /dev/null +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc @@ -0,0 +1,18 @@ +[Auto Allow] +kdewallet=tdewalletmanager + +[Auto Deny] +kdewallet= + +[Wallet] +Close When Idle=false +Close on Screensaver=false +Default Wallet=kdewallet +Enabled=true +First Use=false +Idle Timeout=10 +Launch Manager=true +Leave Manager Open=false +Leave Open=true +Prompt on Open=true +Use One Wallet=true diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc index da8f97f73..a45167843 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="8"> +<kpartgui name="ark_tdeparts" version="8"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc index 888d12e8d..df2c4f29f 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="ark_kparts" version="7"> +<kpartgui name="ark_tdeparts" version="7"> <ActionProperties> <Action name="select_all" icon="ark_selectall"/> </ActionProperties> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc index 2eab2a321..069870b55 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="khtmlpart" version="19"> +<kpartgui name="tdehtmlpart" version="19"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="saveBackground" /> diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/kdewallet.kwl Binary files differindex 485b2e683..485b2e683 100755 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/kdewallet.kwl diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install index 4d50b4fc5..c851101bf 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/tde/kfaximage.h -debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/tdemultipageInterface.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/tde/kviewshell/history.h debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/tde/kviewshell/length.h debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian +++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index afacf68ee..cad02055c 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-trinity-trinity-dbg Priority: extra @@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog index 0a3dc07a4..6c963f3b9 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog @@ -836,7 +836,7 @@ kubuntu-meta (1.30) feisty; urgency=low * Added kubuntu-konqueror-shortcuts to desktop-recommends-i386, desktop-recommends-amd64, desktop-recommends-powerpc, desktop- recommends-ia64, desktop-recommends-sparc, desktop-recommends-hppa - * Added kwalletmanager to desktop-recommends-i386, desktop-recommends- + * Added tdewalletmanager to desktop-recommends-i386, desktop-recommends- amd64, desktop-recommends-powerpc, desktop-recommends-ia64, desktop- recommends-sparc, desktop-recommends-hppa * Added landscape-client to desktop-recommends-i386, desktop- @@ -889,7 +889,7 @@ kubuntu-meta (1.30) feisty; urgency=low powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed kubuntu-konqueror-shortcuts from desktop-i386, desktop- amd64, desktop-powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Removed kwalletmanager from desktop-i386, desktop-amd64, desktop- + * Removed tdewalletmanager from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed landscape-client from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa @@ -1212,7 +1212,7 @@ kubuntu-meta (1.10) edgy; urgency=low desktop-ia64, desktop-sparc, desktop-hppa * Removed kmousetool from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Removed kscreensaver from desktop-i386, desktop-amd64, desktop- + * Removed tdescreensaver from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed linux-headers-686 from desktop-i386 * Removed linux-headers-amd64-generic from desktop-amd64 @@ -2162,7 +2162,7 @@ kubuntu-meta (0.63) dapper; urgency=low * Added cupsys-driver-gutenprint to desktop-ia64 * Added ttf-arphic-ukai to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Added kdnssd to desktop-ia64, desktop-hppa + * Added tdednssd to desktop-ia64, desktop-hppa * Added ttf-arphic-uming to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed python-musicbrainz from desktop-i386, desktop-amd64, @@ -2173,7 +2173,7 @@ kubuntu-meta (0.63) dapper; urgency=low kubuntu-meta (0.62) dapper; urgency=low * Refreshed dependencies - * Added kdnssd to desktop-i386, desktop-amd64, desktop-powerpc, + * Added tdednssd to desktop-i386, desktop-amd64, desktop-powerpc, desktop-sparc -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 13 Jan 2006 01:00:35 +0000 @@ -2285,7 +2285,7 @@ kubuntu-meta (0.56) dapper; urgency=low * Refreshed dependencies * Added knetworkconf to desktop-hppa * Added krita to desktop-hppa - * Added kwalletmanager to desktop-hppa + * Added tdewalletmanager to desktop-hppa * Added knotes to desktop-hppa * Added kdepim-kio-plugins to desktop-hppa * Added kdepim-wizards to desktop-hppa @@ -2441,7 +2441,7 @@ kubuntu-meta (0.53) breezy; urgency=low * Added gstreamer0.8-musepack to desktop-hppa * Added gtk2-engines-gtk-qt to desktop-sparc, desktop-hppa * Added gstreamer0.8-theora to desktop-hppa - * Added kscreensaver to desktop-hppa + * Added tdescreensaver to desktop-hppa * Added kdesktop to desktop-hppa * Added klipper to desktop-hppa * Added konsole to desktop-hppa @@ -3092,7 +3092,7 @@ kubuntu-meta (0.45) breezy; urgency=low kubuntu-meta (0.44) breezy; urgency=low * Refreshed dependencies - * Added kwalletmanager to desktop-i386, desktop-amd64, desktop- + * Added tdewalletmanager to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Jun 2005 23:32:00 +0000 @@ -3282,7 +3282,7 @@ kubuntu-meta (0.39) hoary; urgency=low kubuntu-meta (0.38) hoary; urgency=low * Refreshed dependencies - * Added kscreensaver to desktop-i386, desktop-amd64, desktop-powerpc, + * Added tdescreensaver to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64, desktop-sparc * Removed python-glade2 from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control index f5f9134d4..b10c8b527 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, kdnssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine -Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine +Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version This package depends on all of the packages in the Kubuntu TDE desktop system diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/desktop index bfdaff332..732491954 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop @@ -172,7 +172,7 @@ We've chosen KDE as our desktop user interface of choice == kdenetwork-trinity == * kdenetwork-filesharing-trinity - * kdnssd-trinity + * tdednssd-trinity * (kopete-trinity) * (kpf-trinity) * (kppp-trinity) @@ -196,7 +196,7 @@ We've chosen KDE as our desktop user interface of choice * ark-trinity * (speedcrunch-trinity) * (kmilo-trinity) - * (kwalletmanager-trinity) + * (tdewalletmanager-trinity) == koffice-trinity == @@ -273,7 +273,7 @@ Accessibility tools: * (openoffice.org-draw) [i386 powerpc amd64] * (openoffice.org-math) [i386 powerpc amd64] * (openoffice.org-java-common) [i386 powerpc amd64] - * (kscreensaver-trinity) + * (tdescreensaver-trinity) = Games = diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 index d04f55409..b9a6a4c6e 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 @@ -37,7 +37,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa index aa6d84396..4e0775054 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 index 9873a7dba..2c8b6b5f3 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 @@ -38,7 +38,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 index c28064c75..b8458e4b6 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 @@ -37,7 +37,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia index a1666b456..0b09fc611 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia @@ -37,7 +37,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc index 4f36cc499..cbaae6a43 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 index f39f1dabd..6c811d42d 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 @@ -63,14 +63,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa index 5a4bea656..a3e27e409 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 index bb1c0df3f..9e1c7797d 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 @@ -64,14 +64,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 index dda138ee3..7d6e29a60 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia index e0de83e1b..07a6d8a79 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia @@ -64,14 +64,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc index caf564463..14de9515e 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc index 0aa3a1fb1..6d67f9eac 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc index aa6d84396..4e0775054 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control index 318c6ee15..2805f756f 100644 --- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control +++ b/ubuntu/maverick/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, kscreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, kwalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install index cd7b93d85..2ad412a7f 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install +++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop -debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 +++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 +++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install index c74edf4ce..15ec8f99e 100644 --- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install +++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install @@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so debian/tmp/opt/trinity/lib/trinity/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer debian/tmp/opt/trinity/share/apps/fsview debian/tmp/opt/trinity/share/apps/imagerotation/orient.py debian/tmp/opt/trinity/share/apps/imagerotation/exif.py -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins debian/tmp/opt/trinity/share/apps/konqiconview debian/tmp/opt/trinity/share/apps/konqlistview debian/tmp/opt/trinity/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog index a3043310e..ddf857174 100644 --- a/ubuntu/maverick/tdeartwork/debian/changelog +++ b/ubuntu/maverick/tdeartwork/debian/changelog @@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since tdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low tdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on tdebase-bin (closes: #203185). + * Made tdescreensaver depend on tdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low tdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low tdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed tdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x. + * Renamed tdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index ee0ae9ba5..b0100a04c 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -13,8 +13,8 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-trinity +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -110,13 +110,13 @@ Description: wallpapers released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-trinity +Package: tdescreensaver-trinity Architecture: any Section: tde -Replaces: kscreensaver-trinity (<< 4:14.0.0) -Breaks: kscreensaver-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-trinity +Package: tdescreensaver-xsavers-trinity Architecture: any Section: tde -Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-trinity +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into Trinity. With this package installed you can select and/or configure @@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with Trinity, see the separate package - kscreensaver-trinity. This package does depend on the xscreensaver package, and + tdescreensaver-trinity. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into Trinity. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-webcollage-trinity +Package: tdescreensaver-xsavers-webcollage-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm +Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity screensaver configuration. @@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-extra-trinity +Package: tdescreensaver-xsavers-extra-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) +Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in index 1721be0bf..4b914794e 100644 --- a/ubuntu/maverick/tdeartwork/debian/control.in +++ b/ubuntu/maverick/tdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: tdeartwork Architecture: all Section: tde -Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: tde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install deleted file mode 100644 index f58d9f076..000000000 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install deleted file mode 100644 index f11cf310b..000000000 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers.README.Debian deleted file mode 100644 index 828861775..000000000 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver-xsavers) only contains hooks for the standard -xscreensavers, so that they can be selected and/or configured through -the KDE Control Centre. - -For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver.README.Debian b/ubuntu/maverick/tdeartwork/debian/kscreensaver.README.Debian deleted file mode 100644 index 68584d330..000000000 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver) no longer contains the hooks for the standard -xscreensavers. It only contains the additional screensavers that are -specifically shipped with KDE. - -To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/ubuntu/maverick/tdeartwork/debian/man/kpartsaver-trinity.kss.1 deleted file mode 100644 index 64a0a5c45..000000000 --- a/ubuntu/maverick/tdeartwork/debian/man/kpartsaver-trinity.kss.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KPARTSAVER.KSS 1 "May 12, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kpartsaver.kss \- Media screen saver for KDE -.SH SYNOPSIS -.B kpartsaver.kss -.RI "[ " generic-options " ]" -[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | -\fB\-\-demo\fP ] -.SH DESCRIPTION -\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). -.PP -This program is part of the official KDE artwork module. -.SH OPTIONS -Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. -.TP -\fB\-\-setup\fP -Set up the screen saver. -.TP -\fB\-\-window-id\fP \fIwid\fP -Run in the specified XWindow. -.TP -\fB\-\-root\fP -Run in the root XWindow. -.TP -\fB\-\-demo\fP -Start the screen saver in demo mode (default). -.SH SEE ALSO -.BR kxsconfig (1), -.BR kxsrun (1). -.SH AUTHOR -This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 new file mode 100644 index 000000000..73456139b --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KPARTSAVER.KSS 1 "May 12, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +tdepartsaver.kss \- Media screen saver for KDE +.SH SYNOPSIS +.B tdepartsaver.kss +.RI "[ " generic-options " ]" +[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | +\fB\-\-demo\fP ] +.SH DESCRIPTION +\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). +.PP +This program is part of the official KDE artwork module. +.SH OPTIONS +Below are the screen saver-specific options. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. +.TP +\fB\-\-setup\fP +Set up the screen saver. +.TP +\fB\-\-window-id\fP \fIwid\fP +Run in the specified XWindow. +.TP +\fB\-\-root\fP +Run in the root XWindow. +.TP +\fB\-\-demo\fP +Start the screen saver in demo mode (default). +.SH SEE ALSO +.BR kxsconfig (1), +.BR kxsrun (1). +.SH AUTHOR +This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. +.br +This manual page was prepared by Ben Burton <bab@debian.org> +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules index 4e236c044..963f996bc 100755 --- a/ubuntu/maverick/tdeartwork/debian/rules +++ b/ubuntu/maverick/tdeartwork/debian/rules @@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png - cd kscreensaver/kxsconfig/ && ./update_hacks.sh + cd tdescreensaver/kxsconfig/ && ./update_hacks.sh -binary-install/kscreensaver-xsavers-extra-trinity:: - rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop +binary-install/tdescreensaver-xsavers-extra-trinity:: + rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install index d65c099dc..012466480 100644 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install @@ -14,7 +14,7 @@ debian/tmp/opt/trinity/bin/kclock.kss debian/tmp/opt/trinity/bin/kswarm.kss debian/tmp/opt/trinity/bin/kfountain.kss debian/tmp/opt/trinity/bin/kgravity.kss -debian/tmp/opt/trinity/bin/kpartsaver.kss +debian/tmp/opt/trinity/bin/tdepartsaver.kss debian/tmp/opt/trinity/bin/kpendulum.kss debian/tmp/opt/trinity/bin/kblob.kss debian/tmp/opt/trinity/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/trinity/share/apps/kfiresaver -debian/tmp/opt/trinity/share/apps/kscreensaver +debian/tmp/opt/trinity/share/apps/tdescreensaver diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.manpages b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages index 839491dbc..294e72dd8 100644 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-trinity.manpages +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-trinity.kss.1 debian/man/kgravity-trinity.kss.1 debian/man/klines-trinity.kss.1 debian/man/klorenz-trinity.kss.1 -debian/man/kpartsaver-trinity.kss.1 +debian/man/tdepartsaver-trinity.kss.1 debian/man/kpendulum-trinity.kss.1 debian/man/kpolygon-trinity.kss.1 debian/man/krotation-trinity.kss.1 diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install new file mode 100644 index 000000000..65da0bfe4 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install index 296f023e9..296f023e9 100644 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages index 356af4f32..356af4f32 100644 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/ubuntu/maverick/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian new file mode 100644 index 000000000..a41c9ad57 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver-xsavers) only contains hooks for the standard +xscreensavers, so that they can be selected and/or configured through +the KDE Control Centre. + +For the additional screensavers that are specifically shipped with KDE, +see the separate package tdescreensaver. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian b/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian new file mode 100644 index 000000000..57a145f54 --- /dev/null +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver) no longer contains the hooks for the standard +xscreensavers. It only contains the additional screensavers that are +specifically shipped with KDE. + +To select and/or configure the standard xscreensavers through the KDE Control +Centre, install the separate package tdescreensaver-xsavers. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/ubuntu/maverick/tdebase/debian/control.in +++ b/ubuntu/maverick/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install +++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/ubuntu/maverick/tdebase/debian/kscreensaver-trinity.pam b/ubuntu/maverick/tdebase/debian/kscreensaver-trinity.pam deleted file mode 100644 index 088a00503..000000000 --- a/ubuntu/maverick/tdebase/debian/kscreensaver-trinity.pam +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver -# -@include common-auth -@include common-account -@include common-password -@include common-session diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index a1e9c65f7..bbcbdc032 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam b/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam new file mode 100644 index 000000000..9a2c74519 --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver +# +@include common-auth +@include common-account +@include common-password +@include common-session diff --git a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install index e29ab016c..764c26e42 100644 --- a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install @@ -11,7 +11,7 @@ #debian/tmp/opt/trinity/lib/libgtkxparts.so.0 #debian/tmp/opt/trinity/lib/libgtkxparts.so #debian/tmp/opt/trinity/lib/libgtkxparts.la -#debian/tmp/opt/trinity/include/xkparts +#debian/tmp/opt/trinity/include/xtdeparts #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install +++ b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian +++ b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install index 80d007db5..26f6ba6ea 100644 --- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/kfaximage.h -debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/tdemultipageInterface.h debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/kviewshell/history.h debian/tmp/opt/trinity/include/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/kviewshell/length.h debian/tmp/opt/trinity/include/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 60b5c5d56..6a9f72874 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow tdelibs5-dev co-installable alongside tdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-tdelibs-3.5.6.diff, 47_tdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_tdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_tdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low tdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from tdelibs4-dev + * Remove libtdednssd depend from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in tdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in tdelibs4-dev. - * Add depends on libkdnssd1-avahi from tdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in tdelibs4-dev. + * Add depends on libtdednssd1-avahi from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since + - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/tdelibs4-dev.install: - usr/include/kiobuffer.h - - usr/include/kwallettypes.h + - usr/include/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: tdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low tdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low tdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of tdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of tdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/ubuntu/maverick/tdelibs/debian/copyright b/ubuntu/maverick/tdelibs/debian/copyright index 7c67eaede..945a09ca9 100644 --- a/ubuntu/maverick/tdelibs/debian/copyright +++ b/ubuntu/maverick/tdelibs/debian/copyright @@ -14,9 +14,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx, -tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx, +tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/ubuntu/maverick/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kunittestmodrunner-trinity.1 deleted file mode 100644 index b61b06654..000000000 --- a/ubuntu/maverick/tdelibs/debian/man/kunittestmodrunner-trinity.1 +++ /dev/null @@ -1,159 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" -.SH NAME -kunittestmodrunner -\- a KDE command\-line application to run KUnitTest modules -.SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] -.SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. -.SH OPTIONS -.SS Options: -.TP -.BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] -.TP -.BR \-\-folder \ [ folder ] -Only run tests modules which are found in the folder. Use the query option to select modules. [.] -.TP -.B \-\-enable\-dbgcap -Disables debug capturing. You typically use this option when you use the GUI. -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS KDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.SS -.SH SEE ALSO -.BR kunittestguimodrunner (1) -.sp 1 -.TP -.BR http://developer.kde.org -KDE Developers's Corner website -.SH AUTHORS -.nf -Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> - -.br -.fi -Please use http://bugs.kde.org to report bugs, do not mail the author directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 new file mode 100644 index 000000000..56c4f3bc6 --- /dev/null +++ b/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 @@ -0,0 +1,159 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" +.SH NAME +tdeunittestmodrunner +\- a KDE command\-line application to run KUnitTest modules +.SH SYNOPSIS +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +.SH OPTIONS +.SS Options: +.TP +.BR \-\-query \ [ regexp ] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] +.TP +.BR \-\-folder \ [ folder ] +Only run tests modules which are found in the folder. Use the query option to select modules. [.] +.TP +.B \-\-enable\-dbgcap +Disables debug capturing. You typically use this option when you use the GUI. +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH SEE ALSO +.BR tdeunittestguimodrunner (1) +.sp 1 +.TP +.BR http://developer.kde.org +KDE Developers's Corner website +.SH AUTHORS +.nf +Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs, do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install index 88bf85c86..9bcd52fc7 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install @@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc debian/tmp/etc/trinity/language.codes debian/tmp/etc/trinity/ui/kprintpreviewui.rc debian/tmp/etc/trinity/ui/ui_standards.rc -debian/tmp/opt/trinity/share/applications/tde/kresources.desktop +debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml -debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd @@ -229,22 +229,22 @@ 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/khtml/css/html4.css -debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css -debian/tmp/opt/trinity/share/apps/khtml/domain_info -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml.rc +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 +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/trinity/share/apps/kjava/kjava.jar @@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC debian/tmp/opt/trinity/share/apps/LICENSES/BSD debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2 @@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook debian/tmp/opt/trinity/share/emoticons/Default/angry.png debian/tmp/opt/trinity/share/emoticons/Default/bat.png debian/tmp/opt/trinity/share/emoticons/Default/beer.png @@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio debian/tmp/opt/trinity/share/services/jpeg.kimgio debian/tmp/opt/trinity/share/services/katepart.desktop debian/tmp/opt/trinity/share/services/kbzip2filter.desktop -debian/tmp/opt/trinity/share/services/kcertpart.desktop +debian/tmp/opt/trinity/share/services/tdecertpart.desktop debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop debian/tmp/opt/trinity/share/services/kded/kssld.desktop -debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop +debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop debian/tmp/opt/trinity/share/services/kgzipfilter.desktop -debian/tmp/opt/trinity/share/services/khtml.desktop -debian/tmp/opt/trinity/share/services/khtmlimage.desktop +debian/tmp/opt/trinity/share/services/tdehtml.desktop +debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop debian/tmp/opt/trinity/share/services/kio_uiserver.desktop debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop debian/tmp/opt/trinity/share/services/kmailservice.protocol -debian/tmp/opt/trinity/share/services/kmultipart.desktop +debian/tmp/opt/trinity/share/services/tdemultipart.desktop debian/tmp/opt/trinity/share/services/knotify.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/trinity/share/services/kspell_aspell.desktop -debian/tmp/opt/trinity/share/services/kspell_hspell.desktop -debian/tmp/opt/trinity/share/services/kspell_ispell.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol @@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/trinity/share/servicetypes/kpart.desktop debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/trinity/share/servicetypes/krop.desktop debian/tmp/opt/trinity/share/servicetypes/krwp.desktop debian/tmp/opt/trinity/share/servicetypes/kscan.desktop -debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst index 452b17bfc..c6c9c016f 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/trinity/colors/40\ Colors rm -f /etc/trinity/colors/Royal rm -f /etc/trinity/colors/Web - rm -f /etc/trinity/ktexteditor_autobookmarkerrc + rm -f /etc/trinity/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 30baf6aa3..6f7afbc0c 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp debian/tmp/opt/trinity/bin/dcopidlng debian/tmp/opt/trinity/bin/kconfig_compiler debian/tmp/opt/trinity/bin/ksvgtopng -debian/tmp/opt/trinity/bin/kunittestmodrunner +debian/tmp/opt/trinity/bin/tdeunittestmodrunner debian/tmp/opt/trinity/bin/makekdewidgets debian/tmp/opt/trinity/bin/preparetips @@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h debian/tmp/opt/trinity/include/khexedit/zoominterface.h -debian/tmp/opt/trinity/include/khtmldefaults.h -debian/tmp/opt/trinity/include/khtml_events.h -debian/tmp/opt/trinity/include/khtml_part.h -debian/tmp/opt/trinity/include/khtml_settings.h -debian/tmp/opt/trinity/include/khtmlview.h +debian/tmp/opt/trinity/include/tdehtmldefaults.h +debian/tmp/opt/trinity/include/tdehtml_events.h +debian/tmp/opt/trinity/include/tdehtml_part.h +debian/tmp/opt/trinity/include/tdehtml_settings.h +debian/tmp/opt/trinity/include/tdehtmlview.h debian/tmp/opt/trinity/include/khttpproxysocketdevice.h debian/tmp/opt/trinity/include/kicondialog.h debian/tmp/opt/trinity/include/kiconeffect.h @@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h debian/tmp/opt/trinity/include/kimagefilepreview.h debian/tmp/opt/trinity/include/kimageio.h debian/tmp/opt/trinity/include/kimiface.h -debian/tmp/opt/trinity/include/kimproxy.h -debian/tmp/opt/trinity/include/kimproxyiface.h +debian/tmp/opt/trinity/include/tdeimproxy.h +debian/tmp/opt/trinity/include/tdeimproxyiface.h debian/tmp/opt/trinity/include/kinputdialog.h debian/tmp/opt/trinity/include/kinstance.h debian/tmp/opt/trinity/include/kio/authinfo.h @@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h debian/tmp/opt/trinity/include/kio/tdesasl.h debian/tmp/opt/trinity/include/kio/kmdbase.h debian/tmp/opt/trinity/include/kio/kmdcodec.h -debian/tmp/opt/trinity/include/kio/kntlm.h +debian/tmp/opt/trinity/include/kio/tdentlm.h debian/tmp/opt/trinity/include/kio/metainfojob.h debian/tmp/opt/trinity/include/kio/netaccess.h debian/tmp/opt/trinity/include/kio/observer.h @@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h debian/tmp/opt/trinity/include/kmainwindowiface.h debian/tmp/opt/trinity/include/kmanagerselection.h debian/tmp/opt/trinity/include/kmdcodec.h -debian/tmp/opt/trinity/include/kmdichildarea.h -debian/tmp/opt/trinity/include/kmdichildfrmcaption.h -debian/tmp/opt/trinity/include/kmdichildfrm.h -debian/tmp/opt/trinity/include/kmdichildview.h -debian/tmp/opt/trinity/include/kmdidefines.h -debian/tmp/opt/trinity/include/kmdi/global.h -debian/tmp/opt/trinity/include/kmdiiterator.h -debian/tmp/opt/trinity/include/kmdilistiterator.h -debian/tmp/opt/trinity/include/kmdimainfrm.h -debian/tmp/opt/trinity/include/kmdi/mainwindow.h -debian/tmp/opt/trinity/include/kmdinulliterator.h -debian/tmp/opt/trinity/include/kmdi/tabwidget.h -debian/tmp/opt/trinity/include/kmditaskbar.h -debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h -debian/tmp/opt/trinity/include/kmditoolviewaccessor.h -debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h -debian/tmp/opt/trinity/include/kmediaplayer/player.h -debian/tmp/opt/trinity/include/kmediaplayer/view.h +debian/tmp/opt/trinity/include/tdemdichildarea.h +debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h +debian/tmp/opt/trinity/include/tdemdichildfrm.h +debian/tmp/opt/trinity/include/tdemdichildview.h +debian/tmp/opt/trinity/include/tdemdidefines.h +debian/tmp/opt/trinity/include/tdemdi/global.h +debian/tmp/opt/trinity/include/tdemdiiterator.h +debian/tmp/opt/trinity/include/tdemdilistiterator.h +debian/tmp/opt/trinity/include/tdemdimainfrm.h +debian/tmp/opt/trinity/include/tdemdi/mainwindow.h +debian/tmp/opt/trinity/include/tdemdinulliterator.h +debian/tmp/opt/trinity/include/tdemdi/tabwidget.h +debian/tmp/opt/trinity/include/tdemditaskbar.h +debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h +debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h +debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/trinity/include/tdemediaplayer/player.h +debian/tmp/opt/trinity/include/tdemediaplayer/view.h debian/tmp/opt/trinity/include/kmenubar.h debian/tmp/opt/trinity/include/kmessagebox.h debian/tmp/opt/trinity/include/kmimemagic.h @@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h debian/tmp/opt/trinity/include/kmimetype.h debian/tmp/opt/trinity/include/kmimetyperesolver.h debian/tmp/opt/trinity/include/kmountpoint.h -debian/tmp/opt/trinity/include/kmulticastsocketdevice.h -debian/tmp/opt/trinity/include/kmulticastsocket.h -debian/tmp/opt/trinity/include/kmultipledrag.h -debian/tmp/opt/trinity/include/kmultitabbar.h +debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h +debian/tmp/opt/trinity/include/tdemulticastsocket.h +debian/tmp/opt/trinity/include/tdemultipledrag.h +debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/knewstuff/engine.h @@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h debian/tmp/opt/trinity/include/kpanelappmenu.h debian/tmp/opt/trinity/include/kpanelextension.h debian/tmp/opt/trinity/include/kpanelmenu.h -debian/tmp/opt/trinity/include/kparts/browserextension.h -debian/tmp/opt/trinity/include/kparts/browserinterface.h -debian/tmp/opt/trinity/include/kparts/browserrun.h -debian/tmp/opt/trinity/include/kparts/componentfactory.h -debian/tmp/opt/trinity/include/kparts/dockmainwindow.h -debian/tmp/opt/trinity/include/kparts/event.h -debian/tmp/opt/trinity/include/kparts/factory.h -debian/tmp/opt/trinity/include/kparts/genericfactory.h -debian/tmp/opt/trinity/include/kparts/historyprovider.h -debian/tmp/opt/trinity/include/kparts/mainwindow.h -debian/tmp/opt/trinity/include/kparts/part.h -debian/tmp/opt/trinity/include/kparts/partmanager.h -debian/tmp/opt/trinity/include/kparts/plugin.h -debian/tmp/opt/trinity/include/kparts/statusbarextension.h +debian/tmp/opt/trinity/include/tdeparts/browserextension.h +debian/tmp/opt/trinity/include/tdeparts/browserinterface.h +debian/tmp/opt/trinity/include/tdeparts/browserrun.h +debian/tmp/opt/trinity/include/tdeparts/componentfactory.h +debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h +debian/tmp/opt/trinity/include/tdeparts/event.h +debian/tmp/opt/trinity/include/tdeparts/factory.h +debian/tmp/opt/trinity/include/tdeparts/genericfactory.h +debian/tmp/opt/trinity/include/tdeparts/historyprovider.h +debian/tmp/opt/trinity/include/tdeparts/mainwindow.h +debian/tmp/opt/trinity/include/tdeparts/part.h +debian/tmp/opt/trinity/include/tdeparts/partmanager.h +debian/tmp/opt/trinity/include/tdeparts/plugin.h +debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h debian/tmp/opt/trinity/include/kpassdlg.h debian/tmp/opt/trinity/include/kpassivepopup.h debian/tmp/opt/trinity/include/kpixmapeffect.h @@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h debian/tmp/opt/trinity/include/kreplacedialog.h debian/tmp/opt/trinity/include/kreplace.h debian/tmp/opt/trinity/include/kresolver.h -debian/tmp/opt/trinity/include/kresources/configdialog.h -debian/tmp/opt/trinity/include/kresources/configpage.h -debian/tmp/opt/trinity/include/kresources/configwidget.h -debian/tmp/opt/trinity/include/kresources/factory.h -debian/tmp/opt/trinity/include/kresources/manager.h -debian/tmp/opt/trinity/include/kresources/manageriface.h -debian/tmp/opt/trinity/include/kresources/managerimpl.h -debian/tmp/opt/trinity/include/kresources/resource.h -debian/tmp/opt/trinity/include/kresources/selectdialog.h +debian/tmp/opt/trinity/include/tderesources/configdialog.h +debian/tmp/opt/trinity/include/tderesources/configpage.h +debian/tmp/opt/trinity/include/tderesources/configwidget.h +debian/tmp/opt/trinity/include/tderesources/factory.h +debian/tmp/opt/trinity/include/tderesources/manager.h +debian/tmp/opt/trinity/include/tderesources/manageriface.h +debian/tmp/opt/trinity/include/tderesources/managerimpl.h +debian/tmp/opt/trinity/include/tderesources/resource.h +debian/tmp/opt/trinity/include/tderesources/selectdialog.h debian/tmp/opt/trinity/include/krestrictedline.h debian/tmp/opt/trinity/include/kreverseresolver.h debian/tmp/opt/trinity/include/krfcdate.h @@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h debian/tmp/opt/trinity/include/ksavefile.h debian/tmp/opt/trinity/include/kscan.h debian/tmp/opt/trinity/include/ksconfig.h -debian/tmp/opt/trinity/include/kscreensaver.h -debian/tmp/opt/trinity/include/kscreensaver_vroot.h +debian/tmp/opt/trinity/include/tdescreensaver.h +debian/tmp/opt/trinity/include/tdescreensaver_vroot.h debian/tmp/opt/trinity/include/kscrollview.h debian/tmp/opt/trinity/include/kselect.h debian/tmp/opt/trinity/include/kseparator.h @@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h debian/tmp/opt/trinity/include/ksortablevaluelist.h debian/tmp/opt/trinity/include/kspeech.h debian/tmp/opt/trinity/include/kspeechsink.h -debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h -debian/tmp/opt/trinity/include/kspell2/broker.h -debian/tmp/opt/trinity/include/kspell2/configdialog.h -debian/tmp/opt/trinity/include/kspell2/configwidget.h -debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h -debian/tmp/opt/trinity/include/kspell2/dialog.h -debian/tmp/opt/trinity/include/kspell2/dictionary.h -debian/tmp/opt/trinity/include/kspell2/filter.h -debian/tmp/opt/trinity/include/kspell2/highlighter.h -debian/tmp/opt/trinity/include/kspell2/settings.h -debian/tmp/opt/trinity/include/kspelldlg.h -debian/tmp/opt/trinity/include/kspell.h +debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h +debian/tmp/opt/trinity/include/tdespell2/broker.h +debian/tmp/opt/trinity/include/tdespell2/configdialog.h +debian/tmp/opt/trinity/include/tdespell2/configwidget.h +debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h +debian/tmp/opt/trinity/include/tdespell2/dialog.h +debian/tmp/opt/trinity/include/tdespell2/dictionary.h +debian/tmp/opt/trinity/include/tdespell2/filter.h +debian/tmp/opt/trinity/include/tdespell2/highlighter.h +debian/tmp/opt/trinity/include/tdespell2/settings.h +debian/tmp/opt/trinity/include/tdespelldlg.h +debian/tmp/opt/trinity/include/tdespell.h debian/tmp/opt/trinity/include/ksplashscreen.h debian/tmp/opt/trinity/include/ksqueezedtextlabel.h debian/tmp/opt/trinity/include/ksslall.h @@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h debian/tmp/opt/trinity/include/kstyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h -debian/tmp/opt/trinity/include/ksycocaentry.h -debian/tmp/opt/trinity/include/ksycoca.h -debian/tmp/opt/trinity/include/ksycocatype.h +debian/tmp/opt/trinity/include/tdesycocaentry.h +debian/tmp/opt/trinity/include/tdesycoca.h +debian/tmp/opt/trinity/include/tdesycocatype.h debian/tmp/opt/trinity/include/ksyntaxhighlighter.h debian/tmp/opt/trinity/include/ksystemtray.h debian/tmp/opt/trinity/include/ktabbar.h @@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h debian/tmp/opt/trinity/include/ktempfile.h debian/tmp/opt/trinity/include/ktextbrowser.h debian/tmp/opt/trinity/include/ktextedit.h -debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h -debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/configinterface.h -debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/document.h -debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h -debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/editinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h -debian/tmp/opt/trinity/include/ktexteditor/editor.h -debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/markinterface.h -debian/tmp/opt/trinity/include/ktexteditor/plugin.h -debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h -debian/tmp/opt/trinity/include/ktexteditor/printinterface.h -debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h -debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h -debian/tmp/opt/trinity/include/ktexteditor/undointerface.h -debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h -debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/view.h -debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/document.h +debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h +debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h +debian/tmp/opt/trinity/include/tdetexteditor/editor.h +debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/plugin.h +debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h +debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/view.h +debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h debian/tmp/opt/trinity/include/ktimewidget.h debian/tmp/opt/trinity/include/ktimezones.h debian/tmp/opt/trinity/include/ktimezonewidget.h @@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h debian/tmp/opt/trinity/include/ktypelist.h debian/tmp/opt/trinity/include/kuniqueapp.h debian/tmp/opt/trinity/include/kuniqueapplication.h -debian/tmp/opt/trinity/include/kunittest/module.h -debian/tmp/opt/trinity/include/kunittest/runner.h -debian/tmp/opt/trinity/include/kunittest/tester.h +debian/tmp/opt/trinity/include/tdeunittest/module.h +debian/tmp/opt/trinity/include/tdeunittest/runner.h +debian/tmp/opt/trinity/include/tdeunittest/tester.h debian/tmp/opt/trinity/include/kunload.h debian/tmp/opt/trinity/include/kurifilter.h debian/tmp/opt/trinity/include/kurlbar.h @@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h debian/tmp/opt/trinity/include/kuser.h debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h -debian/tmp/opt/trinity/include/kwallet.h -debian/tmp/opt/trinity/include/kwallettypes.h +debian/tmp/opt/trinity/include/tdewallet.h +debian/tmp/opt/trinity/include/tdewallettypes.h debian/tmp/opt/trinity/include/twindowinfo.h debian/tmp/opt/trinity/include/twindowlistmenu.h debian/tmp/opt/trinity/include/twin.h @@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h debian/tmp/opt/trinity/include/kxmlguifactory.h debian/tmp/opt/trinity/include/kxmlgui.h debian/tmp/opt/trinity/include/kzip.h -debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h -debian/tmp/opt/trinity/include/libkrandr/libkrandr.h -debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h -debian/tmp/opt/trinity/include/libkrandr/randr.h -debian/tmp/opt/trinity/include/libkrsync/krsync.h -debian/tmp/opt/trinity/include/libkmid/alsaout.h -debian/tmp/opt/trinity/include/libkmid/dattypes.h -debian/tmp/opt/trinity/include/libkmid/deviceman.h -debian/tmp/opt/trinity/include/libkmid/fmout.h -debian/tmp/opt/trinity/include/libkmid/gusout.h -debian/tmp/opt/trinity/include/libkmid/libkmid.h -debian/tmp/opt/trinity/include/libkmid/midfile.h -debian/tmp/opt/trinity/include/libkmid/midimapper.h -debian/tmp/opt/trinity/include/libkmid/midiout.h -debian/tmp/opt/trinity/include/libkmid/midispec.h -debian/tmp/opt/trinity/include/libkmid/midistat.h -debian/tmp/opt/trinity/include/libkmid/mt32togm.h -debian/tmp/opt/trinity/include/libkmid/notearray.h -debian/tmp/opt/trinity/include/libkmid/player.h -debian/tmp/opt/trinity/include/libkmid/synthout.h -debian/tmp/opt/trinity/include/libkmid/track.h -debian/tmp/opt/trinity/include/libkmid/voiceman.h +debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h +debian/tmp/opt/trinity/include/libtderandr/libtderandr.h +debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h +debian/tmp/opt/trinity/include/libtderandr/randr.h +debian/tmp/opt/trinity/include/libtdersync/tdersync.h +debian/tmp/opt/trinity/include/libtdemid/alsaout.h +debian/tmp/opt/trinity/include/libtdemid/dattypes.h +debian/tmp/opt/trinity/include/libtdemid/deviceman.h +debian/tmp/opt/trinity/include/libtdemid/fmout.h +debian/tmp/opt/trinity/include/libtdemid/gusout.h +debian/tmp/opt/trinity/include/libtdemid/libtdemid.h +debian/tmp/opt/trinity/include/libtdemid/midfile.h +debian/tmp/opt/trinity/include/libtdemid/midimapper.h +debian/tmp/opt/trinity/include/libtdemid/midiout.h +debian/tmp/opt/trinity/include/libtdemid/midispec.h +debian/tmp/opt/trinity/include/libtdemid/midistat.h +debian/tmp/opt/trinity/include/libtdemid/mt32togm.h +debian/tmp/opt/trinity/include/libtdemid/notearray.h +debian/tmp/opt/trinity/include/libtdemid/player.h +debian/tmp/opt/trinity/include/libtdemid/synthout.h +debian/tmp/opt/trinity/include/libtdemid/track.h +debian/tmp/opt/trinity/include/libtdemid/voiceman.h debian/tmp/opt/trinity/include/netwm_def.h debian/tmp/opt/trinity/include/netwm.h debian/tmp/opt/trinity/include/qxembed.h @@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la debian/tmp/opt/trinity/lib/libtdesu.so debian/tmp/opt/trinity/lib/libtdeui.la debian/tmp/opt/trinity/lib/libtdeui.so -debian/tmp/opt/trinity/lib/libkdnssd.la -debian/tmp/opt/trinity/lib/libkdnssd.so -debian/tmp/opt/trinity/lib/libkhtml.la -debian/tmp/opt/trinity/lib/libkhtml.so -debian/tmp/opt/trinity/lib/libkimproxy.la -debian/tmp/opt/trinity/lib/libkimproxy.so +debian/tmp/opt/trinity/lib/libtdednssd.la +debian/tmp/opt/trinity/lib/libtdednssd.so +debian/tmp/opt/trinity/lib/libtdehtml.la +debian/tmp/opt/trinity/lib/libtdehtml.so +debian/tmp/opt/trinity/lib/libtdeimproxy.la +debian/tmp/opt/trinity/lib/libtdeimproxy.so debian/tmp/opt/trinity/lib/libkio.la debian/tmp/opt/trinity/lib/libkio.so debian/tmp/opt/trinity/lib/libkjava.la debian/tmp/opt/trinity/lib/libkjava.so debian/tmp/opt/trinity/lib/libkjs.la debian/tmp/opt/trinity/lib/libkjs.so -debian/tmp/opt/trinity/lib/libkmdi2.la -debian/tmp/opt/trinity/lib/libkmdi2.so -debian/tmp/opt/trinity/lib/libkmdi.la -debian/tmp/opt/trinity/lib/libkmdi.so -debian/tmp/opt/trinity/lib/libkmediaplayer.la -debian/tmp/opt/trinity/lib/libkmediaplayer.so -debian/tmp/opt/trinity/lib/libkmid.la -debian/tmp/opt/trinity/lib/libkmid.so +debian/tmp/opt/trinity/lib/libtdemdi2.la +debian/tmp/opt/trinity/lib/libtdemdi2.so +debian/tmp/opt/trinity/lib/libtdemdi.la +debian/tmp/opt/trinity/lib/libtdemdi.so +debian/tmp/opt/trinity/lib/libtdemediaplayer.la +debian/tmp/opt/trinity/lib/libtdemediaplayer.so +debian/tmp/opt/trinity/lib/libtdemid.la +debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libknewstuff.so -debian/tmp/opt/trinity/lib/libkntlm.la -debian/tmp/opt/trinity/lib/libkntlm.so -debian/tmp/opt/trinity/lib/libkparts.la -debian/tmp/opt/trinity/lib/libkparts.so -debian/tmp/opt/trinity/lib/libkrandr.la -debian/tmp/opt/trinity/lib/libkrandr.so -debian/tmp/opt/trinity/lib/libkrsync.la -debian/tmp/opt/trinity/lib/libkrsync.so -debian/tmp/opt/trinity/lib/libkresources.la -debian/tmp/opt/trinity/lib/libkresources.so -debian/tmp/opt/trinity/lib/libkscreensaver.la -debian/tmp/opt/trinity/lib/libkscreensaver.so -debian/tmp/opt/trinity/lib/libkscript.la -debian/tmp/opt/trinity/lib/libkscript.so -debian/tmp/opt/trinity/lib/libkspell2.la -debian/tmp/opt/trinity/lib/libkspell2.so -debian/tmp/opt/trinity/lib/libkspell.la -debian/tmp/opt/trinity/lib/libkspell.so -debian/tmp/opt/trinity/lib/libktexteditor.la -debian/tmp/opt/trinity/lib/libktexteditor.so -debian/tmp/opt/trinity/lib/libkunittest.la -debian/tmp/opt/trinity/lib/libkunittest.so -debian/tmp/opt/trinity/lib/libkutils.la -debian/tmp/opt/trinity/lib/libkutils.so -debian/tmp/opt/trinity/lib/libkwalletbackend.la -debian/tmp/opt/trinity/lib/libkwalletbackend.so -debian/tmp/opt/trinity/lib/libkwalletclient.la -debian/tmp/opt/trinity/lib/libkwalletclient.so +debian/tmp/opt/trinity/lib/libtdentlm.la +debian/tmp/opt/trinity/lib/libtdentlm.so +debian/tmp/opt/trinity/lib/libtdeparts.la +debian/tmp/opt/trinity/lib/libtdeparts.so +debian/tmp/opt/trinity/lib/libtderandr.la +debian/tmp/opt/trinity/lib/libtderandr.so +debian/tmp/opt/trinity/lib/libtdersync.la +debian/tmp/opt/trinity/lib/libtdersync.so +debian/tmp/opt/trinity/lib/libtderesources.la +debian/tmp/opt/trinity/lib/libtderesources.so +debian/tmp/opt/trinity/lib/libtdescreensaver.la +debian/tmp/opt/trinity/lib/libtdescreensaver.so +debian/tmp/opt/trinity/lib/libtdescript.la +debian/tmp/opt/trinity/lib/libtdescript.so +debian/tmp/opt/trinity/lib/libtdespell2.la +debian/tmp/opt/trinity/lib/libtdespell2.so +debian/tmp/opt/trinity/lib/libtdespell.la +debian/tmp/opt/trinity/lib/libtdespell.so +debian/tmp/opt/trinity/lib/libtdetexteditor.la +debian/tmp/opt/trinity/lib/libtdetexteditor.so +debian/tmp/opt/trinity/lib/libtdeunittest.la +debian/tmp/opt/trinity/lib/libtdeunittest.so +debian/tmp/opt/trinity/lib/libtdeutils.la +debian/tmp/opt/trinity/lib/libtdeutils.so +debian/tmp/opt/trinity/lib/libtdewalletbackend.la +debian/tmp/opt/trinity/lib/libtdewalletbackend.so +debian/tmp/opt/trinity/lib/libtdewalletclient.la +debian/tmp/opt/trinity/lib/libtdewalletclient.so debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages index af14a7e71..e5756a2db 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-trinity.1 ./debian/man/ksvgtopng-trinity.1 -./debian/man/kunittestmodrunner-trinity.1 +./debian/man/tdeunittestmodrunner-trinity.1 ./debian/man/makekdewidgets-trinity.1 ./debian/man/preparetips-trinity.1 diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install index 80a4b789c..4d1bb325b 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install @@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so debian/tmp/opt/trinity/lib/trinity/kcmshell.la debian/tmp/opt/trinity/lib/trinity/kcmshell.so debian/tmp/opt/trinity/lib/trinity/kconf_update.la @@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so debian/tmp/opt/trinity/lib/trinity/kded_kssld.la debian/tmp/opt/trinity/lib/trinity/kded_kssld.so -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so debian/tmp/opt/trinity/lib/trinity/kded.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so @@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so debian/tmp/opt/trinity/lib/trinity/kimg_dds.la debian/tmp/opt/trinity/lib/trinity/kimg_dds.so debian/tmp/opt/trinity/lib/trinity/kimg_eps.la @@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la debian/tmp/opt/trinity/lib/trinity/klauncher.so debian/tmp/opt/trinity/lib/trinity/knotify.la debian/tmp/opt/trinity/lib/trinity/knotify.so -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so debian/tmp/opt/trinity/lib/trinity/libkatepart.la debian/tmp/opt/trinity/lib/trinity/libkatepart.so -debian/tmp/opt/trinity/lib/trinity/libkcertpart.la -debian/tmp/opt/trinity/lib/trinity/libkcertpart.so +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so -debian/tmp/opt/trinity/lib/trinity/libkmultipart.la -debian/tmp/opt/trinity/lib/trinity/libkmultipart.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +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 @@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0 debian/tmp/opt/trinity/lib/libtdeui.so.4 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0 -debian/tmp/opt/trinity/lib/libkdnssd.so.1 -debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/trinity/lib/libkhtml.so.4 -debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdednssd.so.1 +debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdehtml.so.4 +debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/trinity/lib/libkio.so.4 debian/tmp/opt/trinity/lib/libkio.so.4.2.0 debian/tmp/opt/trinity/lib/libkjava.so.1 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0 debian/tmp/opt/trinity/lib/libkjs.so.1 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0 -debian/tmp/opt/trinity/lib/libkmdi2.so.1 -debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmdi.so.1 -debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/trinity/lib/libkmid.so.0 -debian/tmp/opt/trinity/lib/libkmid.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemdi.so.1 +debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0 -debian/tmp/opt/trinity/lib/libkparts.so.2 -debian/tmp/opt/trinity/lib/libkparts.so.2.1.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95 -debian/tmp/opt/trinity/lib/libkrsync.so.0 -debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1 -debian/tmp/opt/trinity/lib/libkresources.so.1 -debian/tmp/opt/trinity/lib/libkresources.so.1.2.0 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/trinity/lib/libkscript.so.0 -debian/tmp/opt/trinity/lib/libkscript.so.0.0.0 -debian/tmp/opt/trinity/lib/libkspell2.so.1 -debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkspell.so.4 -debian/tmp/opt/trinity/lib/libkspell.so.4.2.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/trinity/lib/libkunittest.so.1 -debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0 -debian/tmp/opt/trinity/lib/libkutils.so.1 -debian/tmp/opt/trinity/lib/libkutils.so.1.2.0 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/trinity/lib/libtdentlm.so.0 +debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeparts.so.2 +debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdersync.so.0 +debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdespell2.so.1 +debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdespell.so.4 +debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeutils.so.1 +debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/kfile_elf.desktop diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/maverick/tdemultimedia/debian/changelog index 37b689f66..70dc106df 100644 --- a/ubuntu/maverick/tdemultimedia/debian/changelog +++ b/ubuntu/maverick/tdemultimedia/debian/changelog @@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low tdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low tdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low tdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low tdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low tdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low tdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking tdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control index cf85ef6b0..42f607611 100644 --- a/ubuntu/maverick/tdemultimedia/debian/control +++ b/ubuntu/maverick/tdemultimedia/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdemultimedia-trinity (<< 4:14.0.0) Breaks: kdemultimedia-trinity (<< 4:14.0.0) -Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) +Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,7 +31,7 @@ Section: devel Architecture: any Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) -Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) +Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module Development files and headers for the Trinity multimedia module. @@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of Trinity, as a component of the KDE multimedia module. See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information. -Package: kmid-trinity +Package: tdemid-trinity Section: sound Architecture: any -Replaces: kmid-trinity (<< 4:14.0.0) -Breaks: kmid-trinity (<< 4:14.0.0) +Replaces: tdemid-trinity (<< 4:14.0.0) +Breaks: tdemid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in index 7b20cca6d..4bf762241 100644 --- a/ubuntu/maverick/tdemultimedia/debian/control.in +++ b/ubuntu/maverick/tdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdemultimedia Section: tde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: tdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: tdemultimedia-dev Section: devel Architecture: any -Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'tdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdemultimedia/debian/copyright b/ubuntu/maverick/tdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/ubuntu/maverick/tdemultimedia/debian/copyright +++ b/ubuntu/maverick/tdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/kmid-16.xpm deleted file mode 100644 index 0a510090a..000000000 --- a/ubuntu/maverick/tdemultimedia/debian/icons/kmid-16.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static char *kmid-16[] = { -/* columns rows colors chars-per-pixel */ -"16 16 104 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c gray4", -"# c #0C0C0C", -"$ c #101010", -"% c #111111", -"& c gray7", -"* c #161616", -"= c gray9", -"- c gray10", -"; c gray11", -": c #1D1D1D", -"> c #1E1E1E", -", c gray12", -"< c #222222", -"1 c #232323", -"2 c gray14", -"3 c #252525", -"4 c gray15", -"5 c #282828", -"6 c #2A2A2A", -"7 c gray17", -"8 c #2D2D2D", -"9 c gray18", -"0 c #2F2F2F", -"q c gray19", -"w c gray20", -"e c #393939", -"r c #3A3A3A", -"t c gray24", -"y c #3F3F3F", -"u c gray25", -"i c gray26", -"p c #444444", -"a c #464646", -"s c #494949", -"d c gray29", -"f c #4B4B4B", -"g c #505050", -"h c #555555", -"j c #565656", -"k c gray34", -"l c #585858", -"z c gray35", -"x c #5B5B5B", -"c c #626262", -"v c gray39", -"b c gray40", -"n c #686868", -"m c #727272", -"M c gray45", -"N c gray46", -"B c #777777", -"V c gray48", -"C c #7B7B7B", -"Z c gray49", -"A c #7E7E7E", -"S c #808080", -"D c #838383", -"F c #868686", -"G c gray53", -"H c #898989", -"J c gray54", -"K c #8D8D8D", -"L c #8E8E8E", -"P c gray56", -"I c gray57", -"U c #929292", -"Y c #959595", -"T c gray59", -"R c #9A9A9A", -"E c #9B9B9B", -"W c gray61", -"Q c #9D9D9D", -"! c gray64", -"~ c #A4A4A4", -"^ c gray65", -"/ c #A7A7A7", -"( c #AFAFAF", -") c #B2B2B2", -"_ c gray70", -"` c gray71", -"' c gray73", -"] c gray74", -"[ c gray", -"{ c #C0C0C0", -"} c gray76", -"| c #CACACA", -" . c gray81", -".. c gray82", -"X. c gray84", -"o. c #D8D8D8", -"O. c #E2E2E2", -"+. c gray89", -"@. c #E6E6E6", -"#. c gray93", -"$. c #F8F8F8", -"%. c #F9F9F9", -"&. c gray100", -"*. c None", -/* pixels */ -" *.*.*.*.*.*.*.*.*.*.", -" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", -" 6 t i C : *.*.*.*.*.*.*.*.*.*.", -" 6 t a C = *.*.*.*.*.*.*.*.*.*.", -" 6 i f C @ *.*.*.*. ", -" 6 a f B *.*.l + D l v l : ", -" 3 r n F 1 H P 3 n | U M - *.", -" = U [ r ! &.Q f t C | *.*.", -" F %.: a #.&.' C & v &.[ *.*.*.", -"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", -"*.k &.] E &.&.Q O.&.` ` k *.*.", -"*.q ] ) D ( ] H U X.! 3 *.*.*.", -"*.# 3 0 i [ +.U U &.P *.*.*.", -"*.& i t a | &./ B U k b : *.*.", -"*.@ 6 0 1 & q : + r f r *.", -"*. *.*.*. *." -}; diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmid.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/kmid.xpm deleted file mode 100644 index fb669aa72..000000000 --- a/ubuntu/maverick/tdemultimedia/debian/icons/kmid.xpm +++ /dev/null @@ -1,251 +0,0 @@ -/* XPM */ -static char *kmid[] = { -/* columns rows colors chars-per-pixel */ -"32 32 213 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c #060606", -"# c #070707", -"$ c gray3", -"% c gray4", -"& c #0B0B0B", -"* c #0C0C0C", -"= c gray5", -"- c #0E0E0E", -"; c gray6", -": c #101010", -"> c #111111", -", c gray7", -"< c gray8", -"1 c #151515", -"2 c #161616", -"3 c gray9", -"4 c #181818", -"5 c #191919", -"6 c gray10", -"7 c #1B1B1B", -"8 c gray11", -"9 c #1D1D1D", -"0 c #1E1E1E", -"q c gray12", -"w c #202020", -"e c gray13", -"r c #222222", -"t c #232323", -"y c gray14", -"u c #252525", -"i c gray15", -"p c #272727", -"a c #282828", -"s c gray16", -"d c #2A2A2A", -"f c gray17", -"g c #2C2C2C", -"h c #2D2D2D", -"j c gray18", -"k c #2F2F2F", -"l c gray19", -"z c #313131", -"x c #323232", -"c c gray20", -"v c #343434", -"b c #353535", -"n c gray21", -"m c #373737", -"M c gray22", -"N c #393939", -"B c #3A3A3A", -"V c gray23", -"C c #3C3C3C", -"Z c gray24", -"A c #3E3E3E", -"S c #3F3F3F", -"D c gray25", -"F c #414141", -"G c gray26", -"H c #434343", -"J c #444444", -"K c gray27", -"L c #464646", -"P c gray28", -"I c #484848", -"U c #494949", -"Y c #4B4B4B", -"T c #4C4C4C", -"R c gray30", -"E c #4E4E4E", -"W c gray31", -"Q c #505050", -"! c #515151", -"~ c gray32", -"^ c #535353", -"/ c gray33", -"( c #555555", -") c #565656", -"_ c gray34", -"` c #585858", -"' c gray35", -"] c #5A5A5A", -"[ c #5B5B5B", -"{ c gray36", -"} c #5D5D5D", -"| c gray37", -" . c #5F5F5F", -".. c #606060", -"X. c gray38", -"o. c #626262", -"O. c gray39", -"+. c #646464", -"@. c #656565", -"#. c #676767", -"$. c #686868", -"%. c DimGray", -"&. c #6A6A6A", -"*. c gray42", -"=. c #6C6C6C", -"-. c #6D6D6D", -";. c gray43", -":. c #6F6F6F", -">. c gray44", -",. c gray45", -"<. c #747474", -"1. c gray46", -"2. c #777777", -"3. c gray47", -"4. c #797979", -"5. c gray48", -"6. c #7B7B7B", -"7. c gray49", -"8. c gray50", -"9. c #808080", -"0. c #818181", -"q. c gray51", -"w. c #838383", -"e. c #848484", -"r. c #868686", -"t. c #888888", -"y. c gray54", -"u. c #8B8B8B", -"i. c gray55", -"p. c #8E8E8E", -"a. c gray57", -"s. c #939393", -"d. c gray58", -"f. c gray59", -"g. c #979797", -"h. c gray60", -"j. c #9A9A9A", -"k. c #9B9B9B", -"l. c gray61", -"z. c #9D9D9D", -"x. c #9F9F9F", -"c. c #A0A0A0", -"v. c gray63", -"b. c #A2A2A2", -"n. c gray64", -"m. c #A4A4A4", -"M. c #A5A5A5", -"N. c gray65", -"B. c #A7A7A7", -"V. c gray66", -"C. c #A9A9A9", -"Z. c #AAAAAA", -"A. c #ACACAC", -"S. c gray68", -"D. c #AEAEAE", -"F. c #AFAFAF", -"G. c gray69", -"H. c #B2B2B2", -"J. c gray70", -"K. c #B4B4B4", -"L. c gray71", -"P. c #B6B6B6", -"I. c #B7B7B7", -"U. c gray72", -"Y. c gray73", -"T. c #BBBBBB", -"R. c #BCBCBC", -"E. c gray74", -"W. c gray", -"Q. c gray75", -"!. c #C0C0C0", -"~. c #C1C1C1", -"^. c #C3C3C3", -"/. c gray77", -"(. c #C5C5C5", -"). c #C6C6C6", -"_. c gray78", -"`. c #C8C8C8", -"'. c gray79", -"]. c gray80", -"[. c #CECECE", -"{. c #D2D2D2", -"}. c LightGray", -"|. c #D5D5D5", -" X c gray84", -".X c #D8D8D8", -"XX c gray85", -"oX c #DADADA", -"OX c gray86", -"+X c #DDDDDD", -"@X c gray87", -"#X c #DFDFDF", -"$X c #E1E1E1", -"%X c gray89", -"&X c gray90", -"*X c #E6E6E6", -"=X c gray91", -"-X c #EEEEEE", -";X c #EFEFEF", -":X c gray94", -">X c #F1F1F1", -",X c gray95", -"<X c #F3F3F3", -"1X c #F4F4F4", -"2X c gray96", -"3X c #F6F6F6", -"4X c #F9F9F9", -"5X c gray98", -"6X c #FBFBFB", -"7X c #FDFDFD", -"8X c #FEFEFE", -"9X c gray100", -"0X c None", -/* pixels */ -" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", -"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", -"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", -"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", -"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", -"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", -"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", -"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", -"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", -"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", -"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", -"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", -"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", -"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", -"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", -"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", -"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", -"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", -"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", -"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", -"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", -"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", -"0X0X 0X", -"0X0X 0X0X0X 0X" -}; diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm new file mode 100644 index 000000000..64ad03b59 --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm @@ -0,0 +1,126 @@ +/* XPM */ +static char *tdemid-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 104 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c gray4", +"# c #0C0C0C", +"$ c #101010", +"% c #111111", +"& c gray7", +"* c #161616", +"= c gray9", +"- c gray10", +"; c gray11", +": c #1D1D1D", +"> c #1E1E1E", +", c gray12", +"< c #222222", +"1 c #232323", +"2 c gray14", +"3 c #252525", +"4 c gray15", +"5 c #282828", +"6 c #2A2A2A", +"7 c gray17", +"8 c #2D2D2D", +"9 c gray18", +"0 c #2F2F2F", +"q c gray19", +"w c gray20", +"e c #393939", +"r c #3A3A3A", +"t c gray24", +"y c #3F3F3F", +"u c gray25", +"i c gray26", +"p c #444444", +"a c #464646", +"s c #494949", +"d c gray29", +"f c #4B4B4B", +"g c #505050", +"h c #555555", +"j c #565656", +"k c gray34", +"l c #585858", +"z c gray35", +"x c #5B5B5B", +"c c #626262", +"v c gray39", +"b c gray40", +"n c #686868", +"m c #727272", +"M c gray45", +"N c gray46", +"B c #777777", +"V c gray48", +"C c #7B7B7B", +"Z c gray49", +"A c #7E7E7E", +"S c #808080", +"D c #838383", +"F c #868686", +"G c gray53", +"H c #898989", +"J c gray54", +"K c #8D8D8D", +"L c #8E8E8E", +"P c gray56", +"I c gray57", +"U c #929292", +"Y c #959595", +"T c gray59", +"R c #9A9A9A", +"E c #9B9B9B", +"W c gray61", +"Q c #9D9D9D", +"! c gray64", +"~ c #A4A4A4", +"^ c gray65", +"/ c #A7A7A7", +"( c #AFAFAF", +") c #B2B2B2", +"_ c gray70", +"` c gray71", +"' c gray73", +"] c gray74", +"[ c gray", +"{ c #C0C0C0", +"} c gray76", +"| c #CACACA", +" . c gray81", +".. c gray82", +"X. c gray84", +"o. c #D8D8D8", +"O. c #E2E2E2", +"+. c gray89", +"@. c #E6E6E6", +"#. c gray93", +"$. c #F8F8F8", +"%. c #F9F9F9", +"&. c gray100", +"*. c None", +/* pixels */ +" *.*.*.*.*.*.*.*.*.*.", +" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", +" 6 t i C : *.*.*.*.*.*.*.*.*.*.", +" 6 t a C = *.*.*.*.*.*.*.*.*.*.", +" 6 i f C @ *.*.*.*. ", +" 6 a f B *.*.l + D l v l : ", +" 3 r n F 1 H P 3 n | U M - *.", +" = U [ r ! &.Q f t C | *.*.", +" F %.: a #.&.' C & v &.[ *.*.*.", +"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", +"*.k &.] E &.&.Q O.&.` ` k *.*.", +"*.q ] ) D ( ] H U X.! 3 *.*.*.", +"*.# 3 0 i [ +.U U &.P *.*.*.", +"*.& i t a | &./ B U k b : *.*.", +"*.@ 6 0 1 & q : + r f r *.", +"*. *.*.*. *." +}; diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm new file mode 100644 index 000000000..c4cbb3bf1 --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm @@ -0,0 +1,251 @@ +/* XPM */ +static char *tdemid[] = { +/* columns rows colors chars-per-pixel */ +"32 32 213 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #060606", +"# c #070707", +"$ c gray3", +"% c gray4", +"& c #0B0B0B", +"* c #0C0C0C", +"= c gray5", +"- c #0E0E0E", +"; c gray6", +": c #101010", +"> c #111111", +", c gray7", +"< c gray8", +"1 c #151515", +"2 c #161616", +"3 c gray9", +"4 c #181818", +"5 c #191919", +"6 c gray10", +"7 c #1B1B1B", +"8 c gray11", +"9 c #1D1D1D", +"0 c #1E1E1E", +"q c gray12", +"w c #202020", +"e c gray13", +"r c #222222", +"t c #232323", +"y c gray14", +"u c #252525", +"i c gray15", +"p c #272727", +"a c #282828", +"s c gray16", +"d c #2A2A2A", +"f c gray17", +"g c #2C2C2C", +"h c #2D2D2D", +"j c gray18", +"k c #2F2F2F", +"l c gray19", +"z c #313131", +"x c #323232", +"c c gray20", +"v c #343434", +"b c #353535", +"n c gray21", +"m c #373737", +"M c gray22", +"N c #393939", +"B c #3A3A3A", +"V c gray23", +"C c #3C3C3C", +"Z c gray24", +"A c #3E3E3E", +"S c #3F3F3F", +"D c gray25", +"F c #414141", +"G c gray26", +"H c #434343", +"J c #444444", +"K c gray27", +"L c #464646", +"P c gray28", +"I c #484848", +"U c #494949", +"Y c #4B4B4B", +"T c #4C4C4C", +"R c gray30", +"E c #4E4E4E", +"W c gray31", +"Q c #505050", +"! c #515151", +"~ c gray32", +"^ c #535353", +"/ c gray33", +"( c #555555", +") c #565656", +"_ c gray34", +"` c #585858", +"' c gray35", +"] c #5A5A5A", +"[ c #5B5B5B", +"{ c gray36", +"} c #5D5D5D", +"| c gray37", +" . c #5F5F5F", +".. c #606060", +"X. c gray38", +"o. c #626262", +"O. c gray39", +"+. c #646464", +"@. c #656565", +"#. c #676767", +"$. c #686868", +"%. c DimGray", +"&. c #6A6A6A", +"*. c gray42", +"=. c #6C6C6C", +"-. c #6D6D6D", +";. c gray43", +":. c #6F6F6F", +">. c gray44", +",. c gray45", +"<. c #747474", +"1. c gray46", +"2. c #777777", +"3. c gray47", +"4. c #797979", +"5. c gray48", +"6. c #7B7B7B", +"7. c gray49", +"8. c gray50", +"9. c #808080", +"0. c #818181", +"q. c gray51", +"w. c #838383", +"e. c #848484", +"r. c #868686", +"t. c #888888", +"y. c gray54", +"u. c #8B8B8B", +"i. c gray55", +"p. c #8E8E8E", +"a. c gray57", +"s. c #939393", +"d. c gray58", +"f. c gray59", +"g. c #979797", +"h. c gray60", +"j. c #9A9A9A", +"k. c #9B9B9B", +"l. c gray61", +"z. c #9D9D9D", +"x. c #9F9F9F", +"c. c #A0A0A0", +"v. c gray63", +"b. c #A2A2A2", +"n. c gray64", +"m. c #A4A4A4", +"M. c #A5A5A5", +"N. c gray65", +"B. c #A7A7A7", +"V. c gray66", +"C. c #A9A9A9", +"Z. c #AAAAAA", +"A. c #ACACAC", +"S. c gray68", +"D. c #AEAEAE", +"F. c #AFAFAF", +"G. c gray69", +"H. c #B2B2B2", +"J. c gray70", +"K. c #B4B4B4", +"L. c gray71", +"P. c #B6B6B6", +"I. c #B7B7B7", +"U. c gray72", +"Y. c gray73", +"T. c #BBBBBB", +"R. c #BCBCBC", +"E. c gray74", +"W. c gray", +"Q. c gray75", +"!. c #C0C0C0", +"~. c #C1C1C1", +"^. c #C3C3C3", +"/. c gray77", +"(. c #C5C5C5", +"). c #C6C6C6", +"_. c gray78", +"`. c #C8C8C8", +"'. c gray79", +"]. c gray80", +"[. c #CECECE", +"{. c #D2D2D2", +"}. c LightGray", +"|. c #D5D5D5", +" X c gray84", +".X c #D8D8D8", +"XX c gray85", +"oX c #DADADA", +"OX c gray86", +"+X c #DDDDDD", +"@X c gray87", +"#X c #DFDFDF", +"$X c #E1E1E1", +"%X c gray89", +"&X c gray90", +"*X c #E6E6E6", +"=X c gray91", +"-X c #EEEEEE", +";X c #EFEFEF", +":X c gray94", +">X c #F1F1F1", +",X c gray95", +"<X c #F3F3F3", +"1X c #F4F4F4", +"2X c gray96", +"3X c #F6F6F6", +"4X c #F9F9F9", +"5X c gray98", +"6X c #FBFBFB", +"7X c #FDFDFD", +"8X c #FEFEFE", +"9X c gray100", +"0X c None", +/* pixels */ +" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", +"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", +"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", +"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", +"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", +"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", +"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", +"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", +"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", +"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", +"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", +"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", +"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", +"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", +"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", +"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", +"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", +"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", +"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", +"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", +"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", +"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", +"0X0X 0X", +"0X0X 0X0X0X 0X" +}; diff --git a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install deleted file mode 100644 index e77e1784a..000000000 --- a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/trinity/bin/kmid -debian/tmp/opt/trinity/lib/trinity/libkmidpart.la -debian/tmp/opt/trinity/lib/trinity/libkmidpart.so -debian/tmp/opt/trinity/lib/libkmidlib.so.0 -debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/trinity/share/applications/tde/kmid.desktop -debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb -debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb -debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/trinity/share/pixmaps -debian/icons/kmid-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu deleted file mode 100644 index ca828ea94..000000000 --- a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="TDE"\ - title="KMid"\ - icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\ - command="/opt/trinity/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 index 76f29a181..2e9e5704d 100644 --- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules index 1e7e0647c..58e944e5d 100755 --- a/ubuntu/maverick/tdemultimedia/debian/rules +++ b/ubuntu/maverick/tdemultimedia/debian/rules @@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ +PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install new file mode 100644 index 000000000..c36f2d16a --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install @@ -0,0 +1,40 @@ +debian/tmp/opt/trinity/bin/tdemid +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so +debian/tmp/opt/trinity/lib/libtdemidlib.so.0 +debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop +debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb +debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/trinity/share/pixmaps +debian/icons/tdemid-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu new file mode 100644 index 000000000..5f3ec9248 --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="TDE"\ + title="KMid"\ + icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\ + command="/opt/trinity/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index 0d5dc5893..000000000 --- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html - diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..e4d54da22 --- /dev/null +++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: tdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html +Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html + diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install index 4edb170bf..97d3eb309 100644 --- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la debian/tmp/opt/trinity/lib/libtdeinit_krec.la debian/tmp/opt/trinity/lib/libtdeinit_noatun.la -debian/tmp/opt/trinity/lib/libkmidlib.la -debian/tmp/opt/trinity/lib/libkmidlib.so +debian/tmp/opt/trinity/lib/libtdemidlib.la +debian/tmp/opt/trinity/lib/libtdemidlib.so debian/tmp/opt/trinity/lib/libmpeg.la debian/tmp/opt/trinity/lib/libmpeg.so debian/tmp/opt/trinity/lib/libnoatun.la diff --git a/ubuntu/maverick/tdenetwork/debian/changelog b/ubuntu/maverick/tdenetwork/debian/changelog index 43b1aadd7..4510420ac 100644 --- a/ubuntu/maverick/tdenetwork/debian/changelog +++ b/ubuntu/maverick/tdenetwork/debian/changelog @@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to tdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in tdelibs) + * Add tdednssd to tdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in tdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control index a1a2dcb2b..a95cc81a7 100644 --- a/ubuntu/maverick/tdenetwork/debian/control +++ b/ubuntu/maverick/tdenetwork/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdenetwork-trinity (<< 4:14.0.0) Breaks: kdenetwork-trinity (<< 4:14.0.0) -Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) +Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) Description: network-related apps from the official Trinity release @@ -331,11 +331,11 @@ Description: LAN information server for Trinity This package is part of Trinity, as a component of the KDE network module. See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information. -Package: kdnssd-trinity +Package: tdednssd-trinity Section: net Architecture: any -Replaces: kdnssd-trinity (<< 4:14.0.0) -Breaks: kdnssd-trinity (<< 4:14.0.0) +Replaces: tdednssd-trinity (<< 4:14.0.0) +Breaks: tdednssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in index 1c7fc62f9..7c7dfdc41 100644 --- a/ubuntu/maverick/tdenetwork/debian/control.in +++ b/ubuntu/maverick/tdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdenetwork Section: tde Architecture: all -Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: tdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'tdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install index 9a1ac79f5..d2a0707c9 100644 --- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install +++ b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/kget -debian/tmp/opt/trinity/lib/trinity/khtml_kget.la -debian/tmp/opt/trinity/lib/trinity/khtml_kget.so +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so debian/tmp/opt/trinity/share/applications/tde/kget.desktop debian/tmp/opt/trinity/share/apps/kget/eventsrc debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png debian/tmp/opt/trinity/share/apps/kget/pics/try5.png debian/tmp/opt/trinity/share/apps/kget/pics/try6.png debian/tmp/opt/trinity/share/apps/kget/pics/try7.png -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index 2579d07e3..0ee562691 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/tdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install index 8d6a52c6b..8d6a52c6b 100644 --- a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install +++ b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog index 09dc0dfc3..268556215 100644 --- a/ubuntu/maverick/tdepim/debian/changelog +++ b/ubuntu/maverick/tdepim/debian/changelog @@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for tdepim-kresources + * Increase version number on Replaces for tdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low tdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package tdepim-kresources. + * Split tderesources into new package tdepim-tderesources. * Split tdepimmacros.h into new package libtdepim1-dev, and make all the other -dev packages depend on it. diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control index 6a2e4385d..1c544b5f5 100644 --- a/ubuntu/maverick/tdepim/debian/control +++ b/ubuntu/maverick/tdepim/debian/control @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0) Breaks: kdepim-trinity (<< 4:14.0.0) -Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) +Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -52,7 +52,7 @@ Section: devel Architecture: any Replaces: kdepim-trinity-dev (<< 4:14.0.0) Breaks: kdepim-trinity-dev (<< 4:14.0.0) -Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) +Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. . @@ -116,7 +116,7 @@ Architecture: any Replaces: kaddressbook-trinity (<< 4:14.0.0) Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity +Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves This package is part of Trinity, and a component of the KDE PIM module. See the 'kde-trinity' and 'tdepim-trinity' packages for more information. -Package: tdepim-kresources-trinity +Package: tdepim-tderesources-trinity Section: tde Architecture: any -Replaces: kdepim-kresources-trinity (<< 4:14.0.0) -Breaks: kdepim-kresources-trinity (<< 4:14.0.0) +Replaces: kdepim-tderesources-trinity (<< 4:14.0.0) +Breaks: kdepim-tderesources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -321,7 +321,7 @@ Architecture: any Replaces: knotes-trinity (<< 4:14.0.0) Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in index 3b45c48d0..4c48dcbef 100644 --- a/ubuntu/maverick/tdepim/debian/control.in +++ b/ubuntu/maverick/tdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources, tdebase-kio-plugins +Suggests: tdepim-tderesources, tdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'tdepim' packages for more information. -Package: tdepim-kresources +Package: tdepim-tderesources Section: tde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: tde Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -441,7 +441,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install index 748b6e9a7..eac493c1b 100644 --- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install +++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install @@ -29,7 +29,7 @@ /opt/trinity/share/services/kabldapconfig.desktop /opt/trinity/share/services/kaddressbook /opt/trinity/share/services/kontact/kaddressbookplugin.desktop -/opt/trinity/share/services/kresources/kabc/imap.desktop +/opt/trinity/share/services/tderesources/kabc/imap.desktop /opt/trinity/share/services/ldifvcardthumbnail.desktop /opt/trinity/share/servicetypes/dcopaddressbook.desktop /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.install b/ubuntu/maverick/tdepim/debian/knotes-trinity.install index 97956b197..8f65af5e3 100644 --- a/ubuntu/maverick/tdepim/debian/knotes-trinity.install +++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.install @@ -15,9 +15,9 @@ /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png -/opt/trinity/share/services/kresources/knotes/imap.desktop -/opt/trinity/share/services/kresources/knotes/local.desktop -/opt/trinity/share/services/kresources/knotes_manager.desktop +/opt/trinity/share/services/tderesources/knotes/imap.desktop +/opt/trinity/share/services/tderesources/knotes/local.desktop +/opt/trinity/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/trinity/share/pixmaps ../icons/knotes-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install index ca6e71652..211c15b4d 100644 --- a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install +++ b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install @@ -13,9 +13,9 @@ /opt/trinity/lib/libkholidays.so.1 /opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/share/apps/libkholidays -/opt/trinity/share/services/kresources/kcal/imap.desktop -/opt/trinity/share/services/kresources/kcal/kabc.desktop -/opt/trinity/share/services/kresources/kcal/local.desktop -/opt/trinity/share/services/kresources/kcal/localdir.desktop -/opt/trinity/share/services/kresources/kcal/remote.desktop -/opt/trinity/share/services/kresources/kcal_manager.desktop +/opt/trinity/share/services/tderesources/kcal/imap.desktop +/opt/trinity/share/services/tderesources/kcal/kabc.desktop +/opt/trinity/share/services/tderesources/kcal/local.desktop +/opt/trinity/share/services/tderesources/kcal/localdir.desktop +/opt/trinity/share/services/tderesources/kcal/remote.desktop +/opt/trinity/share/services/tderesources/kcal_manager.desktop diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install index 6a17101ae..e018f4bdf 100644 --- a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install +++ b/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install @@ -1,7 +1,7 @@ /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/share/apps/tdepimwidgets diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules index 0e1c5356b..96073e510 100755 --- a/ubuntu/maverick/tdepim/debian/rules +++ b/ubuntu/maverick/tdepim/debian/rules @@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ -dDepends # Since -u args go first in dpkg-shlibdeps call ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends -#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \ +#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ # -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install index 588b690b1..bcf0991b5 100644 --- a/ubuntu/maverick/tdepim/debian/tdepim-kresources-trinity.install +++ b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install @@ -74,31 +74,31 @@ /opt/trinity/lib/libkslox.so.0.0.0 /opt/trinity/lib/libgwsoap.so.0 /opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/trinity/share/services/kresources/kabc/kolab.desktop -/opt/trinity/share/services/kresources/kabc/scalix.desktop -/opt/trinity/share/services/kresources/kcal/exchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/trinity/share/services/kresources/kcal/kolab.desktop -/opt/trinity/share/services/kresources/kcal/scalix.desktop -/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/trinity/share/services/kresources/knotes/kolabresource.desktop -/opt/trinity/share/services/kresources/knotes/scalix.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kabc/kolab.desktop +/opt/trinity/share/services/tderesources/kabc/scalix.desktop +/opt/trinity/share/services/tderesources/kcal/exchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kcal/kolab.desktop +/opt/trinity/share/services/tderesources/kcal/scalix.desktop +/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/trinity/share/services/tderesources/knotes/kolabresource.desktop +/opt/trinity/share/services/tderesources/knotes/scalix.desktop /opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl /opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/ubuntu/maverick/tdesdk/debian/changelog +++ b/ubuntu/maverick/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/ubuntu/maverick/tdesdk/debian/control +++ b/ubuntu/maverick/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of Trinity, and a component of the KDE SDK module. diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/ubuntu/maverick/tdesdk/debian/control.in +++ b/ubuntu/maverick/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/ubuntu/maverick/tdesdk/debian/not-installed.list b/ubuntu/maverick/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/ubuntu/maverick/tdesdk/debian/not-installed.list +++ b/ubuntu/maverick/tdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules index 36d49b7c7..2e37f4326 100755 --- a/ubuntu/maverick/tdesdk/debian/rules +++ b/ubuntu/maverick/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h diff --git a/ubuntu/maverick/tdeutils/debian/changelog b/ubuntu/maverick/tdeutils/debian/changelog index b3d3af82b..71992aefe 100644 --- a/ubuntu/maverick/tdeutils/debian/changelog +++ b/ubuntu/maverick/tdeutils/debian/changelog @@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control index 23132b0e0..956b68ea3 100644 --- a/ubuntu/maverick/tdeutils/debian/control +++ b/ubuntu/maverick/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -343,11 +343,11 @@ Description: timer utility for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kwalletmanager-trinity +Package: tdewalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-trinity (<< 4:14.0.0) -Breaks: kwalletmanager-trinity (<< 4:14.0.0) +Replaces: tdewalletmanager-trinity (<< 4:14.0.0) +Breaks: tdewalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in index f1d64bd00..f86496f4d 100644 --- a/ubuntu/maverick/tdeutils/debian/control.in +++ b/ubuntu/maverick/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install b/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install deleted file mode 100644 index 1ba37d2e3..000000000 --- a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/trinity/bin/kwalletmanager -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so -debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png -debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/services/kwallet_config.desktop -debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 index 15d1c35d9..d6ba31cf5 100644 --- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 +++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet deleted file mode 100644 index 6331a925f..000000000 --- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdeutils-doc-html-kwallet -Title: KWallet Handbook -Author: George Staikos, Lauri Watts -Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. -Section: Tools - -Format: HTML -Index: /usr/share/doc/tde/HTML/en/kwallet/index.html -Files: /usr/share/doc/tde/HTML/en/kwallet/*.html - diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet new file mode 100644 index 000000000..d87ba35e0 --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet @@ -0,0 +1,10 @@ +Document: tdeutils-doc-html-tdewallet +Title: KWallet Handbook +Author: George Staikos, Lauri Watts +Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. +Section: Tools + +Format: HTML +Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html + diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install index 17d66276d..a04353048 100644 --- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install +++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tdemultiformlistbox.h +debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h +debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h debian/tmp/opt/trinity/include/ksim/chart.h debian/tmp/opt/trinity/include/ksim/common.h debian/tmp/opt/trinity/include/ksim/ksimconfig.h diff --git a/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install b/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install new file mode 100644 index 000000000..6e75bf792 --- /dev/null +++ b/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install @@ -0,0 +1,31 @@ +debian/tmp/opt/trinity/bin/tdewalletmanager +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so +debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png +debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/services/tdewallet_config.desktop +debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/changelog b/ubuntu/maverick_automake/applications/kaffeine/debian/changelog index b2693cf00..9e8f190d9 100644 --- a/ubuntu/maverick_automake/applications/kaffeine/debian/changelog +++ b/ubuntu/maverick_automake/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/copyright b/ubuntu/maverick_automake/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/ubuntu/maverick_automake/applications/kaffeine/debian/copyright +++ b/ubuntu/maverick_automake/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/changelog b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/changelog index e7bed7c93..bf4ab2d57 100644 --- a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/changelog +++ b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ kde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/ubuntu/maverick_automake/applications/kmplayer/debian/changelog b/ubuntu/maverick_automake/applications/kmplayer/debian/changelog index 77b777a17..269c7bd93 100644 --- a/ubuntu/maverick_automake/applications/kmplayer/debian/changelog +++ b/ubuntu/maverick_automake/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/changelog b/ubuntu/maverick_automake/applications/knetworkmanager/debian/changelog index 5cdaa89d6..24a76ba33 100644 --- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/changelog +++ b/ubuntu/maverick_automake/applications/knetworkmanager/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/control b/ubuntu/maverick_automake/applications/knetworkmanager/debian/control index 3ac6a66b3..9ede20c9e 100644 --- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/control +++ b/ubuntu/maverick_automake/applications/knetworkmanager/debian/control @@ -25,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/control.in b/ubuntu/maverick_automake/applications/knetworkmanager/debian/control.in index 32aa6dea9..d17a8b5ab 100644 --- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/control.in +++ b/ubuntu/maverick_automake/applications/knetworkmanager/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-kde3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-kde3, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-kde3 Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [KDE3] diff --git a/ubuntu/maverick_automake/applications/kpowersave/debian/changelog b/ubuntu/maverick_automake/applications/kpowersave/debian/changelog index 8239733cc..a8a184c7b 100644 --- a/ubuntu/maverick_automake/applications/kpowersave/debian/changelog +++ b/ubuntu/maverick_automake/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install index 6615ebbbc..d419ed082 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/opt/kde3/share/applications/kde/kcmkttsd.desktop debian/tmp/opt/kde3/share/applications/kde/kttsmgr.desktop -debian/tmp/opt/kde3/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/kde3/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/kde3/share/apps/kttsd/festivalint/voices debian/tmp/opt/kde3/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/kde3/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/kde3/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/kde3/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/kde3/share/services/kttsd.desktop debian/tmp/opt/kde3/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/kde3/share/services/kttsd_alsaplugin.desktop diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 index 732718a5d..d49436bad 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/kde/kcmkttsd.desktop debian/tmp/usr/share/applications/kde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 index 732718a5d..d49436bad 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/kttsd-kde3.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kttsd debian/tmp/opt/kde3/bin/kttsmgr debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.la debian/tmp/opt/kde3/lib/kde3/kcm_kttsd.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kttsd.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kttsd.so debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.la debian/tmp/opt/kde3/lib/kde3/libkttsd_akodeplugin.so debian/tmp/opt/kde3/lib/kde3/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/kde3/lib/libkttsd.so.1 debian/tmp/opt/kde3/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/kde/kcmkttsd.desktop debian/tmp/usr/share/applications/kde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/talkers.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/maverick_automake/kdeaddons/debian/konq-plugins-kde3.install b/ubuntu/maverick_automake/kdeaddons/debian/konq-plugins-kde3.install index 49791eb3d..fe7b891f3 100644 --- a/ubuntu/maverick_automake/kdeaddons/debian/konq-plugins-kde3.install +++ b/ubuntu/maverick_automake/kdeaddons/debian/konq-plugins-kde3.install @@ -30,8 +30,8 @@ debian/tmp/opt/kde3/lib/kde3/libdomtreeviewerplugin.la debian/tmp/opt/kde3/lib/kde3/libdomtreeviewerplugin.so debian/tmp/opt/kde3/lib/kde3/libfsviewpart.la debian/tmp/opt/kde3/lib/kde3/libfsviewpart.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlsettingsplugin.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlsettingsplugin.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlsettingsplugin.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlsettingsplugin.so debian/tmp/opt/kde3/lib/kde3/kcm_kuick.la debian/tmp/opt/kde3/lib/kde3/kcm_kuick.so debian/tmp/opt/kde3/lib/kde3/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/kde3/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/kde3/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/kde3/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/kde3/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/kde3/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/kde3/share/apps/domtreeviewer debian/tmp/opt/kde3/share/apps/fsview debian/tmp/opt/kde3/share/apps/imagerotation/orient.py debian/tmp/opt/kde3/share/apps/imagerotation/exif.py -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins debian/tmp/opt/kde3/share/apps/konqiconview debian/tmp/opt/kde3/share/apps/konqlistview debian/tmp/opt/kde3/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/imgallery/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/ubuntu/maverick_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/maverick_automake/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/ubuntu/maverick_automake/kdeartwork/debian/changelog b/ubuntu/maverick_automake/kdeartwork/debian/changelog index 584f51a60..00c10b7fe 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/changelog +++ b/ubuntu/maverick_automake/kdeartwork/debian/changelog @@ -33,13 +33,13 @@ kdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low kdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 kdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ kdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low kdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ kdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make kdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make kdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ kdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low kdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ kdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ kdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ kdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low kdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ kdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ kdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low kdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ kdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ kdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since kdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ kdeartwork (4:3.2.0-1) unstable; urgency=low kdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on kdebase-bin (closes: #203185). + * Made tdescreensaver depend on kdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ kdeartwork (4:3.1.2-1) unstable; urgency=low kdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ kdeartwork (4:3.1.0-2) unstable; urgency=low kdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed kdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x. + * Renamed kdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since kdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/ubuntu/maverick_automake/kdeartwork/debian/control b/ubuntu/maverick_automake/kdeartwork/debian/control index e96e7673f..9fab8bfe0 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/control +++ b/ubuntu/maverick_automake/kdeartwork/debian/control @@ -11,8 +11,8 @@ Standards-Version: 3.8.3 Package: kdeartwork-kde3 Architecture: all Section: kde -Depends: kdeartwork-misc-kde3 (>= ${Source-Version}), kdeartwork-emoticons-kde3 (>= ${Source-Version}), kdeartwork-style-kde3 (>= ${Source-Version}), kdeartwork-theme-icon-kde3 (>= ${Source-Version}), kdeartwork-theme-window-kde3 (>= ${Source-Version}), kdewallpapers-kde3 (>= ${Source-Version}), kscreensaver-kde3 (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-kde3 +Depends: kdeartwork-misc-kde3 (>= ${Source-Version}), kdeartwork-emoticons-kde3 (>= ${Source-Version}), kdeartwork-style-kde3 (>= ${Source-Version}), kdeartwork-theme-icon-kde3 (>= ${Source-Version}), kdeartwork-theme-window-kde3 (>= ${Source-Version}), kdewallpapers-kde3 (>= ${Source-Version}), tdescreensaver-kde3 (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-kde3 Description: themes, styles and more from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE3 This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-kde3 +Package: tdescreensaver-kde3 Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-kde3-bin -Recommends: kwin-kde3, kscreensaver-xsavers-kde3 (= ${Source-Version}) +Recommends: kwin-kde3, tdescreensaver-xsavers-kde3 (= ${Source-Version}) Description: additional screen savers released with KDE3 This package contains the screen savers for KDE3. They can be tested and selected within the Appearance and Themes section of the KDE3 Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE3 . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-kde3 +Package: tdescreensaver-xsavers-kde3 Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-kde3-bin, xscreensaver-data -Recommends: kwin-kde3, kscreensaver-kde3 (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-kde3 +Recommends: kwin-kde3, tdescreensaver-kde3 (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-kde3 Description: KDE3 hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE3. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE3 hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE3, see the separate package - kscreensaver-kde3. This package does depend on the xscreensaver package, and + tdescreensaver-kde3. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE3. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-webcollage-kde3 +Package: tdescreensaver-xsavers-webcollage-kde3 Architecture: all Section: kde -Depends: kscreensaver-xsavers-extra-kde3, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers-extra-kde3, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE3 hook This package give access to the webcollage screensaver through the KDE3 screensaver configuration. @@ -153,17 +153,17 @@ Description: webcollage screensaver KDE3 hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. -Package: kscreensaver-xsavers-extra-kde3 +Package: tdescreensaver-xsavers-extra-kde3 Architecture: all Section: kde -Depends: ${shlibs:Depends}, kscreensaver-xsavers-kde3, xscreensaver-data-extra, xscreensaver-gl-extra -Recommends: kwin-kde3, kscreensaver-kde3 (= ${Source-Version}) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-kde3, xscreensaver-data-extra, xscreensaver-gl-extra +Recommends: kwin-kde3, tdescreensaver-kde3 (= ${Source-Version}) Description: KDE3 hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into KDE3. With this package installed you can select and/or configure @@ -172,7 +172,7 @@ Description: KDE3 hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of KDE3, and a component of the KDE artwork module. See the 'kde-kde3' and 'kdeartwork-kde3' packages for more information. diff --git a/ubuntu/maverick_automake/kdeartwork/debian/control.in b/ubuntu/maverick_automake/kdeartwork/debian/control.in index c12a75d6d..10451f02a 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/control.in +++ b/ubuntu/maverick_automake/kdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: kdeartwork Architecture: all Section: kde -Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: kwin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, kdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: kwin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'kdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: kde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install deleted file mode 100644 index 5111c9cd6..000000000 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-extra-kde3.install +++ /dev/null @@ -1,149 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/anemone.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/apple2.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/attraction.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/barcode.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blaster.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boing.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boxed.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bsod.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/bumps.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cage.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/carousel.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/celtic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/compass.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/coral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/critical.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/crystal.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/demon.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/discrete.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/drift.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/eruption.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flag.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flame.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/flow.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/forest.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/goop.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/grav.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/halftone.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/halo.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/helix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/ifs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/interference.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/juggle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/julia.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/klein.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lament.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/laser.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lightning.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lisa.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lissie.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/loop.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/maze.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/menger.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/moire2.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/moire.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/mountain.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/munch.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/noof.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pacman.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pedal.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/petri.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pinion.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pong.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/providence.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/pyro.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/qix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rocks.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rotor.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/rubik.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sballs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/slip.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sphere.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/spiral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/squiral.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/stairs.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/starfish.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/starwars.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/strange.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/substrate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/t3d.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/tangram.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/triangle.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/truchet.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/twang.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/vines.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/wander.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/worm.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xflame.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xjack.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop usr/share/applnk/System/ScreenSavers/ -kscreensaver/kxsconfig/ScreenSavers/zoom.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install deleted file mode 100644 index f11cf310b..000000000 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage-kde3.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers.README.Debian deleted file mode 100644 index 828861775..000000000 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver-xsavers) only contains hooks for the standard -xscreensavers, so that they can be selected and/or configured through -the KDE Control Centre. - -For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver.README.Debian b/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver.README.Debian deleted file mode 100644 index 68584d330..000000000 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver) no longer contains the hooks for the standard -xscreensavers. It only contains the additional screensavers that are -specifically shipped with KDE. - -To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick_automake/kdeartwork/debian/man/kpartsaver-kde3.kss.1 b/ubuntu/maverick_automake/kdeartwork/debian/man/kpartsaver-kde3.kss.1 deleted file mode 100644 index 64a0a5c45..000000000 --- a/ubuntu/maverick_automake/kdeartwork/debian/man/kpartsaver-kde3.kss.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KPARTSAVER.KSS 1 "May 12, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kpartsaver.kss \- Media screen saver for KDE -.SH SYNOPSIS -.B kpartsaver.kss -.RI "[ " generic-options " ]" -[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | -\fB\-\-demo\fP ] -.SH DESCRIPTION -\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). -.PP -This program is part of the official KDE artwork module. -.SH OPTIONS -Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. -.TP -\fB\-\-setup\fP -Set up the screen saver. -.TP -\fB\-\-window-id\fP \fIwid\fP -Run in the specified XWindow. -.TP -\fB\-\-root\fP -Run in the root XWindow. -.TP -\fB\-\-demo\fP -Start the screen saver in demo mode (default). -.SH SEE ALSO -.BR kxsconfig (1), -.BR kxsrun (1). -.SH AUTHOR -This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/maverick_automake/kdeartwork/debian/man/tdepartsaver-kde3.kss.1 b/ubuntu/maverick_automake/kdeartwork/debian/man/tdepartsaver-kde3.kss.1 new file mode 100644 index 000000000..73456139b --- /dev/null +++ b/ubuntu/maverick_automake/kdeartwork/debian/man/tdepartsaver-kde3.kss.1 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KPARTSAVER.KSS 1 "May 12, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +tdepartsaver.kss \- Media screen saver for KDE +.SH SYNOPSIS +.B tdepartsaver.kss +.RI "[ " generic-options " ]" +[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | +\fB\-\-demo\fP ] +.SH DESCRIPTION +\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). +.PP +This program is part of the official KDE artwork module. +.SH OPTIONS +Below are the screen saver-specific options. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. +.TP +\fB\-\-setup\fP +Set up the screen saver. +.TP +\fB\-\-window-id\fP \fIwid\fP +Run in the specified XWindow. +.TP +\fB\-\-root\fP +Run in the root XWindow. +.TP +\fB\-\-demo\fP +Start the screen saver in demo mode (default). +.SH SEE ALSO +.BR kxsconfig (1), +.BR kxsrun (1). +.SH AUTHOR +This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. +.br +This manual page was prepared by Ben Burton <bab@debian.org> +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-kde3.install index 0117cf4ad..77669bc4f 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/kscreensaver-kde3.install +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-kde3.install @@ -14,7 +14,7 @@ debian/tmp/opt/kde3/bin/kclock.kss debian/tmp/opt/kde3/bin/kswarm.kss debian/tmp/opt/kde3/bin/kfountain.kss debian/tmp/opt/kde3/bin/kgravity.kss -debian/tmp/opt/kde3/bin/kpartsaver.kss +debian/tmp/opt/kde3/bin/tdepartsaver.kss debian/tmp/opt/kde3/bin/kpendulum.kss debian/tmp/opt/kde3/bin/kblob.kss debian/tmp/opt/kde3/bin/klines.kss @@ -39,6 +39,6 @@ debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KSpace.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KSwarm.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KVm.desktop debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/kpartsaver.desktop +debian/tmp/opt/kde3/share/applnk/System/ScreenSavers/tdepartsaver.desktop debian/tmp/opt/kde3/share/apps/kfiresaver -debian/tmp/opt/kde3/share/apps/kscreensaver +debian/tmp/opt/kde3/share/apps/tdescreensaver diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-kde3.manpages b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-kde3.manpages index 948eb83b5..34217fba1 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-kde3.manpages +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-kde3.manpages @@ -8,7 +8,7 @@ debian/man/kfountain-kde3.kss.1 debian/man/kgravity-kde3.kss.1 debian/man/klines-kde3.kss.1 debian/man/klorenz-kde3.kss.1 -debian/man/kpartsaver-kde3.kss.1 +debian/man/tdepartsaver-kde3.kss.1 debian/man/kpendulum-kde3.kss.1 debian/man/kpolygon-kde3.kss.1 debian/man/krotation-kde3.kss.1 diff --git a/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install new file mode 100644 index 000000000..6749db234 --- /dev/null +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-extra-kde3.install @@ -0,0 +1,149 @@ +tdescreensaver/kxsconfig/ScreenSavers/anemone.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/antmaze.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/apollonian.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/apple2.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/atlantis.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/attraction.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/barcode.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blaster.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blitspin.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/blocktube.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boing.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bouboule.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boxed.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/boxfit.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bsod.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bubbles.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/bumps.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cage.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/carousel.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/ccurve.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/celtic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cloudlife.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/compass.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/coral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/crackberg.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/critical.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/crystal.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cubenetic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/cynosure.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/dangerball.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/decayscreen.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/deluxe.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/demon.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/discrete.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/drift.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/epicycle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/eruption.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/euler2d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/extrusion.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fadeplot.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fireworkx.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flag.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flame.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/flow.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fluidballs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/fontglide.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/forest.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glforestfire.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/glplanet.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/goop.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/grav.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/greynetic.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/halftone.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/halo.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/helix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hopalong.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hyperball.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/hypercube.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/ifs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/imsmap.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/interference.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/intermomentary.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/jigsaw.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/juggle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/julia.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/klein.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/kumppa.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lament.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/laser.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lightning.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lisa.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lissie.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/lmorph.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/loop.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/maze.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/memscroller.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/menger.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/mismunch.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/moire2.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/moire.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/mountain.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/munch.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/nerverot.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/noof.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/noseguy.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pacman.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pedal.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/penetrate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/petri.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/phosphor.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/piecewise.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pinion.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/polyominoes.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pong.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/providence.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/pyro.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/qix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rocks.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rorschach.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rotor.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/rubik.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sballs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sierpinski.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/slip.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/speedmine.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sphere.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/spiral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/spotlight.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/sproingies.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/squiral.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/stairs.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/starfish.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/starwars.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/strange.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/substrate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/t3d.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/tangram.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/thornbird.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/timetunnel.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/triangle.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/truchet.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/twang.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vermiculate.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/vines.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/wander.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/whirlygig.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/worm.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/wormhole.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xflame.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xjack.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xmatrix.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xspirograph.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xsublim.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/xteevee.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/zoom.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.install index 6af54c8d2..6af54c8d2 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.install +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.install diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.manpages b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.manpages index cf97247c4..cf97247c4 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-kde3.manpages +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-kde3.manpages diff --git a/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage-kde3.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers.README.Debian b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers.README.Debian new file mode 100644 index 000000000..a41c9ad57 --- /dev/null +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver-xsavers) only contains hooks for the standard +xscreensavers, so that they can be selected and/or configured through +the KDE Control Centre. + +For the additional screensavers that are specifically shipped with KDE, +see the separate package tdescreensaver. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver.README.Debian b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver.README.Debian new file mode 100644 index 000000000..57a145f54 --- /dev/null +++ b/ubuntu/maverick_automake/kdeartwork/debian/tdescreensaver.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver) no longer contains the hooks for the standard +xscreensavers. It only contains the additional screensavers that are +specifically shipped with KDE. + +To select and/or configure the standard xscreensavers through the KDE Control +Centre, install the separate package tdescreensaver-xsavers. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES index ab3d75478..bad62816c 100644 --- a/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/maverick_automake/kdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/kdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/kdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/ubuntu/maverick_automake/kdebase/debian/changelog b/ubuntu/maverick_automake/kdebase/debian/changelog index 48d83199c..fe73757c3 100644 --- a/ubuntu/maverick_automake/kdebase/debian/changelog +++ b/ubuntu/maverick_automake/kdebase/debian/changelog @@ -1,7 +1,7 @@ kdebase-kde3 (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ kdebase-kde3 (4:3.5.10-2ubuntu2) karmic; urgency=low kdebase-kde3 (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ kdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $kdehome=$HOME/.kde so we should use $kdehome instead of $HOME/$kdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low kdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ kdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ kdebase (4:3.5.2-0ubuntu26) dapper; urgency=low kdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low kdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old kdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ kdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/ubuntu/maverick_automake/kdebase/debian/control b/ubuntu/maverick_automake/kdebase/debian/control index dfae80fa1..9705d7db1 100644 --- a/ubuntu/maverick_automake/kdebase/debian/control +++ b/ubuntu/maverick_automake/kdebase/debian/control @@ -106,7 +106,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-kde3, gdb Conflicts: kdebase-libs-kde3 (<< 4:3.0.0), tdm-kde3 (<< 4:3.4.1-2), kdebase-workspace-data-kde3 (<< 7:3.5.0) -Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), kscreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 4:3.3.2-1b) +Replaces: kcontrol-kde3 (<< 4:3.3.0), kdebase-kde3 (<< 4:3.0.0), kdebase-kde3-doc (<< 4:3.0.0), kdebase-libs-kde3 (<< 4:3.0.0), tdescreensaver-kde3 (<< 4:3.0.0), tdm-kde3 (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/maverick_automake/kdebase/debian/control.in b/ubuntu/maverick_automake/kdebase/debian/control.in index 61d7197f8..8566b8000 100644 --- a/ubuntu/maverick_automake/kdebase/debian/control.in +++ b/ubuntu/maverick_automake/kdebase/debian/control.in @@ -98,7 +98,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: kdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install index cb7900105..6e080d0ee 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install @@ -6,7 +6,7 @@ debian/tmp/opt/kde3/bin/kfontinst debian/tmp/opt/kde3/bin/kfontview debian/tmp/opt/kde3/bin/kinfocenter debian/tmp/opt/kde3/bin/klocaldomainurifilterhelper -debian/tmp/opt/kde3/bin/krandrtray +debian/tmp/opt/kde3/bin/tderandrtray debian/tmp/opt/kde3/bin/krdb debian/tmp/opt/kde3/lib/kde3/fontthumbnail.la debian/tmp/opt/kde3/lib/kde3/fontthumbnail.so @@ -54,8 +54,8 @@ debian/tmp/opt/kde3/lib/kde3/kcm_kded.la debian/tmp/opt/kde3/lib/kde3/kcm_kded.so debian/tmp/opt/kde3/lib/kde3/kcm_tdm.la debian/tmp/opt/kde3/lib/kde3/kcm_tdm.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.so -debian/tmp/opt/kde3/lib/kde3/kcm_kdnssd.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.so +debian/tmp/opt/kde3/lib/kde3/kcm_tdednssd.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.la debian/tmp/opt/kde3/lib/kde3/kcm_keys.so debian/tmp/opt/kde3/lib/kde3/kcm_kicker.la @@ -152,7 +152,7 @@ debian/tmp/opt/kde3/share/applications/kde/interrupts.desktop debian/tmp/opt/kde3/share/applications/kde/ioports.desktop debian/tmp/opt/kde3/share/applications/kde/ioslaveinfo.desktop debian/tmp/opt/kde3/share/applications/kde/joystick.desktop -debian/tmp/opt/kde3/share/applications/kde/kcm_kdnssd.desktop +debian/tmp/opt/kde3/share/applications/kde/kcm_tdednssd.desktop debian/tmp/opt/kde3/share/applications/kde/kcmaccess.desktop debian/tmp/opt/kde3/share/applications/kde/kcmcss.desktop debian/tmp/opt/kde3/share/applications/kde/kcmfontinst.desktop @@ -168,11 +168,11 @@ debian/tmp/opt/kde3/share/applications/kde/KControl.desktop debian/tmp/opt/kde3/share/applications/kde/tdm.desktop debian/tmp/opt/kde3/share/applications/kde/keys.desktop debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_behavior.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_fonts.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_java_js.desktop -debian/tmp/opt/kde3/share/applications/kde/krandrtray.desktop -debian/tmp/opt/kde3/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_behavior.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_fonts.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_java_js.desktop +debian/tmp/opt/kde3/share/applications/kde/tderandrtray.desktop +debian/tmp/opt/kde3/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/kde3/share/applications/kde/kthememanager.desktop debian/tmp/opt/kde3/share/applications/kde/iccconfig.desktop debian/tmp/opt/kde3/share/applications/kde/lanbrowser.desktop @@ -212,7 +212,7 @@ debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/kde3/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/kde3/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian index 3c7f407c6..f8b102033 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian +++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libkdeinit_tderandrinithack.so usr/lib/libkdeinit_tderandrinithack.so diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install index d6dc0841f..1fca22e59 100644 --- a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install @@ -211,10 +211,10 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook @@ -345,7 +345,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -449,7 +449,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/licq.png @@ -551,7 +551,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/locale.png @@ -636,7 +636,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/licq.png @@ -780,7 +780,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/licq.png @@ -876,7 +876,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install index 6e81691f0..815c0fb8d 100644 --- a/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/konqueror-kde3.install @@ -35,8 +35,8 @@ debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.la debian/tmp/opt/kde3/lib/kde3/konqsidebar_web.so debian/tmp/opt/kde3/lib/kde3/konqueror.la debian/tmp/opt/kde3/lib/kde3/konqueror.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlkttsdplugin.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlkttsdplugin.so debian/tmp/opt/kde3/lib/libkdeinit_keditbookmarks.so debian/tmp/opt/kde3/lib/libkdeinit_kfmclient.so debian/tmp/opt/kde3/lib/libkdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/kde3/share/applications/kde/kfmclient.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_dir.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_html.desktop debian/tmp/opt/kde3/share/applications/kde/kfmclient_war.desktop -debian/tmp/opt/kde3/share/applications/kde/khtml_filter.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_filter.desktop debian/tmp/opt/kde3/share/applications/kde/konqbrowser.desktop debian/tmp/opt/kde3/share/applications/kde/konquerorsu.desktop debian/tmp/opt/kde3/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/kde3/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/kde3/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/kde3/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/kde3/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/kde3/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/kde3/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install b/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install index 5da82a048..0dd136ca8 100644 --- a/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install +++ b/ubuntu/maverick_automake/kdebase/debian/konqueror-nsplugins-kde3.install @@ -4,5 +4,5 @@ debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.la debian/tmp/opt/kde3/lib/kde3/kcm_nsplugins.so debian/tmp/opt/kde3/lib/kde3/libnsplugin.la debian/tmp/opt/kde3/lib/kde3/libnsplugin.so -debian/tmp/opt/kde3/share/applications/kde/khtml_plugins.desktop +debian/tmp/opt/kde3/share/applications/kde/tdehtml_plugins.desktop debian/tmp/opt/kde3/share/apps/plugin/nspluginpart.rc diff --git a/ubuntu/maverick_automake/kdebase/debian/kscreensaver-kde3.pam b/ubuntu/maverick_automake/kdebase/debian/kscreensaver-kde3.pam deleted file mode 100644 index 088a00503..000000000 --- a/ubuntu/maverick_automake/kdebase/debian/kscreensaver-kde3.pam +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver -# -@include common-auth -@include common-account -@include common-password -@include common-session diff --git a/ubuntu/maverick_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules index 6a3938cba..814abbacf 100755 --- a/ubuntu/maverick_automake/kdebase/debian/rules +++ b/ubuntu/maverick_automake/kdebase/debian/rules @@ -17,7 +17,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde-kde3 --prefix=/opt/kde3 \ - --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=kscreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ + --with-kcp-pam=kcheckpass-kde3 --with-tdm-pam=tdm-kde3 --with-kss-pam=tdescreensaver-kde3 --with-extra-libs=/opt/kde3/lib \ --with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --with-sudo-kdesu-backend \ --enable-closure @@ -254,7 +254,7 @@ binary-install/klipper-kde3:: binary-install/kdebase-kde3-bin:: install -p -D -m644 debian/kcheckpass-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kcheckpass-kde3 - install -p -D -m644 debian/kscreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/kscreensaver-kde3 + install -p -D -m644 debian/tdescreensaver-kde3.pam debian/kdebase-kde3-bin/etc/pam.d/tdescreensaver-kde3 mkdir -p debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-kde3-bin/opt/kde3/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-kde3-bin/etc/X11/Xsession.d/80ubuntu-kde3-xmodmap diff --git a/ubuntu/maverick_automake/kdebase/debian/tdescreensaver-kde3.pam b/ubuntu/maverick_automake/kdebase/debian/tdescreensaver-kde3.pam new file mode 100644 index 000000000..9a2c74519 --- /dev/null +++ b/ubuntu/maverick_automake/kdebase/debian/tdescreensaver-kde3.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver +# +@include common-auth +@include common-account +@include common-password +@include common-session diff --git a/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install b/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install index 081a99fd4..373e36eb4 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install +++ b/ubuntu/maverick_automake/kdegraphics/debian/kdegraphics-dev-kde3.install @@ -149,7 +149,7 @@ debian/tmp/opt/kde3/include/tde/dom/SVGWindow.h debian/tmp/opt/kde3/include/tde/dom/SVGZoomAndPan.h debian/tmp/opt/kde3/include/tde/dom/SVGZoomEvent.h debian/tmp/opt/kde3/include/tde/kfaximage.h -debian/tmp/opt/kde3/include/tde/kmultipageInterface.h +debian/tmp/opt/kde3/include/tde/tdemultipageInterface.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasFactory.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasItem.h debian/tmp/opt/kde3/include/tde/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/kde3/include/tde/kviewshell/documentRenderer.h debian/tmp/opt/kde3/include/tde/kviewshell/documentWidget.h debian/tmp/opt/kde3/include/tde/kviewshell/history.h debian/tmp/opt/kde3/include/tde/kviewshell/hyperlink.h -debian/tmp/opt/kde3/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/kde3/include/tde/kviewshell/tdemultipage.h debian/tmp/opt/kde3/include/tde/kviewshell/length.h debian/tmp/opt/kde3/include/tde/kviewshell/pageNumber.h debian/tmp/opt/kde3/include/tde/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/kde3/lib/libkghostviewlib.la debian/tmp/opt/kde3/lib/libkghostviewlib.so debian/tmp/opt/kde3/lib/libkimageviewer.la debian/tmp/opt/kde3/lib/libkimageviewer.so -debian/tmp/opt/kde3/lib/libkmultipage.la -debian/tmp/opt/kde3/lib/libkmultipage.so +debian/tmp/opt/kde3/lib/libtdemultipage.la +debian/tmp/opt/kde3/lib/libtdemultipage.so debian/tmp/opt/kde3/lib/libkpovmodeler.la debian/tmp/opt/kde3/lib/libkpovmodeler.so debian/tmp/opt/kde3/lib/libksvg.la diff --git a/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.install b/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.install index d4f22ce8c..931c107ef 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.install +++ b/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.install @@ -7,8 +7,8 @@ debian/tmp/opt/kde3/lib/kde3/emptymultipagepart.la debian/tmp/opt/kde3/lib/kde3/emptymultipagepart.so debian/tmp/opt/kde3/lib/kde3/kviewerpart.la debian/tmp/opt/kde3/lib/kde3/kviewerpart.so -debian/tmp/opt/kde3/lib/libkmultipage.so.0 -debian/tmp/opt/kde3/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdemultipage.so.0 +debian/tmp/opt/kde3/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/kde3/share/apps/djvumultipage.rc debian/tmp/opt/kde3/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/kde3/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/kde3/share/services/emptymultipage.desktop debian/tmp/opt/kde3/share/services/djvumultipage.desktop -debian/tmp/opt/kde3/share/servicetypes/kmultipage.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.lintian b/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.lintian index 0957e32c5..ce2a034a2 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.lintian +++ b/ubuntu/maverick_automake/kdegraphics/debian/kviewshell-kde3.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/kde3/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index cddcdd7f6..9e8cbd7fc 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -388,7 +388,7 @@ kdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to kdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow kdelibs5-dev co-installable alongside kdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-kdelibs-3.5.6.diff, 47_kdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ kdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ kdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low kdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_kdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_kdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ kdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ kdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ kdelibs (4:3.5.3-1) unstable; urgency=low kdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ kdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy kdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ kdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except kdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ kdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low kdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 kdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 kdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ kdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ kdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low kdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from kdelibs4-dev + * Remove libtdednssd depend from kdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 kdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in kdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 kdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in kdelibs4-dev. - * Add depends on libkdnssd1-avahi from kdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in kdelibs4-dev. + * Add depends on libtdednssd1-avahi from kdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ kdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low kdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ kdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ kdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low kdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since + - post-3.3.1-kdelibs-tdehtml.diff and post-3.3.1-kdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ kdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/kdelibs4-dev.install: - usr/include/tde/kiobuffer.h - - usr/include/tde/kwallettypes.h + - usr/include/tde/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ kdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-kdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-kdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-kdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ kdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ kdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ kdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: kdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ kdelibs (4:2.1.1-4) unstable; urgency=low kdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ kdelibs (4:2.1.0.1-3) unstable; urgency=low kdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ kdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of kdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of kdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/ubuntu/maverick_automake/kdelibs/debian/copyright b/ubuntu/maverick_automake/kdelibs/debian/copyright index e9c6d2cf8..1cae772e1 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/copyright +++ b/ubuntu/maverick_automake/kdelibs/debian/copyright @@ -12,9 +12,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, kdecore, kded, kdefx, -kdeprint, kdesu, kdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, kdecore, kded, kdefx, +kdeprint, kdesu, kdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install index 56fa28d05..80a04ea76 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install @@ -15,7 +15,7 @@ debian/tmp/etc/kde3/kthemestylerc debian/tmp/etc/kde3/language.codes debian/tmp/etc/kde3/ui/kprintpreviewui.rc debian/tmp/etc/kde3/ui/ui_standards.rc -debian/tmp/opt/kde3/share/applications/kde/kresources.desktop +debian/tmp/opt/kde3/share/applications/kde/tderesources.desktop debian/tmp/opt/kde3/share/apps/dcopidlng/Ast.pm debian/tmp/opt/kde3/share/apps/dcopidlng/Iter.pm debian/tmp/opt/kde3/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/kde3/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/kde3/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/kde3/share/apps/katepart/scripts/sort.js debian/tmp/opt/kde3/share/apps/katepart/syntax/*.xml -debian/tmp/opt/kde3/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/kde3/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/kde3/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/kde3/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/kde3/share/apps/kconf_update/kded.upd debian/tmp/opt/kde3/share/apps/kconf_update/kdeprintrc.upd @@ -229,22 +229,22 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/ktimewidget.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurlcomborequester.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurllabel.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kurlrequester.png -debian/tmp/opt/kde3/share/apps/khtml/css/html4.css -debian/tmp/opt/kde3/share/apps/khtml/css/quirks.css -debian/tmp/opt/kde3/share/apps/khtml/domain_info -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/kde3/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/kde3/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/kde3/share/apps/khtml/khtml.rc +debian/tmp/opt/kde3/share/apps/tdehtml/css/html4.css +debian/tmp/opt/kde3/share/apps/tdehtml/css/quirks.css +debian/tmp/opt/kde3/share/apps/tdehtml/domain_info +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/kde3/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/kde3/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/kde3/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/kde3/share/apps/kjava/kjava.jar @@ -1713,10 +1713,10 @@ debian/tmp/opt/kde3/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/kde3/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/kde3/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/kde3/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/kde3/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/kde3/share/apps/LICENSES/ARTISTIC debian/tmp/opt/kde3/share/apps/LICENSES/BSD debian/tmp/opt/kde3/share/apps/LICENSES/GPL_V2 @@ -1779,9 +1779,9 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/web-docbottom.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/web-doctop.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/x11-license.html debian/tmp/opt/kde3/share/doc/kde/HTML/en/common/xml.dcl -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kspell/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdespell/index.docbook debian/tmp/opt/kde3/share/emoticons/Default/angry.png debian/tmp/opt/kde3/share/emoticons/Default/bat.png debian/tmp/opt/kde3/share/emoticons/Default/beer.png @@ -1919,7 +1919,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2342,7 +2342,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2705,7 +2705,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3078,7 +3078,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3302,7 +3302,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3484,7 +3484,7 @@ debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/kde3/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3567,35 +3567,35 @@ debian/tmp/opt/kde3/share/services/jp2.kimgio debian/tmp/opt/kde3/share/services/jpeg.kimgio debian/tmp/opt/kde3/share/services/katepart.desktop debian/tmp/opt/kde3/share/services/kbzip2filter.desktop -debian/tmp/opt/kde3/share/services/kcertpart.desktop +debian/tmp/opt/kde3/share/services/tdecertpart.desktop debian/tmp/opt/kde3/share/services/kded/kcookiejar.desktop debian/tmp/opt/kde3/share/services/kded/kdeprintd.desktop debian/tmp/opt/kde3/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/kde3/share/services/kded/kpasswdserver.desktop debian/tmp/opt/kde3/share/services/kded/kssld.desktop -debian/tmp/opt/kde3/share/services/kded/kwalletd.desktop +debian/tmp/opt/kde3/share/services/kded/tdewalletd.desktop debian/tmp/opt/kde3/share/services/kded/proxyscout.desktop debian/tmp/opt/kde3/share/services/kgzipfilter.desktop -debian/tmp/opt/kde3/share/services/khtml.desktop -debian/tmp/opt/kde3/share/services/khtmlimage.desktop +debian/tmp/opt/kde3/share/services/tdehtml.desktop +debian/tmp/opt/kde3/share/services/tdehtmlimage.desktop debian/tmp/opt/kde3/share/services/kio_uiserver.desktop debian/tmp/opt/kde3/share/services/kjavaappletviewer.desktop debian/tmp/opt/kde3/share/services/kmailservice.protocol -debian/tmp/opt/kde3/share/services/kmultipart.desktop +debian/tmp/opt/kde3/share/services/tdemultipart.desktop debian/tmp/opt/kde3/share/services/knotify.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/file.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/net.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/kde3/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/kde3/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/kde3/share/services/kspell_aspell.desktop -debian/tmp/opt/kde3/share/services/kspell_hspell.desktop -debian/tmp/opt/kde3/share/services/kspell_ispell.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/kde3/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/kde3/share/services/tdespell_aspell.desktop +debian/tmp/opt/kde3/share/services/tdespell_hspell.desktop +debian/tmp/opt/kde3/share/services/tdespell_ispell.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/kde3/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/kde3/share/services/metainfo.protocol debian/tmp/opt/kde3/share/services/mms.protocol debian/tmp/opt/kde3/share/services/mmst.protocol @@ -3634,21 +3634,21 @@ debian/tmp/opt/kde3/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/kde3/share/servicetypes/kdatatool.desktop debian/tmp/opt/kde3/share/servicetypes/kdedmodule.desktop debian/tmp/opt/kde3/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/kde3/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/kde3/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/kde3/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/kde3/share/servicetypes/kpart.desktop debian/tmp/opt/kde3/share/servicetypes/kplugininfo.desktop debian/tmp/opt/kde3/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/kde3/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/kde3/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/kde3/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/kde3/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/kde3/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/kde3/share/servicetypes/krop.desktop debian/tmp/opt/kde3/share/servicetypes/krwp.desktop debian/tmp/opt/kde3/share/servicetypes/kscan.desktop -debian/tmp/opt/kde3/share/servicetypes/kspellclient.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/kde3/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/kde3/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/kde3/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/kde3/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/kde3/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/kde3/share/servicetypes/scriptinterface.desktop diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.preinst b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.preinst index cbc832186..3f9403736 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.preinst +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/kde3/colors/40\ Colors rm -f /etc/kde3/colors/Royal rm -f /etc/kde3/colors/Web - rm -f /etc/kde3/ktexteditor_autobookmarkerrc + rm -f /etc/kde3/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 04f837902..e8cf99c68 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/kde3/bin/dcopidl2cpp debian/tmp/opt/kde3/bin/dcopidlng debian/tmp/opt/kde3/bin/kconfig_compiler debian/tmp/opt/kde3/bin/ksvgtopng -debian/tmp/opt/kde3/bin/kunittestmodrunner +debian/tmp/opt/kde3/bin/tdeunittestmodrunner debian/tmp/opt/kde3/bin/makekdewidgets debian/tmp/opt/kde3/bin/preparetips @@ -289,11 +289,11 @@ debian/tmp/opt/kde3/include/tde/khexedit/charcolumninterface.h debian/tmp/opt/kde3/include/tde/khexedit/clipboardinterface.h debian/tmp/opt/kde3/include/tde/khexedit/valuecolumninterface.h debian/tmp/opt/kde3/include/tde/khexedit/zoominterface.h -debian/tmp/opt/kde3/include/tde/khtmldefaults.h -debian/tmp/opt/kde3/include/tde/khtml_events.h -debian/tmp/opt/kde3/include/tde/khtml_part.h -debian/tmp/opt/kde3/include/tde/khtml_settings.h -debian/tmp/opt/kde3/include/tde/khtmlview.h +debian/tmp/opt/kde3/include/tde/tdehtmldefaults.h +debian/tmp/opt/kde3/include/tde/tdehtml_events.h +debian/tmp/opt/kde3/include/tde/tdehtml_part.h +debian/tmp/opt/kde3/include/tde/tdehtml_settings.h +debian/tmp/opt/kde3/include/tde/tdehtmlview.h debian/tmp/opt/kde3/include/tde/khttpproxysocketdevice.h debian/tmp/opt/kde3/include/tde/kicondialog.h debian/tmp/opt/kde3/include/tde/kiconeffect.h @@ -306,8 +306,8 @@ debian/tmp/opt/kde3/include/tde/kimageeffect.h debian/tmp/opt/kde3/include/tde/kimagefilepreview.h debian/tmp/opt/kde3/include/tde/kimageio.h debian/tmp/opt/kde3/include/tde/kimiface.h -debian/tmp/opt/kde3/include/tde/kimproxy.h -debian/tmp/opt/kde3/include/tde/kimproxyiface.h +debian/tmp/opt/kde3/include/tde/tdeimproxy.h +debian/tmp/opt/kde3/include/tde/tdeimproxyiface.h debian/tmp/opt/kde3/include/tde/kinputdialog.h debian/tmp/opt/kde3/include/tde/kinstance.h debian/tmp/opt/kde3/include/tde/kio/authinfo.h @@ -327,7 +327,7 @@ debian/tmp/opt/kde3/include/tde/kio/job.h debian/tmp/opt/kde3/include/tde/kio/kdesasl.h debian/tmp/opt/kde3/include/tde/kio/kmdbase.h debian/tmp/opt/kde3/include/tde/kio/kmdcodec.h -debian/tmp/opt/kde3/include/tde/kio/kntlm.h +debian/tmp/opt/kde3/include/tde/kio/tdentlm.h debian/tmp/opt/kde3/include/tde/kio/metainfojob.h debian/tmp/opt/kde3/include/tde/kio/netaccess.h debian/tmp/opt/kde3/include/tde/kio/observer.h @@ -386,24 +386,24 @@ debian/tmp/opt/kde3/include/tde/kmainwindow.h debian/tmp/opt/kde3/include/tde/kmainwindowiface.h debian/tmp/opt/kde3/include/tde/kmanagerselection.h debian/tmp/opt/kde3/include/tde/kmdcodec.h -debian/tmp/opt/kde3/include/tde/kmdichildarea.h -debian/tmp/opt/kde3/include/tde/kmdichildfrmcaption.h -debian/tmp/opt/kde3/include/tde/kmdichildfrm.h -debian/tmp/opt/kde3/include/tde/kmdichildview.h -debian/tmp/opt/kde3/include/tde/kmdidefines.h -debian/tmp/opt/kde3/include/tde/kmdi/global.h -debian/tmp/opt/kde3/include/tde/kmdiiterator.h -debian/tmp/opt/kde3/include/tde/kmdilistiterator.h -debian/tmp/opt/kde3/include/tde/kmdimainfrm.h -debian/tmp/opt/kde3/include/tde/kmdi/mainwindow.h -debian/tmp/opt/kde3/include/tde/kmdinulliterator.h -debian/tmp/opt/kde3/include/tde/kmdi/tabwidget.h -debian/tmp/opt/kde3/include/tde/kmditaskbar.h -debian/tmp/opt/kde3/include/tde/kmdi/toolviewaccessor.h -debian/tmp/opt/kde3/include/tde/kmditoolviewaccessor.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/playerdcopobject.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/player.h -debian/tmp/opt/kde3/include/tde/kmediaplayer/view.h +debian/tmp/opt/kde3/include/tde/tdemdichildarea.h +debian/tmp/opt/kde3/include/tde/tdemdichildfrmcaption.h +debian/tmp/opt/kde3/include/tde/tdemdichildfrm.h +debian/tmp/opt/kde3/include/tde/tdemdichildview.h +debian/tmp/opt/kde3/include/tde/tdemdidefines.h +debian/tmp/opt/kde3/include/tde/tdemdi/global.h +debian/tmp/opt/kde3/include/tde/tdemdiiterator.h +debian/tmp/opt/kde3/include/tde/tdemdilistiterator.h +debian/tmp/opt/kde3/include/tde/tdemdimainfrm.h +debian/tmp/opt/kde3/include/tde/tdemdi/mainwindow.h +debian/tmp/opt/kde3/include/tde/tdemdinulliterator.h +debian/tmp/opt/kde3/include/tde/tdemdi/tabwidget.h +debian/tmp/opt/kde3/include/tde/tdemditaskbar.h +debian/tmp/opt/kde3/include/tde/tdemdi/toolviewaccessor.h +debian/tmp/opt/kde3/include/tde/tdemditoolviewaccessor.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/player.h +debian/tmp/opt/kde3/include/tde/tdemediaplayer/view.h debian/tmp/opt/kde3/include/tde/kmenubar.h debian/tmp/opt/kde3/include/tde/kmessagebox.h debian/tmp/opt/kde3/include/tde/kmimemagic.h @@ -412,10 +412,10 @@ debian/tmp/opt/kde3/include/tde/kmimetypechooser.h debian/tmp/opt/kde3/include/tde/kmimetype.h debian/tmp/opt/kde3/include/tde/kmimetyperesolver.h debian/tmp/opt/kde3/include/tde/kmountpoint.h -debian/tmp/opt/kde3/include/tde/kmulticastsocketdevice.h -debian/tmp/opt/kde3/include/tde/kmulticastsocket.h -debian/tmp/opt/kde3/include/tde/kmultipledrag.h -debian/tmp/opt/kde3/include/tde/kmultitabbar.h +debian/tmp/opt/kde3/include/tde/tdemulticastsocketdevice.h +debian/tmp/opt/kde3/include/tde/tdemulticastsocket.h +debian/tmp/opt/kde3/include/tde/tdemultipledrag.h +debian/tmp/opt/kde3/include/tde/tdemultitabbar.h debian/tmp/opt/kde3/include/tde/knetworkinterface.h debian/tmp/opt/kde3/include/tde/knewstuff/downloaddialog.h debian/tmp/opt/kde3/include/tde/knewstuff/engine.h @@ -440,20 +440,20 @@ debian/tmp/opt/kde3/include/tde/kpanelapplet.h debian/tmp/opt/kde3/include/tde/kpanelappmenu.h debian/tmp/opt/kde3/include/tde/kpanelextension.h debian/tmp/opt/kde3/include/tde/kpanelmenu.h -debian/tmp/opt/kde3/include/tde/kparts/browserextension.h -debian/tmp/opt/kde3/include/tde/kparts/browserinterface.h -debian/tmp/opt/kde3/include/tde/kparts/browserrun.h -debian/tmp/opt/kde3/include/tde/kparts/componentfactory.h -debian/tmp/opt/kde3/include/tde/kparts/dockmainwindow.h -debian/tmp/opt/kde3/include/tde/kparts/event.h -debian/tmp/opt/kde3/include/tde/kparts/factory.h -debian/tmp/opt/kde3/include/tde/kparts/genericfactory.h -debian/tmp/opt/kde3/include/tde/kparts/historyprovider.h -debian/tmp/opt/kde3/include/tde/kparts/mainwindow.h -debian/tmp/opt/kde3/include/tde/kparts/part.h -debian/tmp/opt/kde3/include/tde/kparts/partmanager.h -debian/tmp/opt/kde3/include/tde/kparts/plugin.h -debian/tmp/opt/kde3/include/tde/kparts/statusbarextension.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserextension.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserinterface.h +debian/tmp/opt/kde3/include/tde/tdeparts/browserrun.h +debian/tmp/opt/kde3/include/tde/tdeparts/componentfactory.h +debian/tmp/opt/kde3/include/tde/tdeparts/dockmainwindow.h +debian/tmp/opt/kde3/include/tde/tdeparts/event.h +debian/tmp/opt/kde3/include/tde/tdeparts/factory.h +debian/tmp/opt/kde3/include/tde/tdeparts/genericfactory.h +debian/tmp/opt/kde3/include/tde/tdeparts/historyprovider.h +debian/tmp/opt/kde3/include/tde/tdeparts/mainwindow.h +debian/tmp/opt/kde3/include/tde/tdeparts/part.h +debian/tmp/opt/kde3/include/tde/tdeparts/partmanager.h +debian/tmp/opt/kde3/include/tde/tdeparts/plugin.h +debian/tmp/opt/kde3/include/tde/tdeparts/statusbarextension.h debian/tmp/opt/kde3/include/tde/kpassdlg.h debian/tmp/opt/kde3/include/tde/kpassivepopup.h debian/tmp/opt/kde3/include/tde/kpixmapeffect.h @@ -488,15 +488,15 @@ debian/tmp/opt/kde3/include/tde/kremoteencoding.h debian/tmp/opt/kde3/include/tde/kreplacedialog.h debian/tmp/opt/kde3/include/tde/kreplace.h debian/tmp/opt/kde3/include/tde/kresolver.h -debian/tmp/opt/kde3/include/tde/kresources/configdialog.h -debian/tmp/opt/kde3/include/tde/kresources/configpage.h -debian/tmp/opt/kde3/include/tde/kresources/configwidget.h -debian/tmp/opt/kde3/include/tde/kresources/factory.h -debian/tmp/opt/kde3/include/tde/kresources/manager.h -debian/tmp/opt/kde3/include/tde/kresources/manageriface.h -debian/tmp/opt/kde3/include/tde/kresources/managerimpl.h -debian/tmp/opt/kde3/include/tde/kresources/resource.h -debian/tmp/opt/kde3/include/tde/kresources/selectdialog.h +debian/tmp/opt/kde3/include/tde/tderesources/configdialog.h +debian/tmp/opt/kde3/include/tde/tderesources/configpage.h +debian/tmp/opt/kde3/include/tde/tderesources/configwidget.h +debian/tmp/opt/kde3/include/tde/tderesources/factory.h +debian/tmp/opt/kde3/include/tde/tderesources/manager.h +debian/tmp/opt/kde3/include/tde/tderesources/manageriface.h +debian/tmp/opt/kde3/include/tde/tderesources/managerimpl.h +debian/tmp/opt/kde3/include/tde/tderesources/resource.h +debian/tmp/opt/kde3/include/tde/tderesources/selectdialog.h debian/tmp/opt/kde3/include/tde/krestrictedline.h debian/tmp/opt/kde3/include/tde/kreverseresolver.h debian/tmp/opt/kde3/include/tde/krfcdate.h @@ -508,8 +508,8 @@ debian/tmp/opt/kde3/include/tde/ksambashare.h debian/tmp/opt/kde3/include/tde/ksavefile.h debian/tmp/opt/kde3/include/tde/kscan.h debian/tmp/opt/kde3/include/tde/ksconfig.h -debian/tmp/opt/kde3/include/tde/kscreensaver.h -debian/tmp/opt/kde3/include/tde/kscreensaver_vroot.h +debian/tmp/opt/kde3/include/tde/tdescreensaver.h +debian/tmp/opt/kde3/include/tde/tdescreensaver_vroot.h debian/tmp/opt/kde3/include/tde/kscrollview.h debian/tmp/opt/kde3/include/tde/kselect.h debian/tmp/opt/kde3/include/tde/kseparator.h @@ -541,18 +541,18 @@ debian/tmp/opt/kde3/include/tde/ksockssocketdevice.h debian/tmp/opt/kde3/include/tde/ksortablevaluelist.h debian/tmp/opt/kde3/include/tde/kspeech.h debian/tmp/opt/kde3/include/tde/kspeechsink.h -debian/tmp/opt/kde3/include/tde/kspell2/backgroundchecker.h -debian/tmp/opt/kde3/include/tde/kspell2/broker.h -debian/tmp/opt/kde3/include/tde/kspell2/configdialog.h -debian/tmp/opt/kde3/include/tde/kspell2/configwidget.h -debian/tmp/opt/kde3/include/tde/kspell2/defaultdictionary.h -debian/tmp/opt/kde3/include/tde/kspell2/dialog.h -debian/tmp/opt/kde3/include/tde/kspell2/dictionary.h -debian/tmp/opt/kde3/include/tde/kspell2/filter.h -debian/tmp/opt/kde3/include/tde/kspell2/highlighter.h -debian/tmp/opt/kde3/include/tde/kspell2/settings.h -debian/tmp/opt/kde3/include/tde/kspelldlg.h -debian/tmp/opt/kde3/include/tde/kspell.h +debian/tmp/opt/kde3/include/tde/tdespell2/backgroundchecker.h +debian/tmp/opt/kde3/include/tde/tdespell2/broker.h +debian/tmp/opt/kde3/include/tde/tdespell2/configdialog.h +debian/tmp/opt/kde3/include/tde/tdespell2/configwidget.h +debian/tmp/opt/kde3/include/tde/tdespell2/defaultdictionary.h +debian/tmp/opt/kde3/include/tde/tdespell2/dialog.h +debian/tmp/opt/kde3/include/tde/tdespell2/dictionary.h +debian/tmp/opt/kde3/include/tde/tdespell2/filter.h +debian/tmp/opt/kde3/include/tde/tdespell2/highlighter.h +debian/tmp/opt/kde3/include/tde/tdespell2/settings.h +debian/tmp/opt/kde3/include/tde/tdespelldlg.h +debian/tmp/opt/kde3/include/tde/tdespell.h debian/tmp/opt/kde3/include/tde/ksplashscreen.h debian/tmp/opt/kde3/include/tde/ksqueezedtextlabel.h debian/tmp/opt/kde3/include/tde/ksslall.h @@ -591,9 +591,9 @@ debian/tmp/opt/kde3/include/tde/kstringvalidator.h debian/tmp/opt/kde3/include/tde/kstyle.h debian/tmp/opt/kde3/include/tde/ksvgiconengine.h debian/tmp/opt/kde3/include/tde/kswitchlanguagedialog.h -debian/tmp/opt/kde3/include/tde/ksycocaentry.h -debian/tmp/opt/kde3/include/tde/ksycoca.h -debian/tmp/opt/kde3/include/tde/ksycocatype.h +debian/tmp/opt/kde3/include/tde/tdesycocaentry.h +debian/tmp/opt/kde3/include/tde/tdesycoca.h +debian/tmp/opt/kde3/include/tde/tdesycocatype.h debian/tmp/opt/kde3/include/tde/ksyntaxhighlighter.h debian/tmp/opt/kde3/include/tde/ksystemtray.h debian/tmp/opt/kde3/include/tde/ktabbar.h @@ -604,39 +604,39 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h debian/tmp/opt/kde3/include/tde/ktempfile.h debian/tmp/opt/kde3/include/tde/ktextbrowser.h debian/tmp/opt/kde3/include/tde/ktextedit.h -debian/tmp/opt/kde3/include/tde/ktexteditor/blockselectioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/clipboardinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/codecompletioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/configinterfaceextension.h -debian/tmp/opt/kde3/include/tde/ktexteditor/configinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/cursorinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/document.h -debian/tmp/opt/kde3/include/tde/ktexteditor/documentinfo.h -debian/tmp/opt/kde3/include/tde/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editinterfaceext.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editorchooser.h -debian/tmp/opt/kde3/include/tde/ktexteditor/editor.h -debian/tmp/opt/kde3/include/tde/ktexteditor/encodinginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/highlightinginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/markinterfaceextension.h -debian/tmp/opt/kde3/include/tde/ktexteditor/markinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/plugin.h -debian/tmp/opt/kde3/include/tde/ktexteditor/popupmenuinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/printinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/searchinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/kde3/include/tde/ktexteditor/selectioninterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/templateinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/texthintinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/undointerface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/variableinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/viewcursorinterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/view.h -debian/tmp/opt/kde3/include/tde/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/kde3/include/tde/ktexteditor/wordwrapinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/cursorinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/document.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/documentinfo.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editinterfaceext.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editorchooser.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/editor.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/encodinginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/highlightinginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/markinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/plugin.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/printinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/searchinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/selectioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/templateinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/texthintinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/undointerface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/variableinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/view.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/wordwrapinterface.h debian/tmp/opt/kde3/include/tde/ktimewidget.h debian/tmp/opt/kde3/include/tde/ktimezones.h debian/tmp/opt/kde3/include/tde/ktimezonewidget.h @@ -649,9 +649,9 @@ debian/tmp/opt/kde3/include/tde/ktrader.h debian/tmp/opt/kde3/include/tde/ktypelist.h debian/tmp/opt/kde3/include/tde/kuniqueapp.h debian/tmp/opt/kde3/include/tde/kuniqueapplication.h -debian/tmp/opt/kde3/include/tde/kunittest/module.h -debian/tmp/opt/kde3/include/tde/kunittest/runner.h -debian/tmp/opt/kde3/include/tde/kunittest/tester.h +debian/tmp/opt/kde3/include/tde/tdeunittest/module.h +debian/tmp/opt/kde3/include/tde/tdeunittest/runner.h +debian/tmp/opt/kde3/include/tde/tdeunittest/tester.h debian/tmp/opt/kde3/include/tde/kunload.h debian/tmp/opt/kde3/include/tde/kurifilter.h debian/tmp/opt/kde3/include/tde/kurlbar.h @@ -666,8 +666,8 @@ debian/tmp/opt/kde3/include/tde/kurlrequester.h debian/tmp/opt/kde3/include/tde/kuser.h debian/tmp/opt/kde3/include/tde/kuserprofile.h debian/tmp/opt/kde3/include/tde/kvmallocator.h -debian/tmp/opt/kde3/include/tde/kwallet.h -debian/tmp/opt/kde3/include/tde/kwallettypes.h +debian/tmp/opt/kde3/include/tde/tdewallet.h +debian/tmp/opt/kde3/include/tde/tdewallettypes.h debian/tmp/opt/kde3/include/tde/kwindowinfo.h debian/tmp/opt/kde3/include/tde/kwindowlistmenu.h debian/tmp/opt/kde3/include/tde/kwin.h @@ -681,27 +681,27 @@ debian/tmp/opt/kde3/include/tde/kxmlguiclient.h debian/tmp/opt/kde3/include/tde/kxmlguifactory.h debian/tmp/opt/kde3/include/tde/kxmlgui.h debian/tmp/opt/kde3/include/tde/kzip.h -debian/tmp/opt/kde3/include/tde/libkrandr/ktimerdialog.h -debian/tmp/opt/kde3/include/tde/libkrandr/libkrandr.h -debian/tmp/opt/kde3/include/tde/libkrandr/lowlevel_randr.h -debian/tmp/opt/kde3/include/tde/libkrandr/randr.h -debian/tmp/opt/kde3/include/tde/libkmid/alsaout.h -debian/tmp/opt/kde3/include/tde/libkmid/dattypes.h -debian/tmp/opt/kde3/include/tde/libkmid/deviceman.h -debian/tmp/opt/kde3/include/tde/libkmid/fmout.h -debian/tmp/opt/kde3/include/tde/libkmid/gusout.h -debian/tmp/opt/kde3/include/tde/libkmid/libkmid.h -debian/tmp/opt/kde3/include/tde/libkmid/midfile.h -debian/tmp/opt/kde3/include/tde/libkmid/midimapper.h -debian/tmp/opt/kde3/include/tde/libkmid/midiout.h -debian/tmp/opt/kde3/include/tde/libkmid/midispec.h -debian/tmp/opt/kde3/include/tde/libkmid/midistat.h -debian/tmp/opt/kde3/include/tde/libkmid/mt32togm.h -debian/tmp/opt/kde3/include/tde/libkmid/notearray.h -debian/tmp/opt/kde3/include/tde/libkmid/player.h -debian/tmp/opt/kde3/include/tde/libkmid/synthout.h -debian/tmp/opt/kde3/include/tde/libkmid/track.h -debian/tmp/opt/kde3/include/tde/libkmid/voiceman.h +debian/tmp/opt/kde3/include/tde/libtderandr/ktimerdialog.h +debian/tmp/opt/kde3/include/tde/libtderandr/libtderandr.h +debian/tmp/opt/kde3/include/tde/libtderandr/lowlevel_randr.h +debian/tmp/opt/kde3/include/tde/libtderandr/randr.h +debian/tmp/opt/kde3/include/tde/libtdemid/alsaout.h +debian/tmp/opt/kde3/include/tde/libtdemid/dattypes.h +debian/tmp/opt/kde3/include/tde/libtdemid/deviceman.h +debian/tmp/opt/kde3/include/tde/libtdemid/fmout.h +debian/tmp/opt/kde3/include/tde/libtdemid/gusout.h +debian/tmp/opt/kde3/include/tde/libtdemid/libtdemid.h +debian/tmp/opt/kde3/include/tde/libtdemid/midfile.h +debian/tmp/opt/kde3/include/tde/libtdemid/midimapper.h +debian/tmp/opt/kde3/include/tde/libtdemid/midiout.h +debian/tmp/opt/kde3/include/tde/libtdemid/midispec.h +debian/tmp/opt/kde3/include/tde/libtdemid/midistat.h +debian/tmp/opt/kde3/include/tde/libtdemid/mt32togm.h +debian/tmp/opt/kde3/include/tde/libtdemid/notearray.h +debian/tmp/opt/kde3/include/tde/libtdemid/player.h +debian/tmp/opt/kde3/include/tde/libtdemid/synthout.h +debian/tmp/opt/kde3/include/tde/libtdemid/track.h +debian/tmp/opt/kde3/include/tde/libtdemid/voiceman.h debian/tmp/opt/kde3/include/tde/netwm_def.h debian/tmp/opt/kde3/include/tde/netwm.h debian/tmp/opt/kde3/include/tde/qxembed.h @@ -771,54 +771,54 @@ debian/tmp/opt/kde3/lib/libkdesu.la debian/tmp/opt/kde3/lib/libkdesu.so debian/tmp/opt/kde3/lib/libkdeui.la debian/tmp/opt/kde3/lib/libkdeui.so -debian/tmp/opt/kde3/lib/libkdnssd.la -debian/tmp/opt/kde3/lib/libkdnssd.so -debian/tmp/opt/kde3/lib/libkhtml.la -debian/tmp/opt/kde3/lib/libkhtml.so -debian/tmp/opt/kde3/lib/libkimproxy.la -debian/tmp/opt/kde3/lib/libkimproxy.so +debian/tmp/opt/kde3/lib/libtdednssd.la +debian/tmp/opt/kde3/lib/libtdednssd.so +debian/tmp/opt/kde3/lib/libtdehtml.la +debian/tmp/opt/kde3/lib/libtdehtml.so +debian/tmp/opt/kde3/lib/libtdeimproxy.la +debian/tmp/opt/kde3/lib/libtdeimproxy.so debian/tmp/opt/kde3/lib/libkio.la debian/tmp/opt/kde3/lib/libkio.so debian/tmp/opt/kde3/lib/libkjava.la debian/tmp/opt/kde3/lib/libkjava.so debian/tmp/opt/kde3/lib/libkjs.la debian/tmp/opt/kde3/lib/libkjs.so -debian/tmp/opt/kde3/lib/libkmdi2.la -debian/tmp/opt/kde3/lib/libkmdi2.so -debian/tmp/opt/kde3/lib/libkmdi.la -debian/tmp/opt/kde3/lib/libkmdi.so -debian/tmp/opt/kde3/lib/libkmediaplayer.la -debian/tmp/opt/kde3/lib/libkmediaplayer.so -debian/tmp/opt/kde3/lib/libkmid.la -debian/tmp/opt/kde3/lib/libkmid.so +debian/tmp/opt/kde3/lib/libtdemdi2.la +debian/tmp/opt/kde3/lib/libtdemdi2.so +debian/tmp/opt/kde3/lib/libtdemdi.la +debian/tmp/opt/kde3/lib/libtdemdi.so +debian/tmp/opt/kde3/lib/libtdemediaplayer.la +debian/tmp/opt/kde3/lib/libtdemediaplayer.so +debian/tmp/opt/kde3/lib/libtdemid.la +debian/tmp/opt/kde3/lib/libtdemid.so debian/tmp/opt/kde3/lib/libknewstuff.la debian/tmp/opt/kde3/lib/libknewstuff.so -debian/tmp/opt/kde3/lib/libkntlm.la -debian/tmp/opt/kde3/lib/libkntlm.so -debian/tmp/opt/kde3/lib/libkparts.la -debian/tmp/opt/kde3/lib/libkparts.so -debian/tmp/opt/kde3/lib/libkrandr.la -debian/tmp/opt/kde3/lib/libkrandr.so -debian/tmp/opt/kde3/lib/libkresources.la -debian/tmp/opt/kde3/lib/libkresources.so -debian/tmp/opt/kde3/lib/libkscreensaver.la -debian/tmp/opt/kde3/lib/libkscreensaver.so -debian/tmp/opt/kde3/lib/libkscript.la -debian/tmp/opt/kde3/lib/libkscript.so -debian/tmp/opt/kde3/lib/libkspell2.la -debian/tmp/opt/kde3/lib/libkspell2.so -debian/tmp/opt/kde3/lib/libkspell.la -debian/tmp/opt/kde3/lib/libkspell.so -debian/tmp/opt/kde3/lib/libktexteditor.la -debian/tmp/opt/kde3/lib/libktexteditor.so -debian/tmp/opt/kde3/lib/libkunittest.la -debian/tmp/opt/kde3/lib/libkunittest.so -debian/tmp/opt/kde3/lib/libkutils.la -debian/tmp/opt/kde3/lib/libkutils.so -debian/tmp/opt/kde3/lib/libkwalletbackend.la -debian/tmp/opt/kde3/lib/libkwalletbackend.so -debian/tmp/opt/kde3/lib/libkwalletclient.la -debian/tmp/opt/kde3/lib/libkwalletclient.so +debian/tmp/opt/kde3/lib/libtdentlm.la +debian/tmp/opt/kde3/lib/libtdentlm.so +debian/tmp/opt/kde3/lib/libtdeparts.la +debian/tmp/opt/kde3/lib/libtdeparts.so +debian/tmp/opt/kde3/lib/libtderandr.la +debian/tmp/opt/kde3/lib/libtderandr.so +debian/tmp/opt/kde3/lib/libtderesources.la +debian/tmp/opt/kde3/lib/libtderesources.so +debian/tmp/opt/kde3/lib/libtdescreensaver.la +debian/tmp/opt/kde3/lib/libtdescreensaver.so +debian/tmp/opt/kde3/lib/libtdescript.la +debian/tmp/opt/kde3/lib/libtdescript.so +debian/tmp/opt/kde3/lib/libtdespell2.la +debian/tmp/opt/kde3/lib/libtdespell2.so +debian/tmp/opt/kde3/lib/libtdespell.la +debian/tmp/opt/kde3/lib/libtdespell.so +debian/tmp/opt/kde3/lib/libtdetexteditor.la +debian/tmp/opt/kde3/lib/libtdetexteditor.so +debian/tmp/opt/kde3/lib/libtdeunittest.la +debian/tmp/opt/kde3/lib/libtdeunittest.so +debian/tmp/opt/kde3/lib/libtdeutils.la +debian/tmp/opt/kde3/lib/libtdeutils.so +debian/tmp/opt/kde3/lib/libtdewalletbackend.la +debian/tmp/opt/kde3/lib/libtdewalletbackend.so +debian/tmp/opt/kde3/lib/libtdewalletclient.la +debian/tmp/opt/kde3/lib/libtdewalletclient.so debian/tmp/opt/kde3/lib/libvcard.la debian/tmp/opt/kde3/lib/libvcard.so diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages index 07fa5ba29..5f25ea10f 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-kde3.1 ./debian/man/ksvgtopng-kde3.1 -./debian/man/kunittestmodrunner-kde3.1 +./debian/man/tdeunittestmodrunner-kde3.1 ./debian/man/makekdewidgets-kde3.1 ./debian/man/preparetips-kde3.1 diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4c2a-kde3.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4c2a-kde3.install index 6abd9b10b..52850bab8 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4c2a-kde3.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4c2a-kde3.install @@ -72,8 +72,8 @@ debian/tmp/opt/kde3/lib/kde3/kbuildsycoca.la debian/tmp/opt/kde3/lib/kde3/kbuildsycoca.so debian/tmp/opt/kde3/lib/kde3/kbzip2filter.la debian/tmp/opt/kde3/lib/kde3/kbzip2filter.so -debian/tmp/opt/kde3/lib/kde3/kcm_kresources.la -debian/tmp/opt/kde3/lib/kde3/kcm_kresources.so +debian/tmp/opt/kde3/lib/kde3/kcm_tderesources.la +debian/tmp/opt/kde3/lib/kde3/kcm_tderesources.so debian/tmp/opt/kde3/lib/kde3/kcmshell.la debian/tmp/opt/kde3/lib/kde3/kcmshell.so debian/tmp/opt/kde3/lib/kde3/kconf_update.la @@ -90,8 +90,8 @@ debian/tmp/opt/kde3/lib/kde3/kded_kpasswdserver.la debian/tmp/opt/kde3/lib/kde3/kded_kpasswdserver.so debian/tmp/opt/kde3/lib/kde3/kded_kssld.la debian/tmp/opt/kde3/lib/kde3/kded_kssld.so -debian/tmp/opt/kde3/lib/kde3/kded_kwalletd.la -debian/tmp/opt/kde3/lib/kde3/kded_kwalletd.so +debian/tmp/opt/kde3/lib/kde3/kded_tdewalletd.la +debian/tmp/opt/kde3/lib/kde3/kded_tdewalletd.so debian/tmp/opt/kde3/lib/kde3/kded.la debian/tmp/opt/kde3/lib/kde3/kded_proxyscout.la debian/tmp/opt/kde3/lib/kde3/kded_proxyscout.so @@ -112,8 +112,8 @@ debian/tmp/opt/kde3/lib/kde3/kfileaudiopreview.la debian/tmp/opt/kde3/lib/kde3/kfileaudiopreview.so debian/tmp/opt/kde3/lib/kde3/kgzipfilter.la debian/tmp/opt/kde3/lib/kde3/kgzipfilter.so -debian/tmp/opt/kde3/lib/kde3/khtmlimagepart.la -debian/tmp/opt/kde3/lib/kde3/khtmlimagepart.so +debian/tmp/opt/kde3/lib/kde3/tdehtmlimagepart.la +debian/tmp/opt/kde3/lib/kde3/tdehtmlimagepart.so debian/tmp/opt/kde3/lib/kde3/kimg_dds.la debian/tmp/opt/kde3/lib/kde3/kimg_dds.so debian/tmp/opt/kde3/lib/kde3/kimg_eps.la @@ -164,34 +164,34 @@ debian/tmp/opt/kde3/lib/kde3/klauncher.la debian/tmp/opt/kde3/lib/kde3/klauncher.so debian/tmp/opt/kde3/lib/kde3/knotify.la debian/tmp/opt/kde3/lib/kde3/knotify.so -debian/tmp/opt/kde3/lib/kde3/kspell_aspell.la -debian/tmp/opt/kde3/lib/kde3/kspell_aspell.so -debian/tmp/opt/kde3/lib/kde3/kspell_hspell.la -debian/tmp/opt/kde3/lib/kde3/kspell_hspell.so -debian/tmp/opt/kde3/lib/kde3/kspell_ispell.la -debian/tmp/opt/kde3/lib/kde3/kspell_ispell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_aspell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_aspell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_hspell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_hspell.so +debian/tmp/opt/kde3/lib/kde3/tdespell_ispell.la +debian/tmp/opt/kde3/lib/kde3/tdespell_ispell.so debian/tmp/opt/kde3/lib/kde3/kstyle_highcontrast_config.la debian/tmp/opt/kde3/lib/kde3/kstyle_highcontrast_config.so debian/tmp/opt/kde3/lib/kde3/kstyle_plastik_config.la debian/tmp/opt/kde3/lib/kde3/kstyle_plastik_config.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_docwordcompletion.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_docwordcompletion.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_insertfile.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_insertfile.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_isearch.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_isearch.so -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kdatatool.la -debian/tmp/opt/kde3/lib/kde3/ktexteditor_kdatatool.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_docwordcompletion.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_docwordcompletion.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_insertfile.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_insertfile.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_isearch.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_isearch.so +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kdatatool.la +debian/tmp/opt/kde3/lib/kde3/tdetexteditor_kdatatool.so debian/tmp/opt/kde3/lib/kde3/libkatepart.la debian/tmp/opt/kde3/lib/kde3/libkatepart.so -debian/tmp/opt/kde3/lib/kde3/libkcertpart.la -debian/tmp/opt/kde3/lib/kde3/libkcertpart.so +debian/tmp/opt/kde3/lib/kde3/libtdecertpart.la +debian/tmp/opt/kde3/lib/kde3/libtdecertpart.so debian/tmp/opt/kde3/lib/kde3/libkdeprint_management_module.la debian/tmp/opt/kde3/lib/kde3/libkdeprint_management_module.so -debian/tmp/opt/kde3/lib/kde3/libkhtmlpart.la -debian/tmp/opt/kde3/lib/kde3/libkhtmlpart.so -debian/tmp/opt/kde3/lib/kde3/libkmultipart.la -debian/tmp/opt/kde3/lib/kde3/libkmultipart.so +debian/tmp/opt/kde3/lib/kde3/libtdehtmlpart.la +debian/tmp/opt/kde3/lib/kde3/libtdehtmlpart.so +debian/tmp/opt/kde3/lib/kde3/libtdemultipart.la +debian/tmp/opt/kde3/lib/kde3/libtdemultipart.so debian/tmp/opt/kde3/lib/kde3/libshellscript.la debian/tmp/opt/kde3/lib/kde3/libshellscript.so debian/tmp/opt/kde3/lib/kde3/plugins/designer/kdewidgets.la @@ -259,53 +259,53 @@ debian/tmp/opt/kde3/lib/libkdesu.so.4 debian/tmp/opt/kde3/lib/libkdesu.so.4.2.0 debian/tmp/opt/kde3/lib/libkdeui.so.4 debian/tmp/opt/kde3/lib/libkdeui.so.4.2.0 -debian/tmp/opt/kde3/lib/libkdnssd.so.1 -debian/tmp/opt/kde3/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/kde3/lib/libkhtml.so.4 -debian/tmp/opt/kde3/lib/libkhtml.so.4.2.0 -debian/tmp/opt/kde3/lib/libkimproxy.so.0 -debian/tmp/opt/kde3/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdednssd.so.1 +debian/tmp/opt/kde3/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdehtml.so.4 +debian/tmp/opt/kde3/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdeimproxy.so.0 +debian/tmp/opt/kde3/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/kde3/lib/libkio.so.4 debian/tmp/opt/kde3/lib/libkio.so.4.2.0 debian/tmp/opt/kde3/lib/libkjava.so.1 debian/tmp/opt/kde3/lib/libkjava.so.1.0.0 debian/tmp/opt/kde3/lib/libkjs.so.1 debian/tmp/opt/kde3/lib/libkjs.so.1.2.0 -debian/tmp/opt/kde3/lib/libkmdi2.so.1 -debian/tmp/opt/kde3/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/kde3/lib/libkmdi.so.1 -debian/tmp/opt/kde3/lib/libkmdi.so.1.0.0 -debian/tmp/opt/kde3/lib/libkmediaplayer.so.0 -debian/tmp/opt/kde3/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/kde3/lib/libkmid.so.0 -debian/tmp/opt/kde3/lib/libkmid.so.0.0.95 +debian/tmp/opt/kde3/lib/libtdemdi2.so.1 +debian/tmp/opt/kde3/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdemdi.so.1 +debian/tmp/opt/kde3/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdemediaplayer.so.0 +debian/tmp/opt/kde3/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdemid.so.0 +debian/tmp/opt/kde3/lib/libtdemid.so.0.0.95 debian/tmp/opt/kde3/lib/libknewstuff.so.1 debian/tmp/opt/kde3/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/kde3/lib/libkntlm.so.0 -debian/tmp/opt/kde3/lib/libkntlm.so.0.0.0 -debian/tmp/opt/kde3/lib/libkparts.so.2 -debian/tmp/opt/kde3/lib/libkparts.so.2.1.0 -debian/tmp/opt/kde3/lib/libkrandr.so.0 -debian/tmp/opt/kde3/lib/libkrandr.so.0.0.95 -debian/tmp/opt/kde3/lib/libkresources.so.1 -debian/tmp/opt/kde3/lib/libkresources.so.1.2.0 -debian/tmp/opt/kde3/lib/libkscreensaver.so.4 -debian/tmp/opt/kde3/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/kde3/lib/libkscript.so.0 -debian/tmp/opt/kde3/lib/libkscript.so.0.0.0 -debian/tmp/opt/kde3/lib/libkspell2.so.1 -debian/tmp/opt/kde3/lib/libkspell2.so.1.0.0 -debian/tmp/opt/kde3/lib/libkspell.so.4 -debian/tmp/opt/kde3/lib/libkspell.so.4.2.0 -debian/tmp/opt/kde3/lib/libktexteditor.so.0 -debian/tmp/opt/kde3/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/kde3/lib/libkunittest.so.1 -debian/tmp/opt/kde3/lib/libkunittest.so.1.0.0 -debian/tmp/opt/kde3/lib/libkutils.so.1 -debian/tmp/opt/kde3/lib/libkutils.so.1.2.0 -debian/tmp/opt/kde3/lib/libkwalletbackend.so.1 -debian/tmp/opt/kde3/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/kde3/lib/libkwalletclient.so.1 -debian/tmp/opt/kde3/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/kde3/lib/libtdentlm.so.0 +debian/tmp/opt/kde3/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdeparts.so.2 +debian/tmp/opt/kde3/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/kde3/lib/libtderandr.so.0 +debian/tmp/opt/kde3/lib/libtderandr.so.0.0.95 +debian/tmp/opt/kde3/lib/libtderesources.so.1 +debian/tmp/opt/kde3/lib/libtderesources.so.1.2.0 +debian/tmp/opt/kde3/lib/libtdescreensaver.so.4 +debian/tmp/opt/kde3/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdescript.so.0 +debian/tmp/opt/kde3/lib/libtdescript.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdespell2.so.1 +debian/tmp/opt/kde3/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdespell.so.4 +debian/tmp/opt/kde3/lib/libtdespell.so.4.2.0 +debian/tmp/opt/kde3/lib/libtdetexteditor.so.0 +debian/tmp/opt/kde3/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/kde3/lib/libtdeunittest.so.1 +debian/tmp/opt/kde3/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdeutils.so.1 +debian/tmp/opt/kde3/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/kde3/lib/libtdewalletbackend.so.1 +debian/tmp/opt/kde3/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/kde3/lib/libtdewalletclient.so.1 +debian/tmp/opt/kde3/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/kde3/lib/libvcard.so.0 debian/tmp/opt/kde3/lib/libvcard.so.0.0.0 diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/kunittestmodrunner-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/kunittestmodrunner-kde3.1 deleted file mode 100644 index b61b06654..000000000 --- a/ubuntu/maverick_automake/kdelibs/debian/man/kunittestmodrunner-kde3.1 +++ /dev/null @@ -1,159 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" -.SH NAME -kunittestmodrunner -\- a KDE command\-line application to run KUnitTest modules -.SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] -.SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. -.SH OPTIONS -.SS Options: -.TP -.BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] -.TP -.BR \-\-folder \ [ folder ] -Only run tests modules which are found in the folder. Use the query option to select modules. [.] -.TP -.B \-\-enable\-dbgcap -Disables debug capturing. You typically use this option when you use the GUI. -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS KDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.SS -.SH SEE ALSO -.BR kunittestguimodrunner (1) -.sp 1 -.TP -.BR http://developer.kde.org -KDE Developers's Corner website -.SH AUTHORS -.nf -Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> - -.br -.fi -Please use http://bugs.kde.org to report bugs, do not mail the author directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/tdeunittestmodrunner-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/tdeunittestmodrunner-kde3.1 new file mode 100644 index 000000000..56c4f3bc6 --- /dev/null +++ b/ubuntu/maverick_automake/kdelibs/debian/man/tdeunittestmodrunner-kde3.1 @@ -0,0 +1,159 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" +.SH NAME +tdeunittestmodrunner +\- a KDE command\-line application to run KUnitTest modules +.SH SYNOPSIS +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +.SH OPTIONS +.SS Options: +.TP +.BR \-\-query \ [ regexp ] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] +.TP +.BR \-\-folder \ [ folder ] +Only run tests modules which are found in the folder. Use the query option to select modules. [.] +.TP +.B \-\-enable\-dbgcap +Disables debug capturing. You typically use this option when you use the GUI. +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH SEE ALSO +.BR tdeunittestguimodrunner (1) +.sp 1 +.TP +.BR http://developer.kde.org +KDE Developers's Corner website +.SH AUTHORS +.nf +Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs, do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff index d5b892428..2bdd698e6 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff +++ b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff @@ -4,9 +4,9 @@ find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ echo ./kdecore/kde-config.cpp.in >> files ;\ -- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ +- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \ - : > kde.pot ;\ -+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; ++ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot - $(XGETTEXT) common_texts.cpp -o kde.pot rm -f dirs diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/changelog b/ubuntu/maverick_automake/kdemultimedia/debian/changelog index c85c9a19c..8f03dd4d3 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/changelog +++ b/ubuntu/maverick_automake/kdemultimedia/debian/changelog @@ -584,7 +584,7 @@ kdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low kdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from kdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from kdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ kdemultimedia (4:3.1.5-1) unstable; urgency=low kdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends kdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ kdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ kdemultimedia (4:2.0-final-6) unstable; urgency=low kdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ kdemultimedia (4:2.0-final-4) unstable; urgency=low kdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ kdemultimedia (4:2.0-final-0) unstable; urgency=low kdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ kdemultimedia (4:2.0-20001002-0) unstable; urgency=low kdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ kdemultimedia (4:2.0-20000911-1) unstable; urgency=low kdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking kdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/control b/ubuntu/maverick_automake/kdemultimedia/debian/control index 78993ae49..86260f791 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/control +++ b/ubuntu/maverick_automake/kdemultimedia/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdemultimedia-kde3 Section: kde Architecture: all -Depends: artsbuilder-kde3 (>= ${Source-Version}), juk-kde3 (>= ${Source-Version}), kaboodle-kde3 (>= ${Source-Version}), kaudiocreator-kde3 (>= ${Source-Version}), kdemultimedia-kappfinder-data-kde3 (>= ${Source-Version}), kdemultimedia-kfile-plugins-kde3 (>= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (>= ${Source-Version}), kmid-kde3 (>= ${Source-Version}), kmix-kde3 (>= ${Source-Version}), krec-kde3 (>= ${Source-Version}), kscd-kde3 (>= ${Source-Version}), libarts1-akode-kde3 (>= ${Source-Version}), libarts1-audiofile-kde3 (>= ${Source-Version}), libarts1-mpeglib-kde3 (>= ${Source-Version}), libarts1-xine-kde3 (>= ${Source-Version}), mpeglib-kde3 (>= ${Source-Version}), noatun-kde3 (>= ${Source-Version}) +Depends: artsbuilder-kde3 (>= ${Source-Version}), juk-kde3 (>= ${Source-Version}), kaboodle-kde3 (>= ${Source-Version}), kaudiocreator-kde3 (>= ${Source-Version}), kdemultimedia-kappfinder-data-kde3 (>= ${Source-Version}), kdemultimedia-kfile-plugins-kde3 (>= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (>= ${Source-Version}), tdemid-kde3 (>= ${Source-Version}), kmix-kde3 (>= ${Source-Version}), krec-kde3 (>= ${Source-Version}), kscd-kde3 (>= ${Source-Version}), libarts1-akode-kde3 (>= ${Source-Version}), libarts1-audiofile-kde3 (>= ${Source-Version}), libarts1-mpeglib-kde3 (>= ${Source-Version}), libarts1-xine-kde3 (>= ${Source-Version}), mpeglib-kde3 (>= ${Source-Version}), noatun-kde3 (>= ${Source-Version}) Suggests: kdemultimedia-kde3-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE3 release Package: kdemultimedia-kde3-dev Section: devel Architecture: any -Depends: kdelibs4-kde3-dev (>= 4:3.5.7), artsbuilder-kde3 (= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (= ${Source-Version}), kmid-kde3 (= ${Source-Version}), kmix-kde3 (= ${Source-Version}), krec-kde3 (= ${Source-Version}), kscd-kde3 (= ${Source-Version}), libarts1-akode-kde3 (= ${Source-Version}), libarts1-mpeglib-kde3 (= ${Source-Version}), libkcddb1-kde3 (= ${Source-Version}), mpeglib-kde3 (= ${Source-Version}), noatun-kde3 (= ${Source-Version}) +Depends: kdelibs4-kde3-dev (>= 4:3.5.7), artsbuilder-kde3 (= ${Source-Version}), kdemultimedia-kio-plugins-kde3 (= ${Source-Version}), tdemid-kde3 (= ${Source-Version}), kmix-kde3 (= ${Source-Version}), krec-kde3 (= ${Source-Version}), kscd-kde3 (= ${Source-Version}), libarts1-akode-kde3 (= ${Source-Version}), libarts1-mpeglib-kde3 (= ${Source-Version}), libkcddb1-kde3 (= ${Source-Version}), mpeglib-kde3 (= ${Source-Version}), noatun-kde3 (= ${Source-Version}) Conflicts: libmpeg-kde3-dev Replaces: artsbuilder-kde3 (<< 4:3.0.0), mpeglib-kde3 (<< 4:3.0.0), noatun-kde3 (<< 4:3.0.0) Description: development files for the KDE3 multimedia module @@ -153,7 +153,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE3, as a component of the KDE multimedia module. See the 'kde-kde3' and 'kdemultimedia-kde3' packages for more information. -Package: kmid-kde3 +Package: tdemid-kde3 Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/control.in b/ubuntu/maverick_automake/kdemultimedia/debian/control.in index b5db28208..06bc49583 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/control.in +++ b/ubuntu/maverick_automake/kdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdemultimedia Section: kde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: kdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: kdemultimedia-dev Section: devel Architecture: any -Depends: kdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: kdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'kdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/copyright b/ubuntu/maverick_automake/kdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/copyright +++ b/ubuntu/maverick_automake/kdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid-16.xpm deleted file mode 100644 index 0a510090a..000000000 --- a/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid-16.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static char *kmid-16[] = { -/* columns rows colors chars-per-pixel */ -"16 16 104 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c gray4", -"# c #0C0C0C", -"$ c #101010", -"% c #111111", -"& c gray7", -"* c #161616", -"= c gray9", -"- c gray10", -"; c gray11", -": c #1D1D1D", -"> c #1E1E1E", -", c gray12", -"< c #222222", -"1 c #232323", -"2 c gray14", -"3 c #252525", -"4 c gray15", -"5 c #282828", -"6 c #2A2A2A", -"7 c gray17", -"8 c #2D2D2D", -"9 c gray18", -"0 c #2F2F2F", -"q c gray19", -"w c gray20", -"e c #393939", -"r c #3A3A3A", -"t c gray24", -"y c #3F3F3F", -"u c gray25", -"i c gray26", -"p c #444444", -"a c #464646", -"s c #494949", -"d c gray29", -"f c #4B4B4B", -"g c #505050", -"h c #555555", -"j c #565656", -"k c gray34", -"l c #585858", -"z c gray35", -"x c #5B5B5B", -"c c #626262", -"v c gray39", -"b c gray40", -"n c #686868", -"m c #727272", -"M c gray45", -"N c gray46", -"B c #777777", -"V c gray48", -"C c #7B7B7B", -"Z c gray49", -"A c #7E7E7E", -"S c #808080", -"D c #838383", -"F c #868686", -"G c gray53", -"H c #898989", -"J c gray54", -"K c #8D8D8D", -"L c #8E8E8E", -"P c gray56", -"I c gray57", -"U c #929292", -"Y c #959595", -"T c gray59", -"R c #9A9A9A", -"E c #9B9B9B", -"W c gray61", -"Q c #9D9D9D", -"! c gray64", -"~ c #A4A4A4", -"^ c gray65", -"/ c #A7A7A7", -"( c #AFAFAF", -") c #B2B2B2", -"_ c gray70", -"` c gray71", -"' c gray73", -"] c gray74", -"[ c gray", -"{ c #C0C0C0", -"} c gray76", -"| c #CACACA", -" . c gray81", -".. c gray82", -"X. c gray84", -"o. c #D8D8D8", -"O. c #E2E2E2", -"+. c gray89", -"@. c #E6E6E6", -"#. c gray93", -"$. c #F8F8F8", -"%. c #F9F9F9", -"&. c gray100", -"*. c None", -/* pixels */ -" *.*.*.*.*.*.*.*.*.*.", -" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", -" 6 t i C : *.*.*.*.*.*.*.*.*.*.", -" 6 t a C = *.*.*.*.*.*.*.*.*.*.", -" 6 i f C @ *.*.*.*. ", -" 6 a f B *.*.l + D l v l : ", -" 3 r n F 1 H P 3 n | U M - *.", -" = U [ r ! &.Q f t C | *.*.", -" F %.: a #.&.' C & v &.[ *.*.*.", -"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", -"*.k &.] E &.&.Q O.&.` ` k *.*.", -"*.q ] ) D ( ] H U X.! 3 *.*.*.", -"*.# 3 0 i [ +.U U &.P *.*.*.", -"*.& i t a | &./ B U k b : *.*.", -"*.@ 6 0 1 & q : + r f r *.", -"*. *.*.*. *." -}; diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid.xpm b/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid.xpm deleted file mode 100644 index fb669aa72..000000000 --- a/ubuntu/maverick_automake/kdemultimedia/debian/icons/kmid.xpm +++ /dev/null @@ -1,251 +0,0 @@ -/* XPM */ -static char *kmid[] = { -/* columns rows colors chars-per-pixel */ -"32 32 213 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c #060606", -"# c #070707", -"$ c gray3", -"% c gray4", -"& c #0B0B0B", -"* c #0C0C0C", -"= c gray5", -"- c #0E0E0E", -"; c gray6", -": c #101010", -"> c #111111", -", c gray7", -"< c gray8", -"1 c #151515", -"2 c #161616", -"3 c gray9", -"4 c #181818", -"5 c #191919", -"6 c gray10", -"7 c #1B1B1B", -"8 c gray11", -"9 c #1D1D1D", -"0 c #1E1E1E", -"q c gray12", -"w c #202020", -"e c gray13", -"r c #222222", -"t c #232323", -"y c gray14", -"u c #252525", -"i c gray15", -"p c #272727", -"a c #282828", -"s c gray16", -"d c #2A2A2A", -"f c gray17", -"g c #2C2C2C", -"h c #2D2D2D", -"j c gray18", -"k c #2F2F2F", -"l c gray19", -"z c #313131", -"x c #323232", -"c c gray20", -"v c #343434", -"b c #353535", -"n c gray21", -"m c #373737", -"M c gray22", -"N c #393939", -"B c #3A3A3A", -"V c gray23", -"C c #3C3C3C", -"Z c gray24", -"A c #3E3E3E", -"S c #3F3F3F", -"D c gray25", -"F c #414141", -"G c gray26", -"H c #434343", -"J c #444444", -"K c gray27", -"L c #464646", -"P c gray28", -"I c #484848", -"U c #494949", -"Y c #4B4B4B", -"T c #4C4C4C", -"R c gray30", -"E c #4E4E4E", -"W c gray31", -"Q c #505050", -"! c #515151", -"~ c gray32", -"^ c #535353", -"/ c gray33", -"( c #555555", -") c #565656", -"_ c gray34", -"` c #585858", -"' c gray35", -"] c #5A5A5A", -"[ c #5B5B5B", -"{ c gray36", -"} c #5D5D5D", -"| c gray37", -" . c #5F5F5F", -".. c #606060", -"X. c gray38", -"o. c #626262", -"O. c gray39", -"+. c #646464", -"@. c #656565", -"#. c #676767", -"$. c #686868", -"%. c DimGray", -"&. c #6A6A6A", -"*. c gray42", -"=. c #6C6C6C", -"-. c #6D6D6D", -";. c gray43", -":. c #6F6F6F", -">. c gray44", -",. c gray45", -"<. c #747474", -"1. c gray46", -"2. c #777777", -"3. c gray47", -"4. c #797979", -"5. c gray48", -"6. c #7B7B7B", -"7. c gray49", -"8. c gray50", -"9. c #808080", -"0. c #818181", -"q. c gray51", -"w. c #838383", -"e. c #848484", -"r. c #868686", -"t. c #888888", -"y. c gray54", -"u. c #8B8B8B", -"i. c gray55", -"p. c #8E8E8E", -"a. c gray57", -"s. c #939393", -"d. c gray58", -"f. c gray59", -"g. c #979797", -"h. c gray60", -"j. c #9A9A9A", -"k. c #9B9B9B", -"l. c gray61", -"z. c #9D9D9D", -"x. c #9F9F9F", -"c. c #A0A0A0", -"v. c gray63", -"b. c #A2A2A2", -"n. c gray64", -"m. c #A4A4A4", -"M. c #A5A5A5", -"N. c gray65", -"B. c #A7A7A7", -"V. c gray66", -"C. c #A9A9A9", -"Z. c #AAAAAA", -"A. c #ACACAC", -"S. c gray68", -"D. c #AEAEAE", -"F. c #AFAFAF", -"G. c gray69", -"H. c #B2B2B2", -"J. c gray70", -"K. c #B4B4B4", -"L. c gray71", -"P. c #B6B6B6", -"I. c #B7B7B7", -"U. c gray72", -"Y. c gray73", -"T. c #BBBBBB", -"R. c #BCBCBC", -"E. c gray74", -"W. c gray", -"Q. c gray75", -"!. c #C0C0C0", -"~. c #C1C1C1", -"^. c #C3C3C3", -"/. c gray77", -"(. c #C5C5C5", -"). c #C6C6C6", -"_. c gray78", -"`. c #C8C8C8", -"'. c gray79", -"]. c gray80", -"[. c #CECECE", -"{. c #D2D2D2", -"}. c LightGray", -"|. c #D5D5D5", -" X c gray84", -".X c #D8D8D8", -"XX c gray85", -"oX c #DADADA", -"OX c gray86", -"+X c #DDDDDD", -"@X c gray87", -"#X c #DFDFDF", -"$X c #E1E1E1", -"%X c gray89", -"&X c gray90", -"*X c #E6E6E6", -"=X c gray91", -"-X c #EEEEEE", -";X c #EFEFEF", -":X c gray94", -">X c #F1F1F1", -",X c gray95", -"<X c #F3F3F3", -"1X c #F4F4F4", -"2X c gray96", -"3X c #F6F6F6", -"4X c #F9F9F9", -"5X c gray98", -"6X c #FBFBFB", -"7X c #FDFDFD", -"8X c #FEFEFE", -"9X c gray100", -"0X c None", -/* pixels */ -" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", -"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", -"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", -"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", -"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", -"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", -"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", -"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", -"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", -"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", -"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", -"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", -"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", -"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", -"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", -"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", -"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", -"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", -"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", -"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", -"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", -"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", -"0X0X 0X", -"0X0X 0X0X0X 0X" -}; diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid-16.xpm b/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid-16.xpm new file mode 100644 index 000000000..64ad03b59 --- /dev/null +++ b/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid-16.xpm @@ -0,0 +1,126 @@ +/* XPM */ +static char *tdemid-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 104 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c gray4", +"# c #0C0C0C", +"$ c #101010", +"% c #111111", +"& c gray7", +"* c #161616", +"= c gray9", +"- c gray10", +"; c gray11", +": c #1D1D1D", +"> c #1E1E1E", +", c gray12", +"< c #222222", +"1 c #232323", +"2 c gray14", +"3 c #252525", +"4 c gray15", +"5 c #282828", +"6 c #2A2A2A", +"7 c gray17", +"8 c #2D2D2D", +"9 c gray18", +"0 c #2F2F2F", +"q c gray19", +"w c gray20", +"e c #393939", +"r c #3A3A3A", +"t c gray24", +"y c #3F3F3F", +"u c gray25", +"i c gray26", +"p c #444444", +"a c #464646", +"s c #494949", +"d c gray29", +"f c #4B4B4B", +"g c #505050", +"h c #555555", +"j c #565656", +"k c gray34", +"l c #585858", +"z c gray35", +"x c #5B5B5B", +"c c #626262", +"v c gray39", +"b c gray40", +"n c #686868", +"m c #727272", +"M c gray45", +"N c gray46", +"B c #777777", +"V c gray48", +"C c #7B7B7B", +"Z c gray49", +"A c #7E7E7E", +"S c #808080", +"D c #838383", +"F c #868686", +"G c gray53", +"H c #898989", +"J c gray54", +"K c #8D8D8D", +"L c #8E8E8E", +"P c gray56", +"I c gray57", +"U c #929292", +"Y c #959595", +"T c gray59", +"R c #9A9A9A", +"E c #9B9B9B", +"W c gray61", +"Q c #9D9D9D", +"! c gray64", +"~ c #A4A4A4", +"^ c gray65", +"/ c #A7A7A7", +"( c #AFAFAF", +") c #B2B2B2", +"_ c gray70", +"` c gray71", +"' c gray73", +"] c gray74", +"[ c gray", +"{ c #C0C0C0", +"} c gray76", +"| c #CACACA", +" . c gray81", +".. c gray82", +"X. c gray84", +"o. c #D8D8D8", +"O. c #E2E2E2", +"+. c gray89", +"@. c #E6E6E6", +"#. c gray93", +"$. c #F8F8F8", +"%. c #F9F9F9", +"&. c gray100", +"*. c None", +/* pixels */ +" *.*.*.*.*.*.*.*.*.*.", +" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", +" 6 t i C : *.*.*.*.*.*.*.*.*.*.", +" 6 t a C = *.*.*.*.*.*.*.*.*.*.", +" 6 i f C @ *.*.*.*. ", +" 6 a f B *.*.l + D l v l : ", +" 3 r n F 1 H P 3 n | U M - *.", +" = U [ r ! &.Q f t C | *.*.", +" F %.: a #.&.' C & v &.[ *.*.*.", +"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", +"*.k &.] E &.&.Q O.&.` ` k *.*.", +"*.q ] ) D ( ] H U X.! 3 *.*.*.", +"*.# 3 0 i [ +.U U &.P *.*.*.", +"*.& i t a | &./ B U k b : *.*.", +"*.@ 6 0 1 & q : + r f r *.", +"*. *.*.*. *." +}; diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid.xpm b/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid.xpm new file mode 100644 index 000000000..c4cbb3bf1 --- /dev/null +++ b/ubuntu/maverick_automake/kdemultimedia/debian/icons/tdemid.xpm @@ -0,0 +1,251 @@ +/* XPM */ +static char *tdemid[] = { +/* columns rows colors chars-per-pixel */ +"32 32 213 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #060606", +"# c #070707", +"$ c gray3", +"% c gray4", +"& c #0B0B0B", +"* c #0C0C0C", +"= c gray5", +"- c #0E0E0E", +"; c gray6", +": c #101010", +"> c #111111", +", c gray7", +"< c gray8", +"1 c #151515", +"2 c #161616", +"3 c gray9", +"4 c #181818", +"5 c #191919", +"6 c gray10", +"7 c #1B1B1B", +"8 c gray11", +"9 c #1D1D1D", +"0 c #1E1E1E", +"q c gray12", +"w c #202020", +"e c gray13", +"r c #222222", +"t c #232323", +"y c gray14", +"u c #252525", +"i c gray15", +"p c #272727", +"a c #282828", +"s c gray16", +"d c #2A2A2A", +"f c gray17", +"g c #2C2C2C", +"h c #2D2D2D", +"j c gray18", +"k c #2F2F2F", +"l c gray19", +"z c #313131", +"x c #323232", +"c c gray20", +"v c #343434", +"b c #353535", +"n c gray21", +"m c #373737", +"M c gray22", +"N c #393939", +"B c #3A3A3A", +"V c gray23", +"C c #3C3C3C", +"Z c gray24", +"A c #3E3E3E", +"S c #3F3F3F", +"D c gray25", +"F c #414141", +"G c gray26", +"H c #434343", +"J c #444444", +"K c gray27", +"L c #464646", +"P c gray28", +"I c #484848", +"U c #494949", +"Y c #4B4B4B", +"T c #4C4C4C", +"R c gray30", +"E c #4E4E4E", +"W c gray31", +"Q c #505050", +"! c #515151", +"~ c gray32", +"^ c #535353", +"/ c gray33", +"( c #555555", +") c #565656", +"_ c gray34", +"` c #585858", +"' c gray35", +"] c #5A5A5A", +"[ c #5B5B5B", +"{ c gray36", +"} c #5D5D5D", +"| c gray37", +" . c #5F5F5F", +".. c #606060", +"X. c gray38", +"o. c #626262", +"O. c gray39", +"+. c #646464", +"@. c #656565", +"#. c #676767", +"$. c #686868", +"%. c DimGray", +"&. c #6A6A6A", +"*. c gray42", +"=. c #6C6C6C", +"-. c #6D6D6D", +";. c gray43", +":. c #6F6F6F", +">. c gray44", +",. c gray45", +"<. c #747474", +"1. c gray46", +"2. c #777777", +"3. c gray47", +"4. c #797979", +"5. c gray48", +"6. c #7B7B7B", +"7. c gray49", +"8. c gray50", +"9. c #808080", +"0. c #818181", +"q. c gray51", +"w. c #838383", +"e. c #848484", +"r. c #868686", +"t. c #888888", +"y. c gray54", +"u. c #8B8B8B", +"i. c gray55", +"p. c #8E8E8E", +"a. c gray57", +"s. c #939393", +"d. c gray58", +"f. c gray59", +"g. c #979797", +"h. c gray60", +"j. c #9A9A9A", +"k. c #9B9B9B", +"l. c gray61", +"z. c #9D9D9D", +"x. c #9F9F9F", +"c. c #A0A0A0", +"v. c gray63", +"b. c #A2A2A2", +"n. c gray64", +"m. c #A4A4A4", +"M. c #A5A5A5", +"N. c gray65", +"B. c #A7A7A7", +"V. c gray66", +"C. c #A9A9A9", +"Z. c #AAAAAA", +"A. c #ACACAC", +"S. c gray68", +"D. c #AEAEAE", +"F. c #AFAFAF", +"G. c gray69", +"H. c #B2B2B2", +"J. c gray70", +"K. c #B4B4B4", +"L. c gray71", +"P. c #B6B6B6", +"I. c #B7B7B7", +"U. c gray72", +"Y. c gray73", +"T. c #BBBBBB", +"R. c #BCBCBC", +"E. c gray74", +"W. c gray", +"Q. c gray75", +"!. c #C0C0C0", +"~. c #C1C1C1", +"^. c #C3C3C3", +"/. c gray77", +"(. c #C5C5C5", +"). c #C6C6C6", +"_. c gray78", +"`. c #C8C8C8", +"'. c gray79", +"]. c gray80", +"[. c #CECECE", +"{. c #D2D2D2", +"}. c LightGray", +"|. c #D5D5D5", +" X c gray84", +".X c #D8D8D8", +"XX c gray85", +"oX c #DADADA", +"OX c gray86", +"+X c #DDDDDD", +"@X c gray87", +"#X c #DFDFDF", +"$X c #E1E1E1", +"%X c gray89", +"&X c gray90", +"*X c #E6E6E6", +"=X c gray91", +"-X c #EEEEEE", +";X c #EFEFEF", +":X c gray94", +">X c #F1F1F1", +",X c gray95", +"<X c #F3F3F3", +"1X c #F4F4F4", +"2X c gray96", +"3X c #F6F6F6", +"4X c #F9F9F9", +"5X c gray98", +"6X c #FBFBFB", +"7X c #FDFDFD", +"8X c #FEFEFE", +"9X c gray100", +"0X c None", +/* pixels */ +" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", +"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", +"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", +"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", +"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", +"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", +"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", +"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", +"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", +"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", +"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", +"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", +"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", +"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", +"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", +"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", +"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", +"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", +"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", +"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", +"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", +"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", +"0X0X 0X", +"0X0X 0X0X0X 0X" +}; diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index a1e53644a..000000000 --- a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/kde3/share/doc/kde/HTML/en/kmid/index.html -Files: /opt/kde3/share/doc/kde/HTML/en/kmid/*.html - diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..65f65f552 --- /dev/null +++ b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: kdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/kde3/share/doc/kde/HTML/en/tdemid/index.html +Files: /opt/kde3/share/doc/kde/HTML/en/tdemid/*.html + diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install index 9c0473a9d..de5103f60 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install +++ b/ubuntu/maverick_automake/kdemultimedia/debian/kdemultimedia-kde3-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/kde3/lib/libkdeinit_kmix.la debian/tmp/opt/kde3/lib/libkdeinit_kmixctrl.la debian/tmp/opt/kde3/lib/libkdeinit_krec.la debian/tmp/opt/kde3/lib/libkdeinit_noatun.la -debian/tmp/opt/kde3/lib/libkmidlib.la -debian/tmp/opt/kde3/lib/libkmidlib.so +debian/tmp/opt/kde3/lib/libtdemidlib.la +debian/tmp/opt/kde3/lib/libtdemidlib.so debian/tmp/opt/kde3/lib/libmpeg.la debian/tmp/opt/kde3/lib/libmpeg.so debian/tmp/opt/kde3/lib/libnoatun.la diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.install b/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.install deleted file mode 100644 index 023555e35..000000000 --- a/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/kde3/bin/kmid -debian/tmp/opt/kde3/lib/kde3/libkmidpart.la -debian/tmp/opt/kde3/lib/kde3/libkmidpart.so -debian/tmp/opt/kde3/lib/libkmidlib.so.0 -debian/tmp/opt/kde3/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/kde3/share/applications/kde/kmid.desktop -debian/tmp/opt/kde3/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/kde3/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/kde3/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/kde3/share/apps/kmid/OFortuna.kar -debian/tmp/opt/kde3/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/kde3/share/apps/kmid/fm/drums.sb -debian/tmp/opt/kde3/share/apps/kmid/fm/std.o3 -debian/tmp/opt/kde3/share/apps/kmid/fm/std.sb -debian/tmp/opt/kde3/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/kde3/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/kde3/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/kde3/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/kde3/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/kde3/share/apps/kmid/kmidui.rc -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/kde3/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/kde3/share/apps/kmid/maps/gm.map -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kmid/index.docbook -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/kde3/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/kde3/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/kde3/share/pixmaps -debian/icons/kmid-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.menu b/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.menu deleted file mode 100644 index 8eda5a912..000000000 --- a/ubuntu/maverick_automake/kdemultimedia/debian/kmid-kde3.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="KDE"\ - title="KMid"\ - icon32x32="/opt/kde3/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/kde3/share/pixmaps/kmid-16.xpm"\ - command="/opt/kde3/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 index ef2e440bd..01da7f1a9 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 +++ b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/rules b/ubuntu/maverick_automake/kdemultimedia/debian/rules index 49741de4f..f65e9727b 100755 --- a/ubuntu/maverick_automake/kdemultimedia/debian/rules +++ b/ubuntu/maverick_automake/kdemultimedia/debian/rules @@ -23,12 +23,12 @@ DOC_HTML_PRUNE := kcontrol-kde3 DEB_DH_STRIP_ARGS := --dbg-package=kdemultimedia-kde3-dbg -PACKAGES_WITH_LIBS := artsbuilder-kde3 kdemultimedia-kio-plugins-kde3 kmid-kde3 kmix-kde3 krec-kde3 \ +PACKAGES_WITH_LIBS := artsbuilder-kde3 kdemultimedia-kio-plugins-kde3 tdemid-kde3 kmix-kde3 krec-kde3 \ libarts1-akode-kde3 libarts1-audiofile-kde3 libarts1-mpeglib-kde3 libarts1-xine-kde3 \ libkcddb1-kde3 mpeglib-kde3 noatun-kde3 DEB_DH_MAKESHLIBS_ARGS_artsbuilder-kde3 := -V'artsbuilder-kde3 (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kmid-kde3 := -V'kmid-kde3 (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_tdemid-kde3 := -V'tdemid-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libkcddb1-kde3 := -V'libkcddb1-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_mpeglib-kde3 := -V'mpeglib-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_noatun-kde3 := -V'noatun-kde3 (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.install b/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.install new file mode 100644 index 000000000..2ecf98ab0 --- /dev/null +++ b/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.install @@ -0,0 +1,40 @@ +debian/tmp/opt/kde3/bin/tdemid +debian/tmp/opt/kde3/lib/kde3/libtdemidpart.la +debian/tmp/opt/kde3/lib/kde3/libtdemidpart.so +debian/tmp/opt/kde3/lib/libtdemidlib.so.0 +debian/tmp/opt/kde3/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/kde3/share/applications/kde/tdemid.desktop +debian/tmp/opt/kde3/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/kde3/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/kde3/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/kde3/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/kde3/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/kde3/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/kde3/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/kde3/share/apps/tdemid/fm/std.sb +debian/tmp/opt/kde3/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/kde3/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/kde3/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/kde3/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/kde3/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/kde3/share/apps/tdemid/maps/gm.map +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdemid/index.docbook +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/kde3/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/kde3/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/kde3/share/pixmaps +debian/icons/tdemid-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.menu b/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.menu new file mode 100644 index 000000000..74f641ac8 --- /dev/null +++ b/ubuntu/maverick_automake/kdemultimedia/debian/tdemid-kde3.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="KDE"\ + title="KMid"\ + icon32x32="/opt/kde3/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/kde3/share/pixmaps/tdemid-16.xpm"\ + command="/opt/kde3/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/ubuntu/maverick_automake/kdenetwork/debian/changelog b/ubuntu/maverick_automake/kdenetwork/debian/changelog index 3071b84f0..ad53bebbb 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/changelog +++ b/ubuntu/maverick_automake/kdenetwork/debian/changelog @@ -173,10 +173,10 @@ kdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ kdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low kdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ kdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ kdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 kdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ kdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low kdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to kdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in kdelibs) + * Add tdednssd to kdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in kdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 kdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/ubuntu/maverick_automake/kdenetwork/debian/control b/ubuntu/maverick_automake/kdenetwork/debian/control index 1312b67ae..bbc88d951 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/control +++ b/ubuntu/maverick_automake/kdenetwork/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.8.3 Package: kdenetwork-kde3 Section: kde Architecture: all -Depends: dcoprss-kde3 (>= ${Source-Version}), kdenetwork-kfile-plugins-kde3 (>= ${Source-Version}), kdict-kde3 (>= ${Source-Version}), kdnssd-kde3 (>= ${Source-Version}), kget-kde3 (>= ${Source-Version}), knewsticker-kde3 (>= ${Source-Version}), kopete-kde3 (>= ${Source-Version}), kpf-kde3 (>= ${Source-Version}), kppp-kde3 (>= ${Source-Version}), krdc-kde3 (>= ${Source-Version}), krfb-kde3 (>= ${Source-Version}), ksirc-kde3 (>= ${Source-Version}), kwifimanager-kde3 (>= ${Source-Version}), librss1-kde3 (>= ${Source-Version}) +Depends: dcoprss-kde3 (>= ${Source-Version}), kdenetwork-kfile-plugins-kde3 (>= ${Source-Version}), kdict-kde3 (>= ${Source-Version}), tdednssd-kde3 (>= ${Source-Version}), kget-kde3 (>= ${Source-Version}), knewsticker-kde3 (>= ${Source-Version}), kopete-kde3 (>= ${Source-Version}), kpf-kde3 (>= ${Source-Version}), kppp-kde3 (>= ${Source-Version}), krdc-kde3 (>= ${Source-Version}), krfb-kde3 (>= ${Source-Version}), ksirc-kde3 (>= ${Source-Version}), kwifimanager-kde3 (>= ${Source-Version}), librss1-kde3 (>= ${Source-Version}) Recommends: kdenetwork-filesharing-kde3 (>= ${Source-Version}), ktalkd-kde3 (>= ${Source-Version}), lisa-kde3 (>= ${Source-Version}) Suggests: kdenetwork-kde3-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE3 release @@ -297,7 +297,7 @@ Description: LAN information server for KDE3 This package is part of KDE3, as a component of the KDE network module. See the 'kde-kde3' and 'kdenetwork-kde3' packages for more information. -Package: kdnssd-kde3 +Package: tdednssd-kde3 Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdenetwork/debian/control.in b/ubuntu/maverick_automake/kdenetwork/debian/control.in index dd546016b..a54dbaef3 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/control.in +++ b/ubuntu/maverick_automake/kdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: kdenetwork Section: kde Architecture: all -Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: kdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'kdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdenetwork/debian/kget-kde3.install b/ubuntu/maverick_automake/kdenetwork/debian/kget-kde3.install index 6b44400f5..919781fca 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/kget-kde3.install +++ b/ubuntu/maverick_automake/kdenetwork/debian/kget-kde3.install @@ -1,6 +1,6 @@ debian/tmp/opt/kde3/bin/kget -debian/tmp/opt/kde3/lib/kde3/khtml_kget.la -debian/tmp/opt/kde3/lib/kde3/khtml_kget.so +debian/tmp/opt/kde3/lib/kde3/tdehtml_kget.la +debian/tmp/opt/kde3/lib/kde3/tdehtml_kget.so debian/tmp/opt/kde3/share/applications/kde/kget.desktop debian/tmp/opt/kde3/share/apps/kget/eventsrc debian/tmp/opt/kde3/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/kde3/share/apps/kget/pics/try4.png debian/tmp/opt/kde3/share/apps/kget/pics/try5.png debian/tmp/opt/kde3/share/apps/kget/pics/try6.png debian/tmp/opt/kde3/share/apps/kget/pics/try7.png -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/kde3/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/kde3/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/kde3/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/common debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/kget4.png debian/tmp/opt/kde3/share/doc/kde/HTML/en/kget/kget5.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/kde3/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/ubuntu/maverick_automake/kdenetwork/debian/rules b/ubuntu/maverick_automake/kdenetwork/debian/rules index 3f1d50b69..576c41049 100755 --- a/ubuntu/maverick_automake/kdenetwork/debian/rules +++ b/ubuntu/maverick_automake/kdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/ubuntu/maverick_automake/kdenetwork/debian/kdnssd-kde3.install b/ubuntu/maverick_automake/kdenetwork/debian/tdednssd-kde3.install index b99338125..b99338125 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/kdnssd-kde3.install +++ b/ubuntu/maverick_automake/kdenetwork/debian/tdednssd-kde3.install diff --git a/ubuntu/maverick_automake/kdepim/debian/changelog b/ubuntu/maverick_automake/kdepim/debian/changelog index 026234536..9584314c7 100644 --- a/ubuntu/maverick_automake/kdepim/debian/changelog +++ b/ubuntu/maverick_automake/kdepim/debian/changelog @@ -1035,7 +1035,7 @@ kdepim (4:3.5.0-0ubuntu4) dapper; urgency=low kdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for kdepim-kresources + * Increase version number on Replaces for kdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ kdepim (4:3.4.1-2) UNRELEASED; urgency=low kdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package kdepim-kresources. + * Split tderesources into new package kdepim-tderesources. * Split kdepimmacros.h into new package libkdepim1-dev, and make all the other -dev packages depend on it. diff --git a/ubuntu/maverick_automake/kdepim/debian/control b/ubuntu/maverick_automake/kdepim/debian/control index c8a3c4b47..93393d030 100644 --- a/ubuntu/maverick_automake/kdepim/debian/control +++ b/ubuntu/maverick_automake/kdepim/debian/control @@ -20,7 +20,7 @@ Standards-Version: 3.8.3 Package: kdepim-kde3 Section: kde Architecture: all -Depends: akregator-kde3 (>= ${Source-Version}), kaddressbook-kde3 (>= ${Source-Version}), kalarm-kde3 (>= ${Source-Version}), kandy-kde3 (>= ${Source-Version}), karm-kde3 (>= ${Source-Version}), kdepim-kfile-plugins-kde3 (>= ${Source-Version}), kdepim-kio-plugins-kde3 (>= ${Source-Version}), kdepim-kresources-kde3 (>= ${Source-Version}), kdepim-wizards-kde3 (>= ${Source-Version}), kitchensync-kde3 (>= ${Source-Version}), kleopatra-kde3 (>= ${Source-Version}), kmail-kde3 (>= ${Source-Version}), kmailcvt-kde3 (>= ${Source-Version}), knode-kde3 (>= ${Source-Version}), knotes-kde3 (>= ${Source-Version}), konsolekalendar-kde3 (>= ${Source-Version}), kontact-kde3 (>= ${Source-Version}), korganizer-kde3 (>= ${Source-Version}), korn-kde3 (>= ${Source-Version}), kpilot-kde3 (>= ${Source-Version}), ktnef-kde3 (>= ${Source-Version}), libindex0-kde3 (>= ${Source-Version}), libkcal2b-kde3 (>= ${Source-Version}), libkdepim1a-kde3 (>= ${Source-Version}), libkgantt0-kde3 (>= ${Source-Version}), libkleopatra1-kde3 (>= ${Source-Version}), libkpimexchange1-kde3 (>= ${Source-Version}), libkpimidentities1-kde3 (>= ${Source-Version}), libksieve0-kde3 (>= ${Source-Version}), libktnef1-kde3 (>= ${Source-Version}), libmimelib1c2a-kde3 (>= ${Source-Version}) +Depends: akregator-kde3 (>= ${Source-Version}), kaddressbook-kde3 (>= ${Source-Version}), kalarm-kde3 (>= ${Source-Version}), kandy-kde3 (>= ${Source-Version}), karm-kde3 (>= ${Source-Version}), kdepim-kfile-plugins-kde3 (>= ${Source-Version}), kdepim-kio-plugins-kde3 (>= ${Source-Version}), kdepim-tderesources-kde3 (>= ${Source-Version}), kdepim-wizards-kde3 (>= ${Source-Version}), kitchensync-kde3 (>= ${Source-Version}), kleopatra-kde3 (>= ${Source-Version}), kmail-kde3 (>= ${Source-Version}), kmailcvt-kde3 (>= ${Source-Version}), knode-kde3 (>= ${Source-Version}), knotes-kde3 (>= ${Source-Version}), konsolekalendar-kde3 (>= ${Source-Version}), kontact-kde3 (>= ${Source-Version}), korganizer-kde3 (>= ${Source-Version}), korn-kde3 (>= ${Source-Version}), kpilot-kde3 (>= ${Source-Version}), ktnef-kde3 (>= ${Source-Version}), libindex0-kde3 (>= ${Source-Version}), libkcal2b-kde3 (>= ${Source-Version}), libkdepim1a-kde3 (>= ${Source-Version}), libkgantt0-kde3 (>= ${Source-Version}), libkleopatra1-kde3 (>= ${Source-Version}), libkpimexchange1-kde3 (>= ${Source-Version}), libkpimidentities1-kde3 (>= ${Source-Version}), libksieve0-kde3 (>= ${Source-Version}), libktnef1-kde3 (>= ${Source-Version}), libmimelib1c2a-kde3 (>= ${Source-Version}) Suggests: kdepim-kde3-doc-html Description: Personal Information Management apps from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -46,7 +46,7 @@ Description: debugging symbols for kdepim-kde3 Package: kdepim-kde3-dev Section: devel Architecture: any -Depends: kaddressbook-kde3 (= ${Source-Version}), kalarm-kde3 (= ${Source-Version}), kdepim-kresources-kde3 (= ${Source-Version}), kmail-kde3 (= ${Source-Version}), knotes-kde3 (= ${Source-Version}), kontact-kde3 (= ${Source-Version}), korganizer-kde3 (= ${Source-Version}), kpilot-kde3 (= ${Source-Version}), libkpimidentities1-kde3 (= ${Source-Version}), libkcal2-kde3-dev (= ${Source-Version}), libkdepim1-kde3-dev (= ${Source-Version}), libkgantt0-kde3-dev (= ${Source-Version}), libkleopatra1-kde3-dev (= ${Source-Version}), libkpimexchange1-kde3-dev (= ${Source-Version}), libksieve0-kde3-dev (= ${Source-Version}), libktnef1-kde3-dev (= ${Source-Version}), libmimelib1-kde3-dev (= ${Source-Version}) +Depends: kaddressbook-kde3 (= ${Source-Version}), kalarm-kde3 (= ${Source-Version}), kdepim-tderesources-kde3 (= ${Source-Version}), kmail-kde3 (= ${Source-Version}), knotes-kde3 (= ${Source-Version}), kontact-kde3 (= ${Source-Version}), korganizer-kde3 (= ${Source-Version}), kpilot-kde3 (= ${Source-Version}), libkpimidentities1-kde3 (= ${Source-Version}), libkcal2-kde3-dev (= ${Source-Version}), libkdepim1-kde3-dev (= ${Source-Version}), libkgantt0-kde3-dev (= ${Source-Version}), libkleopatra1-kde3-dev (= ${Source-Version}), libkpimexchange1-kde3-dev (= ${Source-Version}), libksieve0-kde3-dev (= ${Source-Version}), libktnef1-kde3-dev (= ${Source-Version}), libmimelib1-kde3-dev (= ${Source-Version}) Replaces: libkcal2-kde3-dev (<< 4:3.4.1), libmimelib1-kde3-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile kdepim applications. @@ -105,7 +105,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Conflicts: kontact-kde3 (<< 4:3.5.7-1ubuntu5) -Suggests: kdepim-kresources-kde3, kdebase-kio-plugins-kde3 +Suggests: kdepim-tderesources-kde3, kdebase-kio-plugins-kde3 Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -188,7 +188,7 @@ Description: KDE3 pim I/O Slaves This package is part of KDE3, and a component of the KDE PIM module. See the 'kde-kde3' and 'kdepim-kde3' packages for more information. -Package: kdepim-kresources-kde3 +Package: kdepim-tderesources-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} @@ -293,7 +293,7 @@ Package: knotes-kde3 Section: kde Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources-kde3 +Suggests: kdepim-tderesources-kde3 Replaces: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Conflicts: kontact-kde3 (<< 4:3.5.7-1ubuntu5) Description: KDE3 sticky notes @@ -444,7 +444,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-kde3, libkcal2a-kde3 Replaces: libkcal2a-kde3 -Suggests: kdepim-kresources-kde3 +Suggests: kdepim-tderesources-kde3 Description: KDE3 calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/maverick_automake/kdepim/debian/control.in b/ubuntu/maverick_automake/kdepim/debian/control.in index 6588fcdf7..69227af4d 100644 --- a/ubuntu/maverick_automake/kdepim/debian/control.in +++ b/ubuntu/maverick_automake/kdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: kdepim Section: kde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-tderesources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: kdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for kdepim Package: kdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile kdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources, kdebase-kio-plugins +Suggests: kdepim-tderesources, kdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'kdepim' packages for more information. -Package: kdepim-kresources +Package: kdepim-tderesources Section: kde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: kde Architecture: any Depends: ${shlibs:Depends} -Suggests: kdepim-kresources +Suggests: kdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -455,7 +455,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: kdepim-kresources +Suggests: kdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install b/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install index 72f58b3d7..2541f63e1 100644 --- a/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install +++ b/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install @@ -29,7 +29,7 @@ /opt/kde3/share/services/kabldapconfig.desktop /opt/kde3/share/services/kaddressbook /opt/kde3/share/services/kontact/kaddressbookplugin.desktop -/opt/kde3/share/services/kresources/kabc/imap.desktop +/opt/kde3/share/services/tderesources/kabc/imap.desktop /opt/kde3/share/services/ldifvcardthumbnail.desktop /opt/kde3/share/servicetypes/dcopaddressbook.desktop /opt/kde3/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/ubuntu/maverick_automake/kdepim/debian/kdepim-kresources-kde3.install b/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install index 43c46b288..6daf3e055 100644 --- a/ubuntu/maverick_automake/kdepim/debian/kdepim-kresources-kde3.install +++ b/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install @@ -74,31 +74,31 @@ /opt/kde3/lib/libkslox.so.0.0.0 /opt/kde3/lib/libgwsoap.so.0 /opt/kde3/lib/libgwsoap.so.0.0.0 -/opt/kde3/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/kde3/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/kde3/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/kde3/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/kde3/share/services/kresources/kabc/kabc_ox.desktop -/opt/kde3/share/services/kresources/kabc/kabc_slox.desktop -/opt/kde3/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/kde3/share/services/kresources/kabc/kolab.desktop -/opt/kde3/share/services/kresources/kabc/scalix.desktop -/opt/kde3/share/services/kresources/kcal/exchange.desktop -/opt/kde3/share/services/kresources/kcal/kcal_caldav.desktop -/opt/kde3/share/services/kresources/kabc/kabc_carddav.desktop -/opt/kde3/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/kde3/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/kde3/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/kde3/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/kde3/share/services/kresources/kcal/kcal_ox.desktop -/opt/kde3/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/kde3/share/services/kresources/kcal/kcal_slox.desktop -/opt/kde3/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/kde3/share/services/kresources/kcal/kolab.desktop -/opt/kde3/share/services/kresources/kcal/scalix.desktop -/opt/kde3/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/kde3/share/services/kresources/knotes/kolabresource.desktop -/opt/kde3/share/services/kresources/knotes/scalix.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_ox.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_slox.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/kde3/share/services/tderesources/kabc/kolab.desktop +/opt/kde3/share/services/tderesources/kabc/scalix.desktop +/opt/kde3/share/services/tderesources/kcal/exchange.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/kde3/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_ox.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_slox.desktop +/opt/kde3/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/kde3/share/services/tderesources/kcal/kolab.desktop +/opt/kde3/share/services/tderesources/kcal/scalix.desktop +/opt/kde3/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/kde3/share/services/tderesources/knotes/kolabresource.desktop +/opt/kde3/share/services/tderesources/knotes/scalix.desktop /opt/kde3/share/apps/kconf_update/upgrade-resourcetype.pl /opt/kde3/share/apps/kconf_update/kolab-resource.upd diff --git a/ubuntu/maverick_automake/kdepim/debian/knotes-kde3.install b/ubuntu/maverick_automake/kdepim/debian/knotes-kde3.install index 151ce3b3f..ba4860491 100644 --- a/ubuntu/maverick_automake/kdepim/debian/knotes-kde3.install +++ b/ubuntu/maverick_automake/kdepim/debian/knotes-kde3.install @@ -12,9 +12,9 @@ /opt/kde3/share/icons/hicolor/32x32/apps/knotes.png /opt/kde3/share/icons/hicolor/48x48/apps/knotes.png /opt/kde3/share/icons/hicolor/64x64/apps/knotes.png -/opt/kde3/share/services/kresources/knotes/imap.desktop -/opt/kde3/share/services/kresources/knotes/local.desktop -/opt/kde3/share/services/kresources/knotes_manager.desktop +/opt/kde3/share/services/tderesources/knotes/imap.desktop +/opt/kde3/share/services/tderesources/knotes/local.desktop +/opt/kde3/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/kde3/share/pixmaps ../icons/knotes-16.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdepim/debian/libkcal2b-kde3.install b/ubuntu/maverick_automake/kdepim/debian/libkcal2b-kde3.install index c830b6ed3..e4bbff59b 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkcal2b-kde3.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkcal2b-kde3.install @@ -13,9 +13,9 @@ /opt/kde3/lib/libkholidays.so.1 /opt/kde3/lib/libkholidays.so.1.0.0 /opt/kde3/share/apps/libkholidays -/opt/kde3/share/services/kresources/kcal/imap.desktop -/opt/kde3/share/services/kresources/kcal/kabc.desktop -/opt/kde3/share/services/kresources/kcal/local.desktop -/opt/kde3/share/services/kresources/kcal/localdir.desktop -/opt/kde3/share/services/kresources/kcal/remote.desktop -/opt/kde3/share/services/kresources/kcal_manager.desktop +/opt/kde3/share/services/tderesources/kcal/imap.desktop +/opt/kde3/share/services/tderesources/kcal/kabc.desktop +/opt/kde3/share/services/tderesources/kcal/local.desktop +/opt/kde3/share/services/tderesources/kcal/localdir.desktop +/opt/kde3/share/services/tderesources/kcal/remote.desktop +/opt/kde3/share/services/tderesources/kcal_manager.desktop diff --git a/ubuntu/maverick_automake/kdepim/debian/libkdepim1a-kde3.install b/ubuntu/maverick_automake/kdepim/debian/libkdepim1a-kde3.install index 11801fae3..5069a3d0d 100644 --- a/ubuntu/maverick_automake/kdepim/debian/libkdepim1a-kde3.install +++ b/ubuntu/maverick_automake/kdepim/debian/libkdepim1a-kde3.install @@ -1,7 +1,7 @@ /opt/kde3/lib/kde3/plugins/designer/kdepimwidgets.la /opt/kde3/lib/kde3/plugins/designer/kdepimwidgets.so -/opt/kde3/lib/kde3/plugins/designer/kpartsdesignerplugin.la -/opt/kde3/lib/kde3/plugins/designer/kpartsdesignerplugin.so +/opt/kde3/lib/kde3/plugins/designer/tdepartsdesignerplugin.la +/opt/kde3/lib/kde3/plugins/designer/tdepartsdesignerplugin.so /opt/kde3/lib/libkdepim.so.1 /opt/kde3/lib/libkdepim.so.1.0.0 /opt/kde3/share/apps/kdepimwidgets diff --git a/ubuntu/maverick_automake/kdepim/debian/rules b/ubuntu/maverick_automake/kdepim/debian/rules index 07e167879..a1492b72b 100755 --- a/ubuntu/maverick_automake/kdepim/debian/rules +++ b/ubuntu/maverick_automake/kdepim/debian/rules @@ -44,7 +44,7 @@ DEB_DH_MAKESHLIBS_ARGS_libksieve0-kde3 := -V'libksieve0-kde3 (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libktnef1-kde3 := -V'libktnef1-kde3 (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a-kde3 := -V'libmimelib1c2a-kde3 (>= $(shlibs_ver))' -#PACKAGES_WITH_LIBS := akregator-kde3 kaddressbook-kde3 kalarm-kde3 kdepim-kresources-kde3 \ +#PACKAGES_WITH_LIBS := akregator-kde3 kaddressbook-kde3 kalarm-kde3 kdepim-tderesources-kde3 \ # kdepim-wizards-kde3 kitchensync-kde3 kleopatra-kde3 kmail-kde3 knode-kde3 knotes-kde3 kode-kde3 kontact-kde3 \ # korganizer-kde3 kpilot-kde3 ksync-kde3 ktnef-kde3 libindex0-kde3 libkcal2b-kde3 libkdenetwork2-kde3 \ # libkdepim1a-kde3 libkgantt0-kde3 libkleopatra1-kde3 libkmime2-kde3 libkpimexchange1-kde3 \ @@ -64,10 +64,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-kde3 := \ -dDepends # Since -u args go first in dpkg-shlibdeps call # Move kaddressbook-kde3 dependency (from libkabc_xmlrpc.so) to Recommends -DEB_DH_SHLIBDEPS_ARGS_kdepim-kresources-kde3 := \ +DEB_DH_SHLIBDEPS_ARGS_kdepim-tderesources-kde3 := \ -Xopt/lib/kde3/libkabc_xmlrpc.so.1 \ -- -dRecommends \ - debian/kdepim-kresources/opt/kde3/lib/libkabc_xmlrpc.so.1.* \ + debian/kdepim-tderesources/opt/kde3/lib/libkabc_xmlrpc.so.1.* \ -dDepends # Move kaddressbook dependency of libkcal2b-kde3 to Recommends diff --git a/ubuntu/maverick_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog index e089652fe..8f5ffa359 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/changelog +++ b/ubuntu/maverick_automake/kdesdk/debian/changelog @@ -222,9 +222,9 @@ kdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest + * Add Suggests: kdelibs4-doc to tdeunittest. kdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian kdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ kdesdk (4:3.5.0-1) alioth; urgency=low * Add a kdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and kdesdk-kio-plugins, which splits + * New packages: tdeunittest, and kdesdk-kio-plugins, which splits out the svn ioslave from kdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/ubuntu/maverick_automake/kdesdk/debian/control b/ubuntu/maverick_automake/kdesdk/debian/control index 995f4136f..3efde280c 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/control +++ b/ubuntu/maverick_automake/kdesdk/debian/control @@ -14,7 +14,7 @@ Standards-Version: 3.8.3 Package: kdesdk-kde3 Architecture: all Section: kde -Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) +Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), tdeunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version}) Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html Description: software development kit from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -373,17 +373,17 @@ Description: subversion ioslave for KDE3 This package is part of KDE3, and a component of the KDE SDK module. See the 'kde-kde3' and 'kdesdk-kde3' packages for more information. -Package: kunittest-kde3 +Package: tdeunittest-kde3 Architecture: any Section: devel Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: kdelibs4-kde3-doc Description: unit testing library for KDE3 KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE3, and a component of the KDE SDK module. diff --git a/ubuntu/maverick_automake/kdesdk/debian/control.in b/ubuntu/maverick_automake/kdesdk/debian/control.in index fb2d6cec3..3b80525fe 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/control.in +++ b/ubuntu/maverick_automake/kdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: kdesdk Architecture: all Section: kde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'kdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: kdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install index ab97c654a..74efdd0a5 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install +++ b/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install @@ -18,5 +18,5 @@ debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/kde3/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/kde3/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/kde3/share/pixmaps diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs deleted file mode 100644 index 029481923..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install deleted file mode 100644 index 0be1336e4..000000000 --- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/kde3/bin/kunittestmod -debian/tmp/opt/kde3/bin/kunittestguimodrunner -debian/tmp/opt/kde3/lib/libkunittestgui.la -debian/tmp/opt/kde3/lib/libkunittestgui.so -debian/tmp/opt/kde3/lib/libkunittestgui.so.0 -debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h diff --git a/ubuntu/maverick_automake/kdesdk/debian/not-installed.list b/ubuntu/maverick_automake/kdesdk/debian/not-installed.list index f801ede2f..b35fe772b 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/not-installed.list +++ b/ubuntu/maverick_automake/kdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian kdebindings packages. diff --git a/ubuntu/maverick_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules index 1a91a4065..64c2cd3e0 100755 --- a/ubuntu/maverick_automake/kdesdk/debian/rules +++ b/ubuntu/maverick_automake/kdesdk/debian/rules @@ -16,12 +16,12 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-kde3-dbg DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib -PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 kunittest-kde3 libcvsservice0-kde3 umbrello-kde3 +PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 tdeunittest-kde3 libcvsservice0-kde3 umbrello-kde3 DEB_DH_MAKESHLIBS_ARGS_kbabel-kde3 := -V'kbabel-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kompare-kde3 := -V'kompare-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kspy-kde3 := -V'kspy-kde3 (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kunittest-kde3 := -V'kunittest-kde3 (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_tdeunittest-kde3 := -V'tdeunittest-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-kde3 := -V'libcvsservice0-kde3 (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3 := -V'umbrello-kde3 (>= 4:3.5.8-1)' diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install new file mode 100644 index 000000000..700fbe390 --- /dev/null +++ b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install @@ -0,0 +1,7 @@ +debian/tmp/opt/kde3/bin/tdeunittestmod +debian/tmp/opt/kde3/bin/tdeunittestguimodrunner +debian/tmp/opt/kde3/lib/libtdeunittestgui.la +debian/tmp/opt/kde3/lib/libtdeunittestgui.so +debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0 +debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/kde3/include/tde/tdeunittest/runnergui.h diff --git a/ubuntu/maverick_automake/kdeutils/debian/changelog b/ubuntu/maverick_automake/kdeutils/debian/changelog index b06bdfc1c..b39959d16 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/changelog +++ b/ubuntu/maverick_automake/kdeutils/debian/changelog @@ -268,7 +268,7 @@ kdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ kdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ kdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ kdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low kdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/ubuntu/maverick_automake/kdeutils/debian/control b/ubuntu/maverick_automake/kdeutils/debian/control index 4e3a97f28..036f5dd40 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/control +++ b/ubuntu/maverick_automake/kdeutils/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: kdeutils-kde3 Section: kde Architecture: all -Depends: ark-kde3 (>= ${Source-Version}), kcalc-kde3 (>= ${Source-Version}), kcharselect-kde3 (>= ${Source-Version}), kdelirc-kde3 (>= ${Source-Version}), kdessh-kde3 (>= ${Source-Version}), kdf-kde3 (>= ${Source-Version}), kedit-kde3 (>= ${Source-Version}), kfloppy-kde3 (>= ${Source-Version}), kgpg-kde3 (>= ${Source-Version}), khexedit-kde3 (>= ${Source-Version}), kjots-kde3 (>= ${Source-Version}), klaptopdaemon-kde3 (>= ${Source-Version}) | kpowersave-kde3, kmilo-kde3 (>= ${Source-Version}), kregexpeditor-kde3 (>= ${Source-Version}), ksim-kde3 (>= ${Source-Version}), ktimer-kde3 (>= ${Source-Version}), kwalletmanager-kde3 (>= ${Source-Version}), superkaramba-kde3 (>= ${Source-Version}) +Depends: ark-kde3 (>= ${Source-Version}), kcalc-kde3 (>= ${Source-Version}), kcharselect-kde3 (>= ${Source-Version}), kdelirc-kde3 (>= ${Source-Version}), kdessh-kde3 (>= ${Source-Version}), kdf-kde3 (>= ${Source-Version}), kedit-kde3 (>= ${Source-Version}), kfloppy-kde3 (>= ${Source-Version}), kgpg-kde3 (>= ${Source-Version}), khexedit-kde3 (>= ${Source-Version}), kjots-kde3 (>= ${Source-Version}), klaptopdaemon-kde3 (>= ${Source-Version}) | kpowersave-kde3, kmilo-kde3 (>= ${Source-Version}), kregexpeditor-kde3 (>= ${Source-Version}), ksim-kde3 (>= ${Source-Version}), ktimer-kde3 (>= ${Source-Version}), tdewalletmanager-kde3 (>= ${Source-Version}), superkaramba-kde3 (>= ${Source-Version}) Suggests: kdeutils-kde3-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE3 release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -303,7 +303,7 @@ Description: timer utility for KDE3 This package is part of KDE3, as a component of the KDE utilities module. See the 'kde-kde3' and 'kdeutils-kde3' packages for more information. -Package: kwalletmanager-kde3 +Package: tdewalletmanager-kde3 Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdeutils/debian/control.in b/ubuntu/maverick_automake/kdeutils/debian/control.in index e6b817419..f70d7d150 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/control.in +++ b/ubuntu/maverick_automake/kdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: kdeutils Section: kde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: kdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'kdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet deleted file mode 100644 index 294aa088d..000000000 --- a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet +++ /dev/null @@ -1,10 +0,0 @@ -Document: kdeutils-doc-html-kwallet -Title: KWallet Handbook -Author: George Staikos, Lauri Watts -Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. -Section: Tools - -Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwallet/index.html -Files: /usr/share/doc/kde/HTML/en/kwallet/*.html - diff --git a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.tdewallet b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.tdewallet new file mode 100644 index 000000000..799164f38 --- /dev/null +++ b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-doc-html.doc-base.tdewallet @@ -0,0 +1,10 @@ +Document: kdeutils-doc-html-tdewallet +Title: KWallet Handbook +Author: George Staikos, Lauri Watts +Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. +Section: Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/kde/HTML/en/tdewallet/*.html + diff --git a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install index f7092a5fd..c81036c7e 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install +++ b/ubuntu/maverick_automake/kdeutils/debian/kdeutils-kde3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/kde3/include/tde/kmultiformlistbox.h -debian/tmp/opt/kde3/include/tde/kmultiformlistboxentry.h -debian/tmp/opt/kde3/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistbox.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistboxentry.h +debian/tmp/opt/kde3/include/tde/tdemultiformlistboxfactory.h debian/tmp/opt/kde3/include/tde/ksim/chart.h debian/tmp/opt/kde3/include/tde/ksim/common.h debian/tmp/opt/kde3/include/tde/ksim/ksimconfig.h diff --git a/ubuntu/maverick_automake/kdeutils/debian/kwalletmanager-kde3.install b/ubuntu/maverick_automake/kdeutils/debian/kwalletmanager-kde3.install deleted file mode 100644 index 7e960c43b..000000000 --- a/ubuntu/maverick_automake/kdeutils/debian/kwalletmanager-kde3.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/kde3/bin/kwalletmanager -debian/tmp/opt/kde3/lib/kde3/kcm_kwallet.la -debian/tmp/opt/kde3/lib/kde3/kcm_kwallet.so -debian/tmp/opt/kde3/share/applications/kde/kwalletconfig.desktop -debian/tmp/opt/kde3/share/applications/kde/kwalletmanager.desktop -debian/tmp/opt/kde3/share/applications/kde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/kde3/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/kde3/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/common -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit2.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/edit3.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/index.docbook -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/password1.png -debian/tmp/opt/kde3/share/doc/kde/HTML/en/kwallet/password2.png -debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/kde3/share/services/kwallet_config.desktop -debian/tmp/opt/kde3/share/services/kwalletmanager_show.desktop diff --git a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 index 63429d234..0143c7995 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 +++ b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/maverick_automake/kdeutils/debian/tdewalletmanager-kde3.install b/ubuntu/maverick_automake/kdeutils/debian/tdewalletmanager-kde3.install new file mode 100644 index 000000000..14453f55b --- /dev/null +++ b/ubuntu/maverick_automake/kdeutils/debian/tdewalletmanager-kde3.install @@ -0,0 +1,31 @@ +debian/tmp/opt/kde3/bin/tdewalletmanager +debian/tmp/opt/kde3/lib/kde3/kcm_tdewallet.la +debian/tmp/opt/kde3/lib/kde3/kcm_tdewallet.so +debian/tmp/opt/kde3/share/applications/kde/tdewalletconfig.desktop +debian/tmp/opt/kde3/share/applications/kde/tdewalletmanager.desktop +debian/tmp/opt/kde3/share/applications/kde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/kde3/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/kde3/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/common +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/password1.png +debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdewallet/password2.png +debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/kde3/share/services/tdewallet_config.desktop +debian/tmp/opt/kde3/share/services/tdewalletmanager_show.desktop diff --git a/ubuntu/maverick_automake/libraries/python-kde3/debian/control b/ubuntu/maverick_automake/libraries/python-kde3/debian/control index da397514b..4e1d87d9d 100644 --- a/ubuntu/maverick_automake/libraries/python-kde3/debian/control +++ b/ubuntu/maverick_automake/libraries/python-kde3/debian/control @@ -18,7 +18,7 @@ Conflicts: python-kde3-kde3 Description: KDE3 bindings for Python [KDE3] Python binding module that provides wide access to the KDE3 API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-kde3-kde3-dbg Priority: extra @@ -28,7 +28,7 @@ XB-Python-Version: ${python:Versions} Description: KDE3 bindings for Python (debug extensions) [KDE3] Python binding module that provides wide access to the KDE3 API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/ubuntu/precise/applications/kaffeine/debian/changelog b/ubuntu/precise/applications/kaffeine/debian/changelog index ae8921760..3f11ad0ae 100644 --- a/ubuntu/precise/applications/kaffeine/debian/changelog +++ b/ubuntu/precise/applications/kaffeine/debian/changelog @@ -302,7 +302,7 @@ kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low * Added libxcb builddep. * Added back kaffeine-gstreamer package * Removed obsolete kubuntu_05_restore_contrast.diff - * Add kubuntu_06_kparts_mimetype_checking.diff: + * Add kubuntu_06_tdeparts_mimetype_checking.diff: - Makes it possible to select the engine to use. -- Anthony Mercatante <tonio@ubuntu.com> Wed, 05 Mai 2007 11:02:23 +0100 diff --git a/ubuntu/precise/applications/kaffeine/debian/copyright b/ubuntu/precise/applications/kaffeine/debian/copyright index 8b7ddae56..e1f37677a 100644 --- a/ubuntu/precise/applications/kaffeine/debian/copyright +++ b/ubuntu/precise/applications/kaffeine/debian/copyright @@ -8,7 +8,7 @@ Upstream authors: Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> -Copyright for kmultitabbar: +Copyright for tdemultitabbar: (C) 2001-2003 Joseph Wenninger <jowenn@kde.org> Copyright for kaffeine_export copied from kat: diff --git a/ubuntu/precise/applications/kmplayer/debian/changelog b/ubuntu/precise/applications/kmplayer/debian/changelog index 26a6aed53..233e1f465 100644 --- a/ubuntu/precise/applications/kmplayer/debian/changelog +++ b/ubuntu/precise/applications/kmplayer/debian/changelog @@ -52,7 +52,7 @@ kmplayer (1:0.10.0b-1) unstable; urgency=low kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low * New upstream release. - * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Dropped kubuntu_02_use_default_config_with_tdeparts_.diff - applied upstream. * Updated email in kmplayer.1.docbook. * Updated Standards-Version to 3.7.3.0. @@ -335,7 +335,7 @@ kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low [Anthony Mercatante] * Package polishing (debian/copyright, debian/rules...) * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default - * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + * Added kubuntu_02_use_default_config_with_tdeparts_.patch to enable default config in the konqueror plugin * Tarball rebuilt to remove obsolete debian/ folder in it diff --git a/ubuntu/precise/applications/knetworkmanager.cmake/debian/changelog b/ubuntu/precise/applications/knetworkmanager.cmake/debian/changelog index ed0d32a81..d430a6b1e 100644 --- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/changelog +++ b/ubuntu/precise/applications/knetworkmanager.cmake/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control index 988450b51..6650a2b73 100644 --- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control +++ b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control @@ -27,7 +27,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Replaces: network-manager-kde (<< 4:14.0.0) Breaks: network-manager-kde (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control.in b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control.in +++ b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/precise/applications/knetworkmanager8/debian/changelog b/ubuntu/precise/applications/knetworkmanager8/debian/changelog index 04405984c..b68efdcf7 100644 --- a/ubuntu/precise/applications/knetworkmanager8/debian/changelog +++ b/ubuntu/precise/applications/knetworkmanager8/debian/changelog @@ -272,7 +272,7 @@ knetworkmanager (1:0.1-3) unstable; urgency=low - debian/patches/07-overlay_icon_vpn.patch + Show overlay icon (lock) for active VPN connections. - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing kwallet. + + Disable session management to avoid a deadlock when accessing tdewallet. Install an autostart file into /usr/share/autostart/ instead. Closes: #406162 - debian/patches/09-dbus_bool_t.patch diff --git a/ubuntu/precise/applications/knetworkmanager8/debian/control b/ubuntu/precise/applications/knetworkmanager8/debian/control index 711f2e99d..2f3d45694 100644 --- a/ubuntu/precise/applications/knetworkmanager8/debian/control +++ b/ubuntu/precise/applications/knetworkmanager8/debian/control @@ -28,7 +28,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) Replaces: network-manager-kde-trinity (<< 4:14.0.0) Breaks: network-manager-kde-trinity (<< 4:14.0.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/precise/applications/knetworkmanager8/debian/control.in b/ubuntu/precise/applications/knetworkmanager8/debian/control.in index 9a213de18..6ec9fbbd7 100644 --- a/ubuntu/precise/applications/knetworkmanager8/debian/control.in +++ b/ubuntu/precise/applications/knetworkmanager8/debian/control.in @@ -27,7 +27,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) -Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp Provides: knetworkmanager-trinity Conflicts: network-manager-kde Description: KDE systray applet for controlling NetworkManager [Trinity] diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/control b/ubuntu/precise/applications/knetworkmanager9/debian/control index c32604bbf..efd256a36 100644 --- a/ubuntu/precise/applications/knetworkmanager9/debian/control +++ b/ubuntu/precise/applications/knetworkmanager9/debian/control @@ -16,7 +16,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/control.in b/ubuntu/precise/applications/knetworkmanager9/debian/control.in index e54418ea6..a5cefc2bb 100644 --- a/ubuntu/precise/applications/knetworkmanager9/debian/control.in +++ b/ubuntu/precise/applications/knetworkmanager9/debian/control.in @@ -18,7 +18,7 @@ Homepage: http://www.trinitydesktop.org/ Package: network-manager-tde Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: kwalletmanager-trinity +Recommends: tdewalletmanager-trinity Provides: tdenetworkmanager-trinity Description: TDE systray applet for controlling networking [Trinity] Systray applet for controlling network connections managed by diff --git a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install index 7bed60e6c..a0e03ae3b 100644 --- a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install +++ b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install @@ -352,7 +352,7 @@ debian/tmp/opt/trinity/share/services/chalk_rgb_u16_plugin.desktop debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop -debian/tmp/opt/trinity/share/services/chalkscripting.desktop +debian/tmp/opt/trinity/share/services/chaltdescripting.desktop debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install index 4df24b77e..66afcfbba 100644 --- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install +++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install @@ -73,8 +73,8 @@ debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so -debian/tmp/opt/trinity/lib/trinity/chalkscripting.la -debian/tmp/opt/trinity/lib/trinity/chalkscripting.so +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la +debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la @@ -152,6 +152,6 @@ debian/tmp/opt/trinity/lib/libchalkimage.so.* debian/tmp/opt/trinity/lib/libchalk_lms_*.so.* debian/tmp/opt/trinity/lib/libchalk_rgb_*.so.* debian/tmp/opt/trinity/lib/libchalkrgb.so.* -debian/tmp/opt/trinity/lib/libchalkscripting.so.* +debian/tmp/opt/trinity/lib/libchaltdescripting.so.* debian/tmp/opt/trinity/lib/libchalkui.so.* debian/tmp/opt/trinity/lib/libchalk_ycbcr_*.so.* diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian index 08adc5291..cdf64af56 100644 --- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian +++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian @@ -1,4 +1,4 @@ chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm -chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1 +chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchaltdescripting0 libchalkui1 diff --git a/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install index 4b80b83ec..f28ee3bef 100644 --- a/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install +++ b/ubuntu/precise/applications/koffice/debian/koffice-dev-trinity.install @@ -79,8 +79,8 @@ debian/tmp/opt/trinity/lib/libchalkimage.la debian/tmp/opt/trinity/lib/libchalkimage.so debian/tmp/opt/trinity/lib/libchalkrgb.la debian/tmp/opt/trinity/lib/libchalkrgb.so -debian/tmp/opt/trinity/lib/libchalkscripting.la -debian/tmp/opt/trinity/lib/libchalkscripting.so +debian/tmp/opt/trinity/lib/libchaltdescripting.la +debian/tmp/opt/trinity/lib/libchaltdescripting.so debian/tmp/opt/trinity/lib/libchalkui.la debian/tmp/opt/trinity/lib/libchalkui.so debian/tmp/opt/trinity/lib/libkrossapi.la diff --git a/ubuntu/precise/applications/kpowersave.cmake/debian/changelog b/ubuntu/precise/applications/kpowersave.cmake/debian/changelog index c23417124..2d09c1e65 100644 --- a/ubuntu/precise/applications/kpowersave.cmake/debian/changelog +++ b/ubuntu/precise/applications/kpowersave.cmake/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/precise/applications/kpowersave/debian/changelog b/ubuntu/precise/applications/kpowersave/debian/changelog index c23417124..2d09c1e65 100644 --- a/ubuntu/precise/applications/kpowersave/debian/changelog +++ b/ubuntu/precise/applications/kpowersave/debian/changelog @@ -162,7 +162,7 @@ kpowersave (0.6.2-5) unstable; urgency=low * Prepend a sequence number to all patches. * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset kscreensaver settings to correct default values on scheme + - Added. Reset tdescreensaver settings to correct default values on scheme changes and on application shutdown. Patch by Modestas Vainius, thanks! Closes: #399473 diff --git a/ubuntu/precise/applications/tde-style-qtcurve/debian/changelog b/ubuntu/precise/applications/tde-style-qtcurve/debian/changelog index 3ff72d99c..f7612d81f 100644 --- a/ubuntu/precise/applications/tde-style-qtcurve/debian/changelog +++ b/ubuntu/precise/applications/tde-style-qtcurve/debian/changelog @@ -83,8 +83,8 @@ tde-style-qtcurve (0.52.3-1) unstable; urgency=low * Don't lighten border of disabled check/radio buttons. * Lighten trough of disabled slider. - * Modify khtml check to also check to see if widget name == "__khtml" - * Store khtml widgets in a map, to speed up checking. + * Modify tdehtml check to also check to see if widget name == "__tdehtml" + * Store tdehtml widgets in a map, to speed up checking. * Fix shadow on comboboxes. * Draw background of checked menuitem icons as per KDE4. diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-dev-trinity.install index 4d50b4fc5..c851101bf 100644 --- a/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-dev-trinity.install +++ b/ubuntu/precise/kdegraphics.automake/debian/kdegraphics-dev-trinity.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/tde/kfaximage.h -debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/tdemultipageInterface.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/tde/kviewshell/history.h debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/tde/kviewshell/length.h debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.install +++ b/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.lintian b/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.lintian +++ b/ubuntu/precise/kdegraphics.automake/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/precise/libraries/python-trinity/debian/control b/ubuntu/precise/libraries/python-trinity/debian/control index afacf68ee..cad02055c 100644 --- a/ubuntu/precise/libraries/python-trinity/debian/control +++ b/ubuntu/precise/libraries/python-trinity/debian/control @@ -20,7 +20,7 @@ Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. Package: python-trinity-trinity-dbg Priority: extra @@ -32,7 +32,7 @@ XB-Python-Version: ${python:Versions} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyKDE. Using this, you'll get (for example) classes - from kio, kjs, khtml and kprint. + from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog index 0a3dc07a4..6c963f3b9 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/changelog @@ -836,7 +836,7 @@ kubuntu-meta (1.30) feisty; urgency=low * Added kubuntu-konqueror-shortcuts to desktop-recommends-i386, desktop-recommends-amd64, desktop-recommends-powerpc, desktop- recommends-ia64, desktop-recommends-sparc, desktop-recommends-hppa - * Added kwalletmanager to desktop-recommends-i386, desktop-recommends- + * Added tdewalletmanager to desktop-recommends-i386, desktop-recommends- amd64, desktop-recommends-powerpc, desktop-recommends-ia64, desktop- recommends-sparc, desktop-recommends-hppa * Added landscape-client to desktop-recommends-i386, desktop- @@ -889,7 +889,7 @@ kubuntu-meta (1.30) feisty; urgency=low powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed kubuntu-konqueror-shortcuts from desktop-i386, desktop- amd64, desktop-powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Removed kwalletmanager from desktop-i386, desktop-amd64, desktop- + * Removed tdewalletmanager from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed landscape-client from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa @@ -1212,7 +1212,7 @@ kubuntu-meta (1.10) edgy; urgency=low desktop-ia64, desktop-sparc, desktop-hppa * Removed kmousetool from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Removed kscreensaver from desktop-i386, desktop-amd64, desktop- + * Removed tdescreensaver from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed linux-headers-686 from desktop-i386 * Removed linux-headers-amd64-generic from desktop-amd64 @@ -2162,7 +2162,7 @@ kubuntu-meta (0.63) dapper; urgency=low * Added cupsys-driver-gutenprint to desktop-ia64 * Added ttf-arphic-ukai to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa - * Added kdnssd to desktop-ia64, desktop-hppa + * Added tdednssd to desktop-ia64, desktop-hppa * Added ttf-arphic-uming to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc, desktop-hppa * Removed python-musicbrainz from desktop-i386, desktop-amd64, @@ -2173,7 +2173,7 @@ kubuntu-meta (0.63) dapper; urgency=low kubuntu-meta (0.62) dapper; urgency=low * Refreshed dependencies - * Added kdnssd to desktop-i386, desktop-amd64, desktop-powerpc, + * Added tdednssd to desktop-i386, desktop-amd64, desktop-powerpc, desktop-sparc -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 13 Jan 2006 01:00:35 +0000 @@ -2285,7 +2285,7 @@ kubuntu-meta (0.56) dapper; urgency=low * Refreshed dependencies * Added knetworkconf to desktop-hppa * Added krita to desktop-hppa - * Added kwalletmanager to desktop-hppa + * Added tdewalletmanager to desktop-hppa * Added knotes to desktop-hppa * Added kdepim-kio-plugins to desktop-hppa * Added kdepim-wizards to desktop-hppa @@ -2441,7 +2441,7 @@ kubuntu-meta (0.53) breezy; urgency=low * Added gstreamer0.8-musepack to desktop-hppa * Added gtk2-engines-gtk-qt to desktop-sparc, desktop-hppa * Added gstreamer0.8-theora to desktop-hppa - * Added kscreensaver to desktop-hppa + * Added tdescreensaver to desktop-hppa * Added kdesktop to desktop-hppa * Added klipper to desktop-hppa * Added konsole to desktop-hppa @@ -3092,7 +3092,7 @@ kubuntu-meta (0.45) breezy; urgency=low kubuntu-meta (0.44) breezy; urgency=low * Refreshed dependencies - * Added kwalletmanager to desktop-i386, desktop-amd64, desktop- + * Added tdewalletmanager to desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Jun 2005 23:32:00 +0000 @@ -3282,7 +3282,7 @@ kubuntu-meta (0.39) hoary; urgency=low kubuntu-meta (0.38) hoary; urgency=low * Refreshed dependencies - * Added kscreensaver to desktop-i386, desktop-amd64, desktop-powerpc, + * Added tdescreensaver to desktop-i386, desktop-amd64, desktop-powerpc, desktop-ia64, desktop-sparc * Removed python-glade2 from desktop-i386, desktop-amd64, desktop- powerpc, desktop-ia64, desktop-sparc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control index f5f9134d4..b10c8b527 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, kdnssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine -Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, kscreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, kwalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-kfile-plugins-trinity, tdebase-kio-plugins-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdemultimedia-kio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-kfile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, kio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine +Recommends: kio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-kio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, kio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version This package depends on all of the packages in the Kubuntu TDE desktop system diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop index bfdaff332..732491954 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop @@ -172,7 +172,7 @@ We've chosen KDE as our desktop user interface of choice == kdenetwork-trinity == * kdenetwork-filesharing-trinity - * kdnssd-trinity + * tdednssd-trinity * (kopete-trinity) * (kpf-trinity) * (kppp-trinity) @@ -196,7 +196,7 @@ We've chosen KDE as our desktop user interface of choice * ark-trinity * (speedcrunch-trinity) * (kmilo-trinity) - * (kwalletmanager-trinity) + * (tdewalletmanager-trinity) == koffice-trinity == @@ -273,7 +273,7 @@ Accessibility tools: * (openoffice.org-draw) [i386 powerpc amd64] * (openoffice.org-math) [i386 powerpc amd64] * (openoffice.org-java-common) [i386 powerpc amd64] - * (kscreensaver-trinity) + * (tdescreensaver-trinity) = Games = diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 index d04f55409..b9a6a4c6e 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 @@ -37,7 +37,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa index aa6d84396..4e0775054 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 index 9873a7dba..2c8b6b5f3 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 @@ -38,7 +38,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 index c28064c75..b8458e4b6 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 @@ -37,7 +37,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia index a1666b456..0b09fc611 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia @@ -37,7 +37,7 @@ kdepasswd-trinity tdeprint-trinity kdesktop-trinity tdm-trinity -kdnssd-trinity +tdednssd-trinity kghostview-trinity khelpcenter-trinity kicker-trinity diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc index 4f36cc499..cbaae6a43 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 index f39f1dabd..6c811d42d 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 @@ -63,14 +63,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa index 5a4bea656..a3e27e409 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 index bb1c0df3f..9e1c7797d 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 @@ -64,14 +64,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 index dda138ee3..7d6e29a60 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia index e0de83e1b..07a6d8a79 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia @@ -64,14 +64,14 @@ kpf-trinity kppp-trinity krdc-trinity krfb-trinity -kscreensaver-trinity +tdescreensaver-trinity ksysguard-trinity ktorrent-trinity kubuntu-default-settings-trinity kubuntu-trinity-docs kubuntu-konqueror-shortcuts-trinity kvkbd-trinity -kwalletmanager-trinity +tdewalletmanager-trinity landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc index caf564463..14de9515e 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc index 0aa3a1fb1..6d67f9eac 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc @@ -62,14 +62,14 @@ kpf kppp krdc krfb -kscreensaver +tdescreensaver ksysguard ktorrent kubuntu-default-settings kubuntu-docs kubuntu-konqueror-shortcuts kvkbd -kwalletmanager +tdewalletmanager landscape-client laptop-detect libgl1-mesa-dri diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc index aa6d84396..4e0775054 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc @@ -34,7 +34,7 @@ kdepasswd kdeprint kdesktop kdm -kdnssd +tdednssd kghostview khelpcenter kicker diff --git a/ubuntu/precise/metapackages/trinity-livecd/debian/control b/ubuntu/precise/metapackages/trinity-livecd/debian/control index 318c6ee15..2805f756f 100644 --- a/ubuntu/precise/metapackages/trinity-livecd/debian/control +++ b/ubuntu/precise/metapackages/trinity-livecd/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5) Package: trinity-livecd Architecture: all -Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, kscreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, kwalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring +Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-kfile-plugins-trinity, tdeadmin-kfile-plugins-trinity, tdegames-trinity, tdegraphics-kfile-plugins-trinity, tdemultimedia-kfile-plugins-trinity, tdenetwork-kfile-plugins-trinity, tdepim-kfile-plugins-trinity, tdesdk-kfile-plugins-trinity, kdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring Recommends: kpresenter-trinity, kspread-trinity, kword-trinity, tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity, diff --git a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install index cd7b93d85..2ad412a7f 100644 --- a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install +++ b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la @@ -34,7 +34,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/opt/trinity/share/applications/tde/kcmkttsd.desktop debian/tmp/opt/trinity/share/applications/tde/kttsmgr.desktop -debian/tmp/opt/trinity/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/opt/trinity/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/opt/trinity/share/apps/kttsd/festivalint/voices debian/tmp/opt/trinity/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -72,7 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png -debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd.desktop debian/tmp/opt/trinity/share/services/kttsd_akodeplugin.desktop debian/tmp/opt/trinity/share/services/kttsd_alsaplugin.desktop diff --git a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 +++ b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 index 3ebc7a7a8..3e0bd4dc3 100644 --- a/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 +++ b/ubuntu/precise/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kttsd debian/tmp/opt/trinity/bin/kttsmgr debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kttsd.so debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la @@ -32,7 +32,7 @@ debian/tmp/opt/trinity/lib/libkttsd.so.1 debian/tmp/opt/trinity/lib/libkttsd.so.1.0.0 debian/tmp/usr/share/applications/tde/kcmkttsd.desktop debian/tmp/usr/share/applications/tde/kttsmgr.desktop -debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc debian/tmp/usr/share/apps/kttsd/festivalint/sabletowave.scm debian/tmp/usr/share/apps/kttsd/festivalint/voices debian/tmp/usr/share/apps/kttsd/festivalint/xslt/SSMLtoSable.xsl @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png -debian/tmp/usr/share/services/ktexteditor_kttsd.desktop +debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop debian/tmp/usr/share/services/kttsd.desktop debian/tmp/usr/share/services/kttsd_akodeplugin.desktop debian/tmp/usr/share/services/kttsd_artsplugin.desktop diff --git a/ubuntu/precise/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/precise/tdeaddons/debian/konq-plugins-trinity.install index c74edf4ce..15ec8f99e 100644 --- a/ubuntu/precise/tdeaddons/debian/konq-plugins-trinity.install +++ b/ubuntu/precise/tdeaddons/debian/konq-plugins-trinity.install @@ -30,8 +30,8 @@ debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlsettingsplugin.so debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so debian/tmp/opt/trinity/lib/trinity/libkimgallery.la @@ -62,7 +62,7 @@ debian/tmp/opt/trinity/share/applnk/.hidden/crashesplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/dirfilterplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/rsyncplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/fsview.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/khtmlsettingsplugin.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/tdehtmlsettingsplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/kimgalleryplugin.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_babelfish.desktop debian/tmp/opt/trinity/share/applnk/.hidden/plugin_domtreeviewer.desktop @@ -74,7 +74,7 @@ debian/tmp/opt/trinity/share/apps/domtreeviewer debian/tmp/opt/trinity/share/apps/fsview debian/tmp/opt/trinity/share/apps/imagerotation/orient.py debian/tmp/opt/trinity/share/apps/imagerotation/exif.py -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins debian/tmp/opt/trinity/share/apps/konqiconview debian/tmp/opt/trinity/share/apps/konqlistview debian/tmp/opt/trinity/share/apps/konqsidebartng @@ -108,9 +108,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/tdehtmlsettings/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook diff --git a/ubuntu/precise/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/precise/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES index 6208667e9..7d7396e71 100644 --- a/ubuntu/precise/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/precise/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,7 +1,7 @@ -kscreensaver-xsavers depends on xscreensaver-data not xscreensaver +tdescreensaver-xsavers depends on xscreensaver-data not xscreensaver build-dep on xscreensaver-data -add package kscreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra +add package tdescreensaver-xsavers-extra with screensavers from xscreensaver-data-extra and xscreensaver-gl-extra -webcollage depends on -extra not just xsavers - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. diff --git a/ubuntu/precise/tdeartwork/debian/changelog b/ubuntu/precise/tdeartwork/debian/changelog index a3043310e..ddf857174 100644 --- a/ubuntu/precise/tdeartwork/debian/changelog +++ b/ubuntu/precise/tdeartwork/debian/changelog @@ -33,13 +33,13 @@ tdeartwork (4:3.5.9-0ubuntu1) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu4) hardy; urgency=low - * Fix kscreensaver-xsavers-webcollage.install + * Fix tdescreensaver-xsavers-webcollage.install -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Dec 2007 16:06:47 +0000 tdeartwork (4:3.5.8-1ubuntu3) hardy; urgency=low - * Edit kscreensaver-xsaver-webcollage.install to use the file + * Edit tdescreensaver-xsaver-webcollage.install to use the file from sources, since it does not get installed during build. -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Nov 2007 23:36:57 +0000 @@ -53,7 +53,7 @@ tdeartwork (4:3.5.8-1ubuntu2) hardy; urgency=low tdeartwork (4:3.5.8-1ubuntu1) hardy; urgency=low * Merge with Debian, remaining change: - - Add package kscreensaver-xsavers-extra + - Add package tdescreensaver-xsavers-extra -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Nov 2007 17:25:44 +0000 @@ -68,7 +68,7 @@ tdeartwork (4:3.5.8-1) unstable; urgency=low +++ Changes by Sune Vuorela: - * Only make tdeartwork recommend kscreensaver-xsavers, not depend. It pulls + * Only make tdeartwork recommend tdescreensaver-xsavers, not depend. It pulls all sorts of weird gtk-stuff in. * Fix spelling error in control file. @@ -106,7 +106,7 @@ tdeartwork (4:3.5.7-1ubuntu3) gutsy; urgency=low tdeartwork (4:3.5.7-1ubuntu2) gutsy; urgency=low . * Removed TryExec=xscreensaver from all the - kscreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be + tdescreensaver/kxsconfig/ScreenSavers/*.desktop files, so that they can be controlled in the KDE screensavers control panel. Closes LP: #49228 -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 02 Jul 2007 17:13:01 +1000 @@ -149,7 +149,7 @@ tdeartwork (4:3.5.6-2) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add kscreensaver-xsavers-webcollage.README.Debian. + * Add tdescreensaver-xsavers-webcollage.README.Debian. * Remade screensaver-xsavers-webcollage description in debian/control. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 31 Jan 2007 06:01:40 +0100 @@ -210,7 +210,7 @@ tdeartwork (4:3.5.4-0ubuntu1) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low - * Removed kpartsaver.desktop from debian/kscreensavers-xsaver.install. + * Removed tdepartsaver.desktop from debian/tdescreensavers-xsaver.install. Closes bug #53065 -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 21 Jul 2006 23:10:26 +1000 @@ -218,7 +218,7 @@ tdeartwork (4:3.5.3-1ubuntu2) edgy; urgency=low tdeartwork (4:3.5.3-1ubuntu1) edgy; urgency=low * Sync with Debian - * Create kscreensaver-xsavers-extra with the universe xscreensavers + * Create tdescreensaver-xsavers-extra with the universe xscreensavers -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 12:39:40 +0000 @@ -315,7 +315,7 @@ tdeartwork (4:3.4.3-2) unstable; urgency=low +++ Changes by Christopher Martin: - * Remove ant.desktop from kscreensaver-xsavers, as the xscreensaver package + * Remove ant.desktop from tdescreensaver-xsavers, as the xscreensaver package has itself dropped this 'saver. (Closes: #338011) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 15:58:30 +0100 @@ -329,8 +329,8 @@ tdeartwork (4:3.5.2-0ubuntu4) dapper; urgency=low tdeartwork (4:3.5.2-0ubuntu3) dapper; urgency=low * Reverse previous change and list screensavers explicity, can't use - wildcard as some .desktop files should go into kscreensavers - and not kscreensavers-xsaver + wildcard as some .desktop files should go into tdescreensavers + and not tdescreensavers-xsaver -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 30 Mar 2006 16:54:24 +0100 @@ -437,7 +437,7 @@ tdeartwork (4:3.4.0-0pre2) alioth; urgency=low Kopete emoticons, now usable by everyone). * Forward port a patch from KDE 3.3 that fixes the building of the KFireSaver screensaver. - * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. + * Lower tdescreensaver-xsavers's dependency on xscreensaver-gl to a Recommends. (Closes: #278263) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 25 Mar 2005 08:48:21 -0500 @@ -468,7 +468,7 @@ tdeartwork (4:3.3.0-1) unstable; urgency=low * New upstream release (closes: #267571). * The previous versioned libqt3-mt-dev build-depends is no longer necessary, since tdelibs4-dev already forces Qt 3.3. - * Split xscreensaver hooks into a separate package kscreensaver-xsavers, + * Split xscreensaver hooks into a separate package tdescreensaver-xsavers, along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are @@ -524,7 +524,7 @@ tdeartwork (4:3.2.0-1) unstable; urgency=low tdeartwork (4:3.1.5-2) unstable; urgency=low - * Made kscreensaver depend on tdebase-bin (closes: #203185). + * Made tdescreensaver depend on tdebase-bin (closes: #203185). -- Ben Burton <bab@debian.org> Mon, 19 Jan 2004 11:08:45 +1100 @@ -573,7 +573,7 @@ tdeartwork (4:3.1.2-1) unstable; urgency=low tdeartwork (4:3.1.1-1) unstable; urgency=low * New upstream release. - * Package kscreensaver recommends xscreensaver-gl. + * Package tdescreensaver recommends xscreensaver-gl. * Removed alpha compile flags. -- Ben Burton <bab@debian.org> Sun, 23 Mar 2003 15:23:23 +1100 @@ -595,8 +595,8 @@ tdeartwork (4:3.1.0-2) unstable; urgency=low tdeartwork (4:3.1.0-1) unstable; urgency=low * New upstream release. - * Renamed tdeartwork-screensaver to kscreensaver. - * Shifted epoch to 4: since tdebase used to provide kscreensaver 4:3.0.x. + * Renamed tdeartwork-screensaver to tdescreensaver. + * Shifted epoch to 4: since tdebase used to provide tdescreensaver 4:3.0.x. -- Ben Burton <bab@debian.org> Sat, 4 Jan 2003 20:06:44 +1100 diff --git a/ubuntu/precise/tdeartwork/debian/control b/ubuntu/precise/tdeartwork/debian/control index ee0ae9ba5..b0100a04c 100644 --- a/ubuntu/precise/tdeartwork/debian/control +++ b/ubuntu/precise/tdeartwork/debian/control @@ -13,8 +13,8 @@ Architecture: all Section: tde Replaces: kdeartwork-trinity (<< 4:14.0.0) Breaks: kdeartwork-trinity (<< 4:14.0.0) -Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), kscreensaver-trinity (>= ${Source-Version}) -Recommends: kscreensaver-xsavers-trinity +Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers-trinity Description: themes, styles and more from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -110,13 +110,13 @@ Description: wallpapers released with Trinity This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-trinity +Package: tdescreensaver-trinity Architecture: any Section: tde -Replaces: kscreensaver-trinity (<< 4:14.0.0) -Breaks: kscreensaver-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -124,19 +124,19 @@ Description: additional screen savers released with Trinity . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-trinity +Package: tdescreensaver-xsavers-trinity Architecture: any Section: tde -Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0) +Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage-trinity +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into Trinity. With this package installed you can select and/or configure @@ -145,19 +145,19 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with Trinity, see the separate package - kscreensaver-trinity. This package does depend on the xscreensaver package, and + tdescreensaver-trinity. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into Trinity. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-webcollage-trinity +Package: tdescreensaver-xsavers-webcollage-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) -Depends: kscreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm +Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0) +Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm Description: webcollage screensaver Trinity hook This package give access to the webcollage screensaver through the Trinity screensaver configuration. @@ -171,19 +171,19 @@ Description: webcollage screensaver Trinity hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. -Package: kscreensaver-xsavers-extra-trinity +Package: tdescreensaver-xsavers-extra-trinity Architecture: all Section: tde -Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) +Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0) +Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure @@ -192,7 +192,7 @@ Description: Trinity hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. + tdescreensaver. . This package is part of Trinity, and a component of the KDE artwork module. See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information. diff --git a/ubuntu/precise/tdeartwork/debian/control.in b/ubuntu/precise/tdeartwork/debian/control.in index 1721be0bf..4b914794e 100644 --- a/ubuntu/precise/tdeartwork/debian/control.in +++ b/ubuntu/precise/tdeartwork/debian/control.in @@ -11,8 +11,8 @@ Standards-Version: 3.7.2 Package: tdeartwork Architecture: all Section: tde -Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}) -Recommends: kscreensaver-xsavers +Depends: tdeartwork-misc (>= ${Source-Version}), tdeartwork-emoticons (>= ${Source-Version}), tdeartwork-style (>= ${Source-Version}), tdeartwork-theme-icon (>= ${Source-Version}), tdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), tdescreensaver (>= ${Source-Version}) +Recommends: tdescreensaver-xsavers Description: themes, styles and more from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -98,11 +98,11 @@ Description: wallpapers released with KDE This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver +Package: tdescreensaver Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, tdescreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -110,17 +110,17 @@ Description: additional screen savers released with KDE . The hooks for the standard xscreensavers are no longer part of this package. To select and/or configure the standard xscreensavers through - the KDE Control Center, install the separate package kscreensaver-xsavers. + the KDE Control Center, install the separate package tdescreensaver-xsavers. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers +Package: tdescreensaver-xsavers Architecture: any Section: tde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl -Suggests: kscreensaver-xsavers-webcollage +Recommends: twin, tdescreensaver (= ${Source-Version}), xscreensaver-gl +Suggests: tdescreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers into KDE. With this package installed you can select and/or configure @@ -129,17 +129,17 @@ Description: KDE hooks for standard xscreensavers . Note that this package does not actually contain any screensavers itself. For the additional screensavers shipped with KDE, see the separate package - kscreensaver. This package does depend on the xscreensaver package, and + tdescreensaver. This package does depend on the xscreensaver package, and recommend the xscreensaver-gl package, as well as contain the necessary files to integrate these packages into KDE. . This package is part of KDE, and a component of the KDE artwork module. See the 'kde' and 'tdeartwork' packages for more information. -Package: kscreensaver-xsavers-webcollage +Package: tdescreensaver-xsavers-webcollage Architecture: all Section: tde -Depends: kscreensaver-xsavers, miscfiles | wordlist, netpbm +Depends: tdescreensaver-xsavers, miscfiles | wordlist, netpbm Description: webcollage screensaver KDE hook This package give access to the webcollage screensaver through the KDE screensaver configuration. @@ -153,7 +153,7 @@ Description: webcollage screensaver KDE hook your computer in a working environment or in an environment with children. . If you still want to install this package, please read the file - /usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the + /usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the installation. . This package is part of KDE, and a component of the KDE artwork module. diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.install b/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.install deleted file mode 100644 index d65c099dc..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.install +++ /dev/null @@ -1,44 +0,0 @@ -debian/tmp/opt/trinity/bin/kslideshow.kss -debian/tmp/opt/trinity/bin/kpolygon.kss -debian/tmp/opt/trinity/bin/krotation.kss -debian/tmp/opt/trinity/bin/ksolarwinds.kss -debian/tmp/opt/trinity/bin/klorenz.kss -debian/tmp/opt/trinity/bin/kspace.kss -debian/tmp/opt/trinity/bin/kvm.kss -debian/tmp/opt/trinity/bin/kflux.kss -debian/tmp/opt/trinity/bin/kscience.kss -debian/tmp/opt/trinity/bin/kbanner.kss -debian/tmp/opt/trinity/bin/kfiresaver.kss -debian/tmp/opt/trinity/bin/keuphoria.kss -debian/tmp/opt/trinity/bin/kclock.kss -debian/tmp/opt/trinity/bin/kswarm.kss -debian/tmp/opt/trinity/bin/kfountain.kss -debian/tmp/opt/trinity/bin/kgravity.kss -debian/tmp/opt/trinity/bin/kpartsaver.kss -debian/tmp/opt/trinity/bin/kpendulum.kss -debian/tmp/opt/trinity/bin/kblob.kss -debian/tmp/opt/trinity/bin/klines.kss -debian/tmp/opt/trinity/bin/kwave.kss -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KBanner.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KBlob.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KClock.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KEuphoria.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFiresaver.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFlux.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFountain.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KGravity.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KLines-saver.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KLorenz.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KPendulum.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KPolygon.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KRotation.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KScience.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSlideshow.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSolarWinds.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop -debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/kpartsaver.desktop -debian/tmp/opt/trinity/share/apps/kfiresaver -debian/tmp/opt/trinity/share/apps/kscreensaver diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.manpages b/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.manpages deleted file mode 100644 index 839491dbc..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-trinity.manpages +++ /dev/null @@ -1,21 +0,0 @@ -debian/man/kbanner-trinity.kss.1 -debian/man/kblob-trinity.kss.1 -debian/man/kclock-trinity.kss.1 -debian/man/keuphoria-trinity.kss.1 -debian/man/kfiresaver-trinity.kss.1 -debian/man/kflux-trinity.kss.1 -debian/man/kfountain-trinity.kss.1 -debian/man/kgravity-trinity.kss.1 -debian/man/klines-trinity.kss.1 -debian/man/klorenz-trinity.kss.1 -debian/man/kpartsaver-trinity.kss.1 -debian/man/kpendulum-trinity.kss.1 -debian/man/kpolygon-trinity.kss.1 -debian/man/krotation-trinity.kss.1 -debian/man/kscience-trinity.kss.1 -debian/man/kslideshow-trinity.kss.1 -debian/man/ksolarwinds-trinity.kss.1 -debian/man/kspace-trinity.kss.1 -debian/man/kswarm-trinity.kss.1 -debian/man/kvm-trinity.kss.1 -debian/man/kwave-trinity.kss.1 diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install deleted file mode 100644 index f58d9f076..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-extra-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install deleted file mode 100644 index f11cf310b..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install +++ /dev/null @@ -1 +0,0 @@ -kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers.README.Debian deleted file mode 100644 index 828861775..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver-xsavers) only contains hooks for the standard -xscreensavers, so that they can be selected and/or configured through -the KDE Control Centre. - -For the additional screensavers that are specifically shipped with KDE, -see the separate package kscreensaver. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver.README.Debian b/ubuntu/precise/tdeartwork/debian/kscreensaver.README.Debian deleted file mode 100644 index 68584d330..000000000 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -KDE Screensavers for Debian -=========================== - -This package (kscreensaver) no longer contains the hooks for the standard -xscreensavers. It only contains the additional screensavers that are -specifically shipped with KDE. - -To select and/or configure the standard xscreensavers through the KDE Control -Centre, install the separate package kscreensaver-xsavers. - - -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/precise/tdeartwork/debian/man/kpartsaver-trinity.kss.1 b/ubuntu/precise/tdeartwork/debian/man/kpartsaver-trinity.kss.1 deleted file mode 100644 index 64a0a5c45..000000000 --- a/ubuntu/precise/tdeartwork/debian/man/kpartsaver-trinity.kss.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KPARTSAVER.KSS 1 "May 12, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kpartsaver.kss \- Media screen saver for KDE -.SH SYNOPSIS -.B kpartsaver.kss -.RI "[ " generic-options " ]" -[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | -\fB\-\-demo\fP ] -.SH DESCRIPTION -\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). -.PP -This program is part of the official KDE artwork module. -.SH OPTIONS -Below are the screen saver-specific options. -For a full summary of options, run \fIkpartsaver.kss \-\-help\fP. -.TP -\fB\-\-setup\fP -Set up the screen saver. -.TP -\fB\-\-window-id\fP \fIwid\fP -Run in the specified XWindow. -.TP -\fB\-\-root\fP -Run in the root XWindow. -.TP -\fB\-\-demo\fP -Start the screen saver in demo mode (default). -.SH SEE ALSO -.BR kxsconfig (1), -.BR kxsrun (1). -.SH AUTHOR -This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/precise/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/ubuntu/precise/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 new file mode 100644 index 000000000..73456139b --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KPARTSAVER.KSS 1 "May 12, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +tdepartsaver.kss \- Media screen saver for KDE +.SH SYNOPSIS +.B tdepartsaver.kss +.RI "[ " generic-options " ]" +[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP | +\fB\-\-demo\fP ] +.SH DESCRIPTION +\fBMedia\fP is a screen saver for the K Desktop Environment (KDE). +.PP +This program is part of the official KDE artwork module. +.SH OPTIONS +Below are the screen saver-specific options. +For a full summary of options, run \fItdepartsaver.kss \-\-help\fP. +.TP +\fB\-\-setup\fP +Set up the screen saver. +.TP +\fB\-\-window-id\fP \fIwid\fP +Run in the specified XWindow. +.TP +\fB\-\-root\fP +Run in the root XWindow. +.TP +\fB\-\-demo\fP +Start the screen saver in demo mode (default). +.SH SEE ALSO +.BR kxsconfig (1), +.BR kxsrun (1). +.SH AUTHOR +This screen saver was written by Stefan Schimanski <1Stein@gmx.de>. +.br +This manual page was prepared by Ben Burton <bab@debian.org> +for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/precise/tdeartwork/debian/rules b/ubuntu/precise/tdeartwork/debian/rules index 4e236c044..963f996bc 100755 --- a/ubuntu/precise/tdeartwork/debian/rules +++ b/ubuntu/precise/tdeartwork/debian/rules @@ -34,7 +34,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png - cd kscreensaver/kxsconfig/ && ./update_hacks.sh + cd tdescreensaver/kxsconfig/ && ./update_hacks.sh -binary-install/kscreensaver-xsavers-extra-trinity:: - rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop +binary-install/tdescreensaver-xsavers-extra-trinity:: + rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.install b/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.install new file mode 100644 index 000000000..012466480 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.install @@ -0,0 +1,44 @@ +debian/tmp/opt/trinity/bin/kslideshow.kss +debian/tmp/opt/trinity/bin/kpolygon.kss +debian/tmp/opt/trinity/bin/krotation.kss +debian/tmp/opt/trinity/bin/ksolarwinds.kss +debian/tmp/opt/trinity/bin/klorenz.kss +debian/tmp/opt/trinity/bin/kspace.kss +debian/tmp/opt/trinity/bin/kvm.kss +debian/tmp/opt/trinity/bin/kflux.kss +debian/tmp/opt/trinity/bin/kscience.kss +debian/tmp/opt/trinity/bin/kbanner.kss +debian/tmp/opt/trinity/bin/kfiresaver.kss +debian/tmp/opt/trinity/bin/keuphoria.kss +debian/tmp/opt/trinity/bin/kclock.kss +debian/tmp/opt/trinity/bin/kswarm.kss +debian/tmp/opt/trinity/bin/kfountain.kss +debian/tmp/opt/trinity/bin/kgravity.kss +debian/tmp/opt/trinity/bin/tdepartsaver.kss +debian/tmp/opt/trinity/bin/kpendulum.kss +debian/tmp/opt/trinity/bin/kblob.kss +debian/tmp/opt/trinity/bin/klines.kss +debian/tmp/opt/trinity/bin/kwave.kss +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KBanner.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KBlob.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KClock.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KEuphoria.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFiresaver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFlux.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KFountain.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KGravity.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KLines-saver.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KLorenz.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KPendulum.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KPolygon.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KRotation.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KScience.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSlideshow.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSolarWinds.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSpace.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KSwarm.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KVm.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/KWave.desktop +debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop +debian/tmp/opt/trinity/share/apps/kfiresaver +debian/tmp/opt/trinity/share/apps/tdescreensaver diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.manpages b/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.manpages new file mode 100644 index 000000000..294e72dd8 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-trinity.manpages @@ -0,0 +1,21 @@ +debian/man/kbanner-trinity.kss.1 +debian/man/kblob-trinity.kss.1 +debian/man/kclock-trinity.kss.1 +debian/man/keuphoria-trinity.kss.1 +debian/man/kfiresaver-trinity.kss.1 +debian/man/kflux-trinity.kss.1 +debian/man/kfountain-trinity.kss.1 +debian/man/kgravity-trinity.kss.1 +debian/man/klines-trinity.kss.1 +debian/man/klorenz-trinity.kss.1 +debian/man/tdepartsaver-trinity.kss.1 +debian/man/kpendulum-trinity.kss.1 +debian/man/kpolygon-trinity.kss.1 +debian/man/krotation-trinity.kss.1 +debian/man/kscience-trinity.kss.1 +debian/man/kslideshow-trinity.kss.1 +debian/man/ksolarwinds-trinity.kss.1 +debian/man/kspace-trinity.kss.1 +debian/man/kswarm-trinity.kss.1 +debian/man/kvm-trinity.kss.1 +debian/man/kwave-trinity.kss.1 diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install new file mode 100644 index 000000000..65da0bfe4 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-trinity.install index 296f023e9..296f023e9 100644 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-trinity.install diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages index 356af4f32..356af4f32 100644 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-trinity.manpages +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install new file mode 100644 index 000000000..74d362927 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -0,0 +1 @@ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian index c3dd2d9d5..c3dd2d9d5 100644 --- a/ubuntu/precise/tdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers.README.Debian b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers.README.Debian new file mode 100644 index 000000000..a41c9ad57 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver-xsavers.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver-xsavers) only contains hooks for the standard +xscreensavers, so that they can be selected and/or configured through +the KDE Control Centre. + +For the additional screensavers that are specifically shipped with KDE, +see the separate package tdescreensaver. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/precise/tdeartwork/debian/tdescreensaver.README.Debian b/ubuntu/precise/tdeartwork/debian/tdescreensaver.README.Debian new file mode 100644 index 000000000..57a145f54 --- /dev/null +++ b/ubuntu/precise/tdeartwork/debian/tdescreensaver.README.Debian @@ -0,0 +1,11 @@ +KDE Screensavers for Debian +=========================== + +This package (tdescreensaver) no longer contains the hooks for the standard +xscreensavers. It only contains the additional screensavers that are +specifically shipped with KDE. + +To select and/or configure the standard xscreensavers through the KDE Control +Centre, install the separate package tdescreensaver-xsavers. + + -- Ben Burton <bab@debian.org>, Thu, 14 Oct 2004 08:30:34 +1000 diff --git a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 6abff5d30..2fbbb9969 100644 --- a/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/precise/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -20,7 +20,7 @@ install/klipper:: binary-install/tdebase-bin:: install -p -D -m644 debian/kcheckpass.pam debian/tdebase-bin/etc/pam.d/kcheckpass - install -p -D -m644 debian/kscreensaver.pam debian/tdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/tdescreensaver.pam debian/tdebase-bin/etc/pam.d/tdescreensaver install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap diff --git a/ubuntu/precise/tdebase/debian/changelog b/ubuntu/precise/tdebase/debian/changelog index fc2c45054..450f25f23 100644 --- a/ubuntu/precise/tdebase/debian/changelog +++ b/ubuntu/precise/tdebase/debian/changelog @@ -1,7 +1,7 @@ tdebase-trinity (4:3.5.10-2ubuntu12) karmic; urgency=low * Repaired kdesktop crash on load - * Fixed krandrtray crash when randr X extension is unavailable + * Fixed tderandrtray crash when randr X extension is unavailable * Added option to keys config dialog to alter Win key from modifier status -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 07 Dec 2009 13:24:00 -0600 @@ -67,7 +67,7 @@ tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low * Added new ICC loading functionality to kcontrol and tdm - * Added new display output switching functionality to krandrtray + * Added new display output switching functionality to tderandrtray * Beginnings of customizable K menu icon -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 15 Oct 2009 10:46:00 -0600 @@ -750,7 +750,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_17_check_for_prelinking.diff. (Closes LP: #107694) * Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) - * Added kubuntu_fix_kscreensaver_with_compiz_fixed_in_3.5.8.diff (LP: + * Added kubuntu_fix_tdescreensaver_with_compiz_fixed_in_3.5.8.diff (LP: #141628) -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Sep 2007 18:56:10 +1000 @@ -758,7 +758,7 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + kubuntu_53_tdewallet_config.diff as $tdehome=$HOME/.kde so we should use $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -781,7 +781,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -800,14 +800,14 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff . (LP: #136560) + kubuntu_53_tdewallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde + kubuntu_53_tdewallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website @@ -1154,7 +1154,7 @@ tdebase (4:3.5.6-0ubuntu13) feisty; urgency=low tdebase (4:3.5.6-0ubuntu12) feisty; urgency=low - * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + * Add kubuntu_92_tderandrtray_config.diff, tderandrtray now uses guidance display configuration module in the first place. Closes Malone #46877 @@ -2148,7 +2148,7 @@ tdebase (4:3.5.0-4) unstable; urgency=low +++ Changes by Isaac Clerencia - * Add kdnssd kcontrol module files to kcontrol package + * Add tdednssd kcontrol module files to kcontrol package -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 @@ -2210,7 +2210,7 @@ tdebase (4:3.5.2-0ubuntu26) dapper; urgency=low tdebase (4:3.5.2-0ubuntu25) dapper; urgency=low - * Fix kubuntu_53_kwallet_config.diff to not install kwallet + * Fix kubuntu_53_tdewallet_config.diff to not install tdewallet file in wrong directory, closes Malone #45999 * Install filemanagement and webbrowsing konqueror profiles, closes Malone #45004 @@ -2408,7 +2408,7 @@ tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low [ Anthony Mercatante ] - * Add kubuntu_53_kwallet_config.diff copy a default + * Add kubuntu_53_tdewallet_config.diff copy a default KWallet config for new users * Add kubuntu_54_system_protocol_home_dir.diff make system:/ use /home/foo not system:/home/foo keep @@ -2511,7 +2511,7 @@ tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low tdebase (4:3.5.0-0ubuntu15) dapper; urgency=low - * kcontrol replaces old tdebase-bin for kcm_kdnssd.desktop + * kcontrol replaces old tdebase-bin for kcm_tdednssd.desktop -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 @@ -2550,7 +2550,7 @@ tdebase (4:3.5.0-0ubuntu10) dapper; urgency=low tdebase (4:3.5.0-0ubuntu9) dapper; urgency=low * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path - * Install kcm_kdnssd in kcontrol + * Install kcm_tdednssd in kcontrol * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module more recognisable @@ -4332,7 +4332,7 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * More upstream fixes * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) - * Adding in kscreensaver pam file + * Adding in tdescreensaver pam file * Updating tdmrc to match current features and all * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs diff --git a/ubuntu/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in index 8194486c3..136828a50 100644 --- a/ubuntu/precise/tdebase/debian/control.in +++ b/ubuntu/precise/tdebase/debian/control.in @@ -97,7 +97,7 @@ Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), tdescreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install index e8df7c819..f18eaea23 100644 --- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/kfontinst debian/tmp/opt/trinity/bin/kfontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper -debian/tmp/opt/trinity/bin/krandrtray +debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -58,8 +58,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdednssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.so debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la @@ -158,7 +158,7 @@ debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop debian/tmp/opt/trinity/share/applications/tde/ioports.desktop debian/tmp/opt/trinity/share/applications/tde/ioslaveinfo.desktop debian/tmp/opt/trinity/share/applications/tde/joystick.desktop -debian/tmp/opt/trinity/share/applications/tde/kcm_kdnssd.desktop +debian/tmp/opt/trinity/share/applications/tde/kcm_tdednssd.desktop debian/tmp/opt/trinity/share/applications/tde/kcmaccess.desktop debian/tmp/opt/trinity/share/applications/tde/kcmcss.desktop debian/tmp/opt/trinity/share/applications/tde/kcmfontinst.desktop @@ -174,11 +174,11 @@ debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_behavior.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_java_js.desktop -debian/tmp/opt/trinity/share/applications/tde/krandrtray.desktop -debian/tmp/opt/trinity/share/autostart/krandrtray-autostart.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop +debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop +debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop @@ -218,7 +218,7 @@ debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/panel.desktop debian/tmp/opt/trinity/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/nsplugin.desktop debian/tmp/opt/trinity/share/applnk/Settings/WebBrowsing/smb.desktop debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_browser.desktop diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian index d18964b2d..a1120501f 100644 --- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian +++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so +kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so diff --git a/ubuntu/precise/tdebase/debian/konqueror-nsplugins-trinity.install b/ubuntu/precise/tdebase/debian/konqueror-nsplugins-trinity.install index 923c93227..d916322bc 100644 --- a/ubuntu/precise/tdebase/debian/konqueror-nsplugins-trinity.install +++ b/ubuntu/precise/tdebase/debian/konqueror-nsplugins-trinity.install @@ -4,5 +4,5 @@ debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so debian/tmp/opt/trinity/lib/trinity/libnsplugin.la debian/tmp/opt/trinity/lib/trinity/libnsplugin.so -debian/tmp/opt/trinity/share/applications/tde/khtml_plugins.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_plugins.desktop debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc diff --git a/ubuntu/precise/tdebase/debian/konqueror-trinity.install b/ubuntu/precise/tdebase/debian/konqueror-trinity.install index 71c1d7215..029f25bb6 100644 --- a/ubuntu/precise/tdebase/debian/konqueror-trinity.install +++ b/ubuntu/precise/tdebase/debian/konqueror-trinity.install @@ -35,8 +35,8 @@ debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so debian/tmp/opt/trinity/lib/trinity/konqueror.la debian/tmp/opt/trinity/lib/trinity/konqueror.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlkttsdplugin.so debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so @@ -48,7 +48,7 @@ debian/tmp/opt/trinity/share/applications/tde/kfmclient.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_dir.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_html.desktop debian/tmp/opt/trinity/share/applications/tde/kfmclient_war.desktop -debian/tmp/opt/trinity/share/applications/tde/khtml_filter.desktop +debian/tmp/opt/trinity/share/applications/tde/tdehtml_filter.desktop debian/tmp/opt/trinity/share/applications/tde/konqbrowser.desktop debian/tmp/opt/trinity/share/applications/tde/konquerorsu.desktop debian/tmp/opt/trinity/share/applnk/.hidden/konqfilemgr.desktop @@ -60,8 +60,8 @@ debian/tmp/opt/trinity/share/apps/kconf_update/konqsidebartng.upd debian/tmp/opt/trinity/share/apps/kconf_update/move_konqsidebartng_entries.sh debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarks-genui.rc debian/tmp/opt/trinity/share/apps/keditbookmarks/keditbookmarksui.rc -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_iconview.rc debian/tmp/opt/trinity/share/apps/konqiconview/konq_multicolumnview.rc debian/tmp/opt/trinity/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop diff --git a/ubuntu/precise/tdebase/debian/kscreensaver-trinity.pam b/ubuntu/precise/tdebase/debian/kscreensaver-trinity.pam deleted file mode 100644 index 088a00503..000000000 --- a/ubuntu/precise/tdebase/debian/kscreensaver-trinity.pam +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver -# -@include common-auth -@include common-account -@include common-password -@include common-session diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules index a1e9c65f7..bbcbdc032 100755 --- a/ubuntu/precise/tdebase/debian/rules +++ b/ubuntu/precise/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -254,7 +254,7 @@ binary-install/klipper-trinity:: binary-install/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity - install -p -D -m644 debian/kscreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kscreensaver-trinity + install -p -D -m644 debian/tdescreensaver-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/tdescreensaver-trinity mkdir -p debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/ install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-trinity-bin/opt/trinity/share/apps/kxkb/system.xmodmap install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-trinity-bin/etc/X11/Xsession.d/80ubuntu-trinity-xmodmap diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install index 9ac6769ea..7f06b6d76 100644 --- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install @@ -223,10 +223,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -357,7 +357,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png @@ -461,7 +461,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png @@ -563,7 +563,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png @@ -648,7 +648,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png @@ -792,7 +792,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png @@ -888,7 +888,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdescreensaver.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kthememgr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png diff --git a/ubuntu/precise/tdebase/debian/tdescreensaver-trinity.pam b/ubuntu/precise/tdebase/debian/tdescreensaver-trinity.pam new file mode 100644 index 000000000..9a2c74519 --- /dev/null +++ b/ubuntu/precise/tdebase/debian/tdescreensaver-trinity.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/tdescreensaver - specify the PAM behaviour of tdescreensaver +# +@include common-auth +@include common-account +@include common-password +@include common-session diff --git a/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install index e29ab016c..764c26e42 100644 --- a/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install +++ b/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install @@ -11,7 +11,7 @@ #debian/tmp/opt/trinity/lib/libgtkxparts.so.0 #debian/tmp/opt/trinity/lib/libgtkxparts.so #debian/tmp/opt/trinity/lib/libgtkxparts.la -#debian/tmp/opt/trinity/include/xkparts +#debian/tmp/opt/trinity/include/xtdeparts #debian/tmp/opt/trinity/lib/libkmozillapart.so.0.0.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so.0 #debian/tmp/opt/trinity/lib/libkmozillapart.so diff --git a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.install index 2d4ea669a..78a5947e3 100644 --- a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.install +++ b/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.install @@ -7,8 +7,8 @@ debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so debian/tmp/opt/trinity/lib/trinity/kviewerpart.la debian/tmp/opt/trinity/lib/trinity/kviewerpart.so -debian/tmp/opt/trinity/lib/libkmultipage.so.0 -debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0 +debian/tmp/opt/trinity/lib/libtdemultipage.so.0.0.0 debian/tmp/opt/trinity/share/apps/djvumultipage.rc debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png debian/tmp/opt/trinity/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png @@ -25,4 +25,4 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png debian/tmp/opt/trinity/share/services/emptymultipage.desktop debian/tmp/opt/trinity/share/services/djvumultipage.desktop -debian/tmp/opt/trinity/share/servicetypes/kmultipage.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop diff --git a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian index 4a0571207..6ed9b4a4e 100644 --- a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian +++ b/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian @@ -1,2 +1,2 @@ kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so -kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu +kviewshell: package-name-doesnt-match-sonames libtdemultipage0 libdjvu diff --git a/ubuntu/precise/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/precise/tdegraphics/debian/tdegraphics-trinity-dev.install index 80d007db5..26f6ba6ea 100644 --- a/ubuntu/precise/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/ubuntu/precise/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -149,7 +149,7 @@ debian/tmp/opt/trinity/include/dom/SVGWindow.h debian/tmp/opt/trinity/include/dom/SVGZoomAndPan.h debian/tmp/opt/trinity/include/dom/SVGZoomEvent.h debian/tmp/opt/trinity/include/kfaximage.h -debian/tmp/opt/trinity/include/kmultipageInterface.h +debian/tmp/opt/trinity/include/tdemultipageInterface.h debian/tmp/opt/trinity/include/ksvg/CanvasFactory.h debian/tmp/opt/trinity/include/ksvg/CanvasItem.h debian/tmp/opt/trinity/include/ksvg/CanvasItems.h @@ -164,7 +164,7 @@ debian/tmp/opt/trinity/include/kviewshell/documentRenderer.h debian/tmp/opt/trinity/include/kviewshell/documentWidget.h debian/tmp/opt/trinity/include/kviewshell/history.h debian/tmp/opt/trinity/include/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/kviewshell/tdemultipage.h debian/tmp/opt/trinity/include/kviewshell/length.h debian/tmp/opt/trinity/include/kviewshell/pageNumber.h debian/tmp/opt/trinity/include/kviewshell/pageSize.h @@ -185,8 +185,8 @@ debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la debian/tmp/opt/trinity/lib/libkimageviewer.so -debian/tmp/opt/trinity/lib/libkmultipage.la -debian/tmp/opt/trinity/lib/libkmultipage.so +debian/tmp/opt/trinity/lib/libtdemultipage.la +debian/tmp/opt/trinity/lib/libtdemultipage.so debian/tmp/opt/trinity/lib/libkpovmodeler.la debian/tmp/opt/trinity/lib/libkpovmodeler.so debian/tmp/opt/trinity/lib/libksvg.la diff --git a/ubuntu/precise/tdelibs/debian/changelog b/ubuntu/precise/tdelibs/debian/changelog index 60b5c5d56..6a9f72874 100644 --- a/ubuntu/precise/tdelibs/debian/changelog +++ b/ubuntu/precise/tdelibs/debian/changelog @@ -388,7 +388,7 @@ tdelibs (4:3.5.7.dfsg.1-5) unstable; urgency=low +++ Changes by Fathi Boudra: * Move binaries to tdelibs4-dev: kconfig_compiler, ksvgtopng, - kunittestmodrunner, makekdewidgets, preparetips. + tdeunittestmodrunner, makekdewidgets, preparetips. Allow tdelibs5-dev co-installable alongside tdelibs4c2a. * Suggests perl-suid instead Recommends. (Closes: #437414) @@ -602,7 +602,7 @@ tdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low * Resync debian/patches: - Remove, applied upstream: 22_konq_scroll2top_before_new_page_fix.diff, - 25_khtml_non_existant_page_crash.diff, + 25_tdehtml_non_existant_page_crash.diff, 45_konqueror-CVE-2007-0537.diff, 46_CVE-2007-1564-tdelibs-3.5.6.diff, 47_tdelibs-kjs-utf8-parsing.diff. @@ -731,7 +731,7 @@ tdelibs (4:3.5.6-0ubuntu3) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low - * Add kubuntu_67_kwallet_auto_save.diff + * Add kubuntu_67_tdewallet_auto_save.diff Kwallet auto-saves any modification. Closes Malone #67521 @@ -740,7 +740,7 @@ tdelibs (4:3.5.6-0ubuntu2) feisty; urgency=low tdelibs (4:3.5.6-0ubuntu1) feisty; urgency=low * Remove 02_kate_tdeprint_fixes_branch.diff - * Update 27_kdnssd_avahi.dif + * Update 27_tdednssd_avahi.dif * Remove 33_cups12_kprinter_fixes.diff * Remove 35_cups_unify_ipp_uri_assembling.diff * Remove 36_tdeprintd_64bit_fix.diff @@ -823,8 +823,8 @@ tdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: - * Add 44_sync_kwallet_changes to make kwallet write changes to disk - immediately, avoiding losing passwords if kwallet doesn't shutdown + * Add 44_sync_tdewallet_changes to make tdewallet write changes to disk + immediately, avoiding losing passwords if tdewallet doesn't shutdown cleanly. Patch by Josh Metzler. (Closes: #407272) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 18 Apr 2007 14:45:54 +0100 @@ -835,7 +835,7 @@ tdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top of the old page before loading a new one. Patch from upstream svn (22nd patch). - * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading + * New patch (No. 25) from KDE bug #128564. Fixes tdehtml crash on loading some non existing pages when javascript is disabled (Closes: #408413). Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449. @@ -861,11 +861,11 @@ tdelibs (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: * Fixes "Up arrow confused with PrintScrn on evdev keyboards". (Closes: #400887) - * Fixes infinite recursion in khtml when rendering combination of blocks + * Fixes infinite recursion in tdehtml when rendering combination of blocks with overflow:auto and float:right styles. (Closes: #392547) * Fixes "Fatal IO error: client killed" problem in knode. (Closes: #356142) - * Fixes non-standard rendering of floats (khtml). (Closes: #357017) - * Fixes konqueror (khtml) crash when resolving ns in a stylesheet + * Fixes non-standard rendering of floats (tdehtml). (Closes: #357017) + * Fixes konqueror (tdehtml) crash when resolving ns in a stylesheet @imported from external one. (Closes: #401937) +++ Changes by Modestas Vainius: @@ -1016,7 +1016,7 @@ tdelibs (4:3.5.4-1) unstable; urgency=low * new upstreal release: - + Fixes null dereference in khtml, which could cause the browser to crash. + + Fixes null dereference in tdehtml, which could cause the browser to crash. This resolves CVE-2006-3672. Thankfully not every reproducible Konq crash bug gets a CVE number... (Closes: #378962) @@ -1297,7 +1297,7 @@ tdelibs (4:3.5.3-1) unstable; urgency=low tdelibs (4:3.5.2-2) unstable; urgency=low - * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml. + * KDE_3_5_BRANCH update (up to r526316). Contains important fixes for tdehtml. Pages which, since the last upload, didn't render at all, or only showed headers, should be fixed. @@ -1384,7 +1384,7 @@ tdelibs (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Apply patch 27_kdnssd_avahi.diff to replace dummy tdelibs kdnssd + * Apply patch 27_tdednssd_avahi.diff to replace dummy tdelibs tdednssd implementation with a working avahi-based one. * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get @@ -1432,7 +1432,7 @@ tdelibs (4:3.5.0-1) alioth; urgency=low +++ Changes by Christopher Martin: - * Remove an old conffile from KDE 3.3, ktexteditor_autobookmarkerrc, on + * Remove an old conffile from KDE 3.3, tdetexteditor_autobookmarkerrc, on upgrade. (Closes: #339491) * Bump DH_COMPAT to 5. No changes, except tdelibs4c2a-dbg is replaced by @@ -1607,20 +1607,20 @@ tdelibs (4:3.5.2-0ubuntu0) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu11) dapper; urgency=low * Remove stray comma from configure.in.in in - kubuntu_27_kdnssd_avahi.diff that stopped it picking up + kubuntu_27_tdednssd_avahi.diff that stopped it picking up -lavahi-common -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 17:35:07 +0000 tdelibs (4:3.5.1-0ubuntu10) dapper; urgency=low - * Fix include path in kubuntu_27_kdnssd_avahi.diff patch + * Fix include path in kubuntu_27_tdednssd_avahi.diff patch -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 10 Mar 2006 15:34:38 +0000 tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low - * Update 27_kdnssd_avahi.diff now called kubuntu_27_kdnssd_avahi.diff to + * Update 27_tdednssd_avahi.diff now called kubuntu_27_tdednssd_avahi.diff to fix crash when avahi is not installed -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Mar 2006 09:59:35 +0000 @@ -1675,7 +1675,7 @@ tdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low tdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low * New upstream release - * Sync 27_kdnssd_avahi.diff with Debian + * Sync 27_tdednssd_avahi.diff with Debian * Use control-dapper and control-breezy for to allow for backports -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 15:04:54 +0000 @@ -1726,22 +1726,22 @@ tdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low - * Remove libkdnssd depend from tdelibs4-dev + * Remove libtdednssd depend from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:09:29 +0000 tdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low - * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in + * Add kubuntu_27_tdednssd_avahi.diff for avahi support directly in tdelibs -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 21:14:20 +0000 tdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low - * Do not install kdnssd library files, they now come from - libkdnssd1-avahi package. Development files stay in tdelibs4-dev. - * Add depends on libkdnssd1-avahi from tdelibs4-dev + * Do not install tdednssd library files, they now come from + libtdednssd1-avahi package. Development files stay in tdelibs4-dev. + * Add depends on libtdednssd1-avahi from tdelibs4-dev -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 01:25:52 +0000 @@ -1754,7 +1754,7 @@ tdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low tdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add back updated kubuntu_06_kwallet_simplify_string.diff + * Add back updated kubuntu_06_tdewallet_simplify_string.diff and kubuntu_03_applications_menu_entries_move.diff -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Dec 2005 14:34:41 +0000 @@ -1849,7 +1849,7 @@ tdelibs (4:3.4.2-4) unstable; urgency=low +++ Changes by Adeodato Simó: - * Use khtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of + * Use tdehtml/html/htmltokenizer.cpp from 3.5 to fix bogus parsing of whitespace around tags found inside <pre>. This was making konqueror sometimes ignore blank lines in pre mode, which made this friendly maintainer of yours terribly unhappy when visiting bts.turmzimmer.net. @@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low - * Add kubuntu_06_kwallet_simplify_string.diff to simplify KWallet question + * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question * Add kubuntu_07_rubberband.diff for pretty file manager selection * Add versioned build-dep on libxrender-dev and tighten version build-dep of Qt to ensure libXrender.la changes @@ -2374,7 +2374,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. [CM] * Removed patches: - - post-3.3.1-tdelibs-khtml.diff and post-3.3.1-tdelibs-kio.diff since + - post-3.3.1-tdelibs-tdehtml.diff and post-3.3.1-tdelibs-kio.diff since these fixes are in KDE_3_3_BRANCH. [CM] * New patches: @@ -2395,7 +2395,7 @@ tdelibs (4:3.3.2-0pre1) experimental; urgency=low * New entries in debian/tdelibs4-dev.install: - usr/include/kiobuffer.h - - usr/include/kwallettypes.h + - usr/include/tdewallettypes.h * debian/control: - removed unneeded build-dependency on automake1.9. [CM] @@ -2437,8 +2437,8 @@ tdelibs (4:3.3.1-2) unstable; urgency=medium * Include patch to fix CAN-2004-1171 ("plain text password exposure"). Closes half of #285126. Notes about the patches: - - post-3.3.1-tdelibs-khtml.diff: dropped hunks #2 and #3 of patch to - khtml_part.cpp, since they were whitespace adjustments and were causing + - post-3.3.1-tdelibs-tdehtml.diff: dropped hunks #2 and #3 of patch to + tdehtml_part.cpp, since they were whitespace adjustments and were causing failures to apply. - post-3.3.1-tdelibs-kio.diff: the patch as given in the KDE Advisory @@ -2838,7 +2838,7 @@ tdelibs (4:2.2.2-2) unstable; urgency=low * Remove recommends for libssl as I'm breaking policy by recommending something outside of main. Will put this back once libssl goes into main. - * libkmid | libkmid-alsa to help users out a bit + * libtdemid | libtdemid-alsa to help users out a bit -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 20:14:00 -0700 @@ -3027,7 +3027,7 @@ tdelibs (4:2.2.0-0.1beta1-1) unstable; urgency=low * synce with upstream * Drop optimization down for cross arch building - * Move libkscreensaver.so over to -dev package where it belongs + * Move libtdescreensaver.so over to -dev package where it belongs -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:35:00 -0700 @@ -3106,7 +3106,7 @@ tdelibs (4:2.2.0-0beta1-1) unstable; urgency=low * Add Debian menu items: cupsdconf * New packages: tdelibs3-cups * Moving kdoc and qt-doc into Build-Depends-Indep - * Add Provides in for libarts-alsa/libkmid-alsa + * Add Provides in for libarts-alsa/libtdemid-alsa -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 @@ -3150,7 +3150,7 @@ tdelibs (4:2.1.1-4) unstable; urgency=low tdelibs (4:2.1.1-3) unstable; urgency=low * Sync with upstream. - Includes several khtml fixes + Includes several tdehtml fixes Memory leak fix Proxy Authentication fix * Update pam file for kde, add more documentation in it and modify defaults @@ -3198,7 +3198,7 @@ tdelibs (4:2.1.0.1-3) unstable; urgency=low tdelibs (4:2.1.0.1-2) unstable; urgency=low * More upstream fixes - several khtml fixes especially with css + several tdehtml fixes especially with css more font fixes more session fixes..hopefully solving some of the reports * built with new kdoc @@ -3298,8 +3298,8 @@ tdelibs (4:2.1-20010118-1) unstable; urgency=low fix JS and onmouseovers * mimetype fixes (Closes: #76455) * fix build order for libarts-alsa - * breaking out libkmid to avoid unnessary depends (Closes: #82901, #82924) - * libarts and libkmid are Recommends of tdelibs3 and not dependant now + * breaking out libtdemid to avoid unnessary depends (Closes: #82901, #82924) + * libarts and libtdemid are Recommends of tdelibs3 and not dependant now -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 13:00:00 -0700 diff --git a/ubuntu/precise/tdelibs/debian/copyright b/ubuntu/precise/tdelibs/debian/copyright index 7c67eaede..945a09ca9 100644 --- a/ubuntu/precise/tdelibs/debian/copyright +++ b/ubuntu/precise/tdelibs/debian/copyright @@ -14,9 +14,9 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. -libartskde, interfaces, kabc, kate, kcert, kconf_update, tdecore, kded, tdefx, -tdeprint, tdesu, tdeui, kdewidgets, khtml, kimgio, kinit, kio, kioslave, kjs, -kparts, ksmartcard, kspell, kstyles, libkmid, libkscreensaver +libartskde, interfaces, kabc, kate, tdecert, kconf_update, tdecore, kded, tdefx, +tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, kio, kioslave, kjs, +tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver ------------------------------------------------------------------------------ LGPL diff --git a/ubuntu/precise/tdelibs/debian/man/kunittestmodrunner-trinity.1 b/ubuntu/precise/tdelibs/debian/man/kunittestmodrunner-trinity.1 deleted file mode 100644 index b61b06654..000000000 --- a/ubuntu/precise/tdelibs/debian/man/kunittestmodrunner-trinity.1 +++ /dev/null @@ -1,159 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" -.SH NAME -kunittestmodrunner -\- a KDE command\-line application to run KUnitTest modules -.SH SYNOPSIS -\fBkunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] -.SH DESCRIPTION -\fBkunittestmodrunner\fP is a command\-line application to run KUnitTest modules. -It loads all kunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. -.SH OPTIONS -.SS Options: -.TP -.BR \-\-query \ [ regexp ] -Only run modules whose filenames match the regexp. [^kunittest_.*\.la$] -.TP -.BR \-\-folder \ [ folder ] -Only run tests modules which are found in the folder. Use the query option to select modules. [.] -.TP -.B \-\-enable\-dbgcap -Disables debug capturing. You typically use this option when you use the GUI. -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS KDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.SS -.SH SEE ALSO -.BR kunittestguimodrunner (1) -.sp 1 -.TP -.BR http://developer.kde.org -KDE Developers's Corner website -.SH AUTHORS -.nf -Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> - -.br -.fi -Please use http://bugs.kde.org to report bugs, do not mail the author directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/precise/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 new file mode 100644 index 000000000..56c4f3bc6 --- /dev/null +++ b/ubuntu/precise/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 @@ -0,0 +1,159 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KUNITTESTMODRUNNER 1 "Jun 2006" "K Desktop Environment" "KUnitTest modules runner" +.SH NAME +tdeunittestmodrunner +\- a KDE command\-line application to run KUnitTest modules +.SH SYNOPSIS +\fBtdeunittestmodrunner\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBtdeunittestmodrunner\fP is a command\-line application to run KUnitTest modules. +It loads all tdeunittest_*.la modules in the current directory. The exit code is the number of unexpected failures. +.SH OPTIONS +.SS Options: +.TP +.BR \-\-query \ [ regexp ] +Only run modules whose filenames match the regexp. [^tdeunittest_.*\.la$] +.TP +.BR \-\-folder \ [ folder ] +Only run tests modules which are found in the folder. Use the query option to select modules. [.] +.TP +.B \-\-enable\-dbgcap +Disables debug capturing. You typically use this option when you use the GUI. +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH SEE ALSO +.BR tdeunittestguimodrunner (1) +.sp 1 +.TP +.BR http://developer.kde.org +KDE Developers's Corner website +.SH AUTHORS +.nf +Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs, do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On \fBDebian\fP systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install index 88bf85c86..9bcd52fc7 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install @@ -15,7 +15,7 @@ debian/tmp/etc/trinity/kthemestylerc debian/tmp/etc/trinity/language.codes debian/tmp/etc/trinity/ui/kprintpreviewui.rc debian/tmp/etc/trinity/ui/ui_standards.rc -debian/tmp/opt/trinity/share/applications/tde/kresources.desktop +debian/tmp/opt/trinity/share/applications/tde/tderesources.desktop debian/tmp/opt/trinity/share/apps/dcopidlng/Ast.pm debian/tmp/opt/trinity/share/apps/dcopidlng/Iter.pm debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptus @@ -35,9 +35,9 @@ debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-char.js debian/tmp/opt/trinity/share/apps/katepart/scripts/script-indent-c-newline.js debian/tmp/opt/trinity/share/apps/katepart/scripts/sort.js debian/tmp/opt/trinity/share/apps/katepart/syntax/*.xml -debian/tmp/opt/trinity/share/apps/kcertpart/kcertpart.rc +debian/tmp/opt/trinity/share/apps/tdecertpart/tdecertpart.rc debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_instantmessenger.desktop -debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_ktexteditor.desktop +debian/tmp/opt/trinity/share/apps/kcm_componentchooser/kcm_tdetexteditor.desktop debian/tmp/opt/trinity/share/apps/kconf_update/kcookiescfg.upd debian/tmp/opt/trinity/share/apps/kconf_update/kded.upd debian/tmp/opt/trinity/share/apps/kconf_update/tdeprintrc.upd @@ -229,22 +229,22 @@ 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/khtml/css/html4.css -debian/tmp/opt/trinity/share/apps/khtml/css/quirks.css -debian/tmp/opt/trinity/share/apps/khtml/domain_info -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/48x48/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/icons/crystalsvg/64x64/actions/bug.png -debian/tmp/opt/trinity/share/apps/khtml/khtml_browser.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml_popupmenu.rc -debian/tmp/opt/trinity/share/apps/khtml/khtml.rc +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 +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/128x128/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/16x16/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/22x22/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/32x32/actions/images_display.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/48x48/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/icons/crystalsvg/64x64/actions/bug.png +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_browser.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml_popupmenu.rc +debian/tmp/opt/trinity/share/apps/tdehtml/tdehtml.rc debian/tmp/opt/trinity/share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png debian/tmp/opt/trinity/share/apps/kjava/kjava.jar @@ -1714,10 +1714,10 @@ debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc -debian/tmp/opt/trinity/share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc -debian/tmp/opt/trinity/share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc +debian/tmp/opt/trinity/share/apps/tdetexteditor_kdatatool/tdetexteditor_kdatatoolui.rc debian/tmp/opt/trinity/share/apps/LICENSES/ARTISTIC debian/tmp/opt/trinity/share/apps/LICENSES/BSD debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V2 @@ -1780,9 +1780,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdespell/index.docbook debian/tmp/opt/trinity/share/emoticons/Default/angry.png debian/tmp/opt/trinity/share/emoticons/Default/bat.png debian/tmp/opt/trinity/share/emoticons/Default/beer.png @@ -1922,7 +1922,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/image.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/info.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/log.png @@ -2354,7 +2354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png @@ -2723,7 +2723,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/krita_kra.png @@ -3102,7 +3102,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/krita_kra.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png @@ -3332,7 +3332,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/krita_kra.png @@ -3517,7 +3517,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/tdemultiple.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/koffice.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/krita_kra.png @@ -3600,35 +3600,35 @@ debian/tmp/opt/trinity/share/services/jp2.kimgio debian/tmp/opt/trinity/share/services/jpeg.kimgio debian/tmp/opt/trinity/share/services/katepart.desktop debian/tmp/opt/trinity/share/services/kbzip2filter.desktop -debian/tmp/opt/trinity/share/services/kcertpart.desktop +debian/tmp/opt/trinity/share/services/tdecertpart.desktop debian/tmp/opt/trinity/share/services/kded/kcookiejar.desktop debian/tmp/opt/trinity/share/services/kded/tdeprintd.desktop debian/tmp/opt/trinity/share/services/kded/kdetrayproxy.desktop debian/tmp/opt/trinity/share/services/kded/kpasswdserver.desktop debian/tmp/opt/trinity/share/services/kded/kssld.desktop -debian/tmp/opt/trinity/share/services/kded/kwalletd.desktop +debian/tmp/opt/trinity/share/services/kded/tdewalletd.desktop debian/tmp/opt/trinity/share/services/kded/proxyscout.desktop debian/tmp/opt/trinity/share/services/kgzipfilter.desktop -debian/tmp/opt/trinity/share/services/khtml.desktop -debian/tmp/opt/trinity/share/services/khtmlimage.desktop +debian/tmp/opt/trinity/share/services/tdehtml.desktop +debian/tmp/opt/trinity/share/services/tdehtmlimage.desktop debian/tmp/opt/trinity/share/services/kio_uiserver.desktop debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop debian/tmp/opt/trinity/share/services/kmailservice.protocol -debian/tmp/opt/trinity/share/services/kmultipart.desktop +debian/tmp/opt/trinity/share/services/tdemultipart.desktop debian/tmp/opt/trinity/share/services/knotify.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/dir.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/file.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/net.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc/ldapkio.desktop -debian/tmp/opt/trinity/share/services/kresources/kabc_manager.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop -debian/tmp/opt/trinity/share/services/kspell_aspell.desktop -debian/tmp/opt/trinity/share/services/kspell_hspell.desktop -debian/tmp/opt/trinity/share/services/kspell_ispell.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_docwordcompletion.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_insertfile.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_isearch.desktop -debian/tmp/opt/trinity/share/services/ktexteditor_kdatatool.desktop +debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop +debian/tmp/opt/trinity/share/services/tdespell_ispell.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_docwordcompletion.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop +debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop debian/tmp/opt/trinity/share/services/metainfo.protocol debian/tmp/opt/trinity/share/services/mms.protocol debian/tmp/opt/trinity/share/services/mmst.protocol @@ -3667,21 +3667,21 @@ debian/tmp/opt/trinity/share/servicetypes/kcomprfilter.desktop debian/tmp/opt/trinity/share/servicetypes/kdatatool.desktop debian/tmp/opt/trinity/share/servicetypes/kdedmodule.desktop debian/tmp/opt/trinity/share/servicetypes/kfileplugin.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayer.desktop -debian/tmp/opt/trinity/share/servicetypes/kmediaplayerengine.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayer.desktop +debian/tmp/opt/trinity/share/servicetypes/tdemediaplayerengine.desktop debian/tmp/opt/trinity/share/servicetypes/kpart.desktop debian/tmp/opt/trinity/share/servicetypes/kplugininfo.desktop debian/tmp/opt/trinity/share/servicetypes/kpropsdlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kregexpeditor.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_manager.desktop -debian/tmp/opt/trinity/share/servicetypes/kresources_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_manager.desktop +debian/tmp/opt/trinity/share/servicetypes/tderesources_plugin.desktop debian/tmp/opt/trinity/share/servicetypes/krop.desktop debian/tmp/opt/trinity/share/servicetypes/krwp.desktop debian/tmp/opt/trinity/share/servicetypes/kscan.desktop -debian/tmp/opt/trinity/share/servicetypes/kspellclient.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditoreditor.desktop -debian/tmp/opt/trinity/share/servicetypes/ktexteditorplugin.desktop +debian/tmp/opt/trinity/share/servicetypes/tdespellclient.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditoreditor.desktop +debian/tmp/opt/trinity/share/servicetypes/tdetexteditorplugin.desktop debian/tmp/opt/trinity/share/servicetypes/kurifilterplugin.desktop debian/tmp/opt/trinity/share/servicetypes/renamedlgplugin.desktop debian/tmp/opt/trinity/share/servicetypes/scriptinterface.desktop diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.preinst b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.preinst index 452b17bfc..c6c9c016f 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.preinst +++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.preinst @@ -10,7 +10,7 @@ case "$1" in rm -f /etc/trinity/colors/40\ Colors rm -f /etc/trinity/colors/Royal rm -f /etc/trinity/colors/Web - rm -f /etc/trinity/ktexteditor_autobookmarkerrc + rm -f /etc/trinity/tdetexteditor_autobookmarkerrc [ -f "$FILE" ] || exit 0 MD5SUMOLD=`md5sum $FILE | awk '{print $1}'` if dpkg --compare-versions "$2" lt "4:3.4.0-0pre5"; then diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install index 30baf6aa3..6f7afbc0c 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install @@ -4,7 +4,7 @@ debian/tmp/opt/trinity/bin/dcopidl2cpp debian/tmp/opt/trinity/bin/dcopidlng debian/tmp/opt/trinity/bin/kconfig_compiler debian/tmp/opt/trinity/bin/ksvgtopng -debian/tmp/opt/trinity/bin/kunittestmodrunner +debian/tmp/opt/trinity/bin/tdeunittestmodrunner debian/tmp/opt/trinity/bin/makekdewidgets debian/tmp/opt/trinity/bin/preparetips @@ -291,11 +291,11 @@ debian/tmp/opt/trinity/include/khexedit/charcolumninterface.h debian/tmp/opt/trinity/include/khexedit/clipboardinterface.h debian/tmp/opt/trinity/include/khexedit/valuecolumninterface.h debian/tmp/opt/trinity/include/khexedit/zoominterface.h -debian/tmp/opt/trinity/include/khtmldefaults.h -debian/tmp/opt/trinity/include/khtml_events.h -debian/tmp/opt/trinity/include/khtml_part.h -debian/tmp/opt/trinity/include/khtml_settings.h -debian/tmp/opt/trinity/include/khtmlview.h +debian/tmp/opt/trinity/include/tdehtmldefaults.h +debian/tmp/opt/trinity/include/tdehtml_events.h +debian/tmp/opt/trinity/include/tdehtml_part.h +debian/tmp/opt/trinity/include/tdehtml_settings.h +debian/tmp/opt/trinity/include/tdehtmlview.h debian/tmp/opt/trinity/include/khttpproxysocketdevice.h debian/tmp/opt/trinity/include/kicondialog.h debian/tmp/opt/trinity/include/kiconeffect.h @@ -308,8 +308,8 @@ debian/tmp/opt/trinity/include/kimageeffect.h debian/tmp/opt/trinity/include/kimagefilepreview.h debian/tmp/opt/trinity/include/kimageio.h debian/tmp/opt/trinity/include/kimiface.h -debian/tmp/opt/trinity/include/kimproxy.h -debian/tmp/opt/trinity/include/kimproxyiface.h +debian/tmp/opt/trinity/include/tdeimproxy.h +debian/tmp/opt/trinity/include/tdeimproxyiface.h debian/tmp/opt/trinity/include/kinputdialog.h debian/tmp/opt/trinity/include/kinstance.h debian/tmp/opt/trinity/include/kio/authinfo.h @@ -329,7 +329,7 @@ debian/tmp/opt/trinity/include/kio/job.h debian/tmp/opt/trinity/include/kio/tdesasl.h debian/tmp/opt/trinity/include/kio/kmdbase.h debian/tmp/opt/trinity/include/kio/kmdcodec.h -debian/tmp/opt/trinity/include/kio/kntlm.h +debian/tmp/opt/trinity/include/kio/tdentlm.h debian/tmp/opt/trinity/include/kio/metainfojob.h debian/tmp/opt/trinity/include/kio/netaccess.h debian/tmp/opt/trinity/include/kio/observer.h @@ -388,24 +388,24 @@ debian/tmp/opt/trinity/include/kmainwindow.h debian/tmp/opt/trinity/include/kmainwindowiface.h debian/tmp/opt/trinity/include/kmanagerselection.h debian/tmp/opt/trinity/include/kmdcodec.h -debian/tmp/opt/trinity/include/kmdichildarea.h -debian/tmp/opt/trinity/include/kmdichildfrmcaption.h -debian/tmp/opt/trinity/include/kmdichildfrm.h -debian/tmp/opt/trinity/include/kmdichildview.h -debian/tmp/opt/trinity/include/kmdidefines.h -debian/tmp/opt/trinity/include/kmdi/global.h -debian/tmp/opt/trinity/include/kmdiiterator.h -debian/tmp/opt/trinity/include/kmdilistiterator.h -debian/tmp/opt/trinity/include/kmdimainfrm.h -debian/tmp/opt/trinity/include/kmdi/mainwindow.h -debian/tmp/opt/trinity/include/kmdinulliterator.h -debian/tmp/opt/trinity/include/kmdi/tabwidget.h -debian/tmp/opt/trinity/include/kmditaskbar.h -debian/tmp/opt/trinity/include/kmdi/toolviewaccessor.h -debian/tmp/opt/trinity/include/kmditoolviewaccessor.h -debian/tmp/opt/trinity/include/kmediaplayer/playerdcopobject.h -debian/tmp/opt/trinity/include/kmediaplayer/player.h -debian/tmp/opt/trinity/include/kmediaplayer/view.h +debian/tmp/opt/trinity/include/tdemdichildarea.h +debian/tmp/opt/trinity/include/tdemdichildfrmcaption.h +debian/tmp/opt/trinity/include/tdemdichildfrm.h +debian/tmp/opt/trinity/include/tdemdichildview.h +debian/tmp/opt/trinity/include/tdemdidefines.h +debian/tmp/opt/trinity/include/tdemdi/global.h +debian/tmp/opt/trinity/include/tdemdiiterator.h +debian/tmp/opt/trinity/include/tdemdilistiterator.h +debian/tmp/opt/trinity/include/tdemdimainfrm.h +debian/tmp/opt/trinity/include/tdemdi/mainwindow.h +debian/tmp/opt/trinity/include/tdemdinulliterator.h +debian/tmp/opt/trinity/include/tdemdi/tabwidget.h +debian/tmp/opt/trinity/include/tdemditaskbar.h +debian/tmp/opt/trinity/include/tdemdi/toolviewaccessor.h +debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h +debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h +debian/tmp/opt/trinity/include/tdemediaplayer/player.h +debian/tmp/opt/trinity/include/tdemediaplayer/view.h debian/tmp/opt/trinity/include/kmenubar.h debian/tmp/opt/trinity/include/kmessagebox.h debian/tmp/opt/trinity/include/kmimemagic.h @@ -414,10 +414,10 @@ debian/tmp/opt/trinity/include/kmimetypechooser.h debian/tmp/opt/trinity/include/kmimetype.h debian/tmp/opt/trinity/include/kmimetyperesolver.h debian/tmp/opt/trinity/include/kmountpoint.h -debian/tmp/opt/trinity/include/kmulticastsocketdevice.h -debian/tmp/opt/trinity/include/kmulticastsocket.h -debian/tmp/opt/trinity/include/kmultipledrag.h -debian/tmp/opt/trinity/include/kmultitabbar.h +debian/tmp/opt/trinity/include/tdemulticastsocketdevice.h +debian/tmp/opt/trinity/include/tdemulticastsocket.h +debian/tmp/opt/trinity/include/tdemultipledrag.h +debian/tmp/opt/trinity/include/tdemultitabbar.h debian/tmp/opt/trinity/include/knetworkinterface.h debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h debian/tmp/opt/trinity/include/knewstuff/engine.h @@ -442,20 +442,20 @@ debian/tmp/opt/trinity/include/kpanelapplet.h debian/tmp/opt/trinity/include/kpanelappmenu.h debian/tmp/opt/trinity/include/kpanelextension.h debian/tmp/opt/trinity/include/kpanelmenu.h -debian/tmp/opt/trinity/include/kparts/browserextension.h -debian/tmp/opt/trinity/include/kparts/browserinterface.h -debian/tmp/opt/trinity/include/kparts/browserrun.h -debian/tmp/opt/trinity/include/kparts/componentfactory.h -debian/tmp/opt/trinity/include/kparts/dockmainwindow.h -debian/tmp/opt/trinity/include/kparts/event.h -debian/tmp/opt/trinity/include/kparts/factory.h -debian/tmp/opt/trinity/include/kparts/genericfactory.h -debian/tmp/opt/trinity/include/kparts/historyprovider.h -debian/tmp/opt/trinity/include/kparts/mainwindow.h -debian/tmp/opt/trinity/include/kparts/part.h -debian/tmp/opt/trinity/include/kparts/partmanager.h -debian/tmp/opt/trinity/include/kparts/plugin.h -debian/tmp/opt/trinity/include/kparts/statusbarextension.h +debian/tmp/opt/trinity/include/tdeparts/browserextension.h +debian/tmp/opt/trinity/include/tdeparts/browserinterface.h +debian/tmp/opt/trinity/include/tdeparts/browserrun.h +debian/tmp/opt/trinity/include/tdeparts/componentfactory.h +debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h +debian/tmp/opt/trinity/include/tdeparts/event.h +debian/tmp/opt/trinity/include/tdeparts/factory.h +debian/tmp/opt/trinity/include/tdeparts/genericfactory.h +debian/tmp/opt/trinity/include/tdeparts/historyprovider.h +debian/tmp/opt/trinity/include/tdeparts/mainwindow.h +debian/tmp/opt/trinity/include/tdeparts/part.h +debian/tmp/opt/trinity/include/tdeparts/partmanager.h +debian/tmp/opt/trinity/include/tdeparts/plugin.h +debian/tmp/opt/trinity/include/tdeparts/statusbarextension.h debian/tmp/opt/trinity/include/kpassdlg.h debian/tmp/opt/trinity/include/kpassivepopup.h debian/tmp/opt/trinity/include/kpixmapeffect.h @@ -490,15 +490,15 @@ debian/tmp/opt/trinity/include/kremoteencoding.h debian/tmp/opt/trinity/include/kreplacedialog.h debian/tmp/opt/trinity/include/kreplace.h debian/tmp/opt/trinity/include/kresolver.h -debian/tmp/opt/trinity/include/kresources/configdialog.h -debian/tmp/opt/trinity/include/kresources/configpage.h -debian/tmp/opt/trinity/include/kresources/configwidget.h -debian/tmp/opt/trinity/include/kresources/factory.h -debian/tmp/opt/trinity/include/kresources/manager.h -debian/tmp/opt/trinity/include/kresources/manageriface.h -debian/tmp/opt/trinity/include/kresources/managerimpl.h -debian/tmp/opt/trinity/include/kresources/resource.h -debian/tmp/opt/trinity/include/kresources/selectdialog.h +debian/tmp/opt/trinity/include/tderesources/configdialog.h +debian/tmp/opt/trinity/include/tderesources/configpage.h +debian/tmp/opt/trinity/include/tderesources/configwidget.h +debian/tmp/opt/trinity/include/tderesources/factory.h +debian/tmp/opt/trinity/include/tderesources/manager.h +debian/tmp/opt/trinity/include/tderesources/manageriface.h +debian/tmp/opt/trinity/include/tderesources/managerimpl.h +debian/tmp/opt/trinity/include/tderesources/resource.h +debian/tmp/opt/trinity/include/tderesources/selectdialog.h debian/tmp/opt/trinity/include/krestrictedline.h debian/tmp/opt/trinity/include/kreverseresolver.h debian/tmp/opt/trinity/include/krfcdate.h @@ -510,8 +510,8 @@ debian/tmp/opt/trinity/include/ksambashare.h debian/tmp/opt/trinity/include/ksavefile.h debian/tmp/opt/trinity/include/kscan.h debian/tmp/opt/trinity/include/ksconfig.h -debian/tmp/opt/trinity/include/kscreensaver.h -debian/tmp/opt/trinity/include/kscreensaver_vroot.h +debian/tmp/opt/trinity/include/tdescreensaver.h +debian/tmp/opt/trinity/include/tdescreensaver_vroot.h debian/tmp/opt/trinity/include/kscrollview.h debian/tmp/opt/trinity/include/kselect.h debian/tmp/opt/trinity/include/kseparator.h @@ -543,18 +543,18 @@ debian/tmp/opt/trinity/include/ksockssocketdevice.h debian/tmp/opt/trinity/include/ksortablevaluelist.h debian/tmp/opt/trinity/include/kspeech.h debian/tmp/opt/trinity/include/kspeechsink.h -debian/tmp/opt/trinity/include/kspell2/backgroundchecker.h -debian/tmp/opt/trinity/include/kspell2/broker.h -debian/tmp/opt/trinity/include/kspell2/configdialog.h -debian/tmp/opt/trinity/include/kspell2/configwidget.h -debian/tmp/opt/trinity/include/kspell2/defaultdictionary.h -debian/tmp/opt/trinity/include/kspell2/dialog.h -debian/tmp/opt/trinity/include/kspell2/dictionary.h -debian/tmp/opt/trinity/include/kspell2/filter.h -debian/tmp/opt/trinity/include/kspell2/highlighter.h -debian/tmp/opt/trinity/include/kspell2/settings.h -debian/tmp/opt/trinity/include/kspelldlg.h -debian/tmp/opt/trinity/include/kspell.h +debian/tmp/opt/trinity/include/tdespell2/backgroundchecker.h +debian/tmp/opt/trinity/include/tdespell2/broker.h +debian/tmp/opt/trinity/include/tdespell2/configdialog.h +debian/tmp/opt/trinity/include/tdespell2/configwidget.h +debian/tmp/opt/trinity/include/tdespell2/defaultdictionary.h +debian/tmp/opt/trinity/include/tdespell2/dialog.h +debian/tmp/opt/trinity/include/tdespell2/dictionary.h +debian/tmp/opt/trinity/include/tdespell2/filter.h +debian/tmp/opt/trinity/include/tdespell2/highlighter.h +debian/tmp/opt/trinity/include/tdespell2/settings.h +debian/tmp/opt/trinity/include/tdespelldlg.h +debian/tmp/opt/trinity/include/tdespell.h debian/tmp/opt/trinity/include/ksplashscreen.h debian/tmp/opt/trinity/include/ksqueezedtextlabel.h debian/tmp/opt/trinity/include/ksslall.h @@ -593,9 +593,9 @@ debian/tmp/opt/trinity/include/kstringvalidator.h debian/tmp/opt/trinity/include/kstyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h -debian/tmp/opt/trinity/include/ksycocaentry.h -debian/tmp/opt/trinity/include/ksycoca.h -debian/tmp/opt/trinity/include/ksycocatype.h +debian/tmp/opt/trinity/include/tdesycocaentry.h +debian/tmp/opt/trinity/include/tdesycoca.h +debian/tmp/opt/trinity/include/tdesycocatype.h debian/tmp/opt/trinity/include/ksyntaxhighlighter.h debian/tmp/opt/trinity/include/ksystemtray.h debian/tmp/opt/trinity/include/ktabbar.h @@ -606,39 +606,39 @@ debian/tmp/opt/trinity/include/ktempdir.h debian/tmp/opt/trinity/include/ktempfile.h debian/tmp/opt/trinity/include/ktextbrowser.h debian/tmp/opt/trinity/include/ktextedit.h -debian/tmp/opt/trinity/include/ktexteditor/blockselectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/clipboardinterface.h -debian/tmp/opt/trinity/include/ktexteditor/codecompletioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/configinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/configinterface.h -debian/tmp/opt/trinity/include/ktexteditor/cursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/document.h -debian/tmp/opt/trinity/include/ktexteditor/documentinfo.h -debian/tmp/opt/trinity/include/ktexteditor/dynwordwrapinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editinterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/editinterface.h -debian/tmp/opt/trinity/include/ktexteditor/editorchooser.h -debian/tmp/opt/trinity/include/ktexteditor/editor.h -debian/tmp/opt/trinity/include/ktexteditor/encodinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/highlightinginterface.h -debian/tmp/opt/trinity/include/ktexteditor/markinterfaceextension.h -debian/tmp/opt/trinity/include/ktexteditor/markinterface.h -debian/tmp/opt/trinity/include/ktexteditor/plugin.h -debian/tmp/opt/trinity/include/ktexteditor/popupmenuinterface.h -debian/tmp/opt/trinity/include/ktexteditor/printinterface.h -debian/tmp/opt/trinity/include/ktexteditor/searchinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectionextdcopinterface.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterfaceext.h -debian/tmp/opt/trinity/include/ktexteditor/selectioninterface.h -debian/tmp/opt/trinity/include/ktexteditor/sessionconfiginterface.h -debian/tmp/opt/trinity/include/ktexteditor/templateinterface.h -debian/tmp/opt/trinity/include/ktexteditor/texthintinterface.h -debian/tmp/opt/trinity/include/ktexteditor/undointerface.h -debian/tmp/opt/trinity/include/ktexteditor/variableinterface.h -debian/tmp/opt/trinity/include/ktexteditor/viewcursorinterface.h -debian/tmp/opt/trinity/include/ktexteditor/view.h -debian/tmp/opt/trinity/include/ktexteditor/viewstatusmsginterface.h -debian/tmp/opt/trinity/include/ktexteditor/wordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/configinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/cursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/document.h +debian/tmp/opt/trinity/include/tdetexteditor/documentinfo.h +debian/tmp/opt/trinity/include/tdetexteditor/dynwordwrapinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/editinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/editorchooser.h +debian/tmp/opt/trinity/include/tdetexteditor/editor.h +debian/tmp/opt/trinity/include/tdetexteditor/encodinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/highlightinginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterfaceextension.h +debian/tmp/opt/trinity/include/tdetexteditor/markinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/plugin.h +debian/tmp/opt/trinity/include/tdetexteditor/popupmenuinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/printinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/searchinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectionextdcopinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterfaceext.h +debian/tmp/opt/trinity/include/tdetexteditor/selectioninterface.h +debian/tmp/opt/trinity/include/tdetexteditor/sessionconfiginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/templateinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/texthintinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/undointerface.h +debian/tmp/opt/trinity/include/tdetexteditor/variableinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/viewcursorinterface.h +debian/tmp/opt/trinity/include/tdetexteditor/view.h +debian/tmp/opt/trinity/include/tdetexteditor/viewstatusmsginterface.h +debian/tmp/opt/trinity/include/tdetexteditor/wordwrapinterface.h debian/tmp/opt/trinity/include/ktimewidget.h debian/tmp/opt/trinity/include/ktimezones.h debian/tmp/opt/trinity/include/ktimezonewidget.h @@ -651,9 +651,9 @@ debian/tmp/opt/trinity/include/ktrader.h debian/tmp/opt/trinity/include/ktypelist.h debian/tmp/opt/trinity/include/kuniqueapp.h debian/tmp/opt/trinity/include/kuniqueapplication.h -debian/tmp/opt/trinity/include/kunittest/module.h -debian/tmp/opt/trinity/include/kunittest/runner.h -debian/tmp/opt/trinity/include/kunittest/tester.h +debian/tmp/opt/trinity/include/tdeunittest/module.h +debian/tmp/opt/trinity/include/tdeunittest/runner.h +debian/tmp/opt/trinity/include/tdeunittest/tester.h debian/tmp/opt/trinity/include/kunload.h debian/tmp/opt/trinity/include/kurifilter.h debian/tmp/opt/trinity/include/kurlbar.h @@ -668,8 +668,8 @@ debian/tmp/opt/trinity/include/kurlrequester.h debian/tmp/opt/trinity/include/kuser.h debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h -debian/tmp/opt/trinity/include/kwallet.h -debian/tmp/opt/trinity/include/kwallettypes.h +debian/tmp/opt/trinity/include/tdewallet.h +debian/tmp/opt/trinity/include/tdewallettypes.h debian/tmp/opt/trinity/include/twindowinfo.h debian/tmp/opt/trinity/include/twindowlistmenu.h debian/tmp/opt/trinity/include/twin.h @@ -683,28 +683,28 @@ debian/tmp/opt/trinity/include/kxmlguiclient.h debian/tmp/opt/trinity/include/kxmlguifactory.h debian/tmp/opt/trinity/include/kxmlgui.h debian/tmp/opt/trinity/include/kzip.h -debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h -debian/tmp/opt/trinity/include/libkrandr/libkrandr.h -debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h -debian/tmp/opt/trinity/include/libkrandr/randr.h -debian/tmp/opt/trinity/include/libkrsync/krsync.h -debian/tmp/opt/trinity/include/libkmid/alsaout.h -debian/tmp/opt/trinity/include/libkmid/dattypes.h -debian/tmp/opt/trinity/include/libkmid/deviceman.h -debian/tmp/opt/trinity/include/libkmid/fmout.h -debian/tmp/opt/trinity/include/libkmid/gusout.h -debian/tmp/opt/trinity/include/libkmid/libkmid.h -debian/tmp/opt/trinity/include/libkmid/midfile.h -debian/tmp/opt/trinity/include/libkmid/midimapper.h -debian/tmp/opt/trinity/include/libkmid/midiout.h -debian/tmp/opt/trinity/include/libkmid/midispec.h -debian/tmp/opt/trinity/include/libkmid/midistat.h -debian/tmp/opt/trinity/include/libkmid/mt32togm.h -debian/tmp/opt/trinity/include/libkmid/notearray.h -debian/tmp/opt/trinity/include/libkmid/player.h -debian/tmp/opt/trinity/include/libkmid/synthout.h -debian/tmp/opt/trinity/include/libkmid/track.h -debian/tmp/opt/trinity/include/libkmid/voiceman.h +debian/tmp/opt/trinity/include/libtderandr/ktimerdialog.h +debian/tmp/opt/trinity/include/libtderandr/libtderandr.h +debian/tmp/opt/trinity/include/libtderandr/lowlevel_randr.h +debian/tmp/opt/trinity/include/libtderandr/randr.h +debian/tmp/opt/trinity/include/libtdersync/tdersync.h +debian/tmp/opt/trinity/include/libtdemid/alsaout.h +debian/tmp/opt/trinity/include/libtdemid/dattypes.h +debian/tmp/opt/trinity/include/libtdemid/deviceman.h +debian/tmp/opt/trinity/include/libtdemid/fmout.h +debian/tmp/opt/trinity/include/libtdemid/gusout.h +debian/tmp/opt/trinity/include/libtdemid/libtdemid.h +debian/tmp/opt/trinity/include/libtdemid/midfile.h +debian/tmp/opt/trinity/include/libtdemid/midimapper.h +debian/tmp/opt/trinity/include/libtdemid/midiout.h +debian/tmp/opt/trinity/include/libtdemid/midispec.h +debian/tmp/opt/trinity/include/libtdemid/midistat.h +debian/tmp/opt/trinity/include/libtdemid/mt32togm.h +debian/tmp/opt/trinity/include/libtdemid/notearray.h +debian/tmp/opt/trinity/include/libtdemid/player.h +debian/tmp/opt/trinity/include/libtdemid/synthout.h +debian/tmp/opt/trinity/include/libtdemid/track.h +debian/tmp/opt/trinity/include/libtdemid/voiceman.h debian/tmp/opt/trinity/include/netwm_def.h debian/tmp/opt/trinity/include/netwm.h debian/tmp/opt/trinity/include/qxembed.h @@ -774,56 +774,56 @@ debian/tmp/opt/trinity/lib/libtdesu.la debian/tmp/opt/trinity/lib/libtdesu.so debian/tmp/opt/trinity/lib/libtdeui.la debian/tmp/opt/trinity/lib/libtdeui.so -debian/tmp/opt/trinity/lib/libkdnssd.la -debian/tmp/opt/trinity/lib/libkdnssd.so -debian/tmp/opt/trinity/lib/libkhtml.la -debian/tmp/opt/trinity/lib/libkhtml.so -debian/tmp/opt/trinity/lib/libkimproxy.la -debian/tmp/opt/trinity/lib/libkimproxy.so +debian/tmp/opt/trinity/lib/libtdednssd.la +debian/tmp/opt/trinity/lib/libtdednssd.so +debian/tmp/opt/trinity/lib/libtdehtml.la +debian/tmp/opt/trinity/lib/libtdehtml.so +debian/tmp/opt/trinity/lib/libtdeimproxy.la +debian/tmp/opt/trinity/lib/libtdeimproxy.so debian/tmp/opt/trinity/lib/libkio.la debian/tmp/opt/trinity/lib/libkio.so debian/tmp/opt/trinity/lib/libkjava.la debian/tmp/opt/trinity/lib/libkjava.so debian/tmp/opt/trinity/lib/libkjs.la debian/tmp/opt/trinity/lib/libkjs.so -debian/tmp/opt/trinity/lib/libkmdi2.la -debian/tmp/opt/trinity/lib/libkmdi2.so -debian/tmp/opt/trinity/lib/libkmdi.la -debian/tmp/opt/trinity/lib/libkmdi.so -debian/tmp/opt/trinity/lib/libkmediaplayer.la -debian/tmp/opt/trinity/lib/libkmediaplayer.so -debian/tmp/opt/trinity/lib/libkmid.la -debian/tmp/opt/trinity/lib/libkmid.so +debian/tmp/opt/trinity/lib/libtdemdi2.la +debian/tmp/opt/trinity/lib/libtdemdi2.so +debian/tmp/opt/trinity/lib/libtdemdi.la +debian/tmp/opt/trinity/lib/libtdemdi.so +debian/tmp/opt/trinity/lib/libtdemediaplayer.la +debian/tmp/opt/trinity/lib/libtdemediaplayer.so +debian/tmp/opt/trinity/lib/libtdemid.la +debian/tmp/opt/trinity/lib/libtdemid.so debian/tmp/opt/trinity/lib/libknewstuff.la debian/tmp/opt/trinity/lib/libknewstuff.so -debian/tmp/opt/trinity/lib/libkntlm.la -debian/tmp/opt/trinity/lib/libkntlm.so -debian/tmp/opt/trinity/lib/libkparts.la -debian/tmp/opt/trinity/lib/libkparts.so -debian/tmp/opt/trinity/lib/libkrandr.la -debian/tmp/opt/trinity/lib/libkrandr.so -debian/tmp/opt/trinity/lib/libkrsync.la -debian/tmp/opt/trinity/lib/libkrsync.so -debian/tmp/opt/trinity/lib/libkresources.la -debian/tmp/opt/trinity/lib/libkresources.so -debian/tmp/opt/trinity/lib/libkscreensaver.la -debian/tmp/opt/trinity/lib/libkscreensaver.so -debian/tmp/opt/trinity/lib/libkscript.la -debian/tmp/opt/trinity/lib/libkscript.so -debian/tmp/opt/trinity/lib/libkspell2.la -debian/tmp/opt/trinity/lib/libkspell2.so -debian/tmp/opt/trinity/lib/libkspell.la -debian/tmp/opt/trinity/lib/libkspell.so -debian/tmp/opt/trinity/lib/libktexteditor.la -debian/tmp/opt/trinity/lib/libktexteditor.so -debian/tmp/opt/trinity/lib/libkunittest.la -debian/tmp/opt/trinity/lib/libkunittest.so -debian/tmp/opt/trinity/lib/libkutils.la -debian/tmp/opt/trinity/lib/libkutils.so -debian/tmp/opt/trinity/lib/libkwalletbackend.la -debian/tmp/opt/trinity/lib/libkwalletbackend.so -debian/tmp/opt/trinity/lib/libkwalletclient.la -debian/tmp/opt/trinity/lib/libkwalletclient.so +debian/tmp/opt/trinity/lib/libtdentlm.la +debian/tmp/opt/trinity/lib/libtdentlm.so +debian/tmp/opt/trinity/lib/libtdeparts.la +debian/tmp/opt/trinity/lib/libtdeparts.so +debian/tmp/opt/trinity/lib/libtderandr.la +debian/tmp/opt/trinity/lib/libtderandr.so +debian/tmp/opt/trinity/lib/libtdersync.la +debian/tmp/opt/trinity/lib/libtdersync.so +debian/tmp/opt/trinity/lib/libtderesources.la +debian/tmp/opt/trinity/lib/libtderesources.so +debian/tmp/opt/trinity/lib/libtdescreensaver.la +debian/tmp/opt/trinity/lib/libtdescreensaver.so +debian/tmp/opt/trinity/lib/libtdescript.la +debian/tmp/opt/trinity/lib/libtdescript.so +debian/tmp/opt/trinity/lib/libtdespell2.la +debian/tmp/opt/trinity/lib/libtdespell2.so +debian/tmp/opt/trinity/lib/libtdespell.la +debian/tmp/opt/trinity/lib/libtdespell.so +debian/tmp/opt/trinity/lib/libtdetexteditor.la +debian/tmp/opt/trinity/lib/libtdetexteditor.so +debian/tmp/opt/trinity/lib/libtdeunittest.la +debian/tmp/opt/trinity/lib/libtdeunittest.so +debian/tmp/opt/trinity/lib/libtdeutils.la +debian/tmp/opt/trinity/lib/libtdeutils.so +debian/tmp/opt/trinity/lib/libtdewalletbackend.la +debian/tmp/opt/trinity/lib/libtdewalletbackend.so +debian/tmp/opt/trinity/lib/libtdewalletclient.la +debian/tmp/opt/trinity/lib/libtdewalletclient.so debian/tmp/opt/trinity/lib/libvcard.la debian/tmp/opt/trinity/lib/libvcard.so diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages index af14a7e71..e5756a2db 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages +++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages @@ -1,5 +1,5 @@ ./debian/man/kconfig_compiler-trinity.1 ./debian/man/ksvgtopng-trinity.1 -./debian/man/kunittestmodrunner-trinity.1 +./debian/man/tdeunittestmodrunner-trinity.1 ./debian/man/makekdewidgets-trinity.1 ./debian/man/preparetips-trinity.1 diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install index 80a4b789c..4d1bb325b 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install @@ -75,8 +75,8 @@ debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la -debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.la +debian/tmp/opt/trinity/lib/trinity/kcm_tderesources.so debian/tmp/opt/trinity/lib/trinity/kcmshell.la debian/tmp/opt/trinity/lib/trinity/kcmshell.so debian/tmp/opt/trinity/lib/trinity/kconf_update.la @@ -93,8 +93,8 @@ debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so debian/tmp/opt/trinity/lib/trinity/kded_kssld.la debian/tmp/opt/trinity/lib/trinity/kded_kssld.so -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la -debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.la +debian/tmp/opt/trinity/lib/trinity/kded_tdewalletd.so debian/tmp/opt/trinity/lib/trinity/kded.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so @@ -115,8 +115,8 @@ debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la -debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.la +debian/tmp/opt/trinity/lib/trinity/tdehtmlimagepart.so debian/tmp/opt/trinity/lib/trinity/kimg_dds.la debian/tmp/opt/trinity/lib/trinity/kimg_dds.so debian/tmp/opt/trinity/lib/trinity/kimg_eps.la @@ -167,34 +167,34 @@ debian/tmp/opt/trinity/lib/trinity/klauncher.la debian/tmp/opt/trinity/lib/trinity/klauncher.so debian/tmp/opt/trinity/lib/trinity/knotify.la debian/tmp/opt/trinity/lib/trinity/knotify.so -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la -debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la -debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_aspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la +debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la -debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_isearch.so +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.la +debian/tmp/opt/trinity/lib/trinity/tdetexteditor_kdatatool.so debian/tmp/opt/trinity/lib/trinity/libkatepart.la debian/tmp/opt/trinity/lib/trinity/libkatepart.so -debian/tmp/opt/trinity/lib/trinity/libkcertpart.la -debian/tmp/opt/trinity/lib/trinity/libkcertpart.so +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.la +debian/tmp/opt/trinity/lib/trinity/libtdecertpart.so debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so -debian/tmp/opt/trinity/lib/trinity/libkmultipart.la -debian/tmp/opt/trinity/lib/trinity/libkmultipart.so +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la +debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so +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 @@ -264,56 +264,56 @@ debian/tmp/opt/trinity/lib/libtdesu.so.4 debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0 debian/tmp/opt/trinity/lib/libtdeui.so.4 debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0 -debian/tmp/opt/trinity/lib/libkdnssd.so.1 -debian/tmp/opt/trinity/lib/libkdnssd.so.1.0.0 -debian/tmp/opt/trinity/lib/libkhtml.so.4 -debian/tmp/opt/trinity/lib/libkhtml.so.4.2.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0 -debian/tmp/opt/trinity/lib/libkimproxy.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdednssd.so.1 +debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdehtml.so.4 +debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0 +debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0 debian/tmp/opt/trinity/lib/libkio.so.4 debian/tmp/opt/trinity/lib/libkio.so.4.2.0 debian/tmp/opt/trinity/lib/libkjava.so.1 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0 debian/tmp/opt/trinity/lib/libkjs.so.1 debian/tmp/opt/trinity/lib/libkjs.so.1.2.0 -debian/tmp/opt/trinity/lib/libkmdi2.so.1 -debian/tmp/opt/trinity/lib/libkmdi2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmdi.so.1 -debian/tmp/opt/trinity/lib/libkmdi.so.1.0.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0 -debian/tmp/opt/trinity/lib/libkmediaplayer.so.0.0.0 -debian/tmp/opt/trinity/lib/libkmid.so.0 -debian/tmp/opt/trinity/lib/libkmid.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1 +debian/tmp/opt/trinity/lib/libtdemdi2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemdi.so.1 +debian/tmp/opt/trinity/lib/libtdemdi.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0 +debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0 +debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95 debian/tmp/opt/trinity/lib/libknewstuff.so.1 debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0 -debian/tmp/opt/trinity/lib/libkntlm.so.0.0.0 -debian/tmp/opt/trinity/lib/libkparts.so.2 -debian/tmp/opt/trinity/lib/libkparts.so.2.1.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0 -debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95 -debian/tmp/opt/trinity/lib/libkrsync.so.0 -debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1 -debian/tmp/opt/trinity/lib/libkresources.so.1 -debian/tmp/opt/trinity/lib/libkresources.so.1.2.0 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4 -debian/tmp/opt/trinity/lib/libkscreensaver.so.4.2.0 -debian/tmp/opt/trinity/lib/libkscript.so.0 -debian/tmp/opt/trinity/lib/libkscript.so.0.0.0 -debian/tmp/opt/trinity/lib/libkspell2.so.1 -debian/tmp/opt/trinity/lib/libkspell2.so.1.0.0 -debian/tmp/opt/trinity/lib/libkspell.so.4 -debian/tmp/opt/trinity/lib/libkspell.so.4.2.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0 -debian/tmp/opt/trinity/lib/libktexteditor.so.0.0.0 -debian/tmp/opt/trinity/lib/libkunittest.so.1 -debian/tmp/opt/trinity/lib/libkunittest.so.1.0.0 -debian/tmp/opt/trinity/lib/libkutils.so.1 -debian/tmp/opt/trinity/lib/libkutils.so.1.2.0 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1 -debian/tmp/opt/trinity/lib/libkwalletbackend.so.1.0.0 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1 -debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 +debian/tmp/opt/trinity/lib/libtdentlm.so.0 +debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeparts.so.2 +debian/tmp/opt/trinity/lib/libtdeparts.so.2.1.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0 +debian/tmp/opt/trinity/lib/libtderandr.so.0.0.95 +debian/tmp/opt/trinity/lib/libtdersync.so.0 +debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1 +debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4 +debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0 +debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdespell2.so.1 +debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdespell.so.4 +debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0 +debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1 +debian/tmp/opt/trinity/lib/libtdeunittest.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdeutils.so.1 +debian/tmp/opt/trinity/lib/libtdeutils.so.1.2.0 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1 +debian/tmp/opt/trinity/lib/libtdewalletbackend.so.1.0.0 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1 +debian/tmp/opt/trinity/lib/libtdewalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/kfile_elf.desktop diff --git a/ubuntu/precise/tdemultimedia/debian/changelog b/ubuntu/precise/tdemultimedia/debian/changelog index 37b689f66..70dc106df 100644 --- a/ubuntu/precise/tdemultimedia/debian/changelog +++ b/ubuntu/precise/tdemultimedia/debian/changelog @@ -584,7 +584,7 @@ tdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low tdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low - * Remove artsbuilder, kmid, krec depends from tdemultimedia meta-package. + * Remove artsbuilder, tdemid, krec depends from tdemultimedia meta-package. -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 22:37:33 +0000 @@ -784,7 +784,7 @@ tdemultimedia (4:3.1.5-1) unstable; urgency=low tdemultimedia (4:3.1.4-1) unstable; urgency=low * New upstream release. - * Document how to use timidity with kmid. (Closes: #195019) + * Document how to use timidity with tdemid. (Closes: #195019) * kaudiocreator Depends tdemultimedia-kio-plugins. (Closes: #196686) * kaboodle Recommends libarts1-xine. (Closes: #214118) @@ -1013,10 +1013,10 @@ tdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low is the proper name for it. * rename timidity to ktimidity and provide timidity yet we don't conflict with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files - for timidity/kmidi to /etc/kde2/kmidi and conffile them all. kmidi and + for timidity/tdemidi to /etc/kde2/tdemidi and conffile them all. tdemidi and ktimidity both seem to work find for me here now...hopefully it will do the same for you folks. - * Build kmidi/ktimidity with support for most of it's different interfaces. + * Build tdemidi/ktimidity with support for most of it's different interfaces. Not sure if this is how it'll end up being in the end. This includes the default Xaw, Ncurses, and Slang. * Fixes these problems: @@ -1030,7 +1030,7 @@ tdemultimedia (4:2.1.1-2) unstable; urgency=low * Update menu bits to include new kde menu removal tag * a few upstream fixes * Update build-depends to recognize real | virtual - * Adding menu entry for kmid...oops + * Adding menu entry for tdemid...oops -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 15:34:00 -0700 @@ -1160,7 +1160,7 @@ tdemultimedia (4:2.0-final-6) unstable; urgency=low tdemultimedia (4:2.0-final-5) unstable; urgency=low - * building with --enable-debug as it seems kmidi croaks if built without + * building with --enable-debug as it seems tdemidi croaks if built without debug -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 01:10:00 -0700 @@ -1189,7 +1189,7 @@ tdemultimedia (4:2.0-final-4) unstable; urgency=low tdemultimedia (4:2.0-final-3.1) unstable; urgency=low * minor upstream fixes - * more work on kmidi, kmid, and kaiman + * more work on tdemidi, tdemid, and kaiman -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Nov 2000 00:30:00 -0700 @@ -1216,7 +1216,7 @@ tdemultimedia (4:2.0-final-0) unstable; urgency=low tdemultimedia (4:2.0-20001011-2) unstable; urgency=low - * Trying to fix up kmidi + * Trying to fix up tdemidi -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 19:30:00 -0700 @@ -1248,7 +1248,7 @@ tdemultimedia (4:2.0-20001002-0) unstable; urgency=low tdemultimedia (4:2.0-20000925-2) unstable; urgency=low * More upstream fixes - * More work on kmidi - Moving timidity patches into the proper dir + * More work on tdemidi - Moving timidity patches into the proper dir -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 06:00:00 -0700 @@ -1283,7 +1283,7 @@ tdemultimedia (4:2.0-20000911-1) unstable; urgency=low tdemultimedia (4:2.0-20000911-0) unstable; urgency=low * more upstream fixes - * More kmidi fixes + * More tdemidi fixes * Breaking tdemultimedia down -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Sep 2000 04:30:00 -0700 diff --git a/ubuntu/precise/tdemultimedia/debian/control b/ubuntu/precise/tdemultimedia/debian/control index cf85ef6b0..42f607611 100644 --- a/ubuntu/precise/tdemultimedia/debian/control +++ b/ubuntu/precise/tdemultimedia/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdemultimedia-trinity (<< 4:14.0.0) Breaks: kdemultimedia-trinity (<< 4:14.0.0) -Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), kmid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) +Depends: artsbuilder-trinity (>= ${Source-Version}), juk-trinity (>= ${Source-Version}), kaboodle-trinity (>= ${Source-Version}), kaudiocreator-trinity (>= ${Source-Version}), tdemultimedia-kappfinder-data-trinity (>= ${Source-Version}), tdemultimedia-kfile-plugins-trinity (>= ${Source-Version}), tdemultimedia-kio-plugins-trinity (>= ${Source-Version}), tdemid-trinity (>= ${Source-Version}), kmix-trinity (>= ${Source-Version}), krec-trinity (>= ${Source-Version}), kscd-trinity (>= ${Source-Version}), libarts1-akode-trinity (>= ${Source-Version}), libarts1-audiofile-trinity (>= ${Source-Version}), libarts1-mpeglib-trinity (>= ${Source-Version}), libarts1-xine-trinity (>= ${Source-Version}), mpeglib-trinity (>= ${Source-Version}), noatun-trinity (>= ${Source-Version}) Suggests: tdemultimedia-trinity-doc-html (>= ${Source-Version}) Description: multimedia apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -31,7 +31,7 @@ Section: devel Architecture: any Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0) Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0) -Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) +Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), tdemid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version}) Conflicts: libmpeg-trinity-dev Description: development files for the Trinity multimedia module Development files and headers for the Trinity multimedia module. @@ -169,11 +169,11 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of Trinity, as a component of the KDE multimedia module. See the 'kde-trinity' and 'tdemultimedia-trinity' packages for more information. -Package: kmid-trinity +Package: tdemid-trinity Section: sound Architecture: any -Replaces: kmid-trinity (<< 4:14.0.0) -Breaks: kmid-trinity (<< 4:14.0.0) +Replaces: tdemid-trinity (<< 4:14.0.0) +Breaks: tdemid-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: MIDI/karaoke player for Trinity diff --git a/ubuntu/precise/tdemultimedia/debian/control.in b/ubuntu/precise/tdemultimedia/debian/control.in index 7b20cca6d..4bf762241 100644 --- a/ubuntu/precise/tdemultimedia/debian/control.in +++ b/ubuntu/precise/tdemultimedia/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdemultimedia Section: tde Architecture: all -Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) +Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), tdemultimedia-kappfinder-data (>= ${Source-Version}), tdemultimedia-kfile-plugins (>= ${Source-Version}), tdemultimedia-kio-plugins (>= ${Source-Version}), tdemid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version}) Suggests: tdemultimedia-doc-html (>= ${Source-Version}) Description: multimedia apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release Package: tdemultimedia-dev Section: devel Architecture: any -Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) +Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), tdemid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version}) Conflicts: libmpeg-dev Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0) Description: development files for the KDE multimedia module @@ -154,7 +154,7 @@ Description: enables the browsing of audio CDs under Konqueror This package is part of KDE, as a component of the KDE multimedia module. See the 'kde' and 'tdemultimedia' packages for more information. -Package: kmid +Package: tdemid Section: sound Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/precise/tdemultimedia/debian/copyright b/ubuntu/precise/tdemultimedia/debian/copyright index 8957d914a..f85e02329 100644 --- a/ubuntu/precise/tdemultimedia/debian/copyright +++ b/ubuntu/precise/tdemultimedia/debian/copyright @@ -14,7 +14,7 @@ in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and aktion, arts/builder, arts/runtime, arts/tools, -kfile-plugins, kmid, kmidi, koncd, kscd +kfile-plugins, tdemid, tdemidi, koncd, kscd ----------------------------------------------- GPL diff --git a/ubuntu/precise/tdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/precise/tdemultimedia/debian/icons/kmid-16.xpm deleted file mode 100644 index 0a510090a..000000000 --- a/ubuntu/precise/tdemultimedia/debian/icons/kmid-16.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static char *kmid-16[] = { -/* columns rows colors chars-per-pixel */ -"16 16 104 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c gray4", -"# c #0C0C0C", -"$ c #101010", -"% c #111111", -"& c gray7", -"* c #161616", -"= c gray9", -"- c gray10", -"; c gray11", -": c #1D1D1D", -"> c #1E1E1E", -", c gray12", -"< c #222222", -"1 c #232323", -"2 c gray14", -"3 c #252525", -"4 c gray15", -"5 c #282828", -"6 c #2A2A2A", -"7 c gray17", -"8 c #2D2D2D", -"9 c gray18", -"0 c #2F2F2F", -"q c gray19", -"w c gray20", -"e c #393939", -"r c #3A3A3A", -"t c gray24", -"y c #3F3F3F", -"u c gray25", -"i c gray26", -"p c #444444", -"a c #464646", -"s c #494949", -"d c gray29", -"f c #4B4B4B", -"g c #505050", -"h c #555555", -"j c #565656", -"k c gray34", -"l c #585858", -"z c gray35", -"x c #5B5B5B", -"c c #626262", -"v c gray39", -"b c gray40", -"n c #686868", -"m c #727272", -"M c gray45", -"N c gray46", -"B c #777777", -"V c gray48", -"C c #7B7B7B", -"Z c gray49", -"A c #7E7E7E", -"S c #808080", -"D c #838383", -"F c #868686", -"G c gray53", -"H c #898989", -"J c gray54", -"K c #8D8D8D", -"L c #8E8E8E", -"P c gray56", -"I c gray57", -"U c #929292", -"Y c #959595", -"T c gray59", -"R c #9A9A9A", -"E c #9B9B9B", -"W c gray61", -"Q c #9D9D9D", -"! c gray64", -"~ c #A4A4A4", -"^ c gray65", -"/ c #A7A7A7", -"( c #AFAFAF", -") c #B2B2B2", -"_ c gray70", -"` c gray71", -"' c gray73", -"] c gray74", -"[ c gray", -"{ c #C0C0C0", -"} c gray76", -"| c #CACACA", -" . c gray81", -".. c gray82", -"X. c gray84", -"o. c #D8D8D8", -"O. c #E2E2E2", -"+. c gray89", -"@. c #E6E6E6", -"#. c gray93", -"$. c #F8F8F8", -"%. c #F9F9F9", -"&. c gray100", -"*. c None", -/* pixels */ -" *.*.*.*.*.*.*.*.*.*.", -" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", -" 6 t i C : *.*.*.*.*.*.*.*.*.*.", -" 6 t a C = *.*.*.*.*.*.*.*.*.*.", -" 6 i f C @ *.*.*.*. ", -" 6 a f B *.*.l + D l v l : ", -" 3 r n F 1 H P 3 n | U M - *.", -" = U [ r ! &.Q f t C | *.*.", -" F %.: a #.&.' C & v &.[ *.*.*.", -"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", -"*.k &.] E &.&.Q O.&.` ` k *.*.", -"*.q ] ) D ( ] H U X.! 3 *.*.*.", -"*.# 3 0 i [ +.U U &.P *.*.*.", -"*.& i t a | &./ B U k b : *.*.", -"*.@ 6 0 1 & q : + r f r *.", -"*. *.*.*. *." -}; diff --git a/ubuntu/precise/tdemultimedia/debian/icons/kmid.xpm b/ubuntu/precise/tdemultimedia/debian/icons/kmid.xpm deleted file mode 100644 index fb669aa72..000000000 --- a/ubuntu/precise/tdemultimedia/debian/icons/kmid.xpm +++ /dev/null @@ -1,251 +0,0 @@ -/* XPM */ -static char *kmid[] = { -/* columns rows colors chars-per-pixel */ -"32 32 213 2", -" c black", -". c #010101", -"X c #020202", -"o c gray1", -"O c #040404", -"+ c gray2", -"@ c #060606", -"# c #070707", -"$ c gray3", -"% c gray4", -"& c #0B0B0B", -"* c #0C0C0C", -"= c gray5", -"- c #0E0E0E", -"; c gray6", -": c #101010", -"> c #111111", -", c gray7", -"< c gray8", -"1 c #151515", -"2 c #161616", -"3 c gray9", -"4 c #181818", -"5 c #191919", -"6 c gray10", -"7 c #1B1B1B", -"8 c gray11", -"9 c #1D1D1D", -"0 c #1E1E1E", -"q c gray12", -"w c #202020", -"e c gray13", -"r c #222222", -"t c #232323", -"y c gray14", -"u c #252525", -"i c gray15", -"p c #272727", -"a c #282828", -"s c gray16", -"d c #2A2A2A", -"f c gray17", -"g c #2C2C2C", -"h c #2D2D2D", -"j c gray18", -"k c #2F2F2F", -"l c gray19", -"z c #313131", -"x c #323232", -"c c gray20", -"v c #343434", -"b c #353535", -"n c gray21", -"m c #373737", -"M c gray22", -"N c #393939", -"B c #3A3A3A", -"V c gray23", -"C c #3C3C3C", -"Z c gray24", -"A c #3E3E3E", -"S c #3F3F3F", -"D c gray25", -"F c #414141", -"G c gray26", -"H c #434343", -"J c #444444", -"K c gray27", -"L c #464646", -"P c gray28", -"I c #484848", -"U c #494949", -"Y c #4B4B4B", -"T c #4C4C4C", -"R c gray30", -"E c #4E4E4E", -"W c gray31", -"Q c #505050", -"! c #515151", -"~ c gray32", -"^ c #535353", -"/ c gray33", -"( c #555555", -") c #565656", -"_ c gray34", -"` c #585858", -"' c gray35", -"] c #5A5A5A", -"[ c #5B5B5B", -"{ c gray36", -"} c #5D5D5D", -"| c gray37", -" . c #5F5F5F", -".. c #606060", -"X. c gray38", -"o. c #626262", -"O. c gray39", -"+. c #646464", -"@. c #656565", -"#. c #676767", -"$. c #686868", -"%. c DimGray", -"&. c #6A6A6A", -"*. c gray42", -"=. c #6C6C6C", -"-. c #6D6D6D", -";. c gray43", -":. c #6F6F6F", -">. c gray44", -",. c gray45", -"<. c #747474", -"1. c gray46", -"2. c #777777", -"3. c gray47", -"4. c #797979", -"5. c gray48", -"6. c #7B7B7B", -"7. c gray49", -"8. c gray50", -"9. c #808080", -"0. c #818181", -"q. c gray51", -"w. c #838383", -"e. c #848484", -"r. c #868686", -"t. c #888888", -"y. c gray54", -"u. c #8B8B8B", -"i. c gray55", -"p. c #8E8E8E", -"a. c gray57", -"s. c #939393", -"d. c gray58", -"f. c gray59", -"g. c #979797", -"h. c gray60", -"j. c #9A9A9A", -"k. c #9B9B9B", -"l. c gray61", -"z. c #9D9D9D", -"x. c #9F9F9F", -"c. c #A0A0A0", -"v. c gray63", -"b. c #A2A2A2", -"n. c gray64", -"m. c #A4A4A4", -"M. c #A5A5A5", -"N. c gray65", -"B. c #A7A7A7", -"V. c gray66", -"C. c #A9A9A9", -"Z. c #AAAAAA", -"A. c #ACACAC", -"S. c gray68", -"D. c #AEAEAE", -"F. c #AFAFAF", -"G. c gray69", -"H. c #B2B2B2", -"J. c gray70", -"K. c #B4B4B4", -"L. c gray71", -"P. c #B6B6B6", -"I. c #B7B7B7", -"U. c gray72", -"Y. c gray73", -"T. c #BBBBBB", -"R. c #BCBCBC", -"E. c gray74", -"W. c gray", -"Q. c gray75", -"!. c #C0C0C0", -"~. c #C1C1C1", -"^. c #C3C3C3", -"/. c gray77", -"(. c #C5C5C5", -"). c #C6C6C6", -"_. c gray78", -"`. c #C8C8C8", -"'. c gray79", -"]. c gray80", -"[. c #CECECE", -"{. c #D2D2D2", -"}. c LightGray", -"|. c #D5D5D5", -" X c gray84", -".X c #D8D8D8", -"XX c gray85", -"oX c #DADADA", -"OX c gray86", -"+X c #DDDDDD", -"@X c gray87", -"#X c #DFDFDF", -"$X c #E1E1E1", -"%X c gray89", -"&X c gray90", -"*X c #E6E6E6", -"=X c gray91", -"-X c #EEEEEE", -";X c #EFEFEF", -":X c gray94", -">X c #F1F1F1", -",X c gray95", -"<X c #F3F3F3", -"1X c #F4F4F4", -"2X c gray96", -"3X c #F6F6F6", -"4X c #F9F9F9", -"5X c gray98", -"6X c #FBFBFB", -"7X c #FDFDFD", -"8X c #FEFEFE", -"9X c gray100", -"0X c None", -/* pixels */ -" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", -"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", -"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", -"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", -"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", -"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", -"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", -"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", -"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", -"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", -"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", -"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", -"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", -"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", -"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", -"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", -"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", -"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", -"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", -"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", -"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", -"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", -"0X0X 0X", -"0X0X 0X0X0X 0X" -}; diff --git a/ubuntu/precise/tdemultimedia/debian/icons/tdemid-16.xpm b/ubuntu/precise/tdemultimedia/debian/icons/tdemid-16.xpm new file mode 100644 index 000000000..64ad03b59 --- /dev/null +++ b/ubuntu/precise/tdemultimedia/debian/icons/tdemid-16.xpm @@ -0,0 +1,126 @@ +/* XPM */ +static char *tdemid-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 104 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c gray4", +"# c #0C0C0C", +"$ c #101010", +"% c #111111", +"& c gray7", +"* c #161616", +"= c gray9", +"- c gray10", +"; c gray11", +": c #1D1D1D", +"> c #1E1E1E", +", c gray12", +"< c #222222", +"1 c #232323", +"2 c gray14", +"3 c #252525", +"4 c gray15", +"5 c #282828", +"6 c #2A2A2A", +"7 c gray17", +"8 c #2D2D2D", +"9 c gray18", +"0 c #2F2F2F", +"q c gray19", +"w c gray20", +"e c #393939", +"r c #3A3A3A", +"t c gray24", +"y c #3F3F3F", +"u c gray25", +"i c gray26", +"p c #444444", +"a c #464646", +"s c #494949", +"d c gray29", +"f c #4B4B4B", +"g c #505050", +"h c #555555", +"j c #565656", +"k c gray34", +"l c #585858", +"z c gray35", +"x c #5B5B5B", +"c c #626262", +"v c gray39", +"b c gray40", +"n c #686868", +"m c #727272", +"M c gray45", +"N c gray46", +"B c #777777", +"V c gray48", +"C c #7B7B7B", +"Z c gray49", +"A c #7E7E7E", +"S c #808080", +"D c #838383", +"F c #868686", +"G c gray53", +"H c #898989", +"J c gray54", +"K c #8D8D8D", +"L c #8E8E8E", +"P c gray56", +"I c gray57", +"U c #929292", +"Y c #959595", +"T c gray59", +"R c #9A9A9A", +"E c #9B9B9B", +"W c gray61", +"Q c #9D9D9D", +"! c gray64", +"~ c #A4A4A4", +"^ c gray65", +"/ c #A7A7A7", +"( c #AFAFAF", +") c #B2B2B2", +"_ c gray70", +"` c gray71", +"' c gray73", +"] c gray74", +"[ c gray", +"{ c #C0C0C0", +"} c gray76", +"| c #CACACA", +" . c gray81", +".. c gray82", +"X. c gray84", +"o. c #D8D8D8", +"O. c #E2E2E2", +"+. c gray89", +"@. c #E6E6E6", +"#. c gray93", +"$. c #F8F8F8", +"%. c #F9F9F9", +"&. c gray100", +"*. c None", +/* pixels */ +" *.*.*.*.*.*.*.*.*.*.", +" : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.", +" 6 t i C : *.*.*.*.*.*.*.*.*.*.", +" 6 t a C = *.*.*.*.*.*.*.*.*.*.", +" 6 i f C @ *.*.*.*. ", +" 6 a f B *.*.l + D l v l : ", +" 3 r n F 1 H P 3 n | U M - *.", +" = U [ r ! &.Q f t C | *.*.", +" F %.: a #.&.' C & v &.[ *.*.*.", +"*.^ ..E E %.&.^ o.X.] &.@.: *.*.", +"*.k &.] E &.&.Q O.&.` ` k *.*.", +"*.q ] ) D ( ] H U X.! 3 *.*.*.", +"*.# 3 0 i [ +.U U &.P *.*.*.", +"*.& i t a | &./ B U k b : *.*.", +"*.@ 6 0 1 & q : + r f r *.", +"*. *.*.*. *." +}; diff --git a/ubuntu/precise/tdemultimedia/debian/icons/tdemid.xpm b/ubuntu/precise/tdemultimedia/debian/icons/tdemid.xpm new file mode 100644 index 000000000..c4cbb3bf1 --- /dev/null +++ b/ubuntu/precise/tdemultimedia/debian/icons/tdemid.xpm @@ -0,0 +1,251 @@ +/* XPM */ +static char *tdemid[] = { +/* columns rows colors chars-per-pixel */ +"32 32 213 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #060606", +"# c #070707", +"$ c gray3", +"% c gray4", +"& c #0B0B0B", +"* c #0C0C0C", +"= c gray5", +"- c #0E0E0E", +"; c gray6", +": c #101010", +"> c #111111", +", c gray7", +"< c gray8", +"1 c #151515", +"2 c #161616", +"3 c gray9", +"4 c #181818", +"5 c #191919", +"6 c gray10", +"7 c #1B1B1B", +"8 c gray11", +"9 c #1D1D1D", +"0 c #1E1E1E", +"q c gray12", +"w c #202020", +"e c gray13", +"r c #222222", +"t c #232323", +"y c gray14", +"u c #252525", +"i c gray15", +"p c #272727", +"a c #282828", +"s c gray16", +"d c #2A2A2A", +"f c gray17", +"g c #2C2C2C", +"h c #2D2D2D", +"j c gray18", +"k c #2F2F2F", +"l c gray19", +"z c #313131", +"x c #323232", +"c c gray20", +"v c #343434", +"b c #353535", +"n c gray21", +"m c #373737", +"M c gray22", +"N c #393939", +"B c #3A3A3A", +"V c gray23", +"C c #3C3C3C", +"Z c gray24", +"A c #3E3E3E", +"S c #3F3F3F", +"D c gray25", +"F c #414141", +"G c gray26", +"H c #434343", +"J c #444444", +"K c gray27", +"L c #464646", +"P c gray28", +"I c #484848", +"U c #494949", +"Y c #4B4B4B", +"T c #4C4C4C", +"R c gray30", +"E c #4E4E4E", +"W c gray31", +"Q c #505050", +"! c #515151", +"~ c gray32", +"^ c #535353", +"/ c gray33", +"( c #555555", +") c #565656", +"_ c gray34", +"` c #585858", +"' c gray35", +"] c #5A5A5A", +"[ c #5B5B5B", +"{ c gray36", +"} c #5D5D5D", +"| c gray37", +" . c #5F5F5F", +".. c #606060", +"X. c gray38", +"o. c #626262", +"O. c gray39", +"+. c #646464", +"@. c #656565", +"#. c #676767", +"$. c #686868", +"%. c DimGray", +"&. c #6A6A6A", +"*. c gray42", +"=. c #6C6C6C", +"-. c #6D6D6D", +";. c gray43", +":. c #6F6F6F", +">. c gray44", +",. c gray45", +"<. c #747474", +"1. c gray46", +"2. c #777777", +"3. c gray47", +"4. c #797979", +"5. c gray48", +"6. c #7B7B7B", +"7. c gray49", +"8. c gray50", +"9. c #808080", +"0. c #818181", +"q. c gray51", +"w. c #838383", +"e. c #848484", +"r. c #868686", +"t. c #888888", +"y. c gray54", +"u. c #8B8B8B", +"i. c gray55", +"p. c #8E8E8E", +"a. c gray57", +"s. c #939393", +"d. c gray58", +"f. c gray59", +"g. c #979797", +"h. c gray60", +"j. c #9A9A9A", +"k. c #9B9B9B", +"l. c gray61", +"z. c #9D9D9D", +"x. c #9F9F9F", +"c. c #A0A0A0", +"v. c gray63", +"b. c #A2A2A2", +"n. c gray64", +"m. c #A4A4A4", +"M. c #A5A5A5", +"N. c gray65", +"B. c #A7A7A7", +"V. c gray66", +"C. c #A9A9A9", +"Z. c #AAAAAA", +"A. c #ACACAC", +"S. c gray68", +"D. c #AEAEAE", +"F. c #AFAFAF", +"G. c gray69", +"H. c #B2B2B2", +"J. c gray70", +"K. c #B4B4B4", +"L. c gray71", +"P. c #B6B6B6", +"I. c #B7B7B7", +"U. c gray72", +"Y. c gray73", +"T. c #BBBBBB", +"R. c #BCBCBC", +"E. c gray74", +"W. c gray", +"Q. c gray75", +"!. c #C0C0C0", +"~. c #C1C1C1", +"^. c #C3C3C3", +"/. c gray77", +"(. c #C5C5C5", +"). c #C6C6C6", +"_. c gray78", +"`. c #C8C8C8", +"'. c gray79", +"]. c gray80", +"[. c #CECECE", +"{. c #D2D2D2", +"}. c LightGray", +"|. c #D5D5D5", +" X c gray84", +".X c #D8D8D8", +"XX c gray85", +"oX c #DADADA", +"OX c gray86", +"+X c #DDDDDD", +"@X c gray87", +"#X c #DFDFDF", +"$X c #E1E1E1", +"%X c gray89", +"&X c gray90", +"*X c #E6E6E6", +"=X c gray91", +"-X c #EEEEEE", +";X c #EFEFEF", +":X c gray94", +">X c #F1F1F1", +",X c gray95", +"<X c #F3F3F3", +"1X c #F4F4F4", +"2X c gray96", +"3X c #F6F6F6", +"4X c #F9F9F9", +"5X c gray98", +"6X c #FBFBFB", +"7X c #FDFDFD", +"8X c #FEFEFE", +"9X c gray100", +"0X c None", +/* pixels */ +" 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ @ @ $ 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ 3 3 3 6 q q r N l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q y a g l l G 2.N 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ r a v N N C ! 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" @ q a v C C G ( 7.l 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +" r g N C G J ] 7.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r g N G J J | 0.g 0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", +"0X@ r l N G Y J o.0.a 0X0X0X0X0X0X0X0X 0X0X0X ", +"0X r v G J Y Y @.0.a 0X0X0X0X0X0X @ @ ", +"0X r v C J R R @.0.y 0X0X0X0X0X= G o.N C C C C C v 6 ", +"0X r N C Y Y ! &.7.r @ 0X0XJ.| g = J '.B.&.-.-.>.-.! y @ ", +"0X r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6 ", +"0X q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C = 0X0X", +"0X q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @ 0X0X0X", +"0X 3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r 0X0X0X0X0X", +"0X = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X", +"0X J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X", +"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.] 0X0X0X", +"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r 0X0X0X", +"0X 6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@ 0X0X0X", +"0X $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6 0X0X0X", +"0X @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J 0X0X0X", +"0X @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C = 0X0X0X0X", +"0X @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r 0X0X0X0X0X0X", +"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r 0X0X0X0X0X", +"0X0X@ y N N C G J Y J.OX#X#X_.2.@.Q.'.B.] G ( R 3 0X0X0X0X0X", +"0X0X r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @ 0X0X0X0X", +"0X0X r v N C G J v y J | &.o.N : = C R ( ] ] ] l @ 0X0X0X", +"0X0X 3 6 6 3 6 6 6 y y q q q r r = 0X0X", +"0X0X 0X", +"0X0X 0X0X0X 0X" +}; diff --git a/ubuntu/precise/tdemultimedia/debian/kmid-trinity.install b/ubuntu/precise/tdemultimedia/debian/kmid-trinity.install deleted file mode 100644 index e77e1784a..000000000 --- a/ubuntu/precise/tdemultimedia/debian/kmid-trinity.install +++ /dev/null @@ -1,40 +0,0 @@ -debian/tmp/opt/trinity/bin/kmid -debian/tmp/opt/trinity/lib/trinity/libkmidpart.la -debian/tmp/opt/trinity/lib/trinity/libkmidpart.so -debian/tmp/opt/trinity/lib/libkmidlib.so.0 -debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0 -debian/tmp/opt/trinity/share/applications/tde/kmid.desktop -debian/tmp/opt/trinity/share/apps/kmid/DiesIrae.kar -debian/tmp/opt/trinity/share/apps/kmid/Guantanamera.kar -debian/tmp/opt/trinity/share/apps/kmid/MariaDeLasMercedes.kar -debian/tmp/opt/trinity/share/apps/kmid/OFortuna.kar -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/drums.sb -debian/tmp/opt/trinity/share/apps/kmid/fm/std.o3 -debian/tmp/opt/trinity/share/apps/kmid/fm/std.sb -debian/tmp/opt/trinity/share/apps/kmid/icons/button1.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/button2.xpm -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png -debian/tmp/opt/trinity/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png -debian/tmp/opt/trinity/share/apps/kmid/icons/keyboard.xpm -debian/tmp/opt/trinity/share/apps/kmid/kmid_partui.rc -debian/tmp/opt/trinity/share/apps/kmid/kmidui.rc -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map -debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map -debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png -debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop -debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop - -debian/icons/kmid.xpm /opt/trinity/share/pixmaps -debian/icons/kmid-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/precise/tdemultimedia/debian/kmid-trinity.menu b/ubuntu/precise/tdemultimedia/debian/kmid-trinity.menu deleted file mode 100644 index ca828ea94..000000000 --- a/ubuntu/precise/tdemultimedia/debian/kmid-trinity.menu +++ /dev/null @@ -1,11 +0,0 @@ -?package(kmid):\ - needs="X11"\ - section="Apps/Sound"\ - hints="TDE"\ - title="KMid"\ - icon32x32="/opt/trinity/share/pixmaps/kmid.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kmid-16.xpm"\ - command="/opt/trinity/bin/kmid" - -# Icon 32x32 kmid/cr32-app-kmid.png kmid.xpm -# Icon 16x16 kmid/cr16-app-kmid.png kmid-16.xpm diff --git a/ubuntu/precise/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/precise/tdemultimedia/debian/man/kaboodle-trinity.1 index 76f29a181..2e9e5704d 100644 --- a/ubuntu/precise/tdemultimedia/debian/man/kaboodle-trinity.1 +++ b/ubuntu/precise/tdemultimedia/debian/man/kaboodle-trinity.1 @@ -14,7 +14,7 @@ because the original program does not have a manual page. .PP .B Kaboodle is a simple KMedia (aRts) player for KDE, which can play standalone, -or embedded in Konqueror. The embedded player should work for media embedded in khtml, too. +or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too. It is meant for simple stuff like playing a quick video or sound file. .B Kaboodle does not accept plugins, does not have a playlist or volume control and other such features. @@ -205,10 +205,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/precise/tdemultimedia/debian/rules b/ubuntu/precise/tdemultimedia/debian/rules index 1e7e0647c..58e944e5d 100755 --- a/ubuntu/precise/tdemultimedia/debian/rules +++ b/ubuntu/precise/tdemultimedia/debian/rules @@ -26,7 +26,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ +PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity tdemid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.install b/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.install new file mode 100644 index 000000000..c36f2d16a --- /dev/null +++ b/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.install @@ -0,0 +1,40 @@ +debian/tmp/opt/trinity/bin/tdemid +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.la +debian/tmp/opt/trinity/lib/trinity/libtdemidpart.so +debian/tmp/opt/trinity/lib/libtdemidlib.so.0 +debian/tmp/opt/trinity/lib/libtdemidlib.so.0.0.0 +debian/tmp/opt/trinity/share/applications/tde/tdemid.desktop +debian/tmp/opt/trinity/share/apps/tdemid/DiesIrae.kar +debian/tmp/opt/trinity/share/apps/tdemid/Guantanamera.kar +debian/tmp/opt/trinity/share/apps/tdemid/MariaDeLasMercedes.kar +debian/tmp/opt/trinity/share/apps/tdemid/OFortuna.kar +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/drums.sb +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.o3 +debian/tmp/opt/trinity/share/apps/tdemid/fm/std.sb +debian/tmp/opt/trinity/share/apps/tdemid/icons/button1.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/button2.xpm +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/16x16/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/22x22/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/piano.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/crystalsvg/32x32/actions/volume.png +debian/tmp/opt/trinity/share/apps/tdemid/icons/keyboard.xpm +debian/tmp/opt/trinity/share/apps/tdemid/tdemid_partui.rc +debian/tmp/opt/trinity/share/apps/tdemid/tdemidui.rc +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSR500.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaPSS790.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/YamahaQY10.map +debian/tmp/opt/trinity/share/apps/tdemid/maps/gm.map +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdemid/index.docbook +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdemid.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdemid.png +debian/tmp/opt/trinity/share/mimelnk/audio/x-karaoke.desktop +debian/tmp/opt/trinity/share/servicetypes/audiomidi.desktop + +debian/icons/tdemid.xpm /opt/trinity/share/pixmaps +debian/icons/tdemid-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.menu b/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.menu new file mode 100644 index 000000000..5f3ec9248 --- /dev/null +++ b/ubuntu/precise/tdemultimedia/debian/tdemid-trinity.menu @@ -0,0 +1,11 @@ +?package(tdemid):\ + needs="X11"\ + section="Apps/Sound"\ + hints="TDE"\ + title="KMid"\ + icon32x32="/opt/trinity/share/pixmaps/tdemid.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/tdemid-16.xpm"\ + command="/opt/trinity/bin/tdemid" + +# Icon 32x32 tdemid/cr32-app-tdemid.png tdemid.xpm +# Icon 16x16 tdemid/cr16-app-tdemid.png tdemid-16.xpm diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid deleted file mode 100644 index 0d5dc5893..000000000 --- a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdemultimedia-doc-html-kmid -Title: KMid Handbook -Author: Antonio Larrosa Jimenez -Abstract: KMid is a midi/karaoke multimedia player for KDE. -Section: Apps/Music - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html - diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid new file mode 100644 index 000000000..e4d54da22 --- /dev/null +++ b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid @@ -0,0 +1,10 @@ +Document: tdemultimedia-doc-html-tdemid +Title: KMid Handbook +Author: Antonio Larrosa Jimenez +Abstract: KMid is a midi/karaoke multimedia player for KDE. +Section: Apps/Music + +Format: HTML +Index: /opt/trinity/share/doc/tde/HTML/en/tdemid/index.html +Files: /opt/trinity/share/doc/tde/HTML/en/tdemid/*.html + diff --git a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-trinity-dev.install index 4edb170bf..97d3eb309 100644 --- a/ubuntu/precise/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/ubuntu/precise/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -155,8 +155,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_kmix.la debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la debian/tmp/opt/trinity/lib/libtdeinit_krec.la debian/tmp/opt/trinity/lib/libtdeinit_noatun.la -debian/tmp/opt/trinity/lib/libkmidlib.la -debian/tmp/opt/trinity/lib/libkmidlib.so +debian/tmp/opt/trinity/lib/libtdemidlib.la +debian/tmp/opt/trinity/lib/libtdemidlib.so debian/tmp/opt/trinity/lib/libmpeg.la debian/tmp/opt/trinity/lib/libmpeg.so debian/tmp/opt/trinity/lib/libnoatun.la diff --git a/ubuntu/precise/tdenetwork/debian/changelog b/ubuntu/precise/tdenetwork/debian/changelog index 43b1aadd7..4510420ac 100644 --- a/ubuntu/precise/tdenetwork/debian/changelog +++ b/ubuntu/precise/tdenetwork/debian/changelog @@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low * Don't do anything if lisa is already running. (Closes: #407892) * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019) * Pull patch from upstream to fix webcam issues. (Closes: #414424) - * Remove libnss-mdns from kdnssd-depends. (Closes: 412084) + * Remove libnss-mdns from tdednssd-depends. (Closes: 412084) * Increase maximum count of lines in ksirc (Closes: 291968) * Don't build kwifimanager on s390 - they don't have wifi hardware. - * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there. + * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there. * Patch to fix builds on kfreebsd archs. (Closes: 398909) * Make ktalkd depend on update-inetd - we use it in maint scripts. @@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support - to kdnssd (Closes: Malone 33034). + to tdednssd (Closes: Malone 33034). -- Raphaël Pinson <raphink@ubuntu.com> Thu, 20 Jul 2006 12:13:01 +0200 @@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low +++ Changes by Isaac Clerencia: - * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd. + * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd. +++ Changes by Christopher Martin: @@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi installed by default. - * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/. + * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 19:09:40 +0200 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low - * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package. + * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package. -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 18:52:54 +0200 @@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low - * Add kdnssd to tdenetwork meta package - * Remove libkdnssd dependency from kdnssd (now in tdelibs) + * Add tdednssd to tdenetwork meta package + * Remove libtdednssd dependency from tdednssd (now in tdelibs) -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 09:51:13 +0000 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low - * Add package kdnssd with zeroconf:/ ioslave + * Add package tdednssd with zeroconf:/ ioslave -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 02:22:49 +0000 diff --git a/ubuntu/precise/tdenetwork/debian/control b/ubuntu/precise/tdenetwork/debian/control index a1a2dcb2b..a95cc81a7 100644 --- a/ubuntu/precise/tdenetwork/debian/control +++ b/ubuntu/precise/tdenetwork/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdenetwork-trinity (<< 4:14.0.0) Breaks: kdenetwork-trinity (<< 4:14.0.0) -Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) +Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version}) Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version}) Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version}) Description: network-related apps from the official Trinity release @@ -331,11 +331,11 @@ Description: LAN information server for Trinity This package is part of Trinity, as a component of the KDE network module. See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information. -Package: kdnssd-trinity +Package: tdednssd-trinity Section: net Architecture: any -Replaces: kdnssd-trinity (<< 4:14.0.0) -Breaks: kdnssd-trinity (<< 4:14.0.0) +Replaces: tdednssd-trinity (<< 4:14.0.0) +Breaks: tdednssd-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: avahi-daemon Suggests: avahi-autoipd | zeroconf diff --git a/ubuntu/precise/tdenetwork/debian/control.in b/ubuntu/precise/tdenetwork/debian/control.in index 1c7fc62f9..7c7dfdc41 100644 --- a/ubuntu/precise/tdenetwork/debian/control.in +++ b/ubuntu/precise/tdenetwork/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdenetwork Section: tde Architecture: all -Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) +Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version}) Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version}) Suggests: tdenetwork-doc-html (>= ${Source-Version}) Description: network-related apps from the official KDE release @@ -299,7 +299,7 @@ Description: LAN information server for KDE This package is part of KDE, as a component of the KDE network module. See the 'kde' and 'tdenetwork' packages for more information. -Package: kdnssd +Package: tdednssd Section: net Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/precise/tdenetwork/debian/kget-trinity.install b/ubuntu/precise/tdenetwork/debian/kget-trinity.install index 9a1ac79f5..d2a0707c9 100644 --- a/ubuntu/precise/tdenetwork/debian/kget-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/kget-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/kget -debian/tmp/opt/trinity/lib/trinity/khtml_kget.la -debian/tmp/opt/trinity/lib/trinity/khtml_kget.so +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la +debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so debian/tmp/opt/trinity/share/applications/tde/kget.desktop debian/tmp/opt/trinity/share/apps/kget/eventsrc debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png @@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png debian/tmp/opt/trinity/share/apps/kget/pics/try5.png debian/tmp/opt/trinity/share/apps/kget/pics/try6.png debian/tmp/opt/trinity/share/apps/kget/pics/try7.png -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop -debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop +debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png @@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png diff --git a/ubuntu/precise/tdenetwork/debian/rules b/ubuntu/precise/tdenetwork/debian/rules index 2579d07e3..0ee562691 100755 --- a/ubuntu/precise/tdenetwork/debian/rules +++ b/ubuntu/precise/tdenetwork/debian/rules @@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390) DONT_BUILD+= kwifimanager endif ifneq ($(DEB_HOST_ARCH_OS),linux) -DONT_BUILD+= kwifimanager kdnssd +DONT_BUILD+= kwifimanager tdednssd endif export DH_OPTIONS diff --git a/ubuntu/precise/tdenetwork/debian/kdnssd-trinity.install b/ubuntu/precise/tdenetwork/debian/tdednssd-trinity.install index 8d6a52c6b..8d6a52c6b 100644 --- a/ubuntu/precise/tdenetwork/debian/kdnssd-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/tdednssd-trinity.install diff --git a/ubuntu/precise/tdepim/debian/changelog b/ubuntu/precise/tdepim/debian/changelog index 09dc0dfc3..268556215 100644 --- a/ubuntu/precise/tdepim/debian/changelog +++ b/ubuntu/precise/tdepim/debian/changelog @@ -1035,7 +1035,7 @@ tdepim (4:3.5.0-0ubuntu4) dapper; urgency=low tdepim (4:3.5.0-0ubuntu3) dapper; urgency=low - * Increase version number on Replaces for tdepim-kresources + * Increase version number on Replaces for tdepim-tderesources -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 18:42:44 +0000 @@ -1127,7 +1127,7 @@ tdepim (4:3.4.1-2) UNRELEASED; urgency=low tdepim (4:3.4.1-1) experimental; urgency=low * New upstream release. - * Split kresources into new package tdepim-kresources. + * Split tderesources into new package tdepim-tderesources. * Split tdepimmacros.h into new package libtdepim1-dev, and make all the other -dev packages depend on it. diff --git a/ubuntu/precise/tdepim/debian/control b/ubuntu/precise/tdepim/debian/control index 6a2e4385d..1c544b5f5 100644 --- a/ubuntu/precise/tdepim/debian/control +++ b/ubuntu/precise/tdepim/debian/control @@ -22,7 +22,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0) Breaks: kdepim-trinity (<< 4:14.0.0) -Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-kresources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) +Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-kfile-plugins-trinity (>= ${Source-Version}), tdepim-kio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -52,7 +52,7 @@ Section: devel Architecture: any Replaces: kdepim-trinity-dev (<< 4:14.0.0) Breaks: kdepim-trinity-dev (<< 4:14.0.0) -Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-kresources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) +Depends: kaddressbook-trinity (= ${Source-Version}), kalarm-trinity (= ${Source-Version}), tdepim-tderesources-trinity (= ${Source-Version}), kmail-trinity (= ${Source-Version}), knotes-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}), libkleopatra1-trinity-dev (= ${Source-Version}), libkpimexchange1-trinity-dev (= ${Source-Version}), libksieve0-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), libmimelib1-trinity-dev (= ${Source-Version}) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. . @@ -116,7 +116,7 @@ Architecture: any Replaces: kaddressbook-trinity (<< 4:14.0.0) Breaks: kaddressbook-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity +Suggests: tdepim-tderesources-trinity, tdebase-kio-plugins-trinity Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -206,11 +206,11 @@ Description: Trinity pim I/O Slaves This package is part of Trinity, and a component of the KDE PIM module. See the 'kde-trinity' and 'tdepim-trinity' packages for more information. -Package: tdepim-kresources-trinity +Package: tdepim-tderesources-trinity Section: tde Architecture: any -Replaces: kdepim-kresources-trinity (<< 4:14.0.0) -Breaks: kdepim-kresources-trinity (<< 4:14.0.0) +Replaces: kdepim-tderesources-trinity (<< 4:14.0.0) +Breaks: kdepim-tderesources-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, korganizer-trinity Suggests: knotes-trinity @@ -321,7 +321,7 @@ Architecture: any Replaces: knotes-trinity (<< 4:14.0.0) Breaks: knotes-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -470,7 +470,7 @@ Breaks: libkcal2b-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2-trinity, libkcal2a-trinity -Suggests: tdepim-kresources-trinity +Suggests: tdepim-tderesources-trinity Description: Trinity calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/precise/tdepim/debian/control.in b/ubuntu/precise/tdepim/debian/control.in index 3b45c48d0..4c48dcbef 100644 --- a/ubuntu/precise/tdepim/debian/control.in +++ b/ubuntu/precise/tdepim/debian/control.in @@ -19,7 +19,7 @@ Standards-Version: 3.7.2 Package: tdepim Section: tde Architecture: all -Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) +Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-tderesources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version}) Suggests: tdepim-doc-html Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -45,7 +45,7 @@ Description: debugging symbols for tdepim Package: tdepim-dev Section: devel Architecture: any -Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) +Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), tdepim-tderesources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libtdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version}) Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2) Description: KDE Personal Information Management [development] This package contains development files needed to compile tdepim applications. @@ -102,7 +102,7 @@ Package: kaddressbook Section: utils Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources, tdebase-kio-plugins +Suggests: tdepim-tderesources, tdebase-kio-plugins Description: KDE NG addressbook application KAddressBook is the main address book application for KDE; it enables you to manage your contacts efficiently and comfortably. It can load and save @@ -183,7 +183,7 @@ Description: KDE pim I/O Slaves This package is part of KDE, and a component of the KDE PIM module. See the 'kde' and 'tdepim' packages for more information. -Package: tdepim-kresources +Package: tdepim-tderesources Section: tde Architecture: any Depends: ${shlibs:Depends} @@ -286,7 +286,7 @@ Package: knotes Section: tde Architecture: any Depends: ${shlibs:Depends} -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE sticky notes KNotes is a program that lets you write sticky notes. The notes are saved automatically when you exit the program, and they display when you open the @@ -441,7 +441,7 @@ Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} Conflicts: libkcal2, libkcal2a Replaces: libkcal2a -Suggests: tdepim-kresources +Suggests: tdepim-tderesources Description: KDE calendaring library This library provides a C++ API for handling the vCalendar and iCalendar formats. diff --git a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install index 748b6e9a7..eac493c1b 100644 --- a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install +++ b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install @@ -29,7 +29,7 @@ /opt/trinity/share/services/kabldapconfig.desktop /opt/trinity/share/services/kaddressbook /opt/trinity/share/services/kontact/kaddressbookplugin.desktop -/opt/trinity/share/services/kresources/kabc/imap.desktop +/opt/trinity/share/services/tderesources/kabc/imap.desktop /opt/trinity/share/services/ldifvcardthumbnail.desktop /opt/trinity/share/servicetypes/dcopaddressbook.desktop /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop diff --git a/ubuntu/precise/tdepim/debian/knotes-trinity.install b/ubuntu/precise/tdepim/debian/knotes-trinity.install index 97956b197..8f65af5e3 100644 --- a/ubuntu/precise/tdepim/debian/knotes-trinity.install +++ b/ubuntu/precise/tdepim/debian/knotes-trinity.install @@ -15,9 +15,9 @@ /opt/trinity/share/icons/hicolor/32x32/apps/knotes.png /opt/trinity/share/icons/hicolor/48x48/apps/knotes.png /opt/trinity/share/icons/hicolor/64x64/apps/knotes.png -/opt/trinity/share/services/kresources/knotes/imap.desktop -/opt/trinity/share/services/kresources/knotes/local.desktop -/opt/trinity/share/services/kresources/knotes_manager.desktop +/opt/trinity/share/services/tderesources/knotes/imap.desktop +/opt/trinity/share/services/tderesources/knotes/local.desktop +/opt/trinity/share/services/tderesources/knotes_manager.desktop ../icons/knotes.xpm /opt/trinity/share/pixmaps ../icons/knotes-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/precise/tdepim/debian/libkcal2b-trinity.install b/ubuntu/precise/tdepim/debian/libkcal2b-trinity.install index ca6e71652..211c15b4d 100644 --- a/ubuntu/precise/tdepim/debian/libkcal2b-trinity.install +++ b/ubuntu/precise/tdepim/debian/libkcal2b-trinity.install @@ -13,9 +13,9 @@ /opt/trinity/lib/libkholidays.so.1 /opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/share/apps/libkholidays -/opt/trinity/share/services/kresources/kcal/imap.desktop -/opt/trinity/share/services/kresources/kcal/kabc.desktop -/opt/trinity/share/services/kresources/kcal/local.desktop -/opt/trinity/share/services/kresources/kcal/localdir.desktop -/opt/trinity/share/services/kresources/kcal/remote.desktop -/opt/trinity/share/services/kresources/kcal_manager.desktop +/opt/trinity/share/services/tderesources/kcal/imap.desktop +/opt/trinity/share/services/tderesources/kcal/kabc.desktop +/opt/trinity/share/services/tderesources/kcal/local.desktop +/opt/trinity/share/services/tderesources/kcal/localdir.desktop +/opt/trinity/share/services/tderesources/kcal/remote.desktop +/opt/trinity/share/services/tderesources/kcal_manager.desktop diff --git a/ubuntu/precise/tdepim/debian/libtdepim1a-trinity.install b/ubuntu/precise/tdepim/debian/libtdepim1a-trinity.install index 6a17101ae..e018f4bdf 100644 --- a/ubuntu/precise/tdepim/debian/libtdepim1a-trinity.install +++ b/ubuntu/precise/tdepim/debian/libtdepim1a-trinity.install @@ -1,7 +1,7 @@ /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la -/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la +/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/share/apps/tdepimwidgets diff --git a/ubuntu/precise/tdepim/debian/rules b/ubuntu/precise/tdepim/debian/rules index 0e1c5356b..96073e510 100755 --- a/ubuntu/precise/tdepim/debian/rules +++ b/ubuntu/precise/tdepim/debian/rules @@ -63,10 +63,10 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ -dDepends # Since -u args go first in dpkg-shlibdeps call ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends -#DEB_DH_SHLIBDEPS_ARGS_tdepim-kresources-trinity := \ +#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ # -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-kresources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/ubuntu/precise/tdepim/debian/tdepim-kresources-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-kresources-trinity.install deleted file mode 100644 index 588b690b1..000000000 --- a/ubuntu/precise/tdepim/debian/tdepim-kresources-trinity.install +++ /dev/null @@ -1,104 +0,0 @@ -/opt/trinity/lib/trinity/kabc_*.la -/opt/trinity/lib/trinity/kabc_*.so -/opt/trinity/lib/trinity/kcal_caldav.la -/opt/trinity/lib/trinity/kcal_caldav.so -/opt/trinity/lib/trinity/kabc_carddav.la -/opt/trinity/lib/trinity/kabc_carddav.so -/opt/trinity/lib/trinity/kcal_groupdav.la -/opt/trinity/lib/trinity/kcal_groupdav.so -/opt/trinity/lib/trinity/kcal_groupwise.la -/opt/trinity/lib/trinity/kcal_groupwise.so -/opt/trinity/lib/trinity/kcal_kolab.la -/opt/trinity/lib/trinity/kcal_kolab.so -/opt/trinity/lib/trinity/kcal_scalix.la -/opt/trinity/lib/trinity/kcal_scalix.so -/opt/trinity/lib/trinity/kcal_newexchange.la -/opt/trinity/lib/trinity/kcal_newexchange.so -/opt/trinity/lib/trinity/kcal_resourcefeatureplan.la -/opt/trinity/lib/trinity/kcal_resourcefeatureplan.so -/opt/trinity/lib/trinity/kcal_slox.la -/opt/trinity/lib/trinity/kcal_slox.so -/opt/trinity/lib/trinity/kcal_xmlrpc.la -/opt/trinity/lib/trinity/kcal_xmlrpc.so -/opt/trinity/lib/trinity/knotes_kolab.la -/opt/trinity/lib/trinity/knotes_kolab.so -/opt/trinity/lib/trinity/knotes_scalix.la -/opt/trinity/lib/trinity/knotes_scalix.so -/opt/trinity/lib/trinity/knotes_xmlrpc.la -/opt/trinity/lib/trinity/knotes_xmlrpc.so -/opt/trinity/lib/libkabckolab.so.0 -/opt/trinity/lib/libkabckolab.so.0.0.0 -/opt/trinity/lib/libkabcscalix.so.0 -/opt/trinity/lib/libkabcscalix.so.0.0.0 -/opt/trinity/lib/libkabc_groupdav.so.1 -/opt/trinity/lib/libkabc_groupdav.so.1.0.0 -/opt/trinity/lib/libkabc_groupwise.so.1 -/opt/trinity/lib/libkabc_groupwise.so.1.0.0 -/opt/trinity/lib/libkabc_newexchange.so.1 -/opt/trinity/lib/libkabc_newexchange.so.1.0.0 -/opt/trinity/lib/libkabc_slox.so.0 -/opt/trinity/lib/libkabc_slox.so.0.0.0 -/opt/trinity/lib/libkabc_xmlrpc.so.1 -/opt/trinity/lib/libkabc_xmlrpc.so.1.0.0 -/opt/trinity/lib/libkcalkolab.so.0 -/opt/trinity/lib/libkcalkolab.so.0.0.0 -/opt/trinity/lib/libkcalscalix.so.0 -/opt/trinity/lib/libkcalscalix.so.0.0.0 -/opt/trinity/lib/libkcal_caldav.so.1 -/opt/trinity/lib/libkcal_caldav.so.1.0.0 -/opt/trinity/lib/libkabc_carddav.so.1 -/opt/trinity/lib/libkabc_carddav.so.1.0.0 -/opt/trinity/lib/libkcal_groupdav.so.1 -/opt/trinity/lib/libkcal_groupdav.so.1.0.0 -/opt/trinity/lib/libkcal_groupwise.so.1 -/opt/trinity/lib/libkcal_groupwise.so.1.0.0 -/opt/trinity/lib/libkcal_newexchange.so.1 -/opt/trinity/lib/libkcal_newexchange.so.1.0.0 -/opt/trinity/lib/libkcal_resourcefeatureplan.so.1 -/opt/trinity/lib/libkcal_resourcefeatureplan.so.1.0.0 -/opt/trinity/lib/libkcal_slox.so.0 -/opt/trinity/lib/libkcal_slox.so.0.0.0 -/opt/trinity/lib/libkcal_xmlrpc.so.1 -/opt/trinity/lib/libkcal_xmlrpc.so.1.0.0 -/opt/trinity/lib/libkgroupwarebase.so.0 -/opt/trinity/lib/libkgroupwarebase.so.0.0.0 -/opt/trinity/lib/libkgroupwaredav.so.0 -/opt/trinity/lib/libkgroupwaredav.so.0.0.0 -/opt/trinity/lib/libknoteskolab.so.0 -/opt/trinity/lib/libknoteskolab.so.0.0.0 -/opt/trinity/lib/libknotesscalix.so.0 -/opt/trinity/lib/libknotesscalix.so.0.0.0 -/opt/trinity/lib/libknotes_xmlrpc.so.1 -/opt/trinity/lib/libknotes_xmlrpc.so.1.0.0 -/opt/trinity/lib/libkslox.so.0 -/opt/trinity/lib/libkslox.so.0.0.0 -/opt/trinity/lib/libgwsoap.so.0 -/opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/kresources/kabc/kabc_groupdav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_groupwise.desktop -/opt/trinity/share/services/kresources/kabc/kabc_newexchange.desktop -/opt/trinity/share/services/kresources/kabc/kabc_opengroupware.desktop -/opt/trinity/share/services/kresources/kabc/kabc_ox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_slox.desktop -/opt/trinity/share/services/kresources/kabc/kabc_xmlrpc.desktop -/opt/trinity/share/services/kresources/kabc/kolab.desktop -/opt/trinity/share/services/kresources/kabc/scalix.desktop -/opt/trinity/share/services/kresources/kcal/exchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/kresources/kabc/kabc_carddav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupdav.desktop -/opt/trinity/share/services/kresources/kcal/kcal_groupwise.desktop -/opt/trinity/share/services/kresources/kcal/kcal_newexchange.desktop -/opt/trinity/share/services/kresources/kcal/kcal_opengroupware.desktop -/opt/trinity/share/services/kresources/kcal/kcal_ox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop -/opt/trinity/share/services/kresources/kcal/kcal_slox.desktop -/opt/trinity/share/services/kresources/kcal/kcal_xmlrpc.desktop -/opt/trinity/share/services/kresources/kcal/kolab.desktop -/opt/trinity/share/services/kresources/kcal/scalix.desktop -/opt/trinity/share/services/kresources/knotes/knotes_xmlrpc.desktop -/opt/trinity/share/services/kresources/knotes/kolabresource.desktop -/opt/trinity/share/services/kresources/knotes/scalix.desktop - -/opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl -/opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install new file mode 100644 index 000000000..bcf0991b5 --- /dev/null +++ b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install @@ -0,0 +1,104 @@ +/opt/trinity/lib/trinity/kabc_*.la +/opt/trinity/lib/trinity/kabc_*.so +/opt/trinity/lib/trinity/kcal_caldav.la +/opt/trinity/lib/trinity/kcal_caldav.so +/opt/trinity/lib/trinity/kabc_carddav.la +/opt/trinity/lib/trinity/kabc_carddav.so +/opt/trinity/lib/trinity/kcal_groupdav.la +/opt/trinity/lib/trinity/kcal_groupdav.so +/opt/trinity/lib/trinity/kcal_groupwise.la +/opt/trinity/lib/trinity/kcal_groupwise.so +/opt/trinity/lib/trinity/kcal_kolab.la +/opt/trinity/lib/trinity/kcal_kolab.so +/opt/trinity/lib/trinity/kcal_scalix.la +/opt/trinity/lib/trinity/kcal_scalix.so +/opt/trinity/lib/trinity/kcal_newexchange.la +/opt/trinity/lib/trinity/kcal_newexchange.so +/opt/trinity/lib/trinity/kcal_resourcefeatureplan.la +/opt/trinity/lib/trinity/kcal_resourcefeatureplan.so +/opt/trinity/lib/trinity/kcal_slox.la +/opt/trinity/lib/trinity/kcal_slox.so +/opt/trinity/lib/trinity/kcal_xmlrpc.la +/opt/trinity/lib/trinity/kcal_xmlrpc.so +/opt/trinity/lib/trinity/knotes_kolab.la +/opt/trinity/lib/trinity/knotes_kolab.so +/opt/trinity/lib/trinity/knotes_scalix.la +/opt/trinity/lib/trinity/knotes_scalix.so +/opt/trinity/lib/trinity/knotes_xmlrpc.la +/opt/trinity/lib/trinity/knotes_xmlrpc.so +/opt/trinity/lib/libkabckolab.so.0 +/opt/trinity/lib/libkabckolab.so.0.0.0 +/opt/trinity/lib/libkabcscalix.so.0 +/opt/trinity/lib/libkabcscalix.so.0.0.0 +/opt/trinity/lib/libkabc_groupdav.so.1 +/opt/trinity/lib/libkabc_groupdav.so.1.0.0 +/opt/trinity/lib/libkabc_groupwise.so.1 +/opt/trinity/lib/libkabc_groupwise.so.1.0.0 +/opt/trinity/lib/libkabc_newexchange.so.1 +/opt/trinity/lib/libkabc_newexchange.so.1.0.0 +/opt/trinity/lib/libkabc_slox.so.0 +/opt/trinity/lib/libkabc_slox.so.0.0.0 +/opt/trinity/lib/libkabc_xmlrpc.so.1 +/opt/trinity/lib/libkabc_xmlrpc.so.1.0.0 +/opt/trinity/lib/libkcalkolab.so.0 +/opt/trinity/lib/libkcalkolab.so.0.0.0 +/opt/trinity/lib/libkcalscalix.so.0 +/opt/trinity/lib/libkcalscalix.so.0.0.0 +/opt/trinity/lib/libkcal_caldav.so.1 +/opt/trinity/lib/libkcal_caldav.so.1.0.0 +/opt/trinity/lib/libkabc_carddav.so.1 +/opt/trinity/lib/libkabc_carddav.so.1.0.0 +/opt/trinity/lib/libkcal_groupdav.so.1 +/opt/trinity/lib/libkcal_groupdav.so.1.0.0 +/opt/trinity/lib/libkcal_groupwise.so.1 +/opt/trinity/lib/libkcal_groupwise.so.1.0.0 +/opt/trinity/lib/libkcal_newexchange.so.1 +/opt/trinity/lib/libkcal_newexchange.so.1.0.0 +/opt/trinity/lib/libkcal_resourcefeatureplan.so.1 +/opt/trinity/lib/libkcal_resourcefeatureplan.so.1.0.0 +/opt/trinity/lib/libkcal_slox.so.0 +/opt/trinity/lib/libkcal_slox.so.0.0.0 +/opt/trinity/lib/libkcal_xmlrpc.so.1 +/opt/trinity/lib/libkcal_xmlrpc.so.1.0.0 +/opt/trinity/lib/libkgroupwarebase.so.0 +/opt/trinity/lib/libkgroupwarebase.so.0.0.0 +/opt/trinity/lib/libkgroupwaredav.so.0 +/opt/trinity/lib/libkgroupwaredav.so.0.0.0 +/opt/trinity/lib/libknoteskolab.so.0 +/opt/trinity/lib/libknoteskolab.so.0.0.0 +/opt/trinity/lib/libknotesscalix.so.0 +/opt/trinity/lib/libknotesscalix.so.0.0.0 +/opt/trinity/lib/libknotes_xmlrpc.so.1 +/opt/trinity/lib/libknotes_xmlrpc.so.1.0.0 +/opt/trinity/lib/libkslox.so.0 +/opt/trinity/lib/libkslox.so.0.0.0 +/opt/trinity/lib/libgwsoap.so.0 +/opt/trinity/lib/libgwsoap.so.0.0.0 +/opt/trinity/share/services/tderesources/kabc/kabc_groupdav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kabc/kolab.desktop +/opt/trinity/share/services/tderesources/kabc/scalix.desktop +/opt/trinity/share/services/tderesources/kcal/exchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop +/opt/trinity/share/services/tderesources/kabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_opengroupware.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_ox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_slox.desktop +/opt/trinity/share/services/tderesources/kcal/kcal_xmlrpc.desktop +/opt/trinity/share/services/tderesources/kcal/kolab.desktop +/opt/trinity/share/services/tderesources/kcal/scalix.desktop +/opt/trinity/share/services/tderesources/knotes/knotes_xmlrpc.desktop +/opt/trinity/share/services/tderesources/knotes/kolabresource.desktop +/opt/trinity/share/services/tderesources/knotes/scalix.desktop + +/opt/trinity/share/apps/kconf_update/upgrade-resourcetype.pl +/opt/trinity/share/apps/kconf_update/kolab-resource.upd diff --git a/ubuntu/precise/tdesdk/debian/changelog b/ubuntu/precise/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/ubuntu/precise/tdesdk/debian/changelog +++ b/ubuntu/precise/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-doc contains tdeunittest documentation. (Closes: #386040) - * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These + * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/ubuntu/precise/tdesdk/debian/control b/ubuntu/precise/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/ubuntu/precise/tdesdk/debian/control +++ b/ubuntu/precise/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of Trinity, and a component of the KDE SDK module. diff --git a/ubuntu/precise/tdesdk/debian/control.in b/ubuntu/precise/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/ubuntu/precise/tdesdk/debian/control.in +++ b/ubuntu/precise/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) +Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version}) Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html Description: software development kit from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -356,7 +356,7 @@ Description: subversion ioslave for KDE This package is part of KDE, and a component of the KDE SDK module. See the 'kde' and 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-doc Description: unit testing library for KDE KUnitTest is a small library that facilitates the writing of tests for KDE developers. There are two ways to use the KUnitTest library. One is - to create dynamically loadable modules and use the kunittestmodrunner or - kunittestguimodrunner programs to run the tests. The other is to use the + to create dynamically loadable modules and use the tdeunittestmodrunner or + tdeunittestguimodrunner programs to run the tests. The other is to use the libraries to create your own testing application. . This package is part of KDE, and a component of the KDE SDK module. diff --git a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.install +++ b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/precise/tdesdk/debian/kunittest-trinity.docs b/ubuntu/precise/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/ubuntu/precise/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/ubuntu/precise/tdesdk/debian/kunittest-trinity.install b/ubuntu/precise/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/ubuntu/precise/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/ubuntu/precise/tdesdk/debian/not-installed.list b/ubuntu/precise/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/ubuntu/precise/tdesdk/debian/not-installed.list +++ b/ubuntu/precise/tdesdk/debian/not-installed.list @@ -4,8 +4,8 @@ This is deliberate. /usr/share/man/man1/cvscheck.1 - This manpage is junk, so we don't ship it, and include our own instead. -/usr/bin/kunittest -/usr/bin/kunittest_debughelper +/usr/bin/tdeunittest +/usr/bin/tdeunittest_debughelper - These are not useful without the dcopperl bindings which are not built in the Debian tdebindings packages. diff --git a/ubuntu/precise/tdesdk/debian/rules b/ubuntu/precise/tdesdk/debian/rules index 36d49b7c7..2e37f4326 100755 --- a/ubuntu/precise/tdesdk/debian/rules +++ b/ubuntu/precise/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.docs b/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.install b/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/ubuntu/precise/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h diff --git a/ubuntu/precise/tdeutils/debian/changelog b/ubuntu/precise/tdeutils/debian/changelog index b3d3af82b..71992aefe 100644 --- a/ubuntu/precise/tdeutils/debian/changelog +++ b/ubuntu/precise/tdeutils/debian/changelog @@ -268,7 +268,7 @@ tdeutils (4:3.5.5-1) unstable; urgency=low * New upstream release. + Fixes kcalc: Alt-H does not select hex. (Closes: #272026) - + Fixes kwalletmanager does not appear in kde system tray. + + Fixes tdewalletmanager does not appear in kde system tray. (Closes: #372258) + Fixes kgpg: Kgpg editor crashes on decrypting. (Closes: #372767) @@ -287,7 +287,7 @@ tdeutils (4:3.5.4-1) unstable; urgency=low * New upstream release. * KDE_3_5_BRANCH update (up to r567761). - + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001) + + Fixes tdewalletmanager crashes on logout. (Closes: #372564, #377001) +++ Changes by Christopher Martin: @@ -312,7 +312,7 @@ tdeutils (4:3.5.5-0ubuntu1) edgy; urgency=low * New upstream release * kubuntu_12_kmilo_actions.diff updated - * Remove kubuntu_13_downgrade_kwallet.diff + * Remove kubuntu_13_downgrade_tdewallet.diff -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:05 +0000 @@ -325,8 +325,8 @@ tdeutils (4:3.5.4-0ubuntu5) edgy; urgency=low tdeutils (4:3.5.4-0ubuntu4) edgy; urgency=low - * Added kubuntu_13_downgrade_kwallet to avoid bug #57696, downgrading - kwalletmanager to 3.5.2, This bug has been reported on KDE 2 month + * Added kubuntu_13_downgrade_tdewallet to avoid bug #57696, downgrading + tdewalletmanager to 3.5.2, This bug has been reported on KDE 2 month ago (http://bugs.kde.org/show_bug.cgi?id=129161) and 3.5.4 has been released without any correction. Because most apps' authentication system is based on this, the issue diff --git a/ubuntu/precise/tdeutils/debian/control b/ubuntu/precise/tdeutils/debian/control index 23132b0e0..956b68ea3 100644 --- a/ubuntu/precise/tdeutils/debian/control +++ b/ubuntu/precise/tdeutils/debian/control @@ -13,7 +13,7 @@ Section: tde Architecture: all Replaces: kdeutils-trinity (<< 4:14.0.0) Breaks: kdeutils-trinity (<< 4:14.0.0) -Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), kwalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) +Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), kdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}) Suggests: tdeutils-trinity-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -343,11 +343,11 @@ Description: timer utility for Trinity This package is part of Trinity, as a component of the KDE utilities module. See the 'kde-trinity' and 'tdeutils-trinity' packages for more information. -Package: kwalletmanager-trinity +Package: tdewalletmanager-trinity Section: utils Architecture: any -Replaces: kwalletmanager-trinity (<< 4:14.0.0) -Breaks: kwalletmanager-trinity (<< 4:14.0.0) +Replaces: tdewalletmanager-trinity (<< 4:14.0.0) +Breaks: tdewalletmanager-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} Suggests: khelpcenter-trinity Description: wallet manager for Trinity diff --git a/ubuntu/precise/tdeutils/debian/control.in b/ubuntu/precise/tdeutils/debian/control.in index f1d64bd00..f86496f4d 100644 --- a/ubuntu/precise/tdeutils/debian/control.in +++ b/ubuntu/precise/tdeutils/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdeutils Section: tde Architecture: all -Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) +Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}) Suggests: tdeutils-doc-html (>= ${Source-Version}) Description: general purpose utilities from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -287,7 +287,7 @@ Description: timer utility for KDE This package is part of KDE, as a component of the KDE utilities module. See the 'kde' and 'tdeutils' packages for more information. -Package: kwalletmanager +Package: tdewalletmanager Section: utils Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/precise/tdeutils/debian/kwalletmanager-trinity.install b/ubuntu/precise/tdeutils/debian/kwalletmanager-trinity.install deleted file mode 100644 index 1ba37d2e3..000000000 --- a/ubuntu/precise/tdeutils/debian/kwalletmanager-trinity.install +++ /dev/null @@ -1,31 +0,0 @@ -debian/tmp/opt/trinity/bin/kwalletmanager -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so -debian/tmp/opt/trinity/share/applications/tde/kwalletconfig.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager.desktop -debian/tmp/opt/trinity/share/applications/tde/kwalletmanager-kwalletd.desktop -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc -debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png -debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwalletmanager.png -debian/tmp/opt/trinity/share/services/kwallet_config.desktop -debian/tmp/opt/trinity/share/services/kwalletmanager_show.desktop diff --git a/ubuntu/precise/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/precise/tdeutils/debian/man/kcharselect-trinity.1 index 15d1c35d9..d6ba31cf5 100644 --- a/ubuntu/precise/tdeutils/debian/man/kcharselect-trinity.1 +++ b/ubuntu/precise/tdeutils/debian/man/kcharselect-trinity.1 @@ -204,10 +204,10 @@ shared over more than one screen. Specifies the X display to run KDE on. .IP KDESYCOCA Specifies and alternative path for the -.I ksycoca +.I tdesycoca KDE system configuration cache file. The default path is -/tmp/kde-$USER/ksycoca +/tmp/kde-$USER/tdesycoca .IP DCOPSERVER Specifies an alternative path for the DCOP server file. The default file is diff --git a/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet deleted file mode 100644 index 6331a925f..000000000 --- a/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet +++ /dev/null @@ -1,10 +0,0 @@ -Document: tdeutils-doc-html-kwallet -Title: KWallet Handbook -Author: George Staikos, Lauri Watts -Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. -Section: Tools - -Format: HTML -Index: /usr/share/doc/tde/HTML/en/kwallet/index.html -Files: /usr/share/doc/tde/HTML/en/kwallet/*.html - diff --git a/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet b/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet new file mode 100644 index 000000000..d87ba35e0 --- /dev/null +++ b/ubuntu/precise/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet @@ -0,0 +1,10 @@ +Document: tdeutils-doc-html-tdewallet +Title: KWallet Handbook +Author: George Staikos, Lauri Watts +Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords. +Section: Tools + +Format: HTML +Index: /usr/share/doc/tde/HTML/en/tdewallet/index.html +Files: /usr/share/doc/tde/HTML/en/tdewallet/*.html + diff --git a/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install index 17d66276d..a04353048 100644 --- a/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install +++ b/ubuntu/precise/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tdemultiformlistbox.h +debian/tmp/opt/trinity/include/tdemultiformlistboxentry.h +debian/tmp/opt/trinity/include/tdemultiformlistboxfactory.h debian/tmp/opt/trinity/include/ksim/chart.h debian/tmp/opt/trinity/include/ksim/common.h debian/tmp/opt/trinity/include/ksim/ksimconfig.h diff --git a/ubuntu/precise/tdeutils/debian/tdewalletmanager-trinity.install b/ubuntu/precise/tdeutils/debian/tdewalletmanager-trinity.install new file mode 100644 index 000000000..6e75bf792 --- /dev/null +++ b/ubuntu/precise/tdeutils/debian/tdewalletmanager-trinity.install @@ -0,0 +1,31 @@ +debian/tmp/opt/trinity/bin/tdewalletmanager +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdewallet.so +debian/tmp/opt/trinity/share/applications/tde/tdewalletconfig.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager.desktop +debian/tmp/opt/trinity/share/applications/tde/tdewalletmanager-tdewalletd.desktop +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/folder_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalleteditor.rc +debian/tmp/opt/trinity/share/apps/tdewalletmanager/tdewalletmanager.rc +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_closed.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/cr22-action-wallet_open.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit2.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/edit3.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/tdewalletmanager.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password1.png +debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdewallet/password2.png +debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdewalletmanager.png +debian/tmp/opt/trinity/share/services/tdewallet_config.desktop +debian/tmp/opt/trinity/share/services/tdewalletmanager_show.desktop |