summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-10-21 20:16:07 +0200
committeralbator <albator@arcadia.vtf>2011-10-21 20:16:07 +0200
commit7a0adf35896618a7570e425941fc1b74c54def47 (patch)
tree16dab9d8bfbd93575440f357c70907cbb5480980
parentcd71be65dc30c8007ec54becdf6c50260ed8e908 (diff)
parenta8707e2a9f22d082cecb8ea6079175076f983c55 (diff)
downloadtde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz
tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rw-r--r--arch/calvin/trinity-qt3/PKGBUILD37
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/buildvars.mk (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/team-members (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/team-members)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/uploaders.mk (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/versions.pl (renamed from debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl)0
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/changelog9
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/compat1
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/control14
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/copyright24
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/links (renamed from debian/lenny/applications/knetworkmanager/debian/patches/series)0
-rwxr-xr-xdebian/lenny/applications/kdbusnotification/debian/rules191
-rw-r--r--debian/lenny/applications/kdesvn/debian/control1
-rw-r--r--debian/lenny/applications/kiosktool/debian/changelog92
-rw-r--r--debian/lenny/applications/kiosktool/debian/compat1
-rw-r--r--debian/lenny/applications/kiosktool/debian/control15
-rw-r--r--debian/lenny/applications/kiosktool/debian/copyright29
-rw-r--r--debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1146
-rw-r--r--debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1150
-rw-r--r--debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages2
-rw-r--r--debian/lenny/applications/kiosktool/debian/patches/.gitignore (renamed from debian/squeeze/applications/knetworkmanager/debian/patches/series)0
-rwxr-xr-xdebian/lenny/applications/kiosktool/debian/rules17
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/README.source (renamed from debian/lenny/applications/knetworkmanager/debian/README.source)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl (renamed from debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/changelog (renamed from debian/lenny/applications/knetworkmanager/debian/changelog)2
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/compat (renamed from debian/lenny/applications/knetworkmanager/debian/compat)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/control (renamed from debian/squeeze/applications/knetworkmanager/debian/control)5
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/control.in (renamed from debian/lenny/applications/knetworkmanager/debian/control.in)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/copyright (renamed from debian/lenny/applications/knetworkmanager/debian/copyright)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1 (renamed from debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/manpages (renamed from debian/lenny/applications/knetworkmanager/debian/manpages)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/menu (renamed from debian/lenny/applications/knetworkmanager/debian/menu)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides (renamed from debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst (renamed from debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/patches/series (renamed from ubuntu/maverick/applications/knetworkmanager/debian/patches/series)0
-rwxr-xr-xdebian/lenny/applications/knetworkmanager8/debian/rules (renamed from debian/lenny/applications/knetworkmanager/debian/rules)0
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/watch (renamed from debian/lenny/applications/knetworkmanager/debian/watch)0
-rw-r--r--debian/lenny/applications/koffice/debian/control2
-rw-r--r--debian/lenny/applications/piklab/debian/control2
-rwxr-xr-xdebian/lenny/applications/smartcardauth/debian/control2
-rw-r--r--debian/lenny/dependencies/arts/debian/libartsc0-trinity-dev.install2
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/changelog6
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/compat (renamed from debian/squeeze/applications/knetworkmanager/debian/compat)0
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/control55
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/copyright17
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.install1
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs1
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols2
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install5
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/patches/.gitignore0
-rwxr-xr-xdebian/lenny/dependencies/avahi-tqt/debian/rules17
-rw-r--r--debian/lenny/dependencies/avahi-tqt/debian/source/.gitignore0
-rw-r--r--debian/lenny/dependencies/tqtinterface/debian/control4
-rw-r--r--debian/lenny/kdeaddons/debian/control2
-rw-r--r--debian/lenny/kdebase/debian/control12
-rw-r--r--debian/lenny/kdebase/debian/ksplash-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/libtqt3-integration-trinity.install7
-rw-r--r--debian/lenny/kdenetwork/debian/control2
-rw-r--r--debian/lenny/kdepim/debian/akregator-trinity.install2
-rw-r--r--debian/lenny/kdepim/debian/control2
-rw-r--r--debian/lenny/kdesdk/debian/control2
-rwxr-xr-xdebian/lenny/kdeutils/debian/rules2
-rw-r--r--debian/lenny/kdevelop/debian/control2
-rw-r--r--debian/lenny/kdewebdev/debian/control2
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/buildvars.mk (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl (renamed from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl)0
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/changelog9
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/compat1
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/control14
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/copyright24
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/links0
-rwxr-xr-xdebian/squeeze/applications/kdbusnotification/debian/rules191
-rw-r--r--debian/squeeze/applications/kdesvn/debian/control1
-rw-r--r--debian/squeeze/applications/kiosktool/debian/changelog92
-rw-r--r--debian/squeeze/applications/kiosktool/debian/compat1
-rw-r--r--debian/squeeze/applications/kiosktool/debian/control15
-rw-r--r--debian/squeeze/applications/kiosktool/debian/copyright29
-rw-r--r--debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1146
-rw-r--r--debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1150
-rw-r--r--debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages2
-rw-r--r--debian/squeeze/applications/kiosktool/debian/patches/.gitignore0
-rwxr-xr-xdebian/squeeze/applications/kiosktool/debian/rules17
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/README.source (renamed from debian/squeeze/applications/knetworkmanager/debian/README.source)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk86
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk109
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk97
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members16
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk29
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl19
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/changelog (renamed from debian/squeeze/applications/knetworkmanager/debian/changelog)2
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/compat (renamed from ubuntu/maverick/applications/knetworkmanager/debian/compat)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/control (renamed from debian/lenny/applications/knetworkmanager/debian/control)5
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/control.in (renamed from debian/squeeze/applications/knetworkmanager/debian/control.in)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/copyright (renamed from debian/squeeze/applications/knetworkmanager/debian/copyright)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1 (renamed from debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/manpages (renamed from debian/squeeze/applications/knetworkmanager/debian/manpages)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/menu (renamed from debian/squeeze/applications/knetworkmanager/debian/menu)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides (renamed from debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst (renamed from debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/patches/series0
-rwxr-xr-xdebian/squeeze/applications/knetworkmanager8/debian/rules (renamed from debian/squeeze/applications/knetworkmanager/debian/rules)0
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/watch (renamed from debian/squeeze/applications/knetworkmanager/debian/watch)0
-rw-r--r--debian/squeeze/applications/koffice/debian/control2
-rw-r--r--debian/squeeze/applications/piklab/debian/control2
-rwxr-xr-xdebian/squeeze/applications/smartcardauth/debian/control2
-rw-r--r--debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install2
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/changelog6
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/compat1
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/control55
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/copyright17
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install1
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs1
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols2
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install5
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore0
-rwxr-xr-xdebian/squeeze/dependencies/avahi-tqt/debian/rules17
-rw-r--r--debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore0
-rw-r--r--debian/squeeze/dependencies/tqtinterface/debian/control4
-rw-r--r--debian/squeeze/kdeaddons/debian/control2
-rw-r--r--debian/squeeze/kdebase/debian/control14
-rw-r--r--debian/squeeze/kdebase/debian/ksplash-trinity.install4
-rw-r--r--debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install7
-rw-r--r--debian/squeeze/kdenetwork/debian/control2
-rw-r--r--debian/squeeze/kdepim/debian/akregator-trinity.install2
-rw-r--r--debian/squeeze/kdepim/debian/control2
-rw-r--r--debian/squeeze/kdesdk/debian/control2
-rwxr-xr-xdebian/squeeze/kdeutils/debian/rules2
-rw-r--r--debian/squeeze/kdevelop/debian/control2
-rw-r--r--debian/squeeze/kdewebdev/debian/control2
-rw-r--r--mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2bin0 -> 25025 bytes
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch11
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch12
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch22
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch21
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch11
-rw-r--r--mandriva/2010.2/applications/amarok/amarok-add-radios.patch42
-rw-r--r--mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch1163
-rw-r--r--mandriva/2010.2/applications/amarok/kde3-amarok.spec638
-rw-r--r--mandriva/2010.2/applications/k3b/iso-level-3.patch12
-rw-r--r--mandriva/2010.2/applications/k3b/kde3-k3b.spec233
-rw-r--r--mandriva/2010.2/applications/k3b/verify-reload-fix.patch89
-rw-r--r--mandriva/2010.2/applications/kaffine/kde3-kaffeine.spec237
-rw-r--r--mandriva/2010.2/applications/kbudget/kbudget-0.6-stdio.patch12
-rw-r--r--mandriva/2010.2/applications/kbudget/kbudget.spec159
-rw-r--r--mandriva/2010.2/applications/kdebluetooth/kde3-kdebluetooth.spec365
-rw-r--r--mandriva/2010.2/applications/kdebluetooth/kdebluetooth-1.0_beta8-compile.patch10
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/cpu.pngbin0 -> 5336 bytes
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec188
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch11
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch769
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch890
-rw-r--r--mandriva/2010.2/applications/kio-sysinfo/sysinfo.pngbin0 -> 4602 bytes
-rw-r--r--mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch10
-rw-r--r--mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch343
-rw-r--r--mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff12
-rw-r--r--mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch33
-rwxr-xr-xmandriva/2010.2/applications/klamav/klamav.sh13
-rw-r--r--mandriva/2010.2/applications/klamav/klamav.spec220
-rw-r--r--mandriva/2010.2/applications/kmetabar/kmetabar-fix.patch84
-rw-r--r--mandriva/2010.2/applications/kmetabar/kmetabar-kdemacros.diff52
-rw-r--r--mandriva/2010.2/applications/kmetabar/kmetabar.spec68
-rw-r--r--mandriva/2010.2/applications/kmymoney/kmymoney-0.8.2-disable-visibility.patch10
-rw-r--r--mandriva/2010.2/applications/kmymoney/kmymoney2.desktop21
-rw-r--r--mandriva/2010.2/applications/kmymoney/kmymoney2.spec278
-rw-r--r--mandriva/2010.2/applications/knoda/knoda-0.8.3-fix-icon-ext.patch19
-rw-r--r--mandriva/2010.2/applications/knoda/knoda-0.8.3-remove-fr-comment.patch9
-rw-r--r--mandriva/2010.2/applications/knoda/knoda.spec243
-rw-r--r--mandriva/2010.2/applications/knoda/knodapython.tar.bz2bin0 -> 428940 bytes
-rw-r--r--mandriva/2010.2/applications/knoda/lo48-app-knoda.pngbin0 -> 1850 bytes
-rw-r--r--mandriva/2010.2/applications/kosd/kde3-kosd.spec115
-rw-r--r--mandriva/2010.2/applications/krandr/kde3-krandr.spec167
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2-display_switch.patch187
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-add-mandriva-translations.patch11
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-change_the_way_crtcs_are_set.patch131
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_autostart.patch62
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_rrate_display.patch28
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-flush_after_ungrab.patch43
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-grab_server_avoiding_crashes.patch74
-rw-r--r--mandriva/2010.2/applications/krandr/krandr-0.5.2.1-legacy_randr_on_single_output.patch30
-rw-r--r--mandriva/2010.2/applications/krozat/krozat-effect-0.1.tar.bz2bin0 -> 4855 bytes
-rw-r--r--mandriva/2010.2/applications/krozat/krozat-printf.patch12
-rw-r--r--mandriva/2010.2/applications/krozat/krozat-trinity.patch11
-rw-r--r--mandriva/2010.2/applications/krozat/krozat.spec266
-rw-r--r--mandriva/2010.2/applications/ksmoothdock/ksmoothdock-4.5-compile.patch31
-rw-r--r--mandriva/2010.2/applications/ksmoothdock/ksmoothdock.spec157
-rw-r--r--mandriva/2010.2/applications/ktorrent/kde3-ktorrent.spec147
-rw-r--r--mandriva/2010.2/applications/ktorrent/ktorrent-fix-KBytesPerSecToString.diff15
-rw-r--r--mandriva/2010.2/applications/ktorrent/ktorrent-php-path.patch11
-rw-r--r--mandriva/2010.2/applications/kvolumeosd/kde3-kvolumeosd.spec94
-rw-r--r--mandriva/2010.2/common-patches/ac264.patch24
-rw-r--r--mandriva/2010.2/common-patches/fix_autotools.patch34
-rw-r--r--mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch12
-rw-r--r--mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch11
-rw-r--r--mandriva/2010.2/common-patches/readme.txt2
-rw-r--r--mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch13
-rw-r--r--mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch70
-rw-r--r--mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch20
-rw-r--r--mandriva/2010.2/dependencies/arts/arts3.spec347
-rw-r--r--mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec116
-rw-r--r--mandriva/2010.2/dependencies/kde3-macros/kde3.macros57
-rw-r--r--mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec135
-rw-r--r--mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch26
-rw-r--r--mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch23
-rw-r--r--mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff12
-rw-r--r--mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch35
-rw-r--r--mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2bin0 -> 3167960 bytes
-rw-r--r--mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec907
-rw-r--r--mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2bin0 -> 154153 bytes
-rw-r--r--mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2bin0 -> 12809 bytes
-rw-r--r--mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch33
-rw-r--r--mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch35
-rw-r--r--mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch17
-rw-r--r--mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch26
-rw-r--r--mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gzbin0 -> 487629 bytes
-rw-r--r--mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sigbin0 -> 158 bytes
-rw-r--r--mandriva/2010.2/dependencies/pinentry/pinentry-wrapper70
-rw-r--r--mandriva/2010.2/dependencies/pinentry/pinentry.spec310
-rw-r--r--mandriva/2010.2/dependencies/resmgr/desktopdev17
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch10
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2bin0 -> 34945 bytes
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff10
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff33
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff23
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch12
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr.conf69
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr.init56
-rw-r--r--mandriva/2010.2/dependencies/resmgr/resmgr.spec212
-rw-r--r--mandriva/2010.2/i18n/add-low-space-translations.patch21
-rw-r--r--mandriva/2010.2/i18n/add_new_features.patch1874
-rw-r--r--mandriva/2010.2/i18n/filter-replace.patch11
-rw-r--r--mandriva/2010.2/i18n/fix-kdeprint-typo.patch269
-rw-r--r--mandriva/2010.2/i18n/fuzzy-clock.patch152
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-de.spec182
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-en_GB.spec190
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-es.spec183
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-fr-fix-typo.patch117
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-fr.spec215
-rw-r--r--mandriva/2010.2/i18n/kde-i18n-ro.spec183
-rw-r--r--mandriva/2010.2/i18n/kde3-i18n-tr.spec229
-rw-r--r--mandriva/2010.2/i18n/kdepasswd.patch12
-rw-r--r--mandriva/2010.2/i18n/khexeditor-fixes.diff163
-rw-r--r--mandriva/2010.2/i18n/kickoff.patch531
-rw-r--r--mandriva/2010.2/i18n/kio_media.patch462
-rw-r--r--mandriva/2010.2/i18n/knode.patch535
-rw-r--r--mandriva/2010.2/i18n/konqside_metabar.patch203
-rw-r--r--mandriva/2010.2/i18n/konqueror_by_date.patch34
-rw-r--r--mandriva/2010.2/i18n/konqueror_konq_view.patch27
-rw-r--r--mandriva/2010.2/i18n/kopete-extra-strings.patch21
-rw-r--r--mandriva/2010.2/i18n/tr.patch11
-rw-r--r--mandriva/2010.2/i18n/useraccount-translation-fix.patch85
-rw-r--r--mandriva/2010.2/kdeaccessibility/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/kdeaccessibility/kde3-kdeaccessibility.spec347
-rw-r--r--mandriva/2010.2/kdeaddons/kde3-kdeaddons.spec870
-rw-r--r--mandriva/2010.2/kdeaddons/kdeaddons-3.2.3-call-drakclock.patch15
-rw-r--r--mandriva/2010.2/kdeadmin/kde3-kdeadmin.spec534
-rw-r--r--mandriva/2010.2/kdeadmin/kdeadmin-post-3.5.8-add-mandriva-support.patch29
-rw-r--r--mandriva/2010.2/kdeadmin/kpackage.pamd5
-rw-r--r--mandriva/2010.2/kdeartwork/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/kdeartwork/kde3-kdeartwork.spec521
-rw-r--r--mandriva/2010.2/kdeartwork/kdeartwork-3.5.4-fix-screensaver-only-showin-kde.patch2261
-rw-r--r--mandriva/2010.2/kdeartwork/kdeartwork-3.5.5-fix-default-inherits-theme.patch33
-rw-r--r--mandriva/2010.2/kdebase/detect-media-types.patch33
-rw-r--r--mandriva/2010.2/kdebase/fix_openssl.patch30
-rw-r--r--mandriva/2010.2/kdebase/kde3-kdebase.spec2445
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.3.2-fix-kdm-theme-mdk.patch28
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.4.0-fix-scrnsaver.patch18
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.4.2-fix-kdm-server-args.patch14
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.4.2-mdkft.patch20
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5-kde.pam7
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5-kde3-np8
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5-wizard_small.pngbin0 -> 80078 bytes
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.10-fix-vibrate-dialog.patch86
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.12-fix-kcontrol-menu.patch42
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.12-kdm-kcontrol-usericon.patch198
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.12-menus.patch1049
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.12-startkde.patch22
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.3-fix-media-fuser.patch11
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.3-logout-without-confirmation.patch34
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.4-fix-gtk-style.patch24
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.7-clock-drakclock.patch15
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.7-kdesktop_firstrun.patch27
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.7-khelpcenter-htdigsearch-path.patch11
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.7-lzma_support.patch180
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.7-translation-override.patch26
-rw-r--r--mandriva/2010.2/kdebase/kdebase-3.5.9-update-usb.ids.patch4389
-rw-r--r--mandriva/2010.2/kdebase/kdebase-konsole-fixed-font.conf6
-rw-r--r--mandriva/2010.2/kdebase/kdebase-kscreensaver-pamd.patch11
-rw-r--r--mandriva/2010.2/kdebase/kdebase-post-3.5.12-fix-choose-webbrowser-kcontrol.patch14
-rw-r--r--mandriva/2010.2/kdebase/kdebase-post-3.5.8-add-change-session-icon.patch11
-rw-r--r--mandriva/2010.2/kdebase/kdebase-post-3.5.9-Fix-kcontrol-menu-entry.patch11
-rw-r--r--mandriva/2010.2/kdebase/kdebase-post-3.5.9-bookmark-global-copy.patch27
-rw-r--r--mandriva/2010.2/kdebase/kdebase-post-3.5.9-screensaver-onlyshowin-kde.patch30
-rw-r--r--mandriva/2010.2/kdebase/kdeeject77
-rwxr-xr-xmandriva/2010.2/kdebase/kdm-migrate.pl35
-rw-r--r--mandriva/2010.2/kdebase/khotkeys-only_kde.patch7
-rw-r--r--mandriva/2010.2/kdebase/kickoff-mandriva-data.tar.bz2bin0 -> 345121 bytes
-rw-r--r--mandriva/2010.2/kdebase/mandriva-gurpmi.desktop113
-rw-r--r--mandriva/2010.2/kdebase/mandriva-mdvonline.desktop9
-rw-r--r--mandriva/2010.2/kdebase/mandriva-profile-chooser-2.0.tar.bz2bin0 -> 3752 bytes
-rw-r--r--mandriva/2010.2/kdebase/mandriva-startkde417
-rw-r--r--mandriva/2010.2/kdebase/media_saferemove.patch10
-rw-r--r--mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff11
-rw-r--r--mandriva/2010.2/kdebase/net_applet.desktop9
-rw-r--r--mandriva/2010.2/kdebase/turkish-preview.patch112
-rw-r--r--mandriva/2010.2/kdebase/x-urpmi-media.desktop44
-rw-r--r--mandriva/2010.2/kdebase/x-urpmi.desktop5
-rw-r--r--mandriva/2010.2/kdebase/xsettings-kde.desktop7
-rw-r--r--mandriva/2010.2/kdebindings/kde3-kdebindings.spec758
-rw-r--r--mandriva/2010.2/kdebindings/kdebindings-3.5.7-fix-man-dir.patch18
-rw-r--r--mandriva/2010.2/kdebindings/kdebindings-3.5.7-java-ldflags.patch43
-rw-r--r--mandriva/2010.2/kdebindings/kdebindings-3.5.7-sinjdoc.patch29
-rw-r--r--mandriva/2010.2/kdegames/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/kdegames/kde3-kdegames.spec564
-rw-r--r--mandriva/2010.2/kdegames/kdegames-3.5.8-add-support-avahi.patch60
-rw-r--r--mandriva/2010.2/kdegraphics/kde3-kdegraphics.spec1099
-rw-r--r--mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-fix-kdpf-menuEntry.desktop8
-rw-r--r--mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-kgamma_opendisplay.patch29
-rw-r--r--mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch52
-rw-r--r--mandriva/2010.2/kdegraphics/kdegraphics-3.5.3-gphoto2-config.patch35
-rw-r--r--mandriva/2010.2/kdelibs/kde3lib.filter1
-rwxr-xr-xmandriva/2010.2/kdelibs/kde3lib.script2
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.3.2-fix-kurlbar-global.patch20
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.10-LDFLAG_fix-1.patch29
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.10-ktip-on-kde4.patch11
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.2-move-xdg-menu-dir.patch11
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.3-fix-enable-dialogbox.patch30
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.7-add-extra-catalogs.patch13
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.7-cups-1.3-conf.patch134
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.8-add-bookmark-dialog.patch11
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.9-kio-kfile-grouplist.patch63
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-3.5.9-mandriva-mimetypes.tar.bz2bin0 -> 195733 bytes
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs-dcopobject-destruct-crash.patch52
-rw-r--r--mandriva/2010.2/kdelibs/kdelibs3.spec1130
-rw-r--r--mandriva/2010.2/kdelibs/verisign-class-3-secure-server-ca.pem27
-rw-r--r--mandriva/2010.2/kdemultimedia/kde3-kdemultimedia.spec1205
-rw-r--r--mandriva/2010.2/kdenetwork/kde3-kdenetwork.spec997
-rw-r--r--mandriva/2010.2/kdenetwork/kdenetwork-3.5.10-wformat.patch31
-rw-r--r--mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-add-slovenian-provider.patch449
-rw-r--r--mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-fix-kdebug-120625.patch167
-rw-r--r--mandriva/2010.2/kdenetwork/kdenetwork-lisa132
-rw-r--r--mandriva/2010.2/kdenetwork/kdenetwork3-kppp.pamd5
-rw-r--r--mandriva/2010.2/kdepim/configguibarry.cpp95
-rw-r--r--mandriva/2010.2/kdepim/configguibarry.h43
-rw-r--r--mandriva/2010.2/kdepim/kde3-kdepim.spec2102
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-addressbook.sh8
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-akregator.sh8
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-kmail.sh8
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-knode.sh8
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-knotes.sh8
-rwxr-xr-xmandriva/2010.2/kdepim/kdepim-3.2-kontact-korganizer.sh8
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.4.0-fix-kmail-dimap-speedup.patch11
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch31
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.4.2-knode-disable-first-start.patch16
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.4-fix-kalarm-call-twice-dialogbox.patch16
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.4-korganizer-use-sys-timezone.patch36
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.7-kmail-hide_help_button.patch10
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.9-allow-knode-sideband.patch11
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.9-fix-underlinking.patch27
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-barry.patch48
-rw-r--r--mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch37
-rw-r--r--mandriva/2010.2/kdepim/kdepim-only_kde3.patch16
-rw-r--r--mandriva/2010.2/kdesdk/kde3-kdesdk.spec845
-rw-r--r--mandriva/2010.2/kdetoys/kde3-kdetoys.spec470
-rw-r--r--mandriva/2010.2/kdetoys/kdetoys-3.5.6-fix-screensaver-nodisplay.patch11
-rw-r--r--mandriva/2010.2/kdeutils/kde3-kdeutils.spec1505
-rw-r--r--mandriva/2010.2/kdeutils/kdeutils-3.0-ktimer_icons.patch25
-rw-r--r--mandriva/2010.2/kdeutils/kdeutils-3.5.9-fix-lha-support.patch25
-rw-r--r--mandriva/2010.2/kdewebdev/css.tar.bz2bin0 -> 121594 bytes
-rw-r--r--mandriva/2010.2/kdewebdev/html.tar.bz2bin0 -> 93487 bytes
-rw-r--r--mandriva/2010.2/kdewebdev/javascript.tar.bz2bin0 -> 331710 bytes
-rw-r--r--mandriva/2010.2/kdewebdev/kde3-kdewebdev.spec716
-rw-r--r--mandriva/2010.2/kdewebdev/mysql5-quanta-doc-20051117.tar.bz2bin0 -> 1753160 bytes
-rw-r--r--mandriva/2010.2/kdewebdev/php.tar.bz2bin0 -> 417773 bytes
-rw-r--r--mandriva/2010.2/other/kdmtheme/kde-3.5.10-acinclude.patch66
-rw-r--r--mandriva/2010.2/other/kdmtheme/kde3-kdmtheme.spec174
-rw-r--r--mandriva/2010.2/other/kdmtheme/kdmtheme-0.8.2-use-kdesu.patch10
-rw-r--r--mandriva/2010.2/other/kdmtheme/kdmtheme-1.2.2-new-autotools.patch29
-rw-r--r--mandriva/2010.2/other/kicker-backgrounds/kde3-kickers-backgrounds.spec59
-rw-r--r--mandriva/2010.2/other/kickoff-i18n/kde3-kickoff-i18n.spec45
-rw-r--r--mandriva/2010.2/other/kickoff-i18n/kickoff-i18n-1.0-tr-po.patch1642
-rw-r--r--mandriva/2010.2/other/kickoff-i18n/kickoff-i18n-1.0-uz-po.patch1395
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/kde3-ksplash-engine-moodin.spec192
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-0.4.2-fix-bug.patch79
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-0.4.2-memleak-bug.patch15
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-autoconf.patch31
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-automake.patch12
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-drawing_and_scaling_fixes.patch144
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-external_svgrender.patch51
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-fix-svg.patch67
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-fix_drawing_on_compiz.patch67
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-fix_svg_on_base_resolution.patch12
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-kdehome-kde3.patch48
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodin-use-label-offset.patch29
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/moodinkde-use-svg.patch138
-rw-r--r--mandriva/2010.2/other/ksplash-engine-moodin/svgrender.tar.bz2bin0 -> 1025 bytes
-rw-r--r--mandriva/2010.2/other/kwinstyle-Hypnotista_Sade/Hypnotista_Sade-0.1.tar.gzbin0 -> 633383 bytes
-rw-r--r--mandriva/2010.2/other/kwinstyle-Hypnotista_Sade/kde3-kwinstyle-hypnotista_sade.spec75
-rw-r--r--mandriva/2010.2/other/kwinstyle-Hypnotista_Siyah/kde3-kwinstyle-hypnotista_siyah.spec76
-rw-r--r--mandriva/2010.2/other/kwinstyle-deKorator/kde3-kwinstyle-deKorator.spec74
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/kde3-mplayerthumbs.spec79
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/make_preview_horizontal.patch57
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/mplayerthumbs-0.5b-gcc-4.3.patch12
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/sprocket1-large.pngbin0 -> 687 bytes
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/sprocket1-medium.pngbin0 -> 384 bytes
-rw-r--r--mandriva/2010.2/other/mplayerthumbs/sprocket1-small.pngbin0 -> 246 bytes
-rw-r--r--mandriva/2010.2/other/servicemenu-mountiso/fix_weird_iso_names.patch57
-rw-r--r--mandriva/2010.2/other/servicemenu-mountiso/mountiso-0.9.5.spec86
-rw-r--r--mandriva/2010.2/other/servicemenu-rootactions/kde3-servicemenu-rootactions.spec50
-rw-r--r--mandriva/2010.2/other/style-ia-ora/kde3-style-ia-ora.spec214
-rw-r--r--mandriva/2010.2/other/style-wisdom/kde3-style-wisdom.spec84
-rw-r--r--mandriva/2010.2/other/task-kde/task-kde3.spec316
-rw-r--r--mandriva/2010.2/readme.txt29
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/buildvars.mk86
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk109
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk97
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/team-members16
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/uploaders.mk29
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/changelog9
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/compat1
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/control14
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/copyright24
-rw-r--r--ubuntu/maverick/applications/kdbusnotification/debian/links0
-rwxr-xr-xubuntu/maverick/applications/kdbusnotification/debian/rules191
-rw-r--r--ubuntu/maverick/applications/kdesvn/debian/control1
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/changelog92
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/compat1
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/control15
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/copyright29
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1146
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1150
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages2
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff13
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff157
-rwxr-xr-xubuntu/maverick/applications/kiosktool/debian/rules17
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/README.source (renamed from ubuntu/maverick/applications/knetworkmanager/debian/README.source)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk86
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk109
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk97
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members16
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk29
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/changelog (renamed from ubuntu/maverick/applications/knetworkmanager/debian/changelog)2
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/compat1
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/control (renamed from ubuntu/maverick/applications/knetworkmanager/debian/control)5
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/control.in (renamed from ubuntu/maverick/applications/knetworkmanager/debian/control.in)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/copyright (renamed from ubuntu/maverick/applications/knetworkmanager/debian/copyright)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1 (renamed from ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/manpages (renamed from ubuntu/maverick/applications/knetworkmanager/debian/manpages)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/menu (renamed from ubuntu/maverick/applications/knetworkmanager/debian/menu)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides (renamed from ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst (renamed from ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/patches/series0
-rwxr-xr-xubuntu/maverick/applications/knetworkmanager8/debian/rules (renamed from ubuntu/maverick/applications/knetworkmanager/debian/rules)0
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/watch (renamed from ubuntu/maverick/applications/knetworkmanager/debian/watch)0
-rw-r--r--ubuntu/maverick/applications/koffice/debian/control2
-rw-r--r--ubuntu/maverick/applications/piklab/debian/control2
-rw-r--r--ubuntu/maverick/applications/smartcardauth/debian/control2
-rw-r--r--ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install2
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/changelog6
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/compat1
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/control55
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/copyright17
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install1
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs1
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols2
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install5
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore0
-rwxr-xr-xubuntu/maverick/dependencies/avahi-tqt/debian/rules17
-rw-r--r--ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore0
-rw-r--r--ubuntu/maverick/dependencies/tqtinterface/debian/control4
-rw-r--r--ubuntu/maverick/kdeaddons/debian/control2
-rw-r--r--ubuntu/maverick/kdebase/debian/control14
-rw-r--r--ubuntu/maverick/kdebase/debian/ksplash-trinity.install4
-rw-r--r--ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install7
-rw-r--r--ubuntu/maverick/kdenetwork/debian/control2
-rw-r--r--ubuntu/maverick/kdepim/debian/akregator-trinity.install2
-rw-r--r--ubuntu/maverick/kdepim/debian/control2
-rw-r--r--ubuntu/maverick/kdesdk/debian/control2
-rwxr-xr-xubuntu/maverick/kdeutils/debian/rules2
-rw-r--r--ubuntu/maverick/kdevelop/debian/control2
-rw-r--r--ubuntu/maverick/kdewebdev/debian/control2
l---------ubuntu/oneiric1
494 files changed, 53608 insertions, 61 deletions
diff --git a/arch/calvin/trinity-qt3/PKGBUILD b/arch/calvin/trinity-qt3/PKGBUILD
index cf8a3ef51..2fe272238 100644
--- a/arch/calvin/trinity-qt3/PKGBUILD
+++ b/arch/calvin/trinity-qt3/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
pkgname=trinity-qt3
-pkgver=20110918
+pkgver=20110919
pkgrel=1
pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
_prefix="/opt/qt"
@@ -32,14 +32,23 @@ build() {
cd $_gitname && git pull origin
msg "The local files are updated."
else
- git clone $_gitroot
+ git clone $_gitroot
fi
msg "GIT checkout done or server timeout"
msg "Starting make..."
-
+ export QTDIR="${srcdir}/"$_gitname
+ export PATH=${QTDIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+ export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
+ if [ "$CARCH" = "x86_64" ]; then
+ export ARCH="-64"
+ else unset ARCH
+fi
+
cd "$srcdir/$_gitname"
@@ -50,16 +59,28 @@ build() {
msg "Starting configure..."
#make -C qmake || return 1
- ./configure -thread -fast
+ ./configure -prefix ${_prefix} \
+ -fast \
+ -sysconfdir /etc/qt \
+ -thread \
+ -shared \
+ -system-zlib \
+ -platform linux-g++$ARCH \
+ -system-lib{png,jpeg,mng}
make
}
package() {
- echo $PWD
- echo $pkgdir
- mkdir "$pkgdir/lib"
cd "$srcdir/$_gitname"
- make INSTALL_ROOT="$pkgdir/lib/" install
+
+ # Build and install qt.profile
+ echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+ echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+ echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+ echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+ install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+
+ make INSTALL_ROOT="$pkgdir/" install
}
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/buildvars.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..47e83ef4a 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
index 5b6508f8c..5b6508f8c 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members b/debian/lenny/applications/kdbusnotification/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/team-members
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/uploaders.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/lenny/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/kdbusnotification/debian/changelog b/debian/lenny/applications/kdbusnotification/debian/changelog
new file mode 100644
index 000000000..2aaf1b475
--- /dev/null
+++ b/debian/lenny/applications/kdbusnotification/debian/changelog
@@ -0,0 +1,9 @@
+kdbusnotification-trinity (0.1-0ubuntu1) lenny; urgency=low
+
+ * Initial upload
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 17 Oct 2010 19:35:00 -0600
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/lenny/applications/kdbusnotification/debian/compat b/debian/lenny/applications/kdbusnotification/debian/compat
new file mode 100644
index 000000000..8adb55bea
--- /dev/null
+++ b/debian/lenny/applications/kdbusnotification/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/lenny/applications/kdbusnotification/debian/control b/debian/lenny/applications/kdbusnotification/debian/control
new file mode 100644
index 000000000..dfd6737bd
--- /dev/null
+++ b/debian/lenny/applications/kdbusnotification/debian/control
@@ -0,0 +1,14 @@
+Source: kdbusnotification-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kdbusnotification-trinity
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Description: a DBUS notification service [Trinity]
+ kdbusnotification is a small program for Trinity that displays
+ DBUS notifications via unobtrusive, easily dismissed passive popups.
diff --git a/debian/lenny/applications/kdbusnotification/debian/copyright b/debian/lenny/applications/kdbusnotification/debian/copyright
new file mode 100644
index 000000000..760904ce9
--- /dev/null
+++ b/debian/lenny/applications/kdbusnotification/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on
+Mon, 17 Oct 2011 09:37:00 -0600.
+
+Upstream Authors: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+
+Copyright:
+
+ Copyright (c) 2011, Timothy Pearson
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/lenny/applications/knetworkmanager/debian/patches/series b/debian/lenny/applications/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/knetworkmanager/debian/patches/series
+++ b/debian/lenny/applications/kdbusnotification/debian/links
diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
new file mode 100755
index 000000000..3fbf27bb0
--- /dev/null
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -0,0 +1,191 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+INSTALL_DIR = install -p -d -o root -g root -m 755
+INSTALL_FILE = install -p -o root -g root -m 644
+
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+tmp = debian/kdbusnotification-trinity
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
+ # Uncomment the following 2 lines to enable i686 optimziation
+ # You may want to tweak the settings to your likings
+ #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+ #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+endif
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+ perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ # Apply Debian specific patches
+ if test ! -f patch-stamp; then \
+ for patch in $(CURDIR)/debian/patches/*.diff ;\
+ do \
+ echo APPLYING PATCH\: $${patch##*/};\
+ patch -p1 < $$patch ;\
+ done ;\
+ touch patch-stamp ;\
+ fi
+
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
+
+ if test ! -f configure; then \
+ $(MAKE) -f admin/Makefile.common ;\
+ fi
+
+ # make build directory
+ mkdir $(objdir)
+
+ # run configure with build tree $(objdir)
+ cd $(objdir) && \
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ cd $(objdir) && \
+ $(MAKE)
+
+ touch build-stamp
+
+debian-clean:
+ dh_testdir
+ dh_testroot
+
+ dh_clean
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp debian/debiandirs
+
+ # Remove Debian specific patches
+ if test -f patch-stamp; then \
+ for patch in $(CURDIR)/debian/patches/*.diff ;\
+ do \
+ echo REMOVING PATCH\: $${patch##*/};\
+ patch -p1 -R < $$patch ;\
+ done ;\
+ rm -f patch-stamp ;\
+ fi
+
+ # Remove build tree
+ rm -rf $(objdir)
+
+ # if Makefile exists run distclean
+ if test -f Makefile; then \
+ $(MAKE) distclean; \
+ fi
+
+ if test -d CVS; then \
+ $(MAKE) -f admin/Makefile.common cvs-clean ;\
+ fi
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd $(objdir) && \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
+
+ # Install additional files beyond the standard install.
+ dh_install
+
+ # Generate HTML docs.
+ for i in `find $(tmp) -name "index.docbook"`; do \
+ ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
+ done
+
+ # Install standard documentation links.
+ for pkg in `dh_listpackages`; do \
+ if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
+ dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+ opt/trinity/share/doc/$$pkg/html; \
+ fi; \
+ done
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmanpages
+ dh_installmime
+ dh_strip
+ dh_link
+ dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+ dh_fixperms
+ dh_makeshlibs -V
+ dh_installdeb
+ dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+ # We have nothing to do by default.
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/lenny/applications/kdesvn/debian/control b/debian/lenny/applications/kdesvn/debian/control
index c7849ea5e..a90ca64c8 100644
--- a/debian/lenny/applications/kdesvn/debian/control
+++ b/debian/lenny/applications/kdesvn/debian/control
@@ -44,6 +44,7 @@ Package: kdesvn-kio-plugins-trinity
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
Description: subversion I/O slaves for Trinity
This packages includes KIO slaves for svn, svn+file, svn+http,
svn+https, svn+ssh. This allows you to access subversion repositories
diff --git a/debian/lenny/applications/kiosktool/debian/changelog b/debian/lenny/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+ * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+ * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+ * Add kubuntu_03_sudo_support.diff to support sudo
+ * Add depend on kdesudo
+ * Move maintainer to XSBC-Original-Maintainer:
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+ * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+ * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+ * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+ * Rebuild for libstdc++ transition
+ * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+ (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es> Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+ * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+ * Solved a problem with upstream sources due to some messages translated to Spanish
+ * Changed description
+ * First Debian upload, closes: #267595
+ * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+ * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 13 Oct 2004 14:57:28 +0200
+
+kiosktool (0.8-1) unstable; urgency=low
+
+ * First use of cdbs for packaging
+ * Created a man page with kdemangen.pl (thanks to Dominique Devriese)
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+ * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/debian/lenny/applications/kiosktool/debian/compat b/debian/lenny/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable
+ TDE's KIOSK features or otherwise preconfigure TDE for
+ groups of users.
diff --git a/debian/lenny/applications/kiosktool/debian/copyright b/debian/lenny/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+ 2003, 2004 Waldo Bastian <bastian@kde.org>
+ 2004 Martijn Klingens <klingens@kde.org>
+
+License:
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options]
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B \-\-check
+Output currently active prefixes
+.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 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.
+.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
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options]
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B \-\-kderc <file>
+kderc file to save settings to [/etc/kderc]
+.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 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.
+.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
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/squeeze/applications/knetworkmanager/debian/patches/series b/debian/lenny/applications/kiosktool/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/patches/series
+++ b/debian/lenny/applications/kiosktool/debian/patches/.gitignore
diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanager/debian/README.source b/debian/lenny/applications/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/lenny/applications/knetworkmanager/debian/README.source
+++ b/debian/lenny/applications/knetworkmanager8/debian/README.source
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..47e83ef4a 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
index 5b6508f8c..5b6508f8c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/knetworkmanager/debian/changelog b/debian/lenny/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/debian/lenny/applications/knetworkmanager/debian/changelog
+++ b/debian/lenny/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
* UI tweaks for discoverability
diff --git a/debian/lenny/applications/knetworkmanager/debian/compat b/debian/lenny/applications/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/lenny/applications/knetworkmanager/debian/compat
+++ b/debian/lenny/applications/knetworkmanager8/debian/compat
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
index c8875e68c..0b04bbf74 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/lenny/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
libnm-util-dev (>= 0.7.0),
libnm-glib-dev (>= 0.7.0),
network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
libhal-dev,
libdbus-1-tqt-dev,
libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-kde-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/lenny/applications/knetworkmanager/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in
index 43adf3e33..43adf3e33 100644
--- a/debian/lenny/applications/knetworkmanager/debian/control.in
+++ b/debian/lenny/applications/knetworkmanager8/debian/control.in
diff --git a/debian/lenny/applications/knetworkmanager/debian/copyright b/debian/lenny/applications/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/lenny/applications/knetworkmanager/debian/copyright
+++ b/debian/lenny/applications/knetworkmanager8/debian/copyright
diff --git a/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1
+++ b/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanager/debian/manpages b/debian/lenny/applications/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/lenny/applications/knetworkmanager/debian/manpages
+++ b/debian/lenny/applications/knetworkmanager8/debian/manpages
diff --git a/debian/lenny/applications/knetworkmanager/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/lenny/applications/knetworkmanager/debian/menu
+++ b/debian/lenny/applications/knetworkmanager8/debian/menu
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series b/debian/lenny/applications/knetworkmanager8/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series
+++ b/debian/lenny/applications/knetworkmanager8/debian/patches/series
diff --git a/debian/lenny/applications/knetworkmanager/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules
index 97955e38b..97955e38b 100755
--- a/debian/lenny/applications/knetworkmanager/debian/rules
+++ b/debian/lenny/applications/knetworkmanager8/debian/rules
diff --git a/debian/lenny/applications/knetworkmanager/debian/watch b/debian/lenny/applications/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/lenny/applications/knetworkmanager/debian/watch
+++ b/debian/lenny/applications/knetworkmanager8/debian/watch
diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 04167da17..969929548 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org
diff --git a/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control
index 377c91d2c..2e8d8ffda 100644
--- a/debian/lenny/applications/piklab/debian/control
+++ b/debian/lenny/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://piklab.sourceforge.net/
diff --git a/debian/lenny/applications/smartcardauth/debian/control b/debian/lenny/applications/smartcardauth/debian/control
index fa663e62e..4ac2c0ff0 100755
--- a/debian/lenny/applications/smartcardauth/debian/control
+++ b/debian/lenny/applications/smartcardauth/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev
+Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/debian/lenny/dependencies/arts/debian/libartsc0-trinity-dev.install b/debian/lenny/dependencies/arts/debian/libartsc0-trinity-dev.install
index 232640178..a13ee599c 100644
--- a/debian/lenny/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/debian/lenny/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -3,6 +3,6 @@ debian/tmp/opt/trinity/include/artsc/artsc.h
debian/tmp/opt/trinity/include/artsc/artsc_export.h
debian/tmp/opt/trinity/lib/libartsc.la
debian/tmp/opt/trinity/lib/libartsc.so
-debian/tmp/opt/trinity/lib/libgsl.a
+debian/tmp/opt/trinity/lib/libartsgsl.a
debian/tmp/usr/lib/pkgconfig/arts.pc
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/changelog b/debian/lenny/dependencies/avahi-tqt/debian/changelog
new file mode 100644
index 000000000..b977d6076
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/changelog
@@ -0,0 +1,6 @@
+avahi-tqt (0.6.30-0debian0) lenny; urgency=low
+
+ * Initial build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 08 Oct 2011 22:38:00 -0600
+
diff --git a/debian/squeeze/applications/knetworkmanager/debian/compat b/debian/lenny/dependencies/avahi-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/compat
+++ b/debian/lenny/dependencies/avahi-tqt/debian/compat
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/control b/debian/lenny/dependencies/avahi-tqt/debian/control
new file mode 100644
index 000000000..607e76dd1
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/control
@@ -0,0 +1,55 @@
+Source: avahi-tqt
+Section: net
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper,
+ pkg-config,
+ python-support (>= 0.6),
+ libglib2.0-dev (>= 2.4),
+ libgtk2.0-dev (>= 2.14.0),
+ libexpat-dev,
+ libdbus-1-dev (>= 0.60),
+ python-gdbm (>= 2.4.3),
+ python-dbus,
+ python-gtk2 (>= 2.8.6-2),
+ libtqtinterface-dev,
+ intltool (>= 0.35.0),
+ libavahi-common-dev,
+ libavahi-client-dev
+Standards-Version: 3.9.1
+
+Package: libavahi-tqt-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This library contains the interface to integrate the Avahi libraries
+ into a TQt main loop application.
+
+Package: libavahi-tqt-dev
+Section: libdevel
+Architecture: any
+Depends: libavahi-tqt-1 (= ${binary:Version}),
+ ${misc:Depends},
+ libtqtinterface-dev,
+ libavahi-common-dev
+Description: Development headers for the Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This package contains the development headers for the interface
+ to integrate the Avahi libraries into a TQt main loop application. \ No newline at end of file
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/copyright b/debian/lenny/dependencies/avahi-tqt/debian/copyright
new file mode 100644
index 000000000..6771a11ab
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/copyright
@@ -0,0 +1,17 @@
+ License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ See /usr/share/common-licenses/LGPL-2.1 on your debian system.
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
new file mode 100644
index 000000000..50e360b80
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libavahi-tqt.so.*
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
new file mode 100644
index 000000000..967448229
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
@@ -0,0 +1 @@
+libavahi-tqt 1 libavahi-tqt-1 (>= 0.6.16)
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
new file mode 100644
index 000000000..e530241ba
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
@@ -0,0 +1,2 @@
+libavahi-tqt.so.1 libavahi-tqt-1 #MINVER#
+ avahi_qt_poll_get@Base 0.6.16
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
new file mode 100644
index 000000000..7f65054bd
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/avahi-tqt/qt-watch.h
+debian/tmp/usr/lib/libavahi-tqt.so
+debian/tmp/usr/lib/libavahi-tqt.la
+debian/tmp/usr/lib/libavahi-tqt.a
+debian/tmp/usr/lib/pkgconfig/avahi-tqt.pc
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/lenny/dependencies/avahi-tqt/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/patches/.gitignore
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/rules b/debian/lenny/dependencies/avahi-tqt/debian/rules
new file mode 100755
index 000000000..c3ea0343f
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1
+
+override_dh_auto_configure:
+ ./autogen.sh
+ dh_auto_configure -- $(CONFFLAGS) \
+ --enable-compat-libdns_sd \
+ --disable-mono --disable-monodoc \
+ --disable-gtk3 \
+ --with-systemdsystemunitdir=/lib/systemd/system
+
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/source/.gitignore b/debian/lenny/dependencies/avahi-tqt/debian/source/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/lenny/dependencies/avahi-tqt/debian/source/.gitignore
diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index e1c21a588..d2b5de20b 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-qt3-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
Standards-Version: 3.8.4
Package: libtqtinterface
@@ -18,7 +18,7 @@ Description: The Trinity Qt Interface Libraries
Package: libtqtinterface-dev
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-qt3-dev, qt3-apps-dev
+Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, qt3-apps-dev
Description: The Trinity Qt Interface Libraries (Development Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
diff --git a/debian/lenny/kdeaddons/debian/control b/debian/lenny/kdeaddons/debian/control
index 9345f0b9b..c5fe514a6 100644
--- a/debian/lenny/kdeaddons/debian/control
+++ b/debian/lenny/kdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeaddons-trinity
diff --git a/debian/lenny/kdebase/debian/control b/debian/lenny/kdebase/debian/control
index 8681f7ea0..4fde6dcfd 100644
--- a/debian/lenny/kdebase/debian/control
+++ b/debian/lenny/kdebase/debian/control
@@ -13,7 +13,7 @@ Package: kdebase-trinity
Section: kde
Architecture: all
Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), kdebase-trinity-bin (>= ${Source-Version}), kdebase-data-trinity (>= ${Source-Version}), kdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
-Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity
+Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: kdebase-trinity-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -524,6 +524,16 @@ Description: core libraries for Konqueror
This package is part of KDE, and a component of the KDE base module.
See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+Package: libtqt3-integration-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Integration library between TQt3 and TDE
+ These libraries allow you to use TDE dialogs in native TQt3 applications.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+
Package: libkonq4-trinity-dev
Section: libdevel
Architecture: any
diff --git a/debian/lenny/kdebase/debian/ksplash-trinity.install b/debian/lenny/kdebase/debian/ksplash-trinity.install
index 5c77fa766..6865911fd 100644
--- a/debian/lenny/kdebase/debian/ksplash-trinity.install
+++ b/debian/lenny/kdebase/debian/ksplash-trinity.install
@@ -4,6 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.la
debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.so
debian/tmp/opt/trinity/lib/trinity/ksplashdefault.la
debian/tmp/opt/trinity/lib/trinity/ksplashdefault.so
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.la
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.so
debian/tmp/opt/trinity/lib/trinity/ksplashredmond.la
debian/tmp/opt/trinity/lib/trinity/ksplashredmond.so
debian/tmp/opt/trinity/lib/trinity/ksplashstandard.la
@@ -29,6 +31,7 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_inactive_bar.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_top.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/Unified/
debian/tmp/opt/trinity/share/apps/ksplash/Themes/None/Theme.rc
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Background.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Preview.png
@@ -42,6 +45,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.docbook
debian/tmp/opt/trinity/share/services/ksplashdefault.desktop
debian/tmp/opt/trinity/share/services/ksplash.desktop
+debian/tmp/opt/trinity/share/services/ksplashunified.desktop
debian/tmp/opt/trinity/share/services/ksplashredmond.desktop
debian/tmp/opt/trinity/share/services/ksplashstandard.desktop
debian/tmp/opt/trinity/share/servicetypes/ksplashplugins.desktop
diff --git a/debian/lenny/kdebase/debian/libtqt3-integration-trinity.install b/debian/lenny/kdebase/debian/libtqt3-integration-trinity.install
new file mode 100644
index 000000000..9f747bbda
--- /dev/null
+++ b/debian/lenny/kdebase/debian/libtqt3-integration-trinity.install
@@ -0,0 +1,7 @@
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.la
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0.0.0
+debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
diff --git a/debian/lenny/kdenetwork/debian/control b/debian/lenny/kdenetwork/debian/control
index dda16d833..d730851ed 100644
--- a/debian/lenny/kdenetwork/debian/control
+++ b/debian/lenny/kdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind, libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdenetwork-trinity
diff --git a/debian/lenny/kdepim/debian/akregator-trinity.install b/debian/lenny/kdepim/debian/akregator-trinity.install
index e67c9c91a..2dd23adc6 100644
--- a/debian/lenny/kdepim/debian/akregator-trinity.install
+++ b/debian/lenny/kdepim/debian/akregator-trinity.install
@@ -5,6 +5,8 @@
/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.so
/opt/trinity/lib/libakregatorprivate.la
/opt/trinity/lib/libakregatorprivate.so
+/opt/trinity/lib/libakregatorprivate.so.0
+/opt/trinity/lib/libakregatorprivate.so.0.0.0
/opt/trinity/share/applications/kde/akregator.desktop
/opt/trinity/share/apps/akregator
/opt/trinity/share/config.kcfg/akregator.kcfg
diff --git a/debian/lenny/kdepim/debian/control b/debian/lenny/kdepim/debian/control
index ceb8680ae..aafa6defe 100644
--- a/debian/lenny/kdepim/debian/control
+++ b/debian/lenny/kdepim/debian/control
@@ -8,7 +8,7 @@ Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
cdparanoia, gawk, gettext, kdelibs4-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libopensync0-dev, libogg-dev-la,
libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
- libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
+ libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
diff --git a/debian/lenny/kdesdk/debian/control b/debian/lenny/kdesdk/debian/control
index def7fcd4c..e240524d0 100644
--- a/debian/lenny/kdesdk/debian/control
+++ b/debian/lenny/kdesdk/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@fr
Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev,
+ libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
diff --git a/debian/lenny/kdeutils/debian/rules b/debian/lenny/kdeutils/debian/rules
index 7a7ec3e66..f4ba23952 100755
--- a/debian/lenny/kdeutils/debian/rules
+++ b/debian/lenny/kdeutils/debian/rules
@@ -18,7 +18,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity
-DEB_DH_STRIP_ARGS := --dbg-package=kdeutils-trinity-dbg
+DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=kdeutils-trinity-dbg
PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
diff --git a/debian/lenny/kdevelop/debian/control b/debian/lenny/kdevelop/debian/control
index c6d7622c9..d3317527f 100644
--- a/debian/lenny/kdevelop/debian/control
+++ b/debian/lenny/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/debian/lenny/kdewebdev/debian/control b/debian/lenny/kdewebdev/debian/control
index 929fb0a85..4a4dd1f6c 100644
--- a/debian/lenny/kdewebdev/debian/control
+++ b/debian/lenny/kdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..47e83ef4a 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
index 5b6508f8c..5b6508f8c 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members b/debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdbusnotification/debian/changelog b/debian/squeeze/applications/kdbusnotification/debian/changelog
new file mode 100644
index 000000000..14a35fffb
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/changelog
@@ -0,0 +1,9 @@
+kdbusnotification-trinity (0.1-0ubuntu1) squeeze; urgency=low
+
+ * Initial upload
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 17 Oct 2010 19:35:00 -0600
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/squeeze/applications/kdbusnotification/debian/compat b/debian/squeeze/applications/kdbusnotification/debian/compat
new file mode 100644
index 000000000..8adb55bea
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/squeeze/applications/kdbusnotification/debian/control b/debian/squeeze/applications/kdbusnotification/debian/control
new file mode 100644
index 000000000..dfd6737bd
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/control
@@ -0,0 +1,14 @@
+Source: kdbusnotification-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kdbusnotification-trinity
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Description: a DBUS notification service [Trinity]
+ kdbusnotification is a small program for Trinity that displays
+ DBUS notifications via unobtrusive, easily dismissed passive popups.
diff --git a/debian/squeeze/applications/kdbusnotification/debian/copyright b/debian/squeeze/applications/kdbusnotification/debian/copyright
new file mode 100644
index 000000000..760904ce9
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on
+Mon, 17 Oct 2011 09:37:00 -0600.
+
+Upstream Authors: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+
+Copyright:
+
+ Copyright (c) 2011, Timothy Pearson
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/squeeze/applications/kdbusnotification/debian/links b/debian/squeeze/applications/kdbusnotification/debian/links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/links
diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules
new file mode 100755
index 000000000..3fbf27bb0
--- /dev/null
+++ b/debian/squeeze/applications/kdbusnotification/debian/rules
@@ -0,0 +1,191 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+INSTALL_DIR = install -p -d -o root -g root -m 755
+INSTALL_FILE = install -p -o root -g root -m 644
+
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+tmp = debian/kdbusnotification-trinity
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
+ # Uncomment the following 2 lines to enable i686 optimziation
+ # You may want to tweak the settings to your likings
+ #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+ #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
+endif
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+ perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ # Apply Debian specific patches
+ if test ! -f patch-stamp; then \
+ for patch in $(CURDIR)/debian/patches/*.diff ;\
+ do \
+ echo APPLYING PATCH\: $${patch##*/};\
+ patch -p1 < $$patch ;\
+ done ;\
+ touch patch-stamp ;\
+ fi
+
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
+
+ if test ! -f configure; then \
+ $(MAKE) -f admin/Makefile.common ;\
+ fi
+
+ # make build directory
+ mkdir $(objdir)
+
+ # run configure with build tree $(objdir)
+ cd $(objdir) && \
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ cd $(objdir) && \
+ $(MAKE)
+
+ touch build-stamp
+
+debian-clean:
+ dh_testdir
+ dh_testroot
+
+ dh_clean
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp debian/debiandirs
+
+ # Remove Debian specific patches
+ if test -f patch-stamp; then \
+ for patch in $(CURDIR)/debian/patches/*.diff ;\
+ do \
+ echo REMOVING PATCH\: $${patch##*/};\
+ patch -p1 -R < $$patch ;\
+ done ;\
+ rm -f patch-stamp ;\
+ fi
+
+ # Remove build tree
+ rm -rf $(objdir)
+
+ # if Makefile exists run distclean
+ if test -f Makefile; then \
+ $(MAKE) distclean; \
+ fi
+
+ if test -d CVS; then \
+ $(MAKE) -f admin/Makefile.common cvs-clean ;\
+ fi
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd $(objdir) && \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
+
+ # Install additional files beyond the standard install.
+ dh_install
+
+ # Generate HTML docs.
+ for i in `find $(tmp) -name "index.docbook"`; do \
+ ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
+ done
+
+ # Install standard documentation links.
+ for pkg in `dh_listpackages`; do \
+ if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
+ dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+ opt/trinity/share/doc/$$pkg/html; \
+ fi; \
+ done
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmanpages
+ dh_installmime
+ dh_strip
+ dh_link
+ dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+ dh_fixperms
+ dh_makeshlibs -V
+ dh_installdeb
+ dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+ # We have nothing to do by default.
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/squeeze/applications/kdesvn/debian/control b/debian/squeeze/applications/kdesvn/debian/control
index c7849ea5e..a90ca64c8 100644
--- a/debian/squeeze/applications/kdesvn/debian/control
+++ b/debian/squeeze/applications/kdesvn/debian/control
@@ -44,6 +44,7 @@ Package: kdesvn-kio-plugins-trinity
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kdesdk-kio-plugins-trinity
Description: subversion I/O slaves for Trinity
This packages includes KIO slaves for svn, svn+file, svn+http,
svn+https, svn+ssh. This allows you to access subversion repositories
diff --git a/debian/squeeze/applications/kiosktool/debian/changelog b/debian/squeeze/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+ * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+ * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+ * Add kubuntu_03_sudo_support.diff to support sudo
+ * Add depend on kdesudo
+ * Move maintainer to XSBC-Original-Maintainer:
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+ * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+ * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+ * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+ * Rebuild for libstdc++ transition
+ * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+ (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es> Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+ * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+ * Solved a problem with upstream sources due to some messages translated to Spanish
+ * Changed description
+ * First Debian upload, closes: #267595
+ * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+ * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 13 Oct 2004 14:57:28 +0200
+
+kiosktool (0.8-1) unstable; urgency=low
+
+ * First use of cdbs for packaging
+ * Created a man page with kdemangen.pl (thanks to Dominique Devriese)
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+ * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/debian/squeeze/applications/kiosktool/debian/compat b/debian/squeeze/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/squeeze/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable
+ TDE's KIOSK features or otherwise preconfigure TDE for
+ groups of users.
diff --git a/debian/squeeze/applications/kiosktool/debian/copyright b/debian/squeeze/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+ 2003, 2004 Waldo Bastian <bastian@kde.org>
+ 2004 Martijn Klingens <klingens@kde.org>
+
+License:
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options]
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B \-\-check
+Output currently active prefixes
+.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 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.
+.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
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options]
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B \-\-kderc <file>
+kderc file to save settings to [/etc/kderc]
+.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 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.
+.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
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/squeeze/applications/kiosktool/debian/patches/.gitignore b/debian/squeeze/applications/kiosktool/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+ make -f admin/Makefile.common cvs
+ touch debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/knetworkmanager/debian/README.source b/debian/squeeze/applications/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/README.source
+++ b/debian/squeeze/applications/knetworkmanager8/debian/README.source
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now. If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+ DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+ DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+ touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+ done
+
+clean::
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-prehook-impl::
+ mkdir -p po
+ -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
+ -for file in po/*pot; do \
+ sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+ done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+ rm -f debian/stamp-kde-apidox
+ rm -rf po/*.pot
+
+# This is a convenience target for calling manually. It's not part of
+# the build process.
+buildprep: clean apply-patches
+ $(MAKE) -f admin/Makefile.common dist
+ debian/rules clean
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+ @if [ ! -e debian/control.in ] ; then \
+ echo "this package is not yet prepared for using automatic update of uploaders"; \
+ echo "Please do so."; \
+ exit 1; \
+ fi
+ @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+ @if ! diff -q debian/control debian/control.tmp ; then \
+ echo "WARNING:: Control file differs from manually generated one" ; \
+ echo "WARNING:: Please update it manually and check it afterwards" ; \
+ echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+ echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+ fi
+
+
+clean::
+ rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+ @mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/squeeze/applications/knetworkmanager/debian/changelog b/debian/squeeze/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/changelog
+++ b/debian/squeeze/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
* UI tweaks for discoverability
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/compat b/debian/squeeze/applications/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/compat
+++ b/debian/squeeze/applications/knetworkmanager8/debian/compat
diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager8/debian/control
index c8875e68c..0b04bbf74 100644
--- a/debian/lenny/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
libnm-util-dev (>= 0.7.0),
libnm-glib-dev (>= 0.7.0),
network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
libhal-dev,
libdbus-1-tqt-dev,
libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-kde-trinity
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control.in b/debian/squeeze/applications/knetworkmanager8/debian/control.in
index 43adf3e33..43adf3e33 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control.in
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control.in
diff --git a/debian/squeeze/applications/knetworkmanager/debian/copyright b/debian/squeeze/applications/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/copyright
+++ b/debian/squeeze/applications/knetworkmanager8/debian/copyright
diff --git a/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1
+++ b/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager/debian/manpages b/debian/squeeze/applications/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/manpages
+++ b/debian/squeeze/applications/knetworkmanager8/debian/manpages
diff --git a/debian/squeeze/applications/knetworkmanager/debian/menu b/debian/squeeze/applications/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/menu
+++ b/debian/squeeze/applications/knetworkmanager8/debian/menu
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/patches/series b/debian/squeeze/applications/knetworkmanager8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/patches/series
diff --git a/debian/squeeze/applications/knetworkmanager/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules
index 97955e38b..97955e38b 100755
--- a/debian/squeeze/applications/knetworkmanager/debian/rules
+++ b/debian/squeeze/applications/knetworkmanager8/debian/rules
diff --git a/debian/squeeze/applications/knetworkmanager/debian/watch b/debian/squeeze/applications/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/watch
+++ b/debian/squeeze/applications/knetworkmanager8/debian/watch
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control
index 04167da17..969929548 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/squeeze/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org
diff --git a/debian/squeeze/applications/piklab/debian/control b/debian/squeeze/applications/piklab/debian/control
index 377c91d2c..2e8d8ffda 100644
--- a/debian/squeeze/applications/piklab/debian/control
+++ b/debian/squeeze/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://piklab.sourceforge.net/
diff --git a/debian/squeeze/applications/smartcardauth/debian/control b/debian/squeeze/applications/smartcardauth/debian/control
index fa663e62e..4ac2c0ff0 100755
--- a/debian/squeeze/applications/smartcardauth/debian/control
+++ b/debian/squeeze/applications/smartcardauth/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev
+Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install b/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install
index 232640178..a13ee599c 100644
--- a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -3,6 +3,6 @@ debian/tmp/opt/trinity/include/artsc/artsc.h
debian/tmp/opt/trinity/include/artsc/artsc_export.h
debian/tmp/opt/trinity/lib/libartsc.la
debian/tmp/opt/trinity/lib/libartsc.so
-debian/tmp/opt/trinity/lib/libgsl.a
+debian/tmp/opt/trinity/lib/libartsgsl.a
debian/tmp/usr/lib/pkgconfig/arts.pc
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/changelog b/debian/squeeze/dependencies/avahi-tqt/debian/changelog
new file mode 100644
index 000000000..2401c4285
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/changelog
@@ -0,0 +1,6 @@
+avahi-tqt (0.6.30-0debian0) squeeze; urgency=low
+
+ * Initial build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 08 Oct 2011 22:38:00 -0600
+
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/compat b/debian/squeeze/dependencies/avahi-tqt/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/control b/debian/squeeze/dependencies/avahi-tqt/debian/control
new file mode 100644
index 000000000..607e76dd1
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/control
@@ -0,0 +1,55 @@
+Source: avahi-tqt
+Section: net
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper,
+ pkg-config,
+ python-support (>= 0.6),
+ libglib2.0-dev (>= 2.4),
+ libgtk2.0-dev (>= 2.14.0),
+ libexpat-dev,
+ libdbus-1-dev (>= 0.60),
+ python-gdbm (>= 2.4.3),
+ python-dbus,
+ python-gtk2 (>= 2.8.6-2),
+ libtqtinterface-dev,
+ intltool (>= 0.35.0),
+ libavahi-common-dev,
+ libavahi-client-dev
+Standards-Version: 3.9.1
+
+Package: libavahi-tqt-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This library contains the interface to integrate the Avahi libraries
+ into a TQt main loop application.
+
+Package: libavahi-tqt-dev
+Section: libdevel
+Architecture: any
+Depends: libavahi-tqt-1 (= ${binary:Version}),
+ ${misc:Depends},
+ libtqtinterface-dev,
+ libavahi-common-dev
+Description: Development headers for the Avahi TQt integration library
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This package contains the development headers for the interface
+ to integrate the Avahi libraries into a TQt main loop application. \ No newline at end of file
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/copyright b/debian/squeeze/dependencies/avahi-tqt/debian/copyright
new file mode 100644
index 000000000..6771a11ab
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/copyright
@@ -0,0 +1,17 @@
+ License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ See /usr/share/common-licenses/LGPL-2.1 on your debian system.
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
new file mode 100644
index 000000000..50e360b80
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libavahi-tqt.so.*
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
new file mode 100644
index 000000000..967448229
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
@@ -0,0 +1 @@
+libavahi-tqt 1 libavahi-tqt-1 (>= 0.6.16)
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
new file mode 100644
index 000000000..e530241ba
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
@@ -0,0 +1,2 @@
+libavahi-tqt.so.1 libavahi-tqt-1 #MINVER#
+ avahi_qt_poll_get@Base 0.6.16
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
new file mode 100644
index 000000000..7f65054bd
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/avahi-tqt/qt-watch.h
+debian/tmp/usr/lib/libavahi-tqt.so
+debian/tmp/usr/lib/libavahi-tqt.la
+debian/tmp/usr/lib/libavahi-tqt.a
+debian/tmp/usr/lib/pkgconfig/avahi-tqt.pc
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/squeeze/dependencies/avahi-tqt/debian/rules
new file mode 100755
index 000000000..c3ea0343f
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1
+
+override_dh_auto_configure:
+ ./autogen.sh
+ dh_auto_configure -- $(CONFFLAGS) \
+ --enable-compat-libdns_sd \
+ --disable-mono --disable-monodoc \
+ --disable-gtk3 \
+ --with-systemdsystemunitdir=/lib/systemd/system
+
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore b/debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/squeeze/dependencies/tqtinterface/debian/control
index e1c21a588..d2b5de20b 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-qt3-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, libavahi-tqt-dev, qt3-apps-dev, cmake, cdbs
Standards-Version: 3.8.4
Package: libtqtinterface
@@ -18,7 +18,7 @@ Description: The Trinity Qt Interface Libraries
Package: libtqtinterface-dev
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-qt3-dev, qt3-apps-dev
+Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), libavahi-tqt-dev, qt3-apps-dev
Description: The Trinity Qt Interface Libraries (Development Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
diff --git a/debian/squeeze/kdeaddons/debian/control b/debian/squeeze/kdeaddons/debian/control
index 9345f0b9b..c5fe514a6 100644
--- a/debian/squeeze/kdeaddons/debian/control
+++ b/debian/squeeze/kdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, atlantik-trinity-dev, kdebase-trinity-dev, kdemultimedia-trinity-dev, libkdegames-trinity-dev, libkonq4-trinity-dev, kdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.8++-dev | libdb++-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdeaddons-trinity
diff --git a/debian/squeeze/kdebase/debian/control b/debian/squeeze/kdebase/debian/control
index 8681f7ea0..93303a9e7 100644
--- a/debian/squeeze/kdebase/debian/control
+++ b/debian/squeeze/kdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
@@ -13,7 +13,7 @@ Package: kdebase-trinity
Section: kde
Architecture: all
Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), kdebase-trinity-bin (>= ${Source-Version}), kdebase-data-trinity (>= ${Source-Version}), kdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
-Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity
+Recommends: kdm-trinity (>= ${Source-Version}), kdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: kdebase-trinity-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -524,6 +524,16 @@ Description: core libraries for Konqueror
This package is part of KDE, and a component of the KDE base module.
See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+Package: libtqt3-integration-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Integration library between TQt3 and TDE
+ These libraries allow you to use TDE dialogs in native TQt3 applications.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde-trinity' and 'kdebase-trinity' packages for more information.
+
Package: libkonq4-trinity-dev
Section: libdevel
Architecture: any
diff --git a/debian/squeeze/kdebase/debian/ksplash-trinity.install b/debian/squeeze/kdebase/debian/ksplash-trinity.install
index 5c77fa766..6865911fd 100644
--- a/debian/squeeze/kdebase/debian/ksplash-trinity.install
+++ b/debian/squeeze/kdebase/debian/ksplash-trinity.install
@@ -4,6 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.la
debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.so
debian/tmp/opt/trinity/lib/trinity/ksplashdefault.la
debian/tmp/opt/trinity/lib/trinity/ksplashdefault.so
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.la
+debian/tmp/opt/trinity/lib/trinity/ksplashunified.so
debian/tmp/opt/trinity/lib/trinity/ksplashredmond.la
debian/tmp/opt/trinity/lib/trinity/ksplashredmond.so
debian/tmp/opt/trinity/lib/trinity/ksplashstandard.la
@@ -29,6 +31,7 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_inactive_bar.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_top.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/Unified/
debian/tmp/opt/trinity/share/apps/ksplash/Themes/None/Theme.rc
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Background.png
debian/tmp/opt/trinity/share/apps/ksplash/Themes/Redmond/Preview.png
@@ -42,6 +45,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.docbook
debian/tmp/opt/trinity/share/services/ksplashdefault.desktop
debian/tmp/opt/trinity/share/services/ksplash.desktop
+debian/tmp/opt/trinity/share/services/ksplashunified.desktop
debian/tmp/opt/trinity/share/services/ksplashredmond.desktop
debian/tmp/opt/trinity/share/services/ksplashstandard.desktop
debian/tmp/opt/trinity/share/servicetypes/ksplashplugins.desktop
diff --git a/debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install b/debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install
new file mode 100644
index 000000000..9f747bbda
--- /dev/null
+++ b/debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install
@@ -0,0 +1,7 @@
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.la
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0
+debian/tmp/opt/trinity/lib/trinity/plugins/integration/libqtkde.so.0.0.0
+debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
+debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
diff --git a/debian/squeeze/kdenetwork/debian/control b/debian/squeeze/kdenetwork/debian/control
index dda16d833..d730851ed 100644
--- a/debian/squeeze/kdenetwork/debian/control
+++ b/debian/squeeze/kdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind, libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdenetwork-trinity
diff --git a/debian/squeeze/kdepim/debian/akregator-trinity.install b/debian/squeeze/kdepim/debian/akregator-trinity.install
index e67c9c91a..2dd23adc6 100644
--- a/debian/squeeze/kdepim/debian/akregator-trinity.install
+++ b/debian/squeeze/kdepim/debian/akregator-trinity.install
@@ -5,6 +5,8 @@
/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.so
/opt/trinity/lib/libakregatorprivate.la
/opt/trinity/lib/libakregatorprivate.so
+/opt/trinity/lib/libakregatorprivate.so.0
+/opt/trinity/lib/libakregatorprivate.so.0.0.0
/opt/trinity/share/applications/kde/akregator.desktop
/opt/trinity/share/apps/akregator
/opt/trinity/share/config.kcfg/akregator.kcfg
diff --git a/debian/squeeze/kdepim/debian/control b/debian/squeeze/kdepim/debian/control
index ceb8680ae..aafa6defe 100644
--- a/debian/squeeze/kdepim/debian/control
+++ b/debian/squeeze/kdepim/debian/control
@@ -8,7 +8,7 @@ Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
cdparanoia, gawk, gettext, kdelibs4-trinity-dev, bison, byacc, bzip2,
flex, groff-base, libopensync0-dev, libogg-dev-la,
libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
- libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
+ libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
diff --git a/debian/squeeze/kdesdk/debian/control b/debian/squeeze/kdesdk/debian/control
index def7fcd4c..e240524d0 100644
--- a/debian/squeeze/kdesdk/debian/control
+++ b/debian/squeeze/kdesdk/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@fr
Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
gettext, pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
kdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev,
+ libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
diff --git a/debian/squeeze/kdeutils/debian/rules b/debian/squeeze/kdeutils/debian/rules
index 7a7ec3e66..f4ba23952 100755
--- a/debian/squeeze/kdeutils/debian/rules
+++ b/debian/squeeze/kdeutils/debian/rules
@@ -18,7 +18,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity
-DEB_DH_STRIP_ARGS := --dbg-package=kdeutils-trinity-dbg
+DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=kdeutils-trinity-dbg
PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
diff --git a/debian/squeeze/kdevelop/debian/control b/debian/squeeze/kdevelop/debian/control
index c6d7622c9..d3317527f 100644
--- a/debian/squeeze/kdevelop/debian/control
+++ b/debian/squeeze/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/debian/squeeze/kdewebdev/debian/control b/debian/squeeze/kdewebdev/debian/control
index 929fb0a85..4a4dd1f6c 100644
--- a/debian/squeeze/kdewebdev/debian/control
+++ b/debian/squeeze/kdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2 b/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2
new file mode 100644
index 000000000..fdc0264fa
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/Lyrics_CN-0.5.3.tar.bz2
Binary files differ
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch b/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch
new file mode 100644
index 000000000..5f7ab5565
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-1.2-fix-config.patch
@@ -0,0 +1,11 @@
+--- amarok-1.2/amarok/src/app.cpp-- 2005-02-15 11:43:26.600377969 +0100
++++ amarok-1.2/amarok/src/app.cpp 2005-02-15 11:43:51.271844342 +0100
+@@ -81,7 +81,7 @@ App::App()
+ // Remember old folder setup, so we can detect changes after the wizard was used
+ const QStringList oldCollectionFolders = AmarokConfig::collectionFolders();
+
+- if ( amaroK::config()->readBoolEntry( "First Run", true ) || args->isSet( "wizard" ) ) {
++ if ( amaroK::config()->readBoolEntry( "First Run", false ) || args->isSet( "wizard" ) ) {
+ std::cout << "STARTUP\n" << std::flush; //hide the splashscreen
+ firstRunWizard();
+ amaroK::config()->writeEntry( "First Run", false );
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch b/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch
new file mode 100644
index 000000000..b5b92ffc6
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-1.3-fix-default-config.patch
@@ -0,0 +1,12 @@
+--- amarok/src/amarokrc-- 2005-06-08 14:31:48.532241213 +0200
++++ amarok/src/amarokrc 2005-06-08 14:32:11.076771614 +0200
+@@ -8,6 +8,9 @@ CurrentPane=ContextBrowser
+ #see PlaylistWidget::setColumnWidth() for explanation for below
+ ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
+
++[Playback]
++Sound System=xine-engine
++
+ [KNewStuff]
+ TargetDir=amarok/themes
+ Uncompress=application/x-gzip
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch b/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch
new file mode 100644
index 000000000..582ca50ad
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-1.4-beta2-add-multimedia-shortcut.patch
@@ -0,0 +1,22 @@
+diff -Naur amarok-1.4.10/amarok/src/amarokrc amarok-1.4.10_yeni/amarok/src/amarokrc
+--- amarok-1.4.10/amarok/src/amarokrc 2009-12-20 01:16:09.000000000 +0200
++++ amarok-1.4.10_yeni/amarok/src/amarokrc 2009-12-20 01:19:33.994560100 +0200
+@@ -8,6 +8,18 @@
+ #see PlaylistWidget::setColumnWidth() for explanation for below
+ ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
+
++[Shortcuts]
++voldn=Ctrl+Shift+KP_Subtract;XF86AudioLowerVolume
++next=Ctrl+Shift+B;XF86AudioNext
++osd=Ctrl+Shift+O;XF86Start
++play_pause=Ctrl+Shift+P;XF86AudioPlay
++prev=Ctrl+Shift+Z;XF86AudioPrev
++stop=Ctrl+Shift+V;XF86AudioStop
++volup=Ctrl+Shift+KP_Add;XF86AudioRaiseVolume
++pause=Ctrl+Shift+C
++play=Ctrl+Shift+X
++show=Ctrl+Shift+W
++
+ [Playback]
+ Sound System=xine-engine
+
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch b/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch
new file mode 100644
index 000000000..2e3699866
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-1.4.0-use-mandriva-directory.patch
@@ -0,0 +1,21 @@
+--- amarok/src/filebrowser.cpp~ 2006-04-08 18:22:20.000000000 +0200
++++ amarok/src/filebrowser.cpp 2006-04-11 13:52:36.000000000 +0200
+@@ -77,15 +77,16 @@
+ // Try to keep filebrowser working even if not in a medium context
+ // so if a medium object not passed in, keep earlier behavior
+ if (!medium) {
++ KGlobal::locale()->insertCatalogue("menu-messages-main");
+ m_medium = 0;
+- location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath() ) );
++ location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath()+"/"+i18n("Music")));
+ currentFolder = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, *location );
+ //KIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes
+ //if there is a problem so there is no point in using it anyways.
+ //so... setting the diroperator to ~ is the least sucky option
+ if ( !location->isLocalFile() || !currentFolder->isReadable() ) {
+ delete location;
+- location = new KURL( QDir::homeDirPath() ) ;
++ location = new KURL( QDir::homeDirPath()+"/"+i18n("Music")) ;
+ }
+ }
+ else{
diff --git a/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch b/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch
new file mode 100644
index 000000000..2b41e1ba3
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-1.4.1-fix-initial-preference.patch
@@ -0,0 +1,11 @@
+diff -Naur amarok-1.4.10/amarok/src/amarok.desktop amarok-1.4.10_yeni/amarok/src/amarok.desktop
+--- amarok-1.4.10/amarok/src/amarok.desktop 2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10_yeni/amarok/src/amarok.desktop 2009-12-20 01:01:49.987559971 +0200
+@@ -2,6 +2,7 @@
+ Type=Application
+ Version=0.9.4
+ Encoding=UTF-8
++InitialPreference=15
+ Name=Amarok
+ Name[bn]=আমারক
+ Name[el]=AmaroK
diff --git a/mandriva/2010.2/applications/amarok/amarok-add-radios.patch b/mandriva/2010.2/applications/amarok/amarok-add-radios.patch
new file mode 100644
index 000000000..cb4b0fc39
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/amarok-add-radios.patch
@@ -0,0 +1,42 @@
+diff -Naur amarok-1.4.10/amarok/src/data/Cool-Streams.xml amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml
+--- amarok-1.4.10/amarok/src/data/Cool-Streams.xml 2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml 2009-12-20 01:24:34.072559305 +0200
+@@ -9,6 +9,9 @@
+ <stream name="Digital Gunfire [Industrial/EBM]">
+ <url>http://www.digitalgunfire.com/playlist.pls</url>
+ </stream>
++ <stream name="Club 977 80's channel">
++ <url>http://www.club977.com/CLUB977HI.pls</url>
++ </stream>
+ <stream name="Digitally Imported - Chillout [Chill-Out]">
+ <url>http://di.fm/mp3/chillout.pls</url>
+ </stream>
+@@ -18,6 +21,9 @@
+ <stream name="Digitally Imported - Trance [Trance]">
+ <url>http://di.fm/mp3/trance.pls</url>
+ </stream>
++ <stream name="Dogmazic [Free Music/Musique Libre]">
++ <url>http://radio.dogmazic.net:8000/radio_mlo.ogg.m3u</url>
++ </stream>
+ <stream name="DnbRadio [Drum and Bass]">
+ <url>http://dnbradio.com/hi.pls</url>
+ </stream>
+@@ -69,6 +75,18 @@
+ <stream name="Secret Agent [Downtempo/Lounge]">
+ <url>http://somafm.com/secretagent.pls</url>
+ </stream>
++ <stream name="SkyFM [TopHits]">
++ <url>http://www.sky.fm/mp3/tophits.pls</url>
++ </stream>
++ <stream name="SkyFM [80s]">
++ <url>http://www.sky.fm/mp3/the80s.pls</url>
++ </stream>
++ <stream name="SkyFM [Classical music]">
++ <url>http://www.sky.fm/mp3/classical.pls</url>
++ </stream>
++ <stream name="SkyFM [NewAge]">
++ <url>http://www.sky.fm/mp3/newage.pls</url>
++ </stream>
+ <stream name="SLAY Radio [C64 Remixes]">
+ <url>http://sc.slayradio.org:8000/listen.pls</url>
+ </stream>
diff --git a/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch b/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch
new file mode 100644
index 000000000..615163e1a
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/fix-ifpdevice-build.patch
@@ -0,0 +1,1163 @@
+diff -Naur amarok-1.4.10/amarok/configure.in.in amarok-1.4.10-yeni/amarok/configure.in.in
+--- amarok-1.4.10/amarok/configure.in.in 2008-08-14 00:21:51.000000000 +0300
++++ amarok-1.4.10-yeni/amarok/configure.in.in 2010-02-13 04:08:24.239228672 +0200
+@@ -830,8 +830,14 @@
+
+ if test "$build_ifp" != "no"; then
+
+- AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [])
++ AC_LANG_PUSH([C++])
++ AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [],
++ [[#ifdef HAVE_STDIO_H
++ # include <stdio.h>
++ #endif
++ ]])
+ AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
++ AC_LANG_POP
+
+ if test "$have_ifp" = "yes"; then
+ AC_DEFINE(HAVE_IFP, 1, [have ifp])
+diff -Naur amarok-1.4.10/amarok/configure.in.in~ amarok-1.4.10-yeni/amarok/configure.in.in~
+--- amarok-1.4.10/amarok/configure.in.in~ 1970-01-01 02:00:00.000000000 +0200
++++ amarok-1.4.10-yeni/amarok/configure.in.in~ 2010-02-13 04:08:24.238476218 +0200
+@@ -0,0 +1,1140 @@
++
++###############################################################################
++# BEGIN PKG-CONFIG CHECK
++###############################################################################
++
++AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
++AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
++
++###############################################################################
++# END PKG-CONFIG CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN TAGLIB CHECK
++###############################################################################
++
++PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.5], [taglib_15_found=yes], [PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.4])])
++
++AM_CONDITIONAL([TAGLIB_15_FOUND], [test "x$taglib_15_found" = "xyes"])
++AC_SUBST(TAGLIB_CFLAGS)
++AC_SUBST(TAGLIB_LIBS)
++
++if test "x$taglib_15_found" = "xyes"; then
++ AC_DEFINE([TAGLIB_15], 1, [Taglib 1.5 or later found, disabling duplicate metadata plugins])
++fi
++
++###############################################################################
++# END TAGLIB CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN GSTREAMER-0.10 CHECK
++###############################################################################
++
++#AC_ARG_WITH(gstreamer10,
++# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
++# [build_gstreamer10=$withval],
++# [build_gstreamer10=no]
++#)
++#
++#if test "$build_gstreamer10" != "no"; then
++# if test "$PKGCONFIGFOUND" = "yes" ; then
++# # check for GStreamer
++# dnl Now we're ready to ask for gstreamer libs and cflags
++# dnl And we can also ask for the right version of gstreamer
++# have_gst10=no
++#
++# GST10_MAJORMINOR=0.10
++# GST10_REQ=0.10.0
++#
++# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
++# have_gst10=yes,have_gst10=no)
++#
++# dnl Give error if we don't have gstreamer
++# if test "x$have_gst10" = "xno"; then
++# LIB_GST10=""
++# CFLAGS_GST10=""
++# else
++# LIB_GST10=$GST10_LIBS
++# CFLAGS_GST10=$GST10_CFLAGS
++# AC_SUBST(LIB_GST10)
++# AC_SUBST(CFLAGS_GST10)
++# AC_SUBST(GST10_MAJORMINOR)
++# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
++# fi
++# fi
++#fi
++#
++#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
++
++###############################################################################
++# END GSTREAMER-0.10 CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN XINE CHECK
++###############################################################################
++
++AC_ARG_WITH(xine,
++ AC_HELP_STRING([--without-xine],[build Amarok without xine-engine]),
++ [build_xine=$withval],
++ [build_xine=yes]
++)
++
++if test "$build_xine" != "no"; then
++ PKG_CHECK_MODULES([XINE], [libxine >= 1.0.2], , [build_xine=no])
++fi
++
++AM_CONDITIONAL(with_xine, test x$build_xine = xyes)
++AC_SUBST(XINE_CFLAGS)
++AC_SUBST(XINE_LIBS)
++
++###############################################################################
++# END XINE CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN AKODE CHECK
++###############################################################################
++
++#AC_ARG_WITH(akode,
++# AC_HELP_STRING([--without-akode],[build Amarok without akode-engine]),
++# [build_akode=$withval],
++# [build_akode=yes]
++#)
++#
++#if test "$build_akode" != "no"; then
++#
++# AC_CHECK_PROG(AKODE_CONFIG, akode-config, yes)
++#
++# if test x$AKODE_CONFIG = xyes ; then
++# AC_DEFINE(HAVE_AKODE, 1, [have aKode])
++# CFLAGS_AKODE=[`akode-config --cflags`]
++# LIBS_AKODE=[`akode-config --libs`]
++#
++# akode_version=`akode-config --version`
++# akode_version=VERSION_TO_NUMBER(echo $akode_version)
++# akode_version_min="2.0.0"
++# akode_version_min=VERSION_TO_NUMBER(echo $akode_version_min)
++#
++# AC_MSG_CHECKING([for akode-lib version >= 2.0])
++#
++# if test $akode_version -eq $akode_version_min \
++# -o $akode_version -gt $akode_version_min; then
++#
++# echo "yes"
++#
++# else
++# echo "no"
++#
++# build_akode=no
++# fi
++# else
++# build_akode=no
++# fi
++#fi
++#
++#AM_CONDITIONAL(with_akode, test x$build_akode = xyes)
++#AC_SUBST(CFLAGS_AKODE)
++#AC_SUBST(LIBS_AKODE)
++
++###############################################################################
++# END AKODE CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN NMM CHECK
++###############################################################################
++
++AC_ARG_WITH(nmm,
++ AC_HELP_STRING([--with-nmm],[build Amarok with NMM-engine]),
++ [build_nmm=$withval],
++ [build_nmm=no]
++)
++
++AC_ARG_WITH(nmm-dir,
++ AC_HELP_STRING([--with-nmm-dir],[path to the NMM [default=/usr/local]]),
++ [nmm_dir="$withval"],
++ [nmm_dir=/usr/local]
++)
++
++if test "$build_nmm" != "no"; then
++
++ CFLAGS_NMM="-I$nmm_dir/include"
++ LDFLAGS_NMM="-L$nmm_dir/lib"
++ AC_DEFINE(HAVE_NMM, 1, [have NMM])
++fi
++
++AM_CONDITIONAL(with_nmm, test x$build_nmm = xyes)
++AC_SUBST(CFLAGS_NMM)
++AC_SUBST(LDFLAGS_NMM)
++
++###############################################################################
++# END NMM CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN MAS CHECK
++###############################################################################
++
++#AC_ARG_WITH(mas,
++# AC_HELP_STRING([--with-mas],[build Amarok with MAS-engine]),
++# [build_mas=$withval],
++# [build_mas=no]
++#)
++#
++#
++#if test "$build_mas" != "no"; then
++#
++# AC_PATH_PROG(MAS_CONFIG, mas-config, no)
++#
++# if test $MAS_CONFIG = "no"
++# then
++# amarok_warning_mas_notfound=yes
++# echo "amarok_warning_mas_notfound: $amarok_warning_mas_notfound"
++# build_mas=no
++# else
++# AC_DEFINE(HAVE_MAS, 1, [have MAS])
++#
++# CFLAGS_MAS=[`$MAS_CONFIG --cflags`]
++# LIBS_MAS=[`$MAS_CONFIG --libs`]
++#
++# build_mas=yes
++# fi
++#fi
++#
++#AM_CONDITIONAL(with_mas, test x$build_mas = xyes)
++#AC_SUBST(CFLAGS_MAS)
++#AC_SUBST(LIBS_MAS)
++
++###############################################################################
++# END MAS CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN HELIX CHECK
++###############################################################################
++
++AC_ARG_WITH(helix,
++ AC_HELP_STRING([--with-helix],[build Amarok with Helix-engine]),
++ [build_helix=$withval],
++ [build_helix=no]
++)
++
++if test "$build_helix" != "no"; then
++ AC_MSG_CHECKING([for RealPlayer or HelixPlayer])
++
++ if test "$build_helix" = "yes"; then
++ HXPLAY=`type -p hxplay`
++ RPLAY=`type -p realplay`
++ if test "$RPLAY" != "" -a -x "$RPLAY"; then
++ HELIX_LINK=`readlink -f $RPLAY`
++ HELIX_LINK=`dirname $HELIX_LINK`
++ HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd`
++ if test -e "$HELIX_LIBS/common/clntcore.so"; then
++ AC_MSG_RESULT([found RealPlayer in $HELIX_LIBS])
++ build_helix=$HELIX_LIBS
++ fi
++ elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then
++ HELIX_LINK=`readlink -f $HXPLAY`
++ HELIX_LINK=`dirname $HELIX_LINK`
++ HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd`
++ if test -e "$HELIX_LIBS/common/clntcore.so"; then
++ AC_MSG_RESULT([found HelixPlayer in $HELIX_LIBS])
++ build_helix=$HELIX_LIBS
++ fi
++ fi
++ else
++ if test -n "$build_helix" -a -d "$build_helix"; then
++ HELIX_LIBS=`unset CDPATH; cd $build_helix && pwd`
++ else
++ HELIX_LIBS="$build_helix"
++ fi
++ build_helix=$HELIX_LIBS
++ AC_MSG_RESULT([using $HELIX_LIBS])
++ fi
++
++ AC_DEFINE(HAVE_HELIX, 1, [have HELIX])
++ if test "$build_helix" = "yes"; then
++ HELIX_LIBS="/usr/local/RealPlayer"
++ AC_MSG_RESULT(["not found, using default dir"])
++ fi
++ AC_DEFINE_UNQUOTED(HELIX_LIBS, "${HELIX_LIBS}", [location of helix libs])
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++ PKG_CHECK_MODULES([ALSALIB], alsa, have_alsa=yes,have_alsa=no)
++ if test "$have_alsa" = "yes" ; then
++ AC_DEFINE(USE_HELIX_ALSA, 1, [support ALSA in the helix-engine])
++ fi
++ fi
++fi
++
++AM_CONDITIONAL(with_helix, test x$build_helix != xno)
++
++###############################################################################
++# END HELIX CHECK
++###############################################################################
++
++###############################################################################
++# BEGIN yauap CHECK
++###############################################################################
++
++AC_ARG_WITH(yauap,
++ AC_HELP_STRING([--with-yauap],[build Amarok with yauap-engine]),
++ [build_yauap=$withval],
++ [build_yauap=no]
++)
++
++if test "$build_yauap" != "no"; then
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++ # check for dbus-glib
++ have_yauap=no
++
++ PKG_CHECK_MODULES(DBUS, dbus-1,
++ have_yauap=yes,have_yauap=no)
++
++
++ dnl Give error if we don't have gstreamer
++ if test "x$have_yauap" = "xno"; then
++ LIB_YAUAP=""
++ CFLAGS_YAUAP=""
++ else
++ LIB_YAUAP="$DBUS_LIBS -ldbus-qt-1"
++ CFLAGS_YAUAP="$DBUS_CFLAGS"
++ AC_SUBST(LIB_YAUAP)
++ AC_SUBST(CFLAGS_YAUAP)
++ AC_DEFINE(HAVE_YAUAP, 1, [have yauap])
++ fi
++ fi
++fi
++
++AM_CONDITIONAL(with_yauap, [test x$have_yauap = xyes])
++
++###############################################################################
++# END yauap CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN stdint.h CHECK
++###############################################################################
++
++AC_CHECK_HEADER(stdint.h)
++
++###############################################################################
++# END stdint.h CHECK
++###############################################################################
++
++
++###############################################################################
++# BEGIN fabsf CHECK
++###############################################################################
++
++AC_CHECK_DECLS([fabsf],,,[#include <math.h>])
++if test "$ac_cv_have_decl_fabsf" = "yes"; then
++ AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM(
++ [[#include <math.h>]],
++ [[return (int)fabsf(1.f);]])],
++ [AC_DEFINE(HAVE_FABSF, 1, [have fabsf])])
++fi
++
++###############################################################################
++# END fabsf CHECK
++###############################################################################
++
++
++
++
++
++###############################################################################
++# BEGIN INOTIFY CHECK
++###############################################################################
++
++AC_CHECK_HEADERS(linux/inotify.h)
++
++if test x"$ac_cv_header_linux_inotify_h" = x"yes"; then
++ AC_DEFINE(HAVE_INOTIFY, 1, [have inotify])
++fi
++
++###############################################################################
++# END INOTIFY CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN QT OPENGL CHECK
++###############################################################################
++
++AC_ARG_WITH(opengl,
++ AC_HELP_STRING([--without-opengl],[build Amarok without OpenGL support]),
++ [build_opengl=$withval],
++ [build_opengl=yes]
++)
++
++if test "$build_opengl" != "no"; then
++ AC_MSG_CHECKING(for Qt with OpenGL support)
++ AC_CACHE_VAL(ac_cv_kde_qt_has_opengl,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++
++ save_CXXFLAGS="$CXXFLAGS"
++ save_LIBS="$LIBS"
++ save_LDFLAGS="$LDFLAGS"
++
++ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
++ LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
++ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
++
++ AC_TRY_LINK([
++ #include <qgl.h>
++ ],
++ [
++ (void)new QGLWidget((QWidget*)0, "qgl");
++ ],
++ ac_cv_kde_qt_has_opengl=yes,
++ ac_cv_kde_qt_has_opengl=no)
++
++ CXXFLAGS="$save_CXXFLAGS"
++ LIBS="$save_LIBS"
++ LDFLAGS="$save_LDFLAGS"
++ AC_LANG_RESTORE
++ ])
++ AC_MSG_RESULT($ac_cv_kde_qt_has_opengl)
++
++ if test x$ac_cv_kde_qt_has_opengl = xyes; then
++ AC_DEFINE(HAVE_QGLWIDGET, 1, [have Qt with OpenGL support])
++ gl_libs="-lGL"
++ else
++ gl_libs=""
++ fi
++
++ AC_SUBST(gl_libs)
++fi
++
++###############################################################################
++# END QT OPENGL CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN SQLITE CHECK
++###############################################################################
++
++LIB_SQLITE=""
++
++AC_ARG_WITH(included-sqlite,
++ AC_HELP_STRING([--without-included-sqlite],[build Amarok using system sqlite library]),
++ [included_sqlite=$withval],
++ [included_sqlite=yes]
++)
++
++if test x$included_sqlite = xno; then
++ if test x$PKGCONFIGFOUND = xyes; then
++ PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no)
++
++ if test x$have_sqlite = xyes; then
++ ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library])
++ LIB_SQLITE=`pkg-config --libs sqlite3`
++ else
++ # We don't support not having sqlite anymore
++ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
++ no_amarok=yes
++ fi
++ fi
++fi
++
++AC_SUBST(LIB_SQLITE)
++AM_CONDITIONAL(with_included_sqlite, [test x$included_sqlite = xyes])
++
++
++# Determine pointer size for sqlite
++
++KDE_CHECK_TYPES
++AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Determine pointer size for SQLite])
++
++###############################################################################
++# END SQLITE CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN MYSQL CHECK
++###############################################################################
++
++AC_ARG_ENABLE(mysql,
++ AC_HELP_STRING([--enable-mysql],[build Amarok with MySQL support]),
++ [enable_mysql=$enableval],
++ [enable_mysql=no]
++)
++
++if test "$enable_mysql" = "yes"; then
++
++ AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, yes)
++
++ if test x$MYSQL_CONFIG = xyes; then
++ AC_DEFINE(USE_MYSQL, 1, [MySql database support enabled])
++
++ mysql_includes=`mysql_config --cflags`
++ mysql_libs=`mysql_config --libs`
++ else
++ amarok_warning_mysql_notfound=yes
++ enable_mysql=no
++ fi
++
++fi
++
++AM_CONDITIONAL(enable_mysql, test x$enable_mysql = xyes)
++AC_SUBST(mysql_includes)
++AC_SUBST(mysql_libs)
++
++###############################################################################
++# END MYSQL CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN POSTGRESQL CHECK
++###############################################################################
++
++AC_ARG_ENABLE(postgresql,
++ AC_HELP_STRING([--enable-postgresql],[build Amarok with PostgreSQL support]),
++ [enable_postgresql=$enableval],
++ [enable_postgresql=no]
++)
++
++if test "$enable_postgresql" = "yes"; then
++
++ AC_CHECK_PROG(POSTGRESQL_CONFIG, pg_config, yes)
++
++ if test x$POSTGRESQL_CONFIG = xyes; then
++ AC_DEFINE(USE_POSTGRESQL, 1, [Postgresql database support enabled])
++
++ postgresql_includes=-I`pg_config --includedir`
++ postgresql_libs="-L`pg_config --libdir` -lpq"
++ else
++ amarok_warning_postgresql_notfound=yes
++ enable_postgresql=no
++ fi
++
++fi
++
++AM_CONDITIONAL(enable_postgresql, test x$enable_postgresql = xyes)
++AC_SUBST(postgresql_includes)
++AC_SUBST(postgresql_libs)
++
++###############################################################################
++# END POSTGRESQL CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN LIBVISUAL CHECK
++###############################################################################
++
++AC_ARG_WITH(libvisual,
++ AC_HELP_STRING([--without-libvisual],[build Amarok without libvisual support]),
++ [with_libvisual=$withval],
++ [with_libvisual=yes]
++)
++
++if test "$with_libvisual" = "yes"; then
++ ## libvisual plugin depends on sdl
++ AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes)
++
++ if test x$SDL_CONFIG = xyes; then
++ sdl_cflags=`sdl-config --cflags`
++ sdl_libs=`sdl-config --libs`
++ fi
++
++ AC_SUBST(sdl_cflags)
++ AC_SUBST(sdl_libs)
++
++ if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
++
++ PKG_CHECK_MODULES(LIBVISUAL, libvisual-0.4 >= 0.4.0, [build_libvisual="yes"], [build_libvisual="no"])
++
++ AC_SUBST(LIBVISUAL_LIBS)
++ AC_SUBST(LIBVISUAL_CFLAGS)
++
++ if test x$build_libvisual = xyes; then
++ AC_DEFINE(HAVE_LIBVISUAL, 1, [have LIBVISUAL])
++ fi
++ fi
++fi
++
++AM_CONDITIONAL(with_libvisual, test x$build_libvisual = xyes)
++
++###############################################################################
++# END LIBVISUAL CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN TUNEPIMP CHECK
++###############################################################################
++
++AC_ARG_WITH(musicbrainz,
++ AC_HELP_STRING([--without-musicbrainz],[build Amarok without MusicBrainz support]),
++ [with_musicbrainz=$withval],
++ [with_musicbrainz=yes]
++)
++
++if test "$with_musicbrainz" = "yes"; then
++ AC_CHECK_HEADER(tunepimp-0.5/tp_c.h, [build_musicbrainz="yes"],
++ [AC_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"],
++ [build_musicbrainz="no"])])
++fi
++
++if test "$build_musicbrainz" = "yes"; then
++ AC_CHECK_LIB(tunepimp, tr_GetPUID,
++ AC_DEFINE(HAVE_TUNEPIMP, 5, [have MusicBrainz 0.5.x]),
++ AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
++ AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]),
++ AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz])))
++ LIB_TUNEPIMP="-ltunepimp"
++ have_tunepimp=yes
++else
++ AC_DEFINE(HAVE_TUNEPIMP, 0, [have TunePimp])
++ LIB_TUNEPIMP=""
++ have_tunepimp=no
++fi
++
++AC_SUBST(LIB_TUNEPIMP)
++
++###############################################################################
++# END TUNEPIMP CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN AMAZON CHECK
++###############################################################################
++
++AC_ARG_ENABLE(amazon,
++ AC_HELP_STRING([--disable-amazon],[disable Amazon cover download support [default=enable]]),
++ [enable_amazon=$enableval],
++ [enable_amazon=yes]
++)
++
++if test "$enable_amazon" != "no"; then
++ AC_DEFINE(AMAZON_SUPPORT, 1, [Amazon cover download support enabled])
++fi
++
++###############################################################################
++# END AMAZON CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN SCHED_SETAFFINITY BUGGY GLIBC CHECK
++###############################################################################
++
++AC_MSG_CHECKING([if sched_setaffinity should be enabled])
++
++AC_LANG_SAVE
++AC_LANG_CPLUSPLUS
++
++amarok_glibcsched_works=no
++
++AC_TRY_COMPILE([
++ #include <sched.h>
++],
++[
++ cpu_set_t mask;
++ CPU_ZERO( &mask );
++ CPU_SET( 0, &mask );
++ sched_setaffinity( 0, sizeof(mask), &mask );
++],
++ amarok_sched_3params=yes,
++ amarok_sched_3params=no
++)
++
++if test "x$amarok_sched_3params" = "xyes"; then
++ AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly])
++ AC_DEFINE(SCHEDAFFINITY_3PARAMS, 1, [sched_setaffinity takes three params])
++ amarok_glibcsched_works=yes
++fi
++
++if test "x$amarok_sched_3params" = "xno"; then
++ AC_TRY_COMPILE([
++ #include <sched.h>
++ ],
++ [
++ cpu_set_t mask;
++ CPU_ZERO( &mask );
++ CPU_SET( 0, &mask );
++ sched_setaffinity( 0, &mask );
++ ],
++ amarok_sched_2params=yes,
++ amarok_sched_2params=no
++ )
++ if test "x$amarok_sched_2params" = "xyes"; then
++ AC_DEFINE(SCHEDAFFINITY_SUPPORT, 1, [sched_setaffinity works correctly])
++ amarok_glibcsched_works=yes
++ fi
++fi
++
++AC_LANG_RESTORE
++
++AC_MSG_RESULT($amarok_glibcsched_works)
++
++###############################################################################
++# END SCHED_SETAFFINITY BUGGY GLIBC CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN KDEBASE CHECK
++###############################################################################
++
++KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no)
++KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no)
++
++AM_CONDITIONAL(with_konqsidebar, [test x$have_konqsidebar = xyes])
++
++###############################################################################
++# END KDEBASE CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN NJB CHECK
++###############################################################################
++### mediabrowser.cpp can use libnjb if available
++
++AC_ARG_WITH(libnjb,
++ AC_HELP_STRING([--with-libnjb],[build Amarok with Nomad Jukebox support from libnjb]),
++ [build_libnjb=$withval],
++ [build_libnjb=yes]
++)
++
++if test "$build_libnjb" != "no"; then
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++
++ # check for libnjb
++ have_libnjb=no
++
++ PKG_CHECK_MODULES(LIBNJB, libnjb, have_libnjb=yes,have_libnjb=no)
++ if test "x$have_libnjb" != "xno"; then
++ AC_DEFINE(HAVE_LIBNJB, 1, [have libnjb])
++ fi
++ fi
++fi
++
++AM_CONDITIONAL(with_libnjb, [test x$have_libnjb = xyes])
++
++###############################################################################
++# END NJB CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN MTP CHECK
++###############################################################################
++### mediabrowser.cpp can use libmtp if available
++
++AC_ARG_WITH(libmtp,
++ AC_HELP_STRING([--with-libmtp],[build Amarok with support for MTP devices]),
++ [build_libmtp=$withval],
++ [build_libmtp=yes]
++)
++if test "$build_libmtp" != "no"; then
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++ PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.1.1,
++ [
++ have_libmtp=yes
++ ],
++ [
++ have_libmtp=no
++ ])
++ fi
++
++ if test "x$have_libmtp" != "xno"; then
++ AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
++ fi
++fi
++
++AM_CONDITIONAL(with_libmtp, [test x$have_libmtp = xyes])
++
++###############################################################################
++# END MTP CHECK
++###############################################################################
++
++###############################################################################
++# BEGIN RIO KARMA CHECK
++###############################################################################
++### mediabrowser.cpp can use libkarma if available
++
++AC_ARG_WITH(libkarma,
++ AC_HELP_STRING([--with-libkarma],[build Amarok with Rio Karma support]),
++ [build_libkarma=$withval],
++ [build_libkarma=yes]
++)
++
++if test "$build_libkarma" != "no"; then
++ AC_CHECK_HEADERS([libkarma/lkarma.h], [have_libkarma=yes], [], [])
++ AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
++
++ if test "$have_libkarma" = "yes"; then
++ AC_DEFINE(HAVE_LIBKARMA, 1, [have libkarma])
++ else
++ AC_MSG_RESULT($have_libkarma)
++ have_libkarma=no
++ fi
++fi
++
++AM_CONDITIONAL(with_libkarma, [test x$have_libkarma = xyes])
++
++###############################################################################
++# END RIO KARMA CHECK
++###############################################################################
++
++###############################################################################
++# BEGIN IFP CHECK
++###############################################################################
++### mediabrowser.cpp can use libifp if available
++
++AC_ARG_WITH(ifp,
++ AC_HELP_STRING([--with-ifp],[build Amarok with ifp support]),
++ [build_ifp=$withval],
++ [build_ifp=yes]
++)
++
++if test "$build_ifp" != "no"; then
++
++ AC_LANG_PUSH([C])
++ AC_CHECK_HEADERS([ifp.h], [have_ifp=yes], [], [],
++ [[#ifdef HAVE_USB_H
++ # include <USB.h>
++ #endif
++ ]])
++ AC_CHECK_HEADERS([usb.h], [have_usb=yes], [], [])
++ AC_LANG_POP
++
++ if test "$have_ifp" = "yes"; then
++ AC_DEFINE(HAVE_IFP, 1, [have ifp])
++ IFP_LIBS="-lifp -lusb"
++ else
++ AC_MSG_RESULT($have_ifp)
++ have_ifp=no
++ fi
++
++fi
++
++AC_SUBST(IFP_INCLUDES)
++AC_SUBST(IFP_LIBS)
++
++AM_CONDITIONAL(with_ifp, [test x$have_ifp = xyes])
++
++###############################################################################
++# END IFP CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN LIBGPOD CHECK
++###############################################################################
++
++AC_ARG_WITH(libgpod,
++ AC_HELP_STRING([--with-libgpod],[build Amarok with iPod support from libgpod]),
++ [build_libgpod=$withval],
++ [build_libgpod=yes]
++)
++
++if test "$build_libgpod" != "no"; then
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++
++ # check for libgpod
++ have_libgpod=no
++
++ PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0, have_libgpod=yes,have_libgpod=no)
++
++ if test "x$have_libgpod" = "xyes"; then
++ ac_cppflags_save=$CPPFLAGS
++ ac_cflags_save=$CFLAGS
++ ac_libs_save=$LIBS
++ CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
++ CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
++ LIBS="$LIBS $LIBGPOD_LIBS"
++
++ AC_CHECK_FUNCS(itdb_track_set_thumbnails, , have_libgpod_042=no)
++ AC_CHECK_FUNCS(itdb_get_mountpoint, , have_libgpod_042=no)
++ AC_CHECK_FUNCS(itdb_device_get_ipod_info, , have_libgpod_042=no)
++
++ AC_CHECK_MEMBER(struct _Itdb_Track.movie_flag,
++ [AC_DEFINE(HAVE_ITDB_MOVIE_FLAG, 1, [have libgpod movie flag])],
++ have_libgpod_042=no,
++ [#include <gpod/itdb.h>])
++
++ AC_CHECK_MEMBER(struct _Itdb_Track.skip_when_shuffling,
++ [AC_DEFINE(HAVE_ITDB_SKIP_SHUFFLE_FLAG, 1, [have libgpod skip when shuffling flag])],
++ have_libgpod_042=no,
++ [#include <gpod/itdb.h>])
++
++ AC_CHECK_MEMBER(struct _Itdb_Track.mark_unplayed,
++ [AC_DEFINE(HAVE_ITDB_MARK_UNPLAYED, 1, [have libgpod mark played flag])],
++ have_libgpod_042=no,
++ [#include <gpod/itdb.h>])
++
++ AC_CHECK_MEMBER(struct _Itdb_Track.mediatype,
++ [AC_DEFINE(HAVE_ITDB_MEDIATYPE, 1, [have libgpod mediatype flag])],
++ have_libgpod_042=no,
++ [#include <gpod/itdb.h>])
++
++ AC_CHECK_DECL(ITDB_IPOD_MODEL_TOUCH_BLACK,
++ [AC_DEFINE(HAVE_LIBGPOD_060, 1, [have at least libgpod 0.6.0])],
++ have_libgpod_060=no,
++ [#include <gpod/itdb.h>])
++
++ CPPFLAGS=$ac_cppflags_save
++ CFLAGS=$ac_cflags_save
++ LIBS=$ac_libs_save
++ fi
++
++ if test "x$have_libgpod_042" = "xno"; then
++ have_libgpod=no
++ AC_MSG_RESULT(Your libgpod version is too old: at least 0.4.2 is required)
++ fi
++
++ if test "x$have_libgpod" != "xno"; then
++ AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])
++ fi
++ fi
++fi
++
++AM_CONDITIONAL(with_libgpod, [test x$have_libgpod = xyes])
++
++###############################################################################
++# END LIBGPOD CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN statvfs(2) CHECK
++###############################################################################
++
++AC_CHECK_FUNCS(statvfs)
++
++###############################################################################
++# END statvfs(2) CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN MP4V2 CHECK
++###############################################################################
++# m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip
++
++AC_ARG_WITH(mp4v2,
++ AC_HELP_STRING([--with-mp4v2],[build Amarok with M4A/AAC tag support from mp4v2/faad2]),
++ [have_mp4v2=$withval],
++ [have_mp4v2=no]
++)
++
++AC_ARG_WITH(mp4v2-dir,
++ AC_HELP_STRING([--with-mp4v2-dir],[path to mp4v2 [default=/usr]]),
++ [mp4v2_dir="$withval"],
++ [mp4v2_dir=/usr]
++)
++
++if test "$have_mp4v2" != "no"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ ac_cxxflags_save=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS -I$mp4v2_dir/include"
++ ac_ldflags_save=$LDFLAGS
++ LDFLAGS="$LDFLAGS -L$mp4v2_dir/lib"
++
++ # not even everyone using faad2 has <systems.h>
++ if ! test -f config.h; then
++ echo "#include \"confdefs.h\"" > config.h
++ fi
++ ac_cppflags_save=$CPPFLAGS
++ CPPFLAGS="$CPPFLAGS -I."
++ AC_CHECK_HEADERS(systems.h)
++ AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
++ [#ifdef HAVE_SYSTEMS_H
++ # include <systems.h>
++ #endif
++ ])
++
++ AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no )
++
++ if test "$have_mp4v2" = "yes" -a "$have_mp4_h" = "yes"; then
++ AC_DEFINE(HAVE_MP4V2, 1, [have mp4v2])
++ MP4V2_INCLUDES="-I$mp4v2_dir/include"
++ MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2"
++ else
++ have_mp4v2=no
++ fi
++
++ CPPFLAGS=$ac_cppflags_save
++ CXXFLAGS=$ac_cxxflags_save
++ LDFLAGS=$ac_ldflags_save
++ AC_LANG_RESTORE
++fi
++
++AC_SUBST(MP4V2_INCLUDES)
++AC_SUBST(MP4V2_LIBS)
++
++AM_CONDITIONAL(with_mp4v2, [test x$have_mp4v2 != xno ])
++
++###############################################################################
++# END MP4V2 CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN DAAP KDE 3.4 CHECK
++###############################################################################
++
++daapsave_CXXFLAGS="$CXXFLAGS"
++CXXFLAGS="$CXXFLAGS $all_includes"
++AC_LANG_SAVE
++AC_LANG_CPLUSPLUS
++
++AC_MSG_CHECKING([if KDE is at least 3.4 for DAAP support])
++AC_COMPILE_IFELSE([
++#include <kdeversion.h>
++#if ! ( KDE_IS_VERSION( 3, 4, 0 ) )
++#error KDE 3.4
++#endif
++],
++ have_kde34="yes"
++ DNSSD_LIBS=$LIB_KDNSSD
++# echo "yes"
++,
++ have_kde34="no"
++ DNSSD_LIBS=""
++# echo "no"
++)
++CXXFLAGS="$daapsave_CXXFLAGS"
++AC_LANG_RESTORE
++AC_SUBST(DNSSD_LIBS)
++AM_CONDITIONAL(atleast_kde34, [test x$have_kde34 != xno ])
++AC_MSG_RESULT($have_kde34)
++
++###############################################################################
++# END DAAP KDE 3.4 CHECK
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN OPTIONAL DAAP SUPPORT
++###############################################################################
++
++AC_ARG_WITH(daap,
++ AC_HELP_STRING([--without-daap],[build Amarok without support for DAAP]),
++ [have_daap=$withval],
++ [have_daap=yes]
++)
++
++AM_CONDITIONAL(with_daap, [test x$have_daap = xyes])
++
++###############################################################################
++# END OPTIONAL DAAP SUPPORT
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN DAAP TYPE CHECKS
++###############################################################################
++
++AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uint64_t, u_int64_t])
++
++###############################################################################
++# END DAAP TYPE CHECKS
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN DAAP MONGREL RUBY VARIABLE
++###############################################################################
++
++AC_PATH_PROG(RUBY, ruby, no)
++
++ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
++ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
++
++AC_SUBST(ruby_includes)
++AC_SUBST(ruby_ldflags)
++OLDCFLAGS="$CFLAGS"
++CFLAGS="-I$ruby_includes -Wall"
++OLDCPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used
++AC_CHECK_HEADERS([ruby.h], [have_ruby_h=yes], [have_ruby_h=no]) #used in ruby check below
++CFLAGS="$OLDCFLAGS"
++CPPFLAGS="$OLDCPPFLAGS"
++
++###############################################################################
++# END DAAP MONGREL RUBY VARIABLE
++###############################################################################
++
++
++
++###############################################################################
++# BEGIN RUBY CHECK
++###############################################################################
++## TODO: Check version number >= 1.8
++
++if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
++ amarok_error_noruby=yes
++ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
++ no_amarok=yes
++fi
++
++###############################################################################
++# END RUBY CHECK
++###############################################################################
++
++
++###############################################################################
++# BEGIN DO_NOT_COMPILE CHECK
++###############################################################################
++
++if test x$build_xine = xno -a x$build_helix = xno; then
++
++ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
++ no_engine=yes
++
++fi
++
++###############################################################################
++# END DO_NOT_COMPILE CHECK
++###############################################################################
++
diff --git a/mandriva/2010.2/applications/amarok/kde3-amarok.spec b/mandriva/2010.2/applications/amarok/kde3-amarok.spec
new file mode 100644
index 000000000..ed9566073
--- /dev/null
+++ b/mandriva/2010.2/applications/amarok/kde3-amarok.spec
@@ -0,0 +1,638 @@
+%define libname_orig libamarok
+%define libname %mklibname kde3amarok 0
+%define develname %mklibname -d kde3amarok 0
+%define develscripts %mklibname -d kde3amarok-scripts
+
+%define _disable_final 1
+
+#Add MySQL support
+%define build_mysql 1
+%{?_with_mysql: %global build_mysql 1}
+
+#Add PostgreSQL support
+%define build_postgresql 1
+%{?_with_postgresql: %global build_postgresql 1}
+
+Summary: A powerful media player for Kde
+Name: kde3-amarok
+Version: 3.5.12
+Release: %mkrel 1
+Epoch: 1
+License: GPLv2+
+Url: http://amarok.kde.org/
+Group: Sound
+Source0: amarok-%{version}.tar.bz2
+# fwang: add lyric script for Chinese songs
+# http://www.kde-apps.org/content/show.php/Lyrics_CN?content=50120
+Source1: Lyrics_CN-0.5.3.tar.bz2
+Patch0: amarok-1.4.1-fix-initial-preference.patch
+Patch1: amarok-1.3-fix-default-config.patch
+Patch2: amarok-1.2-fix-config.patch
+Patch3: amarok-1.4-beta2-add-multimedia-shortcut.patch
+#(nl): Disable for the moment as it had been reported that this patch is broken.
+Patch4: amarok-1.4.0-use-mandriva-directory.patch
+Patch6: amarok-add-radios.patch
+#Patch8: amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
+#Patch9: wikipedia-lookup.patch
+#Patch10: amarok-1.4.10-gcc44.patch
+Patch11: kde-3.5.10-acinclude.patch
+#Patch12: fix_autotools.patch
+Patch13: fix-ifpdevice-build.patch
+Patch14: kdebase-3.5.12-move-xdg-menu-dir.patch
+Patch15: kdebase-3.5.12-config.patch
+##########################################################
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: kde3-macros
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 2.63
+%else
+BuildRequires: autoconf >= 2.65
+%endif
+BuildRequires: automake >= 1.9
+BuildRequires: taglib-devel >= 1.4
+BuildRequires: kdemultimedia-devel
+BuildRequires: libxine-devel
+BuildRequires: libvisual-devel >= 0.4.0
+BuildRequires: libtunepimp-devel >= 1:0.4.2
+BuildRequires: kdebase3-devel
+BuildRequires: libxml2-utils
+BuildRequires: kde3-k3b-devel
+BuildRequires: libifp-devel
+BuildRequires: SDL-devel
+BuildRequires: libgpod-devel <= 0.7.93
+BuildRequires: libnjb-devel
+BuildRequires: sqlite3-devel
+BuildRequires: libmtp-devel >= 0.3.0
+%if %build_mysql
+BuildRequires: mysql-devel
+%endif
+%if %build_postgresql
+BuildRequires: postgresql-devel
+%endif
+BuildRequires: mesaglut-devel
+BuildRequires: libgpod-devel
+BuildRequires: ruby-devel
+BuildRequires: gpm-devel
+BuildRequires: tcl-devel
+BuildRequires: libkarma-devel
+BuildRequires: musicbrainz-devel
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires: kde3-amarok-engine
+Requires: kde3-amarok-scripts
+Requires: %{libname} = %epoch:%{version}
+Requires: tunepimp-plugins
+Suggests: moodbar
+Requires: libvisual-plugins >= 0.4.0
+Suggests: transkode
+Conflicts : amarok-engine-arts
+Conflicts : amarok-engine-gstreamer
+Conflicts : amarok-engine-akode
+Conflicts : amarok-engine-gstreamer0.10
+
+%description
+Feature Overview
+
+* Music Collection:
+You have a huge music library and want to locate tracks quickly? Let amaroK's
+powerful Collection take care of that! It's a database powered music store,
+which keeps track of your complete music library, allowing you to find any
+title in a matter of seconds.
+
+* Intuitive User Interface:
+You will be amazed to see how easy amaroK is to use! Simply drag-and-drop files
+into the playlist. No hassle with complicated buttons or tangled menus.
+Listening to music has never been easier!
+
+* Streaming Radio:
+Web streams take radio to the next level: Listen to thousands of great radio
+stations on the internet, for free! amaroK provides excellent streaming
+support, with advanced features, such as displaying titles of the currently
+playing songs.
+
+* Context Browser:
+This tool provides useful information on the music you are currently listening
+to, and can make listening suggestions, based on your personal music taste. An
+innovate and unique feature.
+
+* Visualizations:
+amaroK is compatible with XMMS visualization plugins. Allows you to use the
+great number of stunning visualizations available on the net. 3d visualizations
+with OpenGL are a great way to enhance your music experience.
+
+%if %mdkversion < 200900
+%post
+%update_menus
+%{update_desktop_database}
+%endif
+
+%if %mdkversion < 200900
+%postun
+%clean_menus
+%{clean_desktop_database}
+%endif
+
+%files
+%defattr(-,root,root)
+%doc README AUTHORS COPYING ChangeLog
+%{_kde3_bindir}/*
+%{_kde3_appsdir}/konqueror/servicemenus/amarok_*
+%{_kde3_datadir}/locale/*/*/*
+%{_kde3_docdir}/*/*/amarok
+%{_kde3_datadir}/applications/kde/amarok.desktop
+%{_kde3_datadir}/servicetypes/amarok_*
+%{_kde3_datadir}/services/amarok_daap-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_generic-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_ifp-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_ipod-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_massstorage-device.desktop
+%{_kde3_datadir}/services/amarok_mtp-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_nfs-device.desktop
+%{_kde3_datadir}/services/amarok_njb-mediadevice.desktop
+%{_kde3_datadir}/services/amarok_smb-device.desktop
+%{_kde3_datadir}/services/amarok_riokarma-mediadevice.desktop
+%{_kde3_datadir}/services/amarokitpc.protocol
+%{_kde3_datadir}/services/amaroklastfm.protocol
+%{_kde3_datadir}/services/amarokpcast.protocol
+%dir %{_kde3_appsdir}/amarok
+%{_kde3_appsdir}/amarok/amarokui.rc
+%dir %{_kde3_appsdir}/amarok/data
+%{_kde3_appsdir}/amarok/ruby_lib
+%{_kde3_appsdir}/amarok/themes
+%{_kde3_appsdir}/amarok/data/*
+%{_kde3_appsdir}/amarok/icons/*/*/*/*
+%{_kde3_iconsdir}/*/*/*/*
+%{_kde3_appsdir}/amarok/images/*
+%{_kde3_appsdir}/profiles/amarok.profile.xml
+%{_kde3_datadir}/config/amarokrc
+%{_kde3_datadir}/config.kcfg/amarok.kcfg
+%{_kde3_appsdir}/konqsidebartng/*
+
+#--------------------------------------------------------------------
+
+%package scripts
+Summary: Scripts for amarok
+Group: Graphical desktop/KDE3
+Requires: %name = %epoch:%version-%release
+URL: http://amarok.kde.org/
+Requires: kde3-kjsembed
+Requires: ruby
+Requires: python
+# (Anssi 05/2008) ruby_lib moved; the package was obsoleted by amarok-scripts:
+Conflicts: %{_lib}amarok0-scripts < 1:1.4.9.1-3
+
+%description scripts
+This package includes python scripts for amarok.
+
+%files scripts
+%defattr(-,root,root)
+%dir %{_kde3_appsdir}/amarok/scripts/
+%{_kde3_appsdir}/amarok/scripts/*
+%_kde3_libdir/ruby_lib/http11.rb
+%_kde3_libdir/ruby_lib/*.la
+%_kde3_libdir/ruby_lib/*.so.*
+
+#--------------------------------------------------------------------
+
+%package -n %{develscripts}
+Summary: Library scripts for amarok
+Group: Graphical desktop/KDE3
+Requires: %{name}-scripts = %epoch:%{version}
+URL: http://amarok.kde.org/
+Requires: ruby
+Obsoletes: %{libname}-devel-scripts
+Provides: %{libname}-devel-scripts
+
+%description -n %{develscripts}
+This package includes devel for scripts for amarok.
+
+%files -n %{develscripts}
+%defattr(-,root,root)
+%_kde3_libdir/ruby_lib/*.so
+
+#------------------------------------------------------------------
+
+%package engine-xine
+Summary: Amarok xine engine
+Group: Graphical desktop/KDE3
+Provides: kde3-amarok-engine
+URL: http://amarok.kde.org/
+Requires: xine-lib
+Requires: xine-plugins
+Requires: %name = %epoch:%version-%release
+
+%description engine-xine
+This package includes xine engine for amarok.
+
+%files engine-xine
+%defattr(-,root,root)
+%{_kde3_libdir}/kde3/libamarok_xine-engine.*
+%{_kde3_datadir}/services/amarok_xine-engine.desktop
+%{_kde3_datadir}/config.kcfg/xinecfg.kcfg
+
+#--------------------------------------------------------------------
+
+%package engine-yauap
+Summary: Amarok yauap engine
+Group: Graphical desktop/KDE3
+URL: http://amarok.kde.org/
+Requires: %name = %epoch:%version-%release
+Conflicts: %name < 1:1.4.8-1
+
+%description engine-yauap
+This package includes yauap engine for amarok.
+
+%files engine-yauap
+%defattr(-,root,root)
+%{_kde3_libdir}/kde3/libamarok_yauap-engine_plugin.*
+%{_kde3_datadir}/services/amarok_yauap-engine_plugin.desktop
+
+#--------------------------------------------------------------------
+
+%package engine-void
+Summary: Amarok void engine
+Group: Graphical desktop/KDE3
+URL: http://amarok.kde.org/
+Requires: %name = %epoch:%version-%release
+Conflicts: %name < 1:1.4.8-4
+
+%description engine-void
+This package includes void engine for amarok.
+
+%files engine-void
+%defattr(-,root,root)
+%{_kde3_libdir}/kde3/libamarok_void-engine_plugin.*
+%{_kde3_datadir}/services/amarok_void-engine_plugin.desktop
+
+#--------------------------------------------------------------------
+
+%package -n %{libname}
+Summary: Amarok library
+Group: Graphical desktop/KDE3
+Provides: %{libname_orig} = %epoch:%{version}-%{release}
+
+%description -n %{libname}
+Library for Amarok
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%files -n %{libname}
+%defattr(-,root,root)
+%{_kde3_libdir}/libamarok.so.*
+%{_kde3_libdir}/kde3/konqsidebar_universalamarok.*
+%{_kde3_libdir}/kde3/libamarok_daap-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_generic-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_ifp-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_ipod-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_massstorage-device.*
+%{_kde3_libdir}/kde3/libamarok_mtp-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_nfs-device.*
+%{_kde3_libdir}/kde3/libamarok_njb-mediadevice.*
+%{_kde3_libdir}/kde3/libamarok_smb-device.*
+%{_kde3_libdir}/kde3/libamarok_riokarma-mediadevice.*
+
+#--------------------------------------------------------------------
+
+%package -n %{develname}
+Summary: Headers of %name for development
+Group: Development/C
+Requires: %{libname} = %epoch:%{version}
+Provides: %{name}-devel = %epoch:%{version}-%{release}
+Provides: amarok0-devel = %epoch:%{version}-%{release}
+# (Anssi 05/2008) Wrong package name:
+Conflicts: %{_lib}amarok-devel < 1:1.4.9.1-3
+
+%description -n %{develname}
+Headers of %{name} for development.
+
+%files -n %{develname}
+%defattr(-,root,root)
+%{_kde3_libdir}/libamarok.la
+%{_kde3_libdir}/libamarok.so
+
+#--------------------------------------------------------------------
+
+%prep
+%setup -q -n amarok-%version -a 1
+%patch0 -p1 -b .fix_amarok_initial_preference
+%patch1 -p0 -b .fix_amarok_default_config_file
+%patch3 -p1 -b .fix_add_multimedia_shortcut
+%patch6 -p1 -b .add_some_radios
+#%patch8 -p0
+#%patch9 -p1
+#%patch10 -p1
+%if %mdkversion >= 201000
+%patch11 -p1
+#%patch12 -p1
+%patch13 -p1
+%endif
+%patch14 -p0
+%patch15 -p0
+
+%build
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+
+make -f admin/Makefile.common cvs
+export QTDIR=%qt3dir
+
+%configure_kde3 --docdir=%_kde3_docdir\
+ --with-xine \
+ --with-yauap \
+ --without-included-sqlite \
+ --with-libgpod \
+ --without-helix \
+ --without-xmms \
+ --with-libmtp \
+ --with-libkarma \
+ --with-ifp \
+%if %build_mysql
+ --enable-mysql \
+%endif
+%if %build_postgresql
+ --enable-postgresql \
+%endif
+
+%make
+
+%install
+rm -rf %buildroot
+
+%{makeinstall_std}
+
+# install source1
+mkdir -p %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/dict
+pushd Lyrics_CN
+cp -a * %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn
+find %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/ -type f | xargs chmod 0644
+chmod 0755 %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/Lyrics_CN
+popd
+
+#correct wrong script encoding file
+perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/data/Cool-Streams.xml
+perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/playlist2html/README
+perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/webcontrol/README
+
+
+%clean
+rm -rf %buildroot
+
+
+
+%changelog
+
+* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
++ Update to Trinity sources
+- Remove amarok-1.4.10-gcc44.patch, fix_autotools.patch, amarok-1.4.9.1-fix-underlinking.patch, amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
++ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
+- Remove wikipedia-lookup.patch
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:1.4.10-5mvt2010.1
++ Rebuild for MDV 2010.1
++ change required version of libgpod to match MDV 2010.1 packages
+
+* Wed Dec 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-4mvt2010.0
+- Use upper release number to avoid unwanted KDE4 upgrade
+- Fix automake 1.11 and autoconf 2.65 build issues
+- Fix ifp build for compability autoconf changes
+- Change package group
+
+* Sun Dec 20 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-3mvt2010.0
++ Last KDE3 verison
++ Built for 2010.0 release
++ Added gcc4 patch
++ Fix wikipedia lookup patch
++ Fix karma service built
+
+* Tue Sep 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.10-2mdv2009.0
++ Revision: 278767
+- Fix kjsembed and k3b-devel requires
+
+* Thu Aug 14 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.10-1mdv2009.0
++ Revision: 271697
+- New version 1.4.10
+
+* Fri Jul 18 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-9mdv2009.0
++ Revision: 238331
+- add patch to build against libmtp 0.3.0
+
+* Thu Jul 03 2008 Adam Williamson <awilliamson@mandriva.com> 1:1.4.9.1-8mdv2009.0
++ Revision: 231371
+- drop exscalibar (build)requires: moodbar was rewritten not to need exscalibar
+ in august 2006
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+
+* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-7mdv2009.0
++ Revision: 218132
+- add patch to fix underlink
+- rebuild for new configure_kde3
+
+ + Pixel <pixel@mandriva.com>
+ - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Wed Jun 04 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-6mdv2009.0
++ Revision: 214923
+- BR tcl
+- rebuild for new directfb
+
+* Tue May 20 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-5mdv2009.0
++ Revision: 209512
+- change the libamarok0-scripts obsoletes back to conflict to avoid
+ multiple packages obsoleting the same one
+- do not require kde3-amarok in libamarok0 (avoids upgrading users
+ getting both kde3-amarok and amarok)
+
+ + Funda Wang <fundawang@mandriva.org>
+ - libscripts should be obsoleted rather than conflicts
+
+* Tue May 13 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-3mdv2009.0
++ Revision: 206809
+- rename libamarok-devel to libamarok0-devel to avoid conflicts with
+ main amarok package
+- drop libamarok0-scripts and move the contents to amarok-scripts
+
+* Mon May 12 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-2mdv2009.0
++ Revision: 206473
+- drop obsoletes that belong to amarok package
+- do not provide libamarok-devel, it conflicts with main amarok devel pkg
+
+ + Funda Wang <fundawang@mandriva.org>
+ - should be kde3-k3b
+
+* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-1mdv2009.0
++ Revision: 204803
+- New version of lyrics_cn plugin
+- New version 1.4.9.1
+
+* Fri May 09 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.8-11mdv2009.0
++ Revision: 204753
+- Return of kde3 amarok in new /opt path
+- We need old amarok for kde3
+
+* Sat Mar 08 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.8-8mdv2008.1
++ Revision: 182085
+- New license policy
+- fix lyrics_cn file permission
+
+* Tue Mar 04 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-7mdv2008.1
++ Revision: 179228
+- Add support for the new amazon web API
+- Remove condition for unsupported version
+
+* Thu Feb 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-6mdv2008.1
++ Revision: 176529
+- Add transkode as suggest as requested by colin
+
+* Thu Feb 21 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-5mdv2008.1
++ Revision: 173486
+- Only provide amarok-engine on working engines (Bug #37800)
+- Package void engine in its own package (Bug #37797)
+
+* Sun Feb 10 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-3mdv2008.1
++ Revision: 164737
+- [FEATURE] Enable mysql and postgresql support (Bug #36392)
+ Add upstream patch to fix some pbs on the dynamic mode
+- Move yauap in its own engine package
+
+* Thu Dec 20 2007 Olivier Blin <oblin@mandriva.com> 1:1.4.8-1mdv2008.1
++ Revision: 135819
+- restore BuildRoot
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - New version 1.4.8
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Wed Nov 14 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-14mdv2008.1
++ Revision: 108663
+- rebuild for new libgpod
+
+* Wed Oct 31 2007 Thierry Vignaud <tvignaud@mandriva.com> 1:1.4.7-12mdv2008.1
++ Revision: 104176
+- really rebuild for new libmtp
+
+* Sun Oct 28 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-11mdv2008.1
++ Revision: 102710
+- fix startup of lyrics_CN script
+
+* Sat Oct 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-10mdv2008.1
++ Revision: 102620
+- Rebuild for new libmtp
+- New version of Lyrics_CN plugin
+- suggests moodbar
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Add patch from upstream stable branch (patch 16)
+ Add support for other engines and hardware (WIP)
+
+* Mon Sep 03 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-9mdv2008.0
++ Revision: 78441
+- New version of Lyrics_CN plugin
+
+* Fri Aug 31 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-8mdv2008.0
++ Revision: 76978
+- Add upstream patch: amarok freezes when trying to play mp3 files without mp3 support
+- Add upstream patch that fix a crash with mysql
+- Fix post/postun
+- Add new upstream patches from BRANCH
+
+* Mon Aug 27 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:1.4.7-7mdv2008.0
++ Revision: 72238
+- Rebuild for locale dir fix
+
+* Sun Aug 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-6mdv2008.0
++ Revision: 71488
+- Add upstream patches from upcoming 1.4.8 release
+
+* Sat Aug 25 2007 Anssi Hannula <anssi@mandriva.org> 1:1.4.7-5mdv2008.0
++ Revision: 71349
+- rebuild with new rpm-mandriva-setup for find_lang fixes
+
+* Fri Aug 24 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-4mdv2008.0
++ Revision: 70748
+- fix install of lyric_cn script
+- New version of Lyrics_CN
+
+* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-3mdv2008.0
++ Revision: 65550
+- New devel policy for scripts-devel
+
+* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-2mdv2008.0
++ Revision: 65423
+- New devel package policy
+
+* Thu Aug 16 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-1mdv2008.0
++ Revision: 64501
+- New verison 1.4.7
+
+* Fri Aug 10 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-5mdv2008.0
++ Revision: 61071
+- finally fix lyric_cn permission
+
+* Sun Aug 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-4mdv2008.0
++ Revision: 59036
+- Rebuild against latest libmtp
+
+* Wed Jun 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-3mdv2008.0
++ Revision: 44942
+- Rebuild against k3b 1.0.2
+- fix permission
+
+* Fri Jun 22 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-2mdv2008.0
++ Revision: 42938
+- Renew SOURCE1
+ fix executive permission
+
+* Wed Jun 20 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.6-1mdv2008.0
++ Revision: 41932
+- Remove desktop-file-utils require as categories have been merged upstream
+
+ + Funda Wang <fundawang@mandriva.org>
+ - Kill patch21, merged upstream
+ - kill patch 7, merged upstream
+ - New upstream version
+
+* Wed Jun 13 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 1:1.4.5-15mdv2008.0
++ Revision: 38603
+- rebuild for expat
+
+* Fri Jun 01 2007 Herton Ronaldo Krzesinski <herton@mandriva.com.br> 1:1.4.5-14mdv2008.0
++ Revision: 34341
+- Rebuild with libslang2.
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ -Add only needed categories
+
+* Sat May 26 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-13mdv2008.0
++ Revision: 31411
+- Rebuild for directfb 1.0
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Add patch21 from upstream (rev: 667738 )
+
+* Wed May 09 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-12mdv2008.0
++ Revision: 25817
+- Rebuild
+- Fix breakage because of wrongly removed macros
+
+ + Funda Wang <fundawang@mandriva.org>
+ - install with correct permission
+
+* Sat May 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-10mdv2008.0
++ Revision: 22912
+- Added lyrics_cn script for Chinese songs.
+
+* Mon Apr 16 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-9mdv2008.0
++ Revision: 13504
+- Bump release
+
diff --git a/mandriva/2010.2/applications/k3b/iso-level-3.patch b/mandriva/2010.2/applications/k3b/iso-level-3.patch
new file mode 100644
index 000000000..81a83cc65
--- /dev/null
+++ b/mandriva/2010.2/applications/k3b/iso-level-3.patch
@@ -0,0 +1,12 @@
+diff -ur k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp
+--- k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp 2007-11-02 11:55:40.000000000 +0200
++++ k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp 2008-01-04 15:56:28.000000000 +0200
+@@ -52,7 +52,7 @@
+
+ m_doNotCacheInodes = true;
+
+- m_isoLevel = 2;
++ m_isoLevel = 3;
+
+ m_discardSymlinks = false;
+ m_discardBrokenSymlinks = false;
diff --git a/mandriva/2010.2/applications/k3b/kde3-k3b.spec b/mandriva/2010.2/applications/k3b/kde3-k3b.spec
new file mode 100644
index 000000000..449ddcc55
--- /dev/null
+++ b/mandriva/2010.2/applications/k3b/kde3-k3b.spec
@@ -0,0 +1,233 @@
+%define major 3
+%define libname %mklibname k3b %major
+%define oldlibname %mklibname k3b 2
+
+%define k3b_18n_version 1.0.5
+
+Name: kde3-k3b
+Summary: CD-Burner for KDE
+Version: 3.5.12
+Release: %mkrel 1
+License: GPL
+Group: Archiving/Cd burning
+Source0: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
+Source1: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-i18n-%{k3b_18n_version}.tar.bz2
+Patch0: kde-3.5.10-acinclude.patch
+#Patch1: fix_autotools.patch
+#Patch2: new-ffmpeg.diff
+Patch3: iso-level-3.patch
+Patch4: verify-reload-fix.patch
+#Patch5: no-suid-warning.patch
+#Patch6: fix-k3bjobhandler_install.patch
+Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
+Patch8: kdebase-3.5.12-config.patch
+URL: http://www.k3b.org/
+Provides: k3b = %version-%release
+Requires: cdrecord
+Requires: mkisofs
+Requires: cdrdao
+Requires: sox
+Requires: vcdimager
+Requires: normalize
+Requires: kdebase-progs
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: kde3-macros
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%else
+BuildRequires: autoconf >= 1:2.65
+%endif
+BuildRequires: automake >= 1.6.1
+BuildRequires: libcdda-devel
+BuildRequires: kdelibs-devel
+BuildRequires: jpeg-devel
+BuildRequires: png-devel
+BuildRequires: X11-devel
+BuildRequires: mad-devel
+BuildRequires: arts-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: fam-devel
+BuildRequires: audiofile-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: libvorbis-devel
+BuildRequires: nas-devel
+BuildRequires: libflac++-devel
+BuildRequires: libflac-devel
+BuildRequires: id3lib-devel
+BuildRequires: taglib-devel
+BuildRequires: musicbrainz-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libdbus-qt-1-devel
+BuildRequires: GL-devel
+BuildRequires: hal-devel
+BuildRequires: libdvdread-devel
+BuildRequires: desktop-file-utils
+Obsoletes: k3b < 1.95
+Requires: %libname = %version-%release
+
+%description
+K3b is CD-writing software which intends to be feature-rich and
+provide an easily usable interface. Features include burning
+audio CDs from .WAV and .MP3 audio files, configuring external
+programs and configuring devices.
+
+%if %mdkversion < 200900
+%post
+%update_menus
+%endif
+
+%if %mdkversion < 200900
+%postun
+%clean_menus
+%endif
+
+%files -f k3b.lang
+%defattr (-,root,root)
+%dir %_kde3_docdir/HTML/*/k3b
+%doc %_kde3_docdir/HTML/*/k3b/*
+%_kde3_libdir/kde3/*
+%_kde3_bindir/*
+%_kde3_datadir/applications/kde/*
+%_kde3_appsdir/konqueror/servicemenus/*
+%_kde3_datadir/mimelnk/application/*
+%dir %_kde3_appsdir/k3b/
+%_kde3_appsdir/k3b/*
+%_kde3_datadir/sounds/*.wav
+%_kde3_datadir/applnk/.hidden/*.desktop
+%_kde3_iconsdir/*/*/*/*
+%_kde3_appsdir/konqsidebartng/virtual_folders/services/videodvd.desktop
+%_kde3_datadir/services/kfile_k3b.desktop
+%_kde3_datadir/services/videodvd.protocol
+
+#------------------------------------------------------------------
+
+%package -n %libname
+Group: System/Libraries
+Summary: Libraries for %name
+Provides: libk3b = %version-%release
+Conflicts: k3b <= 0.9-3mdk
+Obsoletes: %oldlibname
+Obsoletes: %mklibname k3b 3 < %version-%release
+Obsoletes: %mklibname kde3-k3b 3 < %version-%release
+
+%description -n %libname
+The libraries from %name package
+
+%if %mdkversion < 200900
+%post -n %libname -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %libname -p /sbin/ldconfig
+%endif
+
+%files -n %libname
+%defattr(-,root,root)
+%_kde3_libdir/libk3b.la
+%_kde3_libdir/libk3b.so.%{major}*
+%_kde3_libdir/libk3bdevice.so.*
+%_kde3_libdir/libk3bdevice.la
+
+#------------------------------------------------------------------
+
+%package devel
+Group: Development/Other
+Summary: Libraries for %name
+Requires: %libname = %version-%release
+Provides: kde3-k3b-devel = %{version}-%{release}
+Obsoletes: %oldlibname-devel
+Obsoletes: %libname-devel
+Conflicts: k3b <= 0.9-3mdk
+
+%description devel
+Development libraries from %name
+
+%files devel
+%defattr (-,root,root)
+%_kde3_includedir/*
+%_kde3_libdir/*.so
+
+#------------------------------------------------------------------
+
+%prep
+%setup -q -c -n k3b
+%setup -q -T -D -c -a 1 -n k3b
+cd %_builddir/k3b/k3b-%version
+%if %mdkversion >= 201000
+%patch0 -p1
+#%patch1 -p1
+%endif
+#%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+%patch7 -p0
+%patch8 -p0
+
+
+cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
+%if %mdkversion >= 201000
+%patch0 -p1
+#%patch1 -p1
+%endif
+cd %_builddir/k3b
+
+%build
+export QTDIR=%qt3dir
+
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+
+cd %_builddir/k3b/k3b-%version
+make -f admin/Makefile.common
+
+%configure_kde3 \
+ --without-cdrecord-suid-root \
+ --with-k3bsetup=no
+
+%make
+
+cd -
+
+cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
+make -f admin/Makefile.common
+CFLAGS="${CFLAGS} %optflags"
+CXXFLAGS="${CXXFLAGS} %optflags"
+export CFLAGS CXXFLAGS
+%configure_kde3
+
+# Necessary to regenerate po file !!!! Otherwise it's not generated
+make clean
+find -name *.gmo | xargs rm -f
+%make
+cd -
+
+
+%install
+rm -rf %buildroot
+mkdir -p %buildroot/%_kde3_datadir/applnk/Multimedia
+
+cd %_builddir/k3b/k3b-%{version}
+%makeinstall_std
+cd -
+
+cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
+%makeinstall_std
+cd -
+
+install -d %buildroot/%_kde3_datadir/applications/kde/
+desktop-file-install --vendor='' \
+ --dir %buildroot/%_kde3_datadir/applications/kde/ \
+ --remove-key='Encoding' \
+ --remove-category='Application' \
+ --remove-category='AudioVideo' \
+ --add-category='Utility' \
+ %buildroot/%_kde3_datadir/applications/kde/k3b.desktop
+
+%find_lang k3b k3b k3bsetup libk3b libk3bdevice
+
+%clean
+rm -rf %buildroot
diff --git a/mandriva/2010.2/applications/k3b/verify-reload-fix.patch b/mandriva/2010.2/applications/k3b/verify-reload-fix.patch
new file mode 100644
index 000000000..acba642c5
--- /dev/null
+++ b/mandriva/2010.2/applications/k3b/verify-reload-fix.patch
@@ -0,0 +1,89 @@
+diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog
+--- k3b-1.0.4/ChangeLog 2007-11-02 10:55:57.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/ChangeLog 2007-12-07 19:33:18.000000000 +0100
+@@ -4,9 +4,6 @@
+ * Unmount medium before DVD formatting
+ * Silently (without introducing new strings for translation) allow the burning of files
+ bigger than 4 GB with appropriate versions of genisoimage or mkisofs.
+- * Do only reload the medium before verification if necessary, i.e. if the newly written
+- track cannot be read otherwise (many old drives depend on this). Hopefully this will
+- at least work around the aweful "DMA disabled" bug for many users.
+
+ 1.0.3
+ =====
+diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp
+--- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp 2007-11-02 10:55:53.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp 2007-07-21 21:53:53.000000000 +0200
+@@ -84,8 +84,6 @@
+ K3bPipe pipe;
+
+ bool readSuccessful;
+-
+- bool mediumHasBeenReloaded;
+ };
+
+
+@@ -151,13 +149,11 @@
+ d->currentTrackIndex = 0;
+ d->alreadyReadSectors = 0;
+
+- emit newTask( i18n("Checking medium") );
++ // first we need to reload and mount the device
++ emit newTask( i18n("Reloading the medium") );
+
+- d->mediumHasBeenReloaded = false;
+- connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+- this,
+- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
++ connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)),
++ this, SLOT(slotMediaReloaded(bool)) );
+ }
+
+
+@@ -165,7 +165,6 @@
+ K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
+ K3bDevice::MEDIA_WRITABLE );
+
+- d->mediumHasBeenReloaded = true;
+
+ emit newTask( i18n("Checking medium") );
+
+@@ -191,6 +185,12 @@
+ d->toc = dh->toc();
+ d->totalSectors = 0;
+
++ if ( d->toc.isEmpty() ) {
++ emit infoMessage( i18n( "No tracks to verify found." ), ERROR );
++ jobFinished( false );
++ return;
++ }
++
+ // just to be sure check if we actually have all the tracks
+ int i = 0;
+ for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
+@@ -201,21 +201,9 @@
+ (*it).trackNumber = d->toc.count();
+
+ if( (int)d->toc.count() < (*it).trackNumber ) {
+- if ( d->mediumHasBeenReloaded ) {
+- emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
+- .arg( "Specified track number not found on medium" ), ERROR );
+- jobFinished( false );
+- return;
+- }
+- else {
+- // many drives need to reload the medium to return to a proper state
+- emit newTask( i18n("Reloading the medium") );
+- connect( K3bDevice::reload( d->device ),
+- SIGNAL(finished(bool)),
+- this,
+- SLOT(slotMediaReloaded(bool)) );
+- return;
+- }
++ emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR );
++ jobFinished( false );
++ return;
+ }
+
+ d->totalSectors += trackLength( i );
diff --git a/mandriva/2010.2/applications/kaffine/kde3-kaffeine.spec b/mandriva/2010.2/applications/kaffine/kde3-kaffeine.spec
new file mode 100644
index 000000000..efc7e9a98
--- /dev/null
+++ b/mandriva/2010.2/applications/kaffine/kde3-kaffeine.spec
@@ -0,0 +1,237 @@
+%define name kde3-kaffeine
+%define oname kaffeine
+%define version 3.5.12
+%define pre rc2
+%define release %mkrel 1
+%define xineversion 1.1.11.1
+%define fversion %version
+%define _kde3_liconsdir %_kde3_iconsdir/large
+%define _kde3_miconsdir %_kde3_iconsdir/mini
+%define reallibname %mklibname %{oname} %{major}
+
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Summary: A Xine-based Media Player for KDE3
+License: GPL
+URL: http://kaffeine.sourceforge.net/
+Group: Graphical desktop/KDE3
+Source: http://prdownloads.sourceforge.net/kaffeine/%oname-%fversion.tar.bz2
+#Patch0: kaffeine_configure.patch
+#Patch1: kaffeine_dvb.diff
+#Patch2: kaffeine-link.diff
+#Patch3: kaffeine-0.8.8-fix_autotools.patch
+Patch4: kdebase-3.5.12-move-xdg-menu-dir.patch
+Patch5: kdebase-3.5.12-config.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: kde3-macros
+BuildRequires: kdelibs-devel
+BuildRequires: libxine-devel >= %xineversion
+BuildRequires: libgstreamer-plugins-base-devel >= 0.10
+BuildRequires: libcdda-devel
+BuildRequires: %{_lib}xorg-x11-devel
+BuildRequires: libcdio-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 2.63
+%else
+BuildRequires: autoconf >= 2.65
+%endif
+BuildRequires: automake >= 1.6
+Requires: xine-plugins >= %xineversion
+Requires: kdelibs => 3.5.10
+Obsoletes: reallibname < 0.8.8
+Obsoletes: kaffeine < 0.8.8
+Provides: kaffeine = %version-%release
+
+%description
+Kaffeine is a Xine-based Media Player for QT/KDE3.
+
+
+%package devel
+Group: Development/KDE and Qt
+Summary: Kaffeine kpart library headers
+Requires: %name = %version-%release
+Provides: kaffeine-devel = %version-%release
+Obsoletes: libkaffeine0-devel
+
+%description devel
+Kaffeine is a Xine-based Media Player for QT/KDE3. This is a kpart
+library of Kaffeine.
+
+%prep
+%setup -q -n %oname-%fversion
+#%patch0
+#%patch1
+#%patch2
+#%if %mdkversion >= 201000
+#%patch3 -p1
+#%endif
+%patch4 -p0
+%patch5 -p0
+
+%build
+make -f admin/Makefile.common cvs
+export UNSERMAKE=NO
+export QTDIR=%qt3dir
+export QTLIB=%qt3lib
+export CFLAGS=${RPM_OPT_FLAGS}
+export CXXFLAGS=${RPM_OPT_FLAGSi}
+
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+
+make -f admin/Makefile.common cvs
+
+%configure_kde3 --disable-final --without-lame
+
+%make
+
+%install
+rm -rf %{buildroot}
+%makeinstall_std
+
+# (nl) this have been commited upstream, so remove desktop-file-install for next version
+desktop-file-install --vendor='' \
+ --dir=%buildroot%_kde3_datadir/applications/kde \
+ --remove-key='Encoding' \
+ --remove-category='Application' \
+ %buildroot%_kde3_datadir/applications/kde/*.desktop
+
+
+#mdk icons
+install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/48x48/apps/%{oname}.png %{buildroot}%_kde3_liconsdir/%{oname}.png
+install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/32x32/apps/%{oname}.png %{buildroot}%_kde3_iconsdir/%{oname}.png
+install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/16x16/apps/%{oname}.png %{buildroot}%_kde3_miconsdir/%{oname}.png
+
+
+rm -f %buildroot%_kde3_datadir/mimelnk/application/x-mplayer2.desktop
+
+#rename language files as kaffeine.mo
+#otherwise we can't use translations on Mandy.(# Atilla ÖNTAŞ)
+for i in $(find %buildroot%_kde3_datadir/locale -name "*-0.8.8.mo"); do j=$(echo $i | sed 's/-0.8.8.mo/.mo/g'); mv "$i" "$j"; done
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+
+%defattr(-,root,root)
+%doc AUTHORS COPYING INSTALL README TODO
+%_kde3_bindir/kaffeine
+%doc %_kde3_datadir/doc/HTML/en/kaffeine/
+%_kde3_datadir/applications/kde/kaffeine.desktop
+%_kde3_datadir/mimelnk/*/*
+%_kde3_appsdir/konqueror/servicemenus/*
+%_kde3_datadir/apps/gstreamerpart/gstreamer_part.rc
+%_kde3_libdir/kde3/*
+%_kde3_datadir/apps/kaffeine/*
+%_kde3_appsdir/profiles/kaffeine.profile.xml
+%_kde3_datadir/services/*
+%_kde3_iconsdir/hicolor/*/*/*.png
+%_kde3_liconsdir/%{oname}.png
+%_kde3_miconsdir/%{oname}.png
+%_kde3_iconsdir/%{oname}.png
+%_kde3_datadir/servicetypes/kaffeineaudioencoder.desktop
+%_kde3_datadir/servicetypes/kaffeinedvbplugin.desktop
+%_kde3_datadir/servicetypes/kaffeineepgplugin.desktop
+%_kde3_libdir/libkaffeinepart.so
+%_kde3_datadir/locale/*
+
+
+
+#--------------------------------------------------------------
+%files devel
+%defattr(-,root,root)
+%_kde3_includedir/%oname/
+%_kde3_libdir/libkaffeineaudioencoder.la
+%_kde3_libdir/libkaffeineaudioencoder.so
+%_kde3_libdir/libkaffeinedvbplugin.la
+%_kde3_libdir/libkaffeinedvbplugin.so
+%_kde3_libdir/libkaffeinepart.la
+%_kde3_libdir/libkaffeineepgplugin.la
+%_kde3_libdir/libkaffeineepgplugin.so
+
+#--------------------------------------------------------------------
+
+%package engine-gstreamer
+Group: Graphical desktop/KDE3
+Summary: GStreamer engine for kaffeine
+Requires: %{name}
+Requires: gstreamer0.10-plugins-base >= 0.10
+Requires: gstreamer0.10-plugins-good
+Provides: kaffeine-engine-gstreamer
+Obsoletes:kaffeine-engine-gstreamer < 0.8.8
+
+%description engine-gstreamer
+Summary: gstreamer engine for kaffeine
+
+%files engine-gstreamer
+%defattr(-,root,root)
+%_kde3_libdir/kde3/libgstreamer*
+%_kde3_appsdir/gstreamerpart
+%_kde3_datadir/services/gstreamer*
+
+#--------------------------------------------------------------------
+
+%define major 0
+%define libname %mklibname %{name} %{major}
+%define reallibname %mklibname %{oname} %{major}
+
+%package -n %libname
+Group: System/Libraries
+Summary: Kaffeine kpart library
+Obsoletes: %{reallibname} < 0.8.8
+Provides: %{reallibname}
+
+%description -n %libname
+Kaffeine is a Xine-based Media Player for QT/KDE3. This is a kpart
+library of Kaffeine.
+
+
+%files -n %libname
+%defattr(-,root,root)
+%_kde3_libdir/lib*.so.*
+
+
+#--------------------------------------------------------------------
+
+%package engine-xine
+Group: Graphical desktop/KDE3
+Requires: xine-plugins
+Summary: Xine engine for kaffeine
+BuildRequires: gstreamer0.10-devel
+BuildRequires: libgstreamer0.10-plugins-base-devel
+BuildRequires: libxine-devel
+Requires: %{name}
+Provides: kaffeine-engine-xine
+Obsoletes:kaffeine-engine-xine < 0.8.8
+
+%description engine-xine
+Summary: Xine engine for kaffeine
+
+%files engine-xine
+%defattr(-,root,root)
+%_kde3_libdir/kde3/libxine*
+%_kde3_appsdir/kaffeine/xine*
+%_kde3_datadir/services/xine*
+
+#--------------------------------------------------------------------
+%changelog
+
+* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvf2011.2
++ Update to Trinity 3.5.12 sources
+- Remove kaffeine-0.8.8-fix_autotools.patch, kaffeine_configure.patch, kaffeine-link.diff
++ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
+
+* Sat Apr 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-3mvt2010.1
+- fix buildrequires
+- rebuild for 2010.1
+
+* Tue Feb 09 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-2mvt2010.0
+- Fix built with autoconf 2.65 and automake 1.11
+- Change package group
+
+* Sat Nov 21 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-1mvt2010.0
+- Build KDE3 package for Mandriva
diff --git a/mandriva/2010.2/applications/kbudget/kbudget-0.6-stdio.patch b/mandriva/2010.2/applications/kbudget/kbudget-0.6-stdio.patch
new file mode 100644
index 000000000..3da01d31d
--- /dev/null
+++ b/mandriva/2010.2/applications/kbudget/kbudget-0.6-stdio.patch
@@ -0,0 +1,12 @@
+--- kbudget/kbudget.cpp.orig 2009-03-25 18:31:24.000000000 +0100
++++ kbudget/kbudget.cpp 2009-03-25 18:34:08.000000000 +0100
+@@ -16,7 +16,8 @@
+ ***************************************************************************/
+
+ #include <config.h>
+-
++#include <stdlib.h>
++
+ // include files for QT
+ #include <qdir.h>
+ #include <qprinter.h>
diff --git a/mandriva/2010.2/applications/kbudget/kbudget.spec b/mandriva/2010.2/applications/kbudget/kbudget.spec
new file mode 100644
index 000000000..7ee2eec42
--- /dev/null
+++ b/mandriva/2010.2/applications/kbudget/kbudget.spec
@@ -0,0 +1,159 @@
+Summary: Budgeting and personal finance program for KDE
+Name: kbudget
+Version: 0.6
+Release: %mkrel 13
+License: GPL
+Group: Office
+Source0: %{name}-%{version}.tar.bz2
+URL: http://www.garandnet.net/kbudget/
+BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: kdelibs3-devel
+Patch0: kbudget-0.6-stdio.patch
+
+%description
+KBudget is a budgeting and personal finance program for KDE.
+It requires KDE 3 and is currently in early development.
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+
+%setup -q
+%patch0 -p0
+
+%build
+#make -f admin/Makefile.common cvs
+
+export QTDIR=%_prefix/%_lib/qt3
+export KDEDIR=%_prefix
+
+export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
+export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
+
+# Search for qt/kde libraries in the right directories (avoid patch)
+# NOTE: please don't regenerate configure scripts below
+perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /(kde|qt)_(libdirs|libraries)=/" configure
+
+%configure_kde3
+
+%make
+
+%install
+rm -rf %{buildroot}
+#make prefix=%{buildroot}%{_prefix} install
+%makeinstall
+%find_lang kbudget
+
+%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/22x22/apps/%{name}.png %{buildroot}%{_iconsdir}/%{name}.png
+mkdir -p %{buildroot}%{_miconsdir}
+%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/16x16/apps/%{name}.png %{buildroot}%{_miconsdir}/%{name}.png
+mkdir -p %{buildroot}%{_liconsdir}
+%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/48x48/apps/%{name}.png %{buildroot}%{_liconsdir}/%{name}.png
+
+
+install -m 755 -d %buildroot%{_menudir}
+
+%clean
+rm -rf %{buildroot}
+
+%post
+%if %mdkversion > 200600
+%update_icon_cache crystalsvg
+%endif
+
+%postun
+%if %mdkversion > 200600
+%clean_icon_cache crystalsvg
+%endif
+
+%files -f kbudget.lang
+%defattr(-, root, root, 0755)
+%doc README AUTHORS
+%_bindir/%{name}
+
+
+# copy regular icons to %_icondir
+%_iconsdir/%name.png
+%_liconsdir/%name.png
+%_miconsdir/%name.png
+
+
+%_iconsdir/crystalsvg/128x128/apps/*
+%_iconsdir/crystalsvg/128x128/mimetypes/*
+%_iconsdir/crystalsvg/16x16/apps/*
+%_iconsdir/crystalsvg/16x16/mimetypes/*
+%_iconsdir/crystalsvg/22x22/apps/*
+%_iconsdir/crystalsvg/22x22/mimetypes/*
+%_iconsdir/crystalsvg/32x32/apps/*
+%_iconsdir/crystalsvg/32x32/mimetypes/*
+%_iconsdir/crystalsvg/48x48/apps/*
+%_iconsdir/crystalsvg/48x48/mimetypes/*
+%_iconsdir/crystalsvg/scalable/apps/*
+%_iconsdir/crystalsvg/scalable/mimetypes/*
+
+%_datadir/applnk/Applications/%{name}.desktop
+%_datadir/mimelnk/application/x-%{name}.desktop
+%dir %_datadir/apps/%{name}
+%_datadir/apps/%{name}/*.rc
+
+# other html doc
+%dir %_defaultdocdir/HTML/en/kbudget
+%_defaultdocdir/HTML/en/kbudget/*
+
+
+
+%changelog
+* Wed Jul 21 2011 Tim Williams <tim@my-place.org.uk> 0.6-13mdv2010.2
++ Rebuild against Trinity 3.5.12
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.6-12mdv2010.1
++ MDV 2010.1 rebuild
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 0.6-11mdv2010.0
++ MDV 2010.0 rebuild
+
+* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 0.6-10mdv2009.1
++ Revision: 361079
+- Bump to rebuild against cooker
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - rebuild
+
+* Tue Feb 19 2008 Thierry Vignaud <tvignaud@mandriva.com> 0.6-7mdv2008.1
++ Revision: 172392
+- fix update-menus-without-menu-file-in-%%post(|un)
+- kdedesktop2mdkmenu.pl is no more
+- rebuild
+- fix "foobar is blabla" summary (=> "blabla") so that it looks nice in rpmdrake
+- kill re-definition of %%buildroot on Pixel's request
+- import kbudget
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+
+* Mon Jun 26 2006 Nicolas Lcureuil <neoclust@mandriva.org> 0.6-6mdv2007.0
+- Use new menu
+- Register icons
+
+* Fri Dec 23 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.6-5mdk
+- Fix Build
+- use mkrel
+- BuildRequires : kdelibs-devel
+
+* Fri May 06 2005 Laurent MONTEL <lmontel@mandriva.com> 0.6-4mdk
+- Fix build on x86_64
+
+* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-3mdk
+- Rebuils
+
+* Tue Feb 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-2mdk
+- Fix distlint
+
+* Wed Dec 31 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.6-1mdk
+- 0.6
+
+* Sun Oct 15 2003 Nicolas CHIPAUX <chipaux@mandrakesoft.com> 0.5-2mdk
+- libdir fix
+
+* Sun Sep 23 2003 Nicolas CHIPAUX <chipaux@mandrakesoft.com> 0.5-1mdk
+- Initial release
diff --git a/mandriva/2010.2/applications/kdebluetooth/kde3-kdebluetooth.spec b/mandriva/2010.2/applications/kdebluetooth/kde3-kdebluetooth.spec
new file mode 100644
index 000000000..225779767
--- /dev/null
+++ b/mandriva/2010.2/applications/kdebluetooth/kde3-kdebluetooth.spec
@@ -0,0 +1,365 @@
+%define oname kdebluetooth
+%define _requires_exceptions devel\(libbluetooth\)\||devel\(libGLcore\)\||devel\(libGL\)
+
+%define _disable_ld_no_undefined 1
+
+%define major 0
+%define libname %mklibname %name %major
+%define liboldname %mklibname %oname %major
+%define develname %mklibname %name -d
+%define develoldname %mklibname %oname -d
+%define svn_rev svn697456
+%define beta beta8
+
+Name: kde3-%{oname}
+Summary: Access and control bluetooth devices in KDE
+Version: 1.0
+Epoch: 1
+Release: %mkrel -c %beta 14
+Source: %{oname}-%{version}_%beta.tar.bz2
+Patch0: kdebluetooth-1.0_beta8-compile.patch
+URL: http://bluetooth.kmobiletools.org
+License: GPL
+Group: System/Configuration/Hardware
+BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: pkgconfig
+BuildRequires: arts-devel
+BuildRequires: qt3-devel >= 3.3.6-15mdv2007.0
+BuildRequires: kdelibs-devel
+BuildRequires: dbus-devel
+BuildRequires: libdbus-qt-1-devel
+BuildRequires: hal-devel
+BuildRequires: openobex-devel >= 1.2
+BuildRequires: kdepim-devel
+BuildRequires: bluez-devel
+BuildRequires: bluez-sdp-devel
+BuildRequires: libxml2-utils
+BuildRequires: obexftp-devel
+BuildConflicts: xmms-devel
+Requires: bluez-utils
+Requires: bluez-sdp
+Provides: bluez-pin
+Obsoletes: kdebluetooth-pin
+Provides: %{oname} = %epoch:%version-%release
+Obsoletes: %{oname}
+
+%description
+The aim of this project is a tight and easy to use integration of Bluetooth
+into the KDE desktop. You can manage your local Bluetooth devices and services
+with it, browse your Bluetooth neighbourhood with konqueror and send and
+receive files with just a few clicks. And that's not all you can do with it...
+
+%if %mdkversion < 200900
+%post
+%update_menus
+%endif
+
+%if %mdkversion < 200900
+%postun
+%clean_menus
+%endif
+
+%files -f %oname.lang
+%defattr(-,root,root)
+%{_kde3_bindir}/kbluelock
+%{_kde3_bindir}/kbluemon
+%{_kde3_bindir}/kbluetooth
+%{_kde3_bindir}/kinputwizard
+%{_kde3_bindir}/kbtobexclient
+%{_kde3_bindir}/kioobex_start
+%{_kde3_libdir}/kde3/kcm_btpaired.*
+%{_kde3_libdir}/kde3/kio_bluetooth.*
+%{_kde3_libdir}/kde3/kio_obex.*
+%{_kde3_libdir}/kde3/kio_sdp.*
+%{_kde3_libdir}/kdebluetooth/servers/kbtobexsrv
+%{_kde3_appsdir}/kdebluetooth/dunhandler/dunhandler
+%{_kde3_appsdir}/kdebluetooth/faxhandler/faxhandler
+%{_kde3_appsdir}/kdebluetooth/faxhandler/kbtfax
+%{_kde3_appsdir}/kdebluetooth/eventsrc
+%{_kde3_appsdir}/kbtobexclient/kbtobexclientui.rc
+%{_kde3_appsdir}/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
+%{_kde3_appsdir}/konqueror/servicemenus/kbtobexclient_sendfile.desktop
+%{_kde3_iconsdir}/*/*/*/kdebluetooth.*
+%dir %{_kde3_datadir}/mimelnk/bluetooth/
+%{_kde3_datadir}/mimelnk/bluetooth/*.desktop
+%{_kde3_datadir}/applnk/Settings/Network/Bluetooth
+%_kde3_datadir/applnk/Utilities/dunhandler.desktop
+%_kde3_datadir/applnk/Utilities/faxhandler.desktop
+%_kde3_datadir/applnk/.hidden/kioobex_start.desktop
+%{_kde3_datadir}/servicetypes/*
+%{_kde3_datadir}/services/*
+%{_kde3_datadir}/autostart/*
+%dir %{_kde3_datadir}/desktop-directories
+%{_kde3_datadir}/desktop-directories/*
+%{_kde3_datadir}/applications/kde/*.desktop
+%{_kde3_iconsdir}/hicolor/*/apps/kbluetooth.png
+%{_kde3_iconsdir}/hicolor/*/apps/kbluelock.png
+
+#--------------------------------------------------------------------------
+
+%package -n %develname
+%define _requires_exceptions devel\(libbluetooth\)
+Group: Development/KDE and Qt
+Summary: Development for KDE Bluetooth
+Requires: %libname = %epoch:%version-%release
+Provides: kdebluetooth-devel = %epoch:%{version}-%{release}
+Obsoletes: %libname-devel
+Provides: %{develoldname} = %epoch:%version-%release
+Obsoletes: %{develoldname}
+
+
+%description -n %develname
+The aim of this project is a tight and easy to use integration of Bluetooth
+into the KDE desktop. You can manage your local Bluetooth devices and services
+with it, browse your Bluetooth neighbourhood with konqueror and send and
+receive files with just a few clicks. And that's not all you can do with it...
+
+%files -n %develname
+%defattr(-,root,root)
+%{_kde3_includedir}/*
+%{_kde3_libdir}/*.la
+%{_kde3_libdir}/*.so
+
+#--------------------------------------------------------------------------
+
+%package -n %libname
+Group: System/Configuration/Hardware
+Summary: Development for KDE Bluetooth
+Provides: %{liboldname} = %epoch:%version-%release
+Obsoletes: %{liboldname}
+
+%description -n %libname
+The aim of this project is a tight and easy to use integration of Bluetooth
+into the KDE desktop. You can manage your local Bluetooth devices and services
+with it, browse your Bluetooth neighbourhood with konqueror and send and
+receive files with just a few clicks. And that's not all you can do with it...
+
+%if %mdkversion < 200900
+%post -n %libname -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %libname -p /sbin/ldconfig
+%endif
+
+%files -n %libname
+%defattr(-,root,root)
+%{_kde3_libdir}/*.so.*
+
+#--------------------------------------------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version}_%beta
+%patch0 -p0
+
+%build
+
+%configure_kde3 \
+ --without-xmms
+
+
+%make
+
+%install
+rm -rf %buildroot
+
+%makeinstall_std
+
+%find_lang %{oname} --with-html
+
+%clean
+rm -rf %buildroot
+
+
+
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 1:1.0-0.beta8.14mvt2010.2
++ Rebuild for Trinity
+
+* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1:1.0-0.beta8.13mvt2010.1
++ Rebuild for MDV 2010.1
+
+* Tue Jan 19 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.0-0.beta8.12mvt2010.0
+- Rebuild for 2010.0
+- Change package name to avoid KDE4 upgrade
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:1.0-0.beta8.11mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 1:1.0-0.beta8.10mdv2009.1
++ Revision: 361207
+- Bump release, fix build to recompile
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - rebuild early 2009.0 package (before pixel changes)
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+ - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.0-0.beta8.8mdv2009.0
++ Revision: 204662
+- Move to /opt
+
+* Sun Feb 24 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta8.8mdv2008.1
++ Revision: 174146
+- Rebuild
+
+* Thu Feb 07 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta8.7mdv2008.1
++ Revision: 163348
+- Rebuild
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+* Mon Dec 31 2007 Oden Eriksson <oeriksson@mandriva.com> 1:1.0-0.beta8.6mdv2008.1
++ Revision: 139863
+- rebuilt against openldap-2.4.7 libs
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Thu Sep 20 2007 Anssi Hannula <anssi@mandriva.org> 1:1.0-0.beta8.5mdv2008.0
++ Revision: 91632
+- remove broken workaround for find-lang.pl bug that prevented
+ installation, the bug is properly fixed in rpm-mandriva-setup-build 1.60
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - update to version 1.0_beta8:
+ * back to kbluetoothd kio_obex module (Novell #310145)
+ * added wrapper classes for new obex-data-server
+ * fixed config file to fix wrong autostart settings
+
+* Tue Sep 18 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta7.3mdv2008.0
++ Revision: 89735
+- upload again because of HD failure
+
+* Mon Sep 17 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta7.2mdv2008.0
++ Revision: 89249
+- Fix File list
+- Fix File list
+- Use new tarball fixing some bugs
+
+* Mon Sep 03 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta7.1mdv2008.0
++ Revision: 78718
+- Fix file list
+- New upstream beta => beta7
+
+* Wed Aug 08 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.0-0.beta5.1mdv2008.0
++ Revision: 60183
+- New release 1.0 Beta5
+
+* Thu Aug 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:1.0-0.beta3.4mdv2008.0
++ Revision: 58254
+- Rebuild against latest bluez-utils to fix a crash in the passkey agent
+
+* Wed Jun 20 2007 Helio Chissini de Castro <helio@mandriva.com> 1:1.0-0.beta3.3mdv2008.0
++ Revision: 41730
+- Missig build requires
+- New devel library policy
+- Added new kdebluetooth branch based on standard dbus calls.
+
+ + Funda Wang <fundawang@mandriva.org>
+ - Remove unwanted obsoletes
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Obsoletes bluez-pin as it is gone
+ - New version Beta3
+ - Fix Group
+
+* Mon May 21 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.0-1.beta2.13mdv2008.0
++ Revision: 29096
+- Add BuildRequire
+- Fix File list
+- Remove old menu entries
+- Add menu macros needed for non XDG-Compliant WM
+- Rebuild
+
+
+* Sat Mar 31 2007 Laurent Montel <lmontel@mandriva.com> 1.0-1.beta2.12mdv2007.1
++ Revision: 150049
+- fix menu
+
+* Thu Feb 22 2007 Olivier Blin <oblin@mandriva.com> 1.0-1.beta2.11mdv2007.1
++ Revision: 124768
+- try current user before relying on the "who" command (#28448)
+
+* Mon Feb 05 2007 Laurent Montel <lmontel@mandriva.com> 1.0-1.beta2.10mdv2007.1
++ Revision: 116277
+- Use kwrite by default into template
+
+* Wed Jan 17 2007 Laurent Montel <lmontel@mandriva.com> 1.0-1.beta2.9mdv2007.1
++ Revision: 109783
+- I don't understand... a beta2 called beta1...
+- Fix message
+- Fix crash
+- Add missing menu
+
+ + Helio Chissini de Castro <helio@mandriva.com>
+ - New upstream version ( 1.0 beta2 )
+
+ + Gustavo Pichorim Boiko <boiko@mandriva.com>
+ - added a patch fixing directory mimetype when using ObexFTP
+ - cosmetic changes on spec file
+
+* Wed Sep 13 2006 Helio Chissini de Castro <helio@mandriva.com> 1.0-0.beta1.8mdv2007.0
++ Revision: 61111
+- Added new revision with obex 1.2 compliance ( fix openobex detection and
+ compilation )
+- Adde kdebluetooth-pin package ( for pin_helper )
+- Pin helper separated to make easy access to backward auth patch on bluez-utils
+- BuildConflicts on xmms-devel
+- Fixed kdebluetooth pin alternatives
+- import kdebluetooth-1.0-0.beta1.5mdv2007.0
+
+* Wed May 25 2005 Nicolas L�cureuil <neoclust@mandriva.org> 1.0-0.beta1.2mdk
+- Drop Patch 0, 1, 2, 3 ( Merged Upstream )
+- Fix files permissions
+- Fix doc section
+
+* Wed May 25 2005 Laurent MONTEL <lmontel@mandriva.com> 1.0-0.beta1.1
+- 1.0beta1
+
+* Wed Mar 09 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.0.cvs20041202-5mdk
+- amarok support for kbemusedsrv (P1 from cvs)
+- fix build with recent bluez libs (P2 from CVS)
+
+* Tue Dec 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20041202-4mdk
+- Fix install script bug found by Arnaud
+
+* Tue Dec 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20041202-3mdk
+- Fix obsolete
+
+* Tue Dec 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20041202-2mdk
+- Fix requires
+
+* Thu Dec 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20041202-1mdk
+- Update code from CVS
+
+* Thu Dec 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20040914-3mdk
+- Fix spec file
+
+* Tue Oct 19 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.0.cvs20040914-2mdk
+- fix build
+
+* Wed Sep 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20040914-1mdk
+- cvs 20040914
+
+* Tue Aug 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20040718-3mdk
+- Rebuild with new menu
+
+* Fri Jul 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20040718-2mdk
+- Fix tarball (add admin directory into package)
+
+* Mon Jul 19 2004 Austin Acton <austin@mandrake.org> 0.0.cvs20040718-1mdk
+- cvs 20040718
+- configure 2.5
+- disable-rpath
+
+* Sat Jun 19 2004 Austin Acton <austin@mandrake.org> 0.0.cvs20040618-1mdk
+- cvs 20040618
+
+* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.0.cvs20040302-5mdk
+- Rebuild
+
diff --git a/mandriva/2010.2/applications/kdebluetooth/kdebluetooth-1.0_beta8-compile.patch b/mandriva/2010.2/applications/kdebluetooth/kdebluetooth-1.0_beta8-compile.patch
new file mode 100644
index 000000000..119d815bd
--- /dev/null
+++ b/mandriva/2010.2/applications/kdebluetooth/kdebluetooth-1.0_beta8-compile.patch
@@ -0,0 +1,10 @@
+--- kdebluetooth/kcm_btpaired/pairedtab.h.orig 2009-03-25 22:45:39.000000000 +0100
++++ kdebluetooth/kcm_btpaired/pairedtab.h 2009-03-25 22:46:23.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <qstringlist.h>
+ #include <qdatetime.h>
+ #include <vector>
++#include <stdint.h>
+
+ #include "exportdialog.h"
+
diff --git a/mandriva/2010.2/applications/kio-sysinfo/cpu.png b/mandriva/2010.2/applications/kio-sysinfo/cpu.png
new file mode 100644
index 000000000..646db5253
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/cpu.png
Binary files differ
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec b/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec
new file mode 100644
index 000000000..44cd185ca
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kde3-kio-sysinfo.spec
@@ -0,0 +1,188 @@
+%define oname kio-sysinfo
+Name: kde3-%oname
+Version: 1.8.2
+Release: %mkrel 14
+Summary: KIO Slave sysinfo:/
+License: LGPL
+Group: System/Libraries
+URL: http://www.kde-apps.org/content/show.php?content=58704
+Source0: http://download.tuxfamily.org/kiosysinfo/Sources/%oname-%version.tar.gz
+# Source1: 48x48/apps/kcmprocessor.png
+Source1: cpu.png
+# Source2: 48x48/devices/system.png
+Source2: sysinfo.png
+Patch0: kio-sysinfo-1.8.2-suse-10.3.patch
+Patch1: kio-sysinfo-1.8.2-uz-translation.patch
+Patch2: kio-sysinfo-1.8.2-gcc4.patch
+Patch3: kde-3.5.10-acinclude.patch
+Patch4: fix_autotools.patch
+BuildRequires: kdelibs-devel
+BuildRequires: hal-devel
+BuildRequires: dbus-devel
+BuildRequires: libhd-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: automake >= 1.6.1
+BuildRequires: kde3-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Obsoletes: sysinfo < 1.8.2-4
+
+%description
+KIO Slave sysinfo:/. It shows various information about your pc,
+like cpu, ram. kernel version, exc. It also shows the removable
+devices and partition (total space/available space) and you can open,
+mount and unmount it from this KIO slave.
+
+%files -f kio_sysinfo.lang
+%defattr(-,root,root)
+%{_kde3_libdir}/kde3/*
+%{_kde3_datadir}/applications/kde/kfmclient_sysinfo.desktop
+%{_kde3_appsdir}/sysinfo
+%{_kde3_datadir}/mimelnk/application/x-sysinfo.desktop
+%{_kde3_datadir}/services/ksysinfopart.desktop
+%{_kde3_datadir}/services/sysinfo.protocol
+
+#--------------------------------------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%if %mdkversion >= 201000
+%patch3 -p1
+%patch4 -p1
+%endif
+%__cp -f %SOURCE1 about/images/cpu.png
+%__cp -f %SOURCE2 about/images/sysinfo.png
+
+%build
+make -f admin/Makefile.common
+
+%configure_kde3 \
+ --with-qt-dir=%{qt3dir} \
+ --with-qt-includes=%{qt3include} \
+ --with-qt-libraries=%{qt3lib}
+
+%make
+
+%install
+rm -rf %buildroot
+
+%makeinstall_std
+
+%{find_lang} kio_sysinfo
+
+%clean
+rm -rf %{buildroot}
+
+
+%changelog
+
+* Thu Jul 14 2011 Tim Williams <tim@my-place.org.uk> 1.8.2-14mvt2010.2
++ rebuild for trinity KDE
+
+* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1.8.2-13mvt2010
++ Rebuild for MDV 2010.1
+
+* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.8.2-12mvt2010
++ Fix built with autoconf 2.65 and asutmoake 1.11
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 1.8.2-11mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Tue Jun 24 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-10mdv2009.0
++ Revision: 228752
+- Fix specfile name
+- Fix with new name
+
+* Sun Jun 08 2008 Funda Wang <fundawang@mandriva.org> 1.8.2-10mdv2009.0
++ Revision: 216987
+- rebuild for new major of hwinfo
+
+* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-9mdv2009.0
++ Revision: 204707
+- Move to /opt
+
+* Tue Apr 01 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-8mdv2008.1
++ Revision: 191468
+- Use neutral icon again
+
+* Wed Mar 26 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-7mdv2008.1
++ Revision: 190353
+- Fix for bug https://qa.mandriva.com/show_bug.cgi?id=39173 - Proper dbus/hal device handling
+
+* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.8.2-6mdv2008.1
++ Revision: 141781
+- rebuilt against openldap-2.4.7 libs
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Sun Oct 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-5mdv2008.1
++ Revision: 100829
+- Updated patch0 from bug#32822
+
+* Fri Oct 12 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-4mdv2008.1
++ Revision: 97268
+- Rename to kio-sysinfo as sysinfo is too confusing
+
+* Thu Sep 27 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-3mdv2008.0
++ Revision: 93343
+- really fix bug#32031
+
+* Tue Aug 28 2007 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-2mdv2008.0
++ Revision: 72846
+- Fix mimelnk placement
+
+* Tue Aug 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-1mdv2008.0
++ Revision: 68729
+- New version 1.8.2
+
+ + Eskild Hustvedt <eskild@mandriva.org>
+ - Fixed description
+
+* Sat Aug 04 2007 Funda Wang <fundawang@mandriva.org> 1.8.1-1mdv2008.0
++ Revision: 58918
+- Rediff uz patch
+
+ + Tomasz Pawel Gajc <tpg@mandriva.org>
+ - new version
+ - bzip2 sources
+
+* Wed Jul 25 2007 Funda Wang <fundawang@mandriva.org> 1.8-2mdv2008.0
++ Revision: 55432
+- Add uz translation to fix mdvbug#32031
+
+* Tue Jul 24 2007 Funda Wang <fundawang@mandriva.org> 1.8-1mdv2008.0
++ Revision: 55039
+- New version
+- uz translation has been merged upstream
+- do not use autotools for kde packages
+- use aclocal
+- BR libhd
+- Replace images with icons here: http://www.kde-look.org/content/show.php?content=61727
+- New verison
+- rediff patch
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - New patch for Uzbek translations (thanks to Mashrab Kuvatov)
+ - [FEATURE] Add Uzbek translations ( thanks to Mashrab Kuvatov) (bug report #32031)
+
+* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 1.3-4mdv2008.0
++ Revision: 36204
+- rebuild with correct optflags
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ -Patch0: Make Sysinfo:/ display Mandriva Linux on System: instead of nothing
+
+* Mon Jun 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.3-2mdv2008.0
++ Revision: 35108
+- Fix File List
+- Import sysinfo
+
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch
new file mode 100644
index 000000000..7854d751b
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-gcc4.patch
@@ -0,0 +1,11 @@
+--- kio-sysinfo-1.8.2/src/sysinfo.cpp.orig 2009-11-13 15:20:27.000000000 +0000
++++ kio-sysinfo-1.8.2/src/sysinfo.cpp 2009-11-13 15:24:53.000000000 +0000
+@@ -245,7 +245,7 @@
+
+ static unsigned long int scan_one( const char* buff, const char *key )
+ {
+- char *b = strstr( buff, key );
++ const char *b = strstr( buff, key );
+ if ( !b )
+ return 0;
+ unsigned long int val = 0;
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch
new file mode 100644
index 000000000..14aaa9fde
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-suse-10.3.patch
@@ -0,0 +1,769 @@
+diff -u -r kio-sysinfo-1.8.2/src/ksysinfopart.cpp kio-sysinfo-10.3/src/ksysinfopart.cpp
+--- kio-sysinfo-1.8.2/src/ksysinfopart.cpp 2006-05-20 14:21:16.000000000 -0300
++++ kio-sysinfo-10.3/src/ksysinfopart.cpp 2007-08-14 13:09:50.000000000 -0300
+@@ -84,6 +84,10 @@
+ rescanTimer=new QTimer(this);
+ connect(rescanTimer, SIGNAL(timeout()), SLOT(rescan()));
+ rescanTimer->start(20000, true);
++ setJScriptEnabled(false);
++ setJavaEnabled(false);
++ setPluginsEnabled(false);
++ setMetaRefreshEnabled(false);
+
+ connectDCOPSignal("kded", "networkstatus", "statusChange(QString,int)", "rescan()", false);
+ installEventFilter( this );
+Somente em kio-sysinfo-1.8.2/src: Makefile
+diff -u -r kio-sysinfo-1.8.2/src/Makefile.am kio-sysinfo-10.3/src/Makefile.am
+--- kio-sysinfo-1.8.2/src/Makefile.am 2006-05-20 14:21:16.000000000 -0300
++++ kio-sysinfo-10.3/src/Makefile.am 2007-08-14 13:07:17.000000000 -0300
+@@ -1,10 +1,11 @@
++SUBDIRS = .
+
+ INCLUDES = $(all_includes) `pkg-config --cflags hal`
+
+ kde_module_LTLIBRARIES = kio_sysinfo.la libksysinfopart.la
+
+ kio_sysinfo_la_SOURCES = sysinfo.cpp
+-kio_sysinfo_la_LIBADD = $(LIB_KIO) -lGL
++kio_sysinfo_la_LIBADD = $(LIB_KIO) -lhd -lGL
+ kio_sysinfo_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $$(pkg-config --libs hal)
+
+ kde_services_DATA = sysinfo.protocol ksysinfopart.desktop
+@@ -15,13 +16,11 @@
+
+ xdg_apps_DATA = kfmclient_sysinfo.desktop
+
+-podir=../po
+-COMMAND=$(XGETTEXT) --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale
+ messages:
+- $(COMMAND) *.cpp -o $(podir)/kio_sysinfo.pot
++ $(XGETTEXT) *.cpp -o $(podir)/kio_sysinfo.pot
+
+ METASOURCES = AUTO
+
+ apps_DATA = x-sysinfo.desktop
+-appsdir = $(kde_mimedir)/applications
++appsdir = $(kde_mimedir)/application
+
+Somente em kio-sysinfo-1.8.2/src: Makefile.in
+diff -u -r kio-sysinfo-1.8.2/src/sysinfo.cpp kio-sysinfo-10.3/src/sysinfo.cpp
+--- kio-sysinfo-1.8.2/src/sysinfo.cpp 2007-08-21 08:12:15.000000000 -0300
++++ kio-sysinfo-10.3/src/sysinfo.cpp 2007-09-21 13:41:53.000000000 -0300
+@@ -25,7 +25,6 @@
+
+ #include <qfile.h>
+ #include <qdir.h>
+-#include <qregexp.h>
+
+ #include <stdlib.h>
+ #include <math.h>
+@@ -56,22 +55,22 @@
+ #include <kglobalsettings.h>
+ #include <ktempfile.h>
+
+-
+ #include "sysinfo.h"
+
+
+ using namespace KIO;
+ #define BR "<br>"
+
+-static QString formattedUnit( unsigned long long value, int post=1 )
++static QString formattedUnit( Q_UINT64 value, int post=1 )
+ {
+- if (value > (1024 * 1024))
+- if (value > (1024 * 1024 * 1024))
+- return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * (post == 0 ? 1024 : 1024.0)), post));
++ if (value >= (1024 * 1024))
++ if (value >= (1024 * 1024 * 1024))
++ return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0),
++ post));
+ else
+- return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * (post == 0 ? 1024 : 1024.0)), post));
++ return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), post));
+ else
+- return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / (post == 0 ? 1024 : 1024.0), post));
++ return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, post));
+ }
+
+ static QString htmlQuote(const QString& _s)
+@@ -124,46 +123,39 @@
+
+ void kio_sysinfoProtocol::get( const KURL & /*url*/ )
+ {
+- FILE *fp; //this pointer is used to open file
+-
+ mimeType( "application/x-sysinfo" );
+
++ // CPU info
++ infoMessage( i18n( "Looking for CPU information..." ) );
++ cpuInfo();
++
+ // header
+ QString location = locate( "data", "sysinfo/about/my-computer.html" );
+ QFile f( location );
+ f.open( IO_ReadOnly );
+ QTextStream t( &f );
+-
+- infoMessage(i18n("Looking for hardware information..."));
+-
+ QString content = t.read();
+- content = content.arg( i18n( "My Computer" ) ); // <title>
+-
+- content = content.arg( "file:" + locate( "data", "sysinfo/about/style.css" ) );
+-
+- content = content.arg( i18n( "My Computer" ) ); // <h1>
+- content = content.arg( i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ) ); // catchphrase
++ content = content.arg( i18n( "My Computer" ),
++ htmlQuote("file:" + locate( "data", "sysinfo/about/style.css" )),
++ i18n( "My Computer"),
++ i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ));
+
+ QString sysInfo = "<div id=\"column2\">"; // table with 2 cols
+ QString dummy;
+
+ // disk info
+- sysInfo += "<h2 id=\"hdds\">" + i18n( "Disks Information" ) + "</h2>";
++ infoMessage( i18n( "Looking for disk information..." ) );
++ sysInfo += "<h2 id=\"hdds\">" + i18n( "Disk Information" ) + "</h2>";
+ sysInfo += diskInfo();
+
+ osInfo();
+ sysInfo += "<h2 id=\"sysinfo\">" +i18n( "OS Information" ) + "</h2>";
+ sysInfo += "<table>";
+- sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + m_info[OS_SYSNAME] + " " + m_info[OS_RELEASE] + " " + m_info[OS_MACHINE] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + m_info[OS_USER] + "@" + m_info[OS_HOSTNAME] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "System:" ) + "</td><td>" + m_info[OS_SYSTEM] + "</td></tr>";
+-
+- if((fp =fopen ("/etc/lsb-release", "r"))!=NULL) {
+- fclose(fp);
+- sysInfo += "<tr><td>" + i18n( "Version:" ) + "</td><td>" + m_info[OS_VERSION] + "</td></tr>";
+-
+- }
+-
++ sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSNAME]) + " " +
++ htmlQuote(m_info[OS_RELEASE]) + " " + htmlQuote(m_info[OS_MACHINE]) + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + htmlQuote(m_info[OS_USER]) + "@"
++ + htmlQuote(m_info[OS_HOSTNAME]) + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "System:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSTEM]) + "</td></tr>";
+ sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE::versionString() + "</td></tr>";
+ sysInfo += "</table>";
+
+@@ -172,34 +164,30 @@
+ {
+ sysInfo += "<h2 id=\"display\">" + i18n( "Display Info" ) + "</h2>";
+ sysInfo += "<table>";
+- sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[GFX_VENDOR] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[GFX_MODEL] + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + htmlQuote(m_info[GFX_VENDOR]) + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) + "</td></tr>";
+ if (!m_info[GFX_DRIVER].isNull())
+- sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + m_info[GFX_DRIVER] + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + htmlQuote(m_info[GFX_DRIVER]) + "</td></tr>";
+ sysInfo += "</table>";
+ }
+
+ sysInfo += "</div><div id=\"column1\">"; // second column
+
+ // OS info
++ infoMessage( i18n( "Getting OS information...." ) );
+
+ // common folders
+- sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>";
+- sysInfo += "<ul>";
+-
+- sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::homeDirPath() ) + i18n( "My Home Folder" ) + "</a></li>";
+- sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::rootDirPath() ) + i18n( "Root Folder" ) + "</a></li>";
+-
+- if((fp =fopen ("/usr/lib/kde3/kio_apt.so", "r"))!=NULL) {
+- sysInfo += "<li><a href=\"apt:/\">" + i18n( "Repository" ) + "</a></li>";
+- fclose(fp);
+- }
+- //sysInfo += "<li><a href=\"programs:/\">" + i18n( "Application" ) + "</a></li>";
+-
++ sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>"; sysInfo += "<ul>";
++ if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
++ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(KGlobalSettings::documentPath()) )
++ + i18n( "My Documents" ) + "</a></li>";
++ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::homeDirPath()) ) + i18n( "My Home Folder" ) + "</a></li>";
++ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::rootDirPath()) ) + i18n( "Root Folder" ) + "</a></li>";
+ sysInfo += "<li><a href=\"remote:/\">" + i18n( "Network Folders" ) + "</a></li>";
+ sysInfo += "</ul>";
+
+ // net info
++ infoMessage( i18n( "Looking up network status..." ) );
+ int state = netInfo();
+ if (state > 1) { // assume no network manager / networkstatus
+ sysInfo += "<h2 id=\"net\">" + i18n( "Network Status" ) + "</h2>";
+@@ -208,8 +196,6 @@
+ sysInfo += "</ul>";
+ }
+
+- // CPU info
+- cpuInfo();
+ if ( !m_info[CPU_MODEL].isNull() )
+ {
+ sysInfo += "<h2 id=\"cpu\">" + i18n( "CPU Information" ) + "</h2>";
+@@ -231,30 +217,17 @@
+ }
+
+ // memory info
++ infoMessage( i18n( "Looking for memory information..." ) );
+ memoryInfo();
+ sysInfo += "<h2 id=\"memory\">" + i18n( "Memory Information" ) + "</h2>";
+ sysInfo += "<table>";
+ sysInfo += "<tr><td>" + i18n( "Total memory (RAM):" ) + "</td><td>" + m_info[MEM_TOTALRAM] + "</td></tr>";
+ sysInfo += "<tr><td>" + i18n( "Free memory:" ) + "</td><td>" + m_info[MEM_FREERAM] + "</td></tr>";
+ dummy = i18n( "Used Memory" );
+- sysInfo += "<tr><td>" + i18n( "Total Swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( " Free Swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
++ dummy += "<tr><td>" + i18n( "Total swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
++ sysInfo += "<tr><td>" + i18n( "Free swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
+ sysInfo += "</table>";
+
+- // hw info
+- if (!m_info[TYPE].isNull() || !m_info[MANUFACTURER].isNull() || !m_info[PRODUCT].isNull()
+- || !m_info[BIOSVENDOR].isNull() || !m_info[ BIOSVERSION ].isNull())
+- {
+- sysInfo += "<h2 id=\"hwinfo\">" +i18n( "Hardware Information" ) + "</h2>";
+- sysInfo += "<table>";
+- sysInfo += "<tr><td>" + i18n( "Type:" ) + "</td><td>" + m_info[ TYPE ] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[ MANUFACTURER ] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[ PRODUCT ] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Bios Vendor:" ) + "</td><td>" + m_info[ BIOSVENDOR ] + "</td></tr>";
+- sysInfo += "<tr><td>" + i18n( "Bios Version:" ) + "</td><td>" + m_info[ BIOSVERSION ] + "</td></tr>";
+- sysInfo += "</table>";
+- }
+-
+ sysInfo += "</div>";
+
+ // Send the data
+@@ -278,11 +251,11 @@
+ unsigned long int val = 0;
+ if ( sscanf( b + strlen( key ), ": %lu", &val ) != 1 )
+ return 0;
+- kdDebug() << "scan_one " << key << " " << val << endl;
++ kdDebug(1242) << "scan_one " << key << " " << val << endl;
+ return val;
+ }
+
+-static unsigned long int calculateFreeRam()
++static Q_UINT64 calculateFreeRam()
+ {
+ FILE *fd = fopen( "/proc/meminfo", "rt" );
+ if ( !fd )
+@@ -291,10 +264,10 @@
+ QTextIStream is( fd );
+ QString MemInfoBuf = is.read();
+
+- unsigned long int MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
+- unsigned long int Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
+- unsigned long int Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
+- unsigned long int Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
++ Q_UINT64 MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
++ Q_UINT64 Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
++ Q_UINT64 Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
++ Q_UINT64 Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
+ fclose( fd );
+
+ MemFree += Cached + Buffers + Slab;
+@@ -310,19 +283,19 @@
+
+ if ( retval !=-1 )
+ {
+- const int mem_unit = info.mem_unit;
++ Q_UINT64 mem_unit = info.mem_unit;
+
+- m_info[MEM_TOTALRAM] = formattedUnit( info.totalram * mem_unit );
+- unsigned long int totalFree = calculateFreeRam() * 1024;
+- kdDebug() << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
++ m_info[MEM_TOTALRAM] = formattedUnit( Q_UINT64(info.totalram) * mem_unit );
++ Q_UINT64 totalFree = calculateFreeRam() * 1024;
++ kdDebug(1242) << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
+ if ( totalFree > info.freeram * info.mem_unit || true )
+- m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( info.freeram * mem_unit ))
++ m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( Q_UINT64(info.freeram) * mem_unit ))
+ .arg( formattedUnit( totalFree - info.freeram * mem_unit ));
+ else
+- m_info[MEM_FREERAM] = formattedUnit( info.freeram * mem_unit );
++ m_info[MEM_FREERAM] = formattedUnit( Q_UINT64(info.freeram) * mem_unit );
+
+- m_info[MEM_TOTALSWAP] = formattedUnit( info.totalswap * mem_unit );
+- m_info[MEM_FREESWAP] = formattedUnit( info.freeswap * mem_unit );
++ m_info[MEM_TOTALSWAP] = formattedUnit( Q_UINT64(info.totalswap) * mem_unit );
++ m_info[MEM_FREESWAP] = formattedUnit( Q_UINT64(info.freeswap) * mem_unit );
+
+ m_info[SYSTEM_UPTIME] = convertSeconds( info.uptime );
+ }
+@@ -346,6 +319,7 @@
+ m_info[CPU_TEMP] =
+ readFromFile(QString("/proc/acpi/thermal_zone/%1/temperature").arg(names[i]), "temperature", ":");
+ m_info[CPU_TEMP] = m_info[CPU_TEMP].stripWhiteSpace();
++ m_info[CPU_TEMP].replace(" C",QString::fromUtf8("°C"));
+ if (!m_info[CPU_TEMP].isEmpty())
+ break;
+ }
+@@ -355,9 +329,12 @@
+ m_info[CPU_MODEL] = readFromFile( "/proc/cpuinfo", "cpu", ":" );
+ }
+
++
+ QString kio_sysinfoProtocol::diskInfo()
+ {
+- QString result = "<table>";
++ QString result = "<table><tr><th>" + i18n( "Device" ) + "</th><th>" + i18n( "Filesystem" ) + "</th><th>" +
++ i18n( "Total space" ) + "</th><th>" + i18n( "Available space" ) + "</th></tr>";
++
+ if ( fillMediaDevices() )
+ {
+ for ( QValueList<DiskInfo>::ConstIterator it = m_devices.constBegin(); it != m_devices.constEnd(); ++it )
+@@ -365,74 +342,72 @@
+ QString tooltip = i18n("Press the right mouse button for more options like Mount or Eject");
+
+ DiskInfo di = ( *it );
+- QString label = di.userLabel.isEmpty() ? di.label : di.userLabel;
++ unsigned int percent = 0;
++ Q_UINT64 usage = di.total - di.avail;
++ if (di.total)
++ percent = usage / ( di.total / 100);
++
++ KURL media;
++ media.setProtocol("media");
++ media.setPath("/" + di.name);
++
++ result += QString( "<tr><td>%1 <a href=\"%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>\n" ).
++ arg( icon( di.iconName ) ).arg( media.htmlURL() ).arg( htmlQuote(di.label) ).arg( di.fsType ).
++ arg( di.total ? formattedUnit( di.total) : QString::null).arg(di.mounted ?
++ formattedUnit (di.avail ) : QString::null).arg( htmlQuote(tooltip) );
++ if (di.mounted) {
++ QColor c;
++ c.setHsv(100-percent, 180, 230);
++ result += QString("<tr><td colspan=\"4\" class=\"bar\" width=\"100%\">"
++ "<div class=\"filled\" style=\"width: %1%; height: 1em; background-color: %3\">"
++ "%2</div></td></tr>\n")
++ .arg(percent).arg(formattedUnit(usage).replace(" ", "&nbsp;")).arg(c.name());
++ }
++ }
++ }
++ else // fall back to fstab parsing
++ {
++ FILE * fp;
++ if ( !( fp = setmntent( "/etc/fstab", "r" ) ) )
++ {
++ kdDebug(1242) << k_funcinfo << "Failed to open /etc/fstab" << endl;
++ return QString::null;
++ }
++
++#define FS_NAME mnt_ent->mnt_fsname // device-name
++#define FS_FILE mnt_ent->mnt_dir // mount-point
++#define FS_TYPE mnt_ent->mnt_type // fs-type
++
++ struct statfs sfs;
++ struct mntent *mnt_ent;
++ unsigned long long total, avail;
+
+- unsigned long long usage,percent,peer;
+- usage = di.total - di.avail;
+- peer = di.total / 100;
+-
+- peer == 0 ? percent = 0 : percent = usage / peer;
+-
+- if (percent < 20) {
+- result += QString( "<tr>"
+- " <td>%1</td>"
+- " <td width=\"90%\">"
+- " <table width=\"100%\">"
+- " <tr>"
+- " <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
+- " " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
+- " </td>"
+- " <td width=\"40%\" class=\"bar\">"
+- " <div style=\"width: %8%; height:10px;\"></div><span style=\"float:left; padding-top:2px\">&nbsp%9&nbsp</span>"
+- " </tr>"
+- " </table>"
+- " </td>"
+- "</tr>"
+- "<tr></tr>" ).
+-
+- arg( icon( di.iconName, 32 ) ).
+- arg( di.name ).
+- arg( tooltip).
+- arg( label ).
+- arg( di.fsType ).
+- arg( formattedUnit( di.total,0 ) ).
+- arg( formattedUnit( di.avail,0 ) ).
+- arg( di.mounted ? percent : 0).
+- arg( di.mounted ? formattedUnit( usage ) : QString::null );
+-
+- }
+-
+- else {
+-
+- result += QString( "<tr>"
+- " <td>%1</td>"
+- " <td width=\"90%\">"
+- " <table width=\"100%\">"
+- " <tr>"
+- " <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
+- " " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
+- " </td>"
+- " <td width=\"40%\" class=\"bar\">"
+- " <div style=\"width: %8%; height:10px;\">%9&nbsp</div>"
+- " </tr>"
+- " </table>"
+- " </td>"
+- "</tr>"
+- "<tr></tr>" ).
+-
+- arg( icon( di.iconName, 32 ) ).
+- arg( di.name ).
+- arg( tooltip).
+- arg( label ).
+- arg( di.fsType ).
+- arg( formattedUnit( di.total,0 ) ).
+- arg( formattedUnit( di.avail,0 ) ).
+- arg( di.mounted ? percent : 0).
+- arg( di.mounted ? formattedUnit( usage ) : QString::null );
+- }
++ while ( ( mnt_ent = getmntent( fp ) ) != NULL )
++ {
++ total = avail = 0;
++ if ( statfs( FS_FILE, &sfs ) == 0 )
++ {
++ total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
++ if ( total > 0 && strcmp( FS_TYPE, "subdomainfs" ) != 0 ) // discard empty or otherwise strange devices
++ {
++ avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
++ int lastSlash = QString( FS_NAME ).findRev( '/' );
++ QString deviceName = lastSlash != -1 ? QString( FS_NAME ).mid( lastSlash + 1 ) : QString( FS_NAME );
++ //kdDebug(1242) << k_funcinfo << "Device name: " << deviceName << endl;
++ QString model = deviceName.left( deviceName.length() - 1 );
++ model = readFromFile( "/proc/ide/" + model + "/model" );
++ QString devIcon = icon( iconForDevice( deviceName ), KIcon::SizeSmall );
++ result += QString( "<tr><td>%1 <a href=\"file:%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>" )
++ .arg( devIcon ).arg( FS_FILE ).arg( FS_FILE ).arg( FS_TYPE ).arg( formattedUnit( total ) )
++ .arg( formattedUnit( avail ) ).arg( model );
++ }
++ }
+ }
++ endmntent( fp );
+ }
++
+ result += "</table>";
++
+ return result;
+ }
+
+@@ -442,12 +417,12 @@
+ // query kded.networkstatus.status(QString host)
+ DCOPRef nsd( "kded", "networkstatus" );
+ nsd.setDCOPClient( m_dcopClient );
+- DCOPReply reply = nsd.call( "status", QString( "www.google.com" ) );
++ DCOPReply reply = nsd.call( "status", QString( "www.mandriva.com" ) );
+
+ if ( reply.isValid() )
+ return reply;
+
+- kdDebug() << k_funcinfo << "Reply is invalid" << endl;
++ kdDebug(1242) << k_funcinfo << "Reply is invalid" << endl;
+
+ return 0;
+ }
+@@ -539,7 +514,6 @@
+ #endif
+ }
+
+-#define INFO_DRI "/proc/dri/0/name"
+
+ bool kio_sysinfoProtocol::glInfo()
+ {
+@@ -621,7 +595,6 @@
+ return true;
+ }
+
+-
+ QString kio_sysinfoProtocol::netStatus( int code ) const
+ {
+ if ( code == 1 || code == 2 )
+@@ -641,7 +614,8 @@
+ QString kio_sysinfoProtocol::icon( const QString & name, int size ) const
+ {
+ QString path = KGlobal::iconLoader()->iconPath( name, -size );
+- return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"center\"/>" ).arg( path ).arg( size ).arg( size );
++ return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"bottom\"/>" ).arg(
++ htmlQuote(path) ).arg( size ).arg( size );
+ }
+
+ QString kio_sysinfoProtocol::iconForDevice( const QString & name ) const
+@@ -659,7 +633,6 @@
+
+ void kio_sysinfoProtocol::osInfo()
+ {
+- FILE *fp;
+ struct utsname uts;
+ uname( &uts );
+ m_info[ OS_SYSNAME ] = uts.sysname;
+@@ -670,14 +643,8 @@
+
+ m_info[ OS_USER ] = KUser().loginName();
+
+- if((fp =fopen ("/etc/lsb-release", "r"))==NULL)
+- m_info[ OS_SYSTEM ] = readFromFile( "/etc/issue" );
+- else
+- { fclose(fp);
+- m_info[ OS_SYSTEM ] = readFromFile( "/etc/lsb-release", "DISTRIB_DESCRIPTION", "=" );
+- m_info[ OS_VERSION ] = readFromFile( "/etc/lsb-release", "DISTRIB_CODENAME", "=" );
+- }
+-
++ m_info[ OS_SYSTEM ] = readFromFile( "/etc/mandriva-release" );
++ m_info[ OS_SYSTEM ].replace("X86-64","x86_64");
+ }
+
+ static const KCmdLineOptions options[] =
+@@ -698,10 +665,10 @@
+ KCmdLineArgs::addCmdLineOptions( options );
+ KApplication app( false, true );
+
+- kdDebug(7101) << "*** Starting kio_sysinfo " << endl;
++ kdDebug(1242) << "*** Starting kio_sysinfo " << endl;
+
+ if (argc != 4) {
+- kdDebug(7101) << "Usage: kio_sysinfo protocol domain-socket1 domain-socket2" << endl;
++ kdDebug(1242) << "Usage: kio_sysinfo protocol domain-socket1 domain-socket2" << endl;
+ exit(-1);
+ }
+
+@@ -710,7 +677,7 @@
+ kio_sysinfoProtocol slave( args->arg(1), args->arg(2));
+ slave.dispatchLoop();
+
+- kdDebug(7101) << "*** kio_sysinfo Done" << endl;
++ kdDebug(1242) << "*** kio_sysinfo Done" << endl;
+ return 0;
+ }
+ }
+@@ -723,15 +690,15 @@
+ if ( devices.isEmpty() )
+ return false;
+
+- kdDebug() << devices << endl;
++ kdDebug(1242) << devices << endl;
+
+ m_devices.clear();
+
+ LibHalContext *m_halContext = libhal_ctx_new();
+ if (!m_halContext)
+ {
+- kdDebug(1219) << "Failed to initialize HAL!" << endl;
+- return false;
++ kdDebug(1242) << "Failed to initialize HAL!" << endl;
++ return false;
+ }
+
+ DBusError error;
+@@ -786,30 +753,26 @@
+ struct statfs sfs;
+ if ( di.mounted && statfs( QFile::encodeName( di.mountPoint ), &sfs ) == 0 )
+ {
+- di.total = ( unsigned long long ) sfs.f_blocks * sfs.f_bsize;
++ di.total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
+ di.avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
+ } else if (m_halContext && di.id.startsWith("/org/freedesktop/Hal/" ) )
+- {
+- dbus_error_init(&error);
+- di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
+- if (dbus_error_is_set(&error))
+- di.total = 0;
+- }
++ {
++ dbus_error_init(&error);
++ di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
++ if (dbus_error_is_set(&error))
++ di.total = 0;
++ }
+
+- di.model = libhal_device_get_property_string( m_halContext, di.id.latin1( ), "block.storage_device", &error );
+- di.model = libhal_device_get_property_string( m_halContext, di.model.latin1( ), "storage.model", &error );
++ // guess the model
++ QString ideName = di.name;
++ ideName.truncate( 3 );
++ di.model = readFromFile( "/proc/ide/" + ideName + "/model" );
+
+- ++it; // skip separator
++ ++it; // skip separator
+
+- m_devices.append( di );
++ m_devices.append( di );
+ }
+
+- m_info[PRODUCT ] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.product", &error );
+- m_info[MANUFACTURER ] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.manufacturer", &error );
+- m_info[TYPE] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.chassis.type", &error );
+- m_info[BIOSVENDOR] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.vendor", &error );
+- m_info[BIOSVERSION] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.version", &error );
+-
+ libhal_ctx_free(m_halContext);
+
+ return true;
+diff -u -r kio-sysinfo-1.8.2/src/sysinfo.h kio-sysinfo-10.3/src/sysinfo.h
+--- kio-sysinfo-1.8.2/src/sysinfo.h 2007-08-21 08:13:36.000000000 -0300
++++ kio-sysinfo-10.3/src/sysinfo.h 2007-08-14 13:10:29.000000000 -0300
+@@ -51,7 +51,7 @@
+ QString iconName;
+
+ // own stuff
+- unsigned long long total, avail; // space on device
++ Q_UINT64 total, avail; // space on device
+ QString model; // physical device model (name)
+ };
+
+@@ -78,12 +78,11 @@
+ MEM_FREERAM,
+ MEM_TOTALSWAP,
+ MEM_FREESWAP,
+- STEPPING, //speedstep
+ SYSTEM_UPTIME, // in seconds
+ CPU_MODEL,
+ CPU_SPEED, // in MHz
+- CPU_CORES,
+- CPU_TEMP,
++ CPU_CORES,
++ CPU_TEMP,
+ OS_SYSNAME, // man 2 uname
+ OS_RELEASE,
+ OS_VERSION,
+@@ -94,31 +93,16 @@
+ GFX_VENDOR, // Display stuff
+ GFX_MODEL,
+ GFX_DRIVER,
+- SYSINFO_LAST,
+- PRODUCT,
+- MANUFACTURER,
+- TYPE,
+- BIOSVENDOR,
+- BIOSVERSION
++ SYSINFO_LAST
+ };
+
+ private:
+ /**
+- * Read sysinfo from (proc) filesystem. The data is assumed to be separated by newlines, with key:value pairs
+- *
+- * @param filename file to read from
+- * @param info requested field (if empty, return the first line from the file)
+- * @param sep separator
+- * NOT USED YET
+- */
+- // QString readFromFile( const QString & filename, const QString & info = QString::null, const char * sep = 0 ) const;
+-
+- /**
+ * Gather basic memory info
+ */
+ void memoryInfo();
+
+- /**
++ /**
+ * Gather CPU info
+ */
+ void cpuInfo();
+diff -u -r kio-sysinfo-1.8.2/admin/acinclude.m4.in kio-sysinfo-10.3/admin/acinclude.m4.in
+--- kio-sysinfo-1.8.2/admin/acinclude.m4.in 2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/acinclude.m4.in 2007-03-19 13:45:09.000000000 -0300
+@@ -983,7 +983,7 @@
+ X_INCLUDES="-I$x_includes"
+ fi
+
+-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
++if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
+ X_LDFLAGS=""
+ x_libraries="/usr/lib"; dnl better than nothing :-
+ else
+@@ -3198,7 +3198,7 @@
+ case $host in
+ *-*-linux-gnu)
+ CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
++ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
+ KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+ KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+ ;;
+@@ -4624,12 +4624,14 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.4",
+- [KDE_CHECK_PYTHON_INTERN("2.3",
+- [KDE_CHECK_PYTHON_INTERN("2.2",
+- [KDE_CHECK_PYTHON_INTERN("2.1",
+- [KDE_CHECK_PYTHON_INTERN("2.0",
+- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++ KDE_CHECK_PYTHON_INTERN("2.5",
++ [KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
++ [KDE_CHECK_PYTHON_INTERN("2.2",
++ [KDE_CHECK_PYTHON_INTERN("2.1",
++ [KDE_CHECK_PYTHON_INTERN("2.0",
++ [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++ ])
+ ])
+ ])
+ ])
+@@ -5213,9 +5215,10 @@
+ for dir in $javadirs; do
+ dnl Check for the java executable
+ if test -x "$dir/java"; then
++ sane_path=$(cd $dir; /bin/pwd)
+ dnl And also check for a libjvm.so somewhere under there
+ dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
+- if test "$dir" != "/usr/bin"; then
++ if test "$sane_path" != "/usr/bin"; then
+ libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
+ if test ! -f $libjvmdir/libjvm.so; then continue; fi
+ jredirs="$jredirs $dir"
+Somente em kio-sysinfo-1.8.2/admin: cvs-clean.pl
+diff -u -r kio-sysinfo-1.8.2/admin/cvs.sh kio-sysinfo-10.3/admin/cvs.sh
+--- kio-sysinfo-1.8.2/admin/cvs.sh 2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/cvs.sh 2007-05-14 04:16:15.000000000 -0300
+@@ -68,7 +68,7 @@
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ echo "*** $AUTOMAKE_STRING found."
+ UNSERMAKE=no
+ ;;
+@@ -316,7 +316,7 @@
+ fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+- VERSION="\"3.5.4\""
++ VERSION="\"3.5.7\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+ modulename=`pwd`;
+diff -u -r kio-sysinfo-1.8.2/admin/detect-autoconf.pl kio-sysinfo-10.3/admin/detect-autoconf.pl
+--- kio-sysinfo-1.8.2/admin/detect-autoconf.pl 2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/detect-autoconf.pl 2007-08-14 10:26:09.000000000 -0300
+@@ -46,6 +46,8 @@
+
+ ($version) = $file =~ /$prefix\/$program-?(.*)$/;
+ $version =~ s/-|\.//g;
++ # Don't check the -wrapper ones
++ next if $version eq "wrapper";
+
+ # Special case some programs to make sure it has a minimum version.
+ if (not $version and exists $minimumVersions{$program})
+Somente em kio-sysinfo-1.8.2/admin: detect-autoconf.sh
+diff -u -r kio-sysinfo-1.8.2/admin/libtool.m4.in kio-sysinfo-10.3/admin/libtool.m4.in
+--- kio-sysinfo-1.8.2/admin/libtool.m4.in 2006-08-31 15:56:03.000000000 -0300
++++ kio-sysinfo-10.3/admin/libtool.m4.in 2007-04-23 16:19:55.000000000 -0300
+@@ -1424,7 +1424,7 @@
+ libsuff=
+ if test "x$LINUX_64_MODE" = x64; then
+ # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64; then
++ if test -d /lib64 -a ! -h /lib64; then
+ libsuff=64
+ fi
+ fi
diff --git a/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch
new file mode 100644
index 000000000..c4fe2ef3f
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/kio-sysinfo-1.8.2-uz-translation.patch
@@ -0,0 +1,890 @@
+diff -u -r -N kio-sysinfo-1.8.2/configure kio-sysinfo-1.8.2.uz/configure
+--- kio-sysinfo-1.8.2/configure 2007-08-20 12:18:47.000000000 +0200
++++ kio-sysinfo-1.8.2.uz/configure 2007-08-23 17:11:06.000000000 +0200
+@@ -32988,6 +32988,8 @@
+
+ ac_config_files="$ac_config_files po/tr/Makefile"
+
++ac_config_files="$ac_config_files po/uz/Makefile"
++
+ ac_config_files="$ac_config_files src/Makefile"
+
+ cat >confcache <<\_ACEOF
+@@ -33612,6 +33614,7 @@
+ "po/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;;
+ "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;;
+ "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;;
++ "po/uz/Makefile") CONFIG_FILES="$CONFIG_FILES po/uz/Makefile" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -u -r -N kio-sysinfo-1.8.2/po/Makefile.in kio-sysinfo-1.8.2.uz/po/Makefile.in
+--- kio-sysinfo-1.8.2/po/Makefile.in 2007-08-20 12:14:51.000000000 +0200
++++ kio-sysinfo-1.8.2.uz/po/Makefile.in 2007-08-23 17:17:39.000000000 +0200
+@@ -314,7 +314,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. tr nl it pt_BR es de fr pl cs el hu ru
++SUBDIRS =. tr nl it pt_BR es de fr pl cs el hu ru uz
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am all-recursive
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/kio_sysinfo.po kio-sysinfo-1.8.2.uz/po/uz/kio_sysinfo.po
+--- kio-sysinfo-1.8.2/po/uz/kio_sysinfo.po 1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/kio_sysinfo.po 2007-08-22 23:23:20.000000000 +0200
+@@ -0,0 +1,244 @@
++# translation of kio_sysinfo-uz.po to Uzbek
++# This file is put in the public domain.
++#
++# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2007.
++msgid ""
++msgstr ""
++"Project-Id-Version: kio_sysinfo-uz\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2006-11-01 16:28+0300\n"
++"PO-Revision-Date: 2007-07-22 00:07+0200\n"
++"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
++"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
++
++#: ksysinfopart.cpp:72
++msgid "KSysinfo"
++msgstr "KSysinfo"
++
++#: sysinfo.cpp:67
++msgid "%1 GB"
++msgstr "%1 Гб"
++
++#: sysinfo.cpp:69
++msgid "%1 MB"
++msgstr "%1 Мб"
++
++#: sysinfo.cpp:71
++msgid "%1 KB"
++msgstr "%1 Кб"
++
++#: sysinfo.cpp:107 sysinfo.cpp:101
++msgid "My Computer"
++msgstr "Компьютер"
++
++#: sysinfo.cpp:102
++msgid "Folders, Harddisks, Removable Devices, System Information and more..."
++msgstr "Жилдлар, қаттиқ дисклар, олиб бўладиган ускуналар, тизим ҳақида маълумот ва ҳоказо..."
++
++#: sysinfo.cpp:108
++msgid "Looking for disk information..."
++msgstr "Диск ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:109
++msgid "Disks Information"
++msgstr "Диск ҳақида маълумот"
++
++#: sysinfo.cpp:113
++msgid "OS Information"
++msgstr "ОТ ҳақида маълумот"
++
++#: sysinfo.cpp:115
++msgid "OS:"
++msgstr "ОТ:"
++
++#: sysinfo.cpp:116
++msgid "Current user:"
++msgstr "Жорий фойдаланувчи:"
++
++#: sysinfo.cpp:117
++msgid "System:"
++msgstr "Тизим:"
++
++#: sysinfo.cpp:118
++msgid "KDE:"
++msgstr "KDE:"
++
++#: sysinfo.cpp:124
++msgid "Display Info"
++msgstr "Дисплей ҳақида маълумот"
++
++#: sysinfo.cpp:126
++msgid "Vendor:"
++msgstr "Ишлаб чиқарувчи:"
++
++#: sysinfo.cpp:127
++msgid "Model:"
++msgstr "Русуми:"
++
++#: sysinfo.cpp:129
++msgid "Driver:"
++msgstr "Драйвер:"
++
++#: sysinfo.cpp:136
++msgid "Getting OS information...."
++msgstr "ОТ ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:139
++msgid "Common Folders"
++msgstr "Умумий жилдлар"
++
++#: sysinfo.cpp:143
++msgid "My Home Folder"
++msgstr "Уй жилди"
++
++#: sysinfo.cpp:144
++msgid "Root Folder"
++msgstr "Туб жилди"
++
++#: sysinfo.cpp:145
++msgid "Network Folders"
++msgstr "Тармоқ жилдлари"
++
++#: sysinfo.cpp:149
++msgid "Looking up network status..."
++msgstr "Тармоқнинг ҳолати аниқланяпти..."
++
++#: sysinfo.cpp:152
++msgid "Network Status"
++msgstr "Тармоқнинг ҳолати"
++
++#: sysinfo.cpp:159
++msgid "Looking for CPU information..."
++msgstr "Процессор ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:163
++msgid "CPU Information"
++msgstr "Процессор ҳақида маълумот"
++
++#: sysinfo.cpp:165
++msgid "Processor (CPU):"
++msgstr "Процессор:"
++
++#: sysinfo.cpp:166
++msgid "Speed:"
++msgstr "Тезлик:"
++
++#: sysinfo.cpp:167
++msgid "%1 MHz"
++msgstr "%1 МГц"
++
++#: sysinfo.cpp:172
++msgid "Looking for memory information..."
++msgstr "Хотира ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:174
++msgid "Memory Information"
++msgstr "Хотира ҳақида маълумот"
++
++#: sysinfo.cpp:176
++msgid "Total memory (RAM):"
++msgstr "Жами хотира:"
++
++#: sysinfo.cpp:177
++msgid "Free memory:"
++msgstr "Бўш хотира:"
++
++#: sysinfo.cpp:178
++msgid "Used Memory"
++msgstr "Ишлатилган хотира"
++
++#: sysinfo.cpp:179
++msgid "Total swap:"
++msgstr "Жами своп:"
++
++#: sysinfo.cpp:180
++msgid "Free swap:"
++msgstr "Бўш своп:"
++
++#: sysinfo.cpp:184
++msgid "Looking for hardware information..."
++msgstr "Асбоб-ускуналар ҳақида маълумот аниқланяпти..."
++
++#: sysinfo.cpp:186
++msgid "Hardware Information"
++msgstr "Асбоб-ускуналар ҳақида маълумот"
++
++#: sysinfo.cpp:191
++msgid "Bios Vendor:"
++msgstr "Bios ишлаб чиқарувчиси:"
++
++#: sysinfo.cpp:192
++msgid "Bios Version:"
++msgstr "Bios версияси:"
++
++#: sysinfo.cpp:256
++msgid "%1 (+ %2 Caches)"
++msgstr "%1 (+ %2 кэш)"
++
++#: sysinfo.cpp:288
++msgid "Device"
++msgstr "Ускуна"
++
++#: sysinfo.cpp:288
++msgid "Filesystem"
++msgstr "Файл тизими"
++
++#: sysinfo.cpp:289
++msgid "Total space"
++msgstr "Жами жой"
++
++#: sysinfo.cpp:289
++msgid "Available space"
++msgstr "Бўш жой"
++
++#: sysinfo.cpp:295
++msgid "Press the right mouse button for more options like Mount or Eject"
++msgstr "Улаш ёки узиш буйруқлар учун сичқончанинг ўнг тугмасини босинг"
++
++#: sysinfo.cpp:478
++msgid "%1 (3D Support)"
++msgstr "%1 (3D имкониятлар)"
++
++#: sysinfo.cpp:480
++msgid "%1 (No 3D Support)"
++msgstr "%1 (3D имкониятларсиз)"
++
++#: sysinfo.cpp:491
++msgid "Network is <strong>unreachable</strong>"
++msgstr "Тармоққа <strong>уланмаган</strong>"
++
++#: sysinfo.cpp:493
++msgid "You are <strong>offline</strong>"
++msgstr "<strong>Офлайн</strong>"
++
++#: sysinfo.cpp:495
++msgid "Network is <strong>shutting down</strong>"
++msgstr "Тармоқдан <strong>узилмоқда</strong>"
++
++#: sysinfo.cpp:497
++msgid "<strong>Establishing</strong> connection to the network"
++msgstr "Тармоққа <strong>уланмоқда</strong>"
++
++#: sysinfo.cpp:499
++msgid "You are <strong>online</strong>"
++msgstr "<strong>Онлайн</strong>"
++
++#: sysinfo.cpp:501
++msgid "Unknown network status"
++msgstr "Тармоқнинг ҳолати номаълум"
++
++msgid "Total"
++msgstr "Жами"
++
++msgid "Available"
++msgstr "Бўш"
++
++msgid "Total Swap:"
++msgstr "Жами своп:"
++
++msgid " Free Swap:"
++msgstr "Бўш своп:"
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/Makefile.am kio-sysinfo-1.8.2.uz/po/uz/Makefile.am
+--- kio-sysinfo-1.8.2/po/uz/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/Makefile.am 2007-08-22 23:23:20.000000000 +0200
+@@ -0,0 +1,3 @@
++KDE_LANG=uz
++
++POFILES=AUTO
+diff -u -r -N kio-sysinfo-1.8.2/po/uz/Makefile.in kio-sysinfo-1.8.2.uz/po/uz/Makefile.in
+--- kio-sysinfo-1.8.2/po/uz/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ kio-sysinfo-1.8.2.uz/po/uz/Makefile.in 2007-08-22 23:24:22.000000000 +0200
+@@ -0,0 +1,599 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 483858 $
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = po/uz
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++GREP = @GREP@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
++KDE_INCLUDES = @KDE_INCLUDES@
++KDE_LDFLAGS = @KDE_LDFLAGS@
++KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
++KDE_MT_LIBS = @KDE_MT_LIBS@
++KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
++KDE_PLUGIN = @KDE_PLUGIN@
++KDE_RPATH = @KDE_RPATH@
++KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
++KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
++KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
++KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
++KDE_USE_FPIE = @KDE_USE_FPIE@
++KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
++KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
++KDE_USE_PIE = @KDE_USE_PIE@
++KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
++LDFLAGS = @LDFLAGS@
++LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
++LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
++LIBCOMPAT = @LIBCOMPAT@
++LIBCRYPT = @LIBCRYPT@
++LIBDL = @LIBDL@
++LIBJPEG = @LIBJPEG@
++LIBOBJS = @LIBOBJS@
++LIBPNG = @LIBPNG@
++LIBPTHREAD = @LIBPTHREAD@
++LIBRESOLV = @LIBRESOLV@
++LIBS = @LIBS@
++LIBSM = @LIBSM@
++LIBSOCKET = @LIBSOCKET@
++LIBTOOL = @LIBTOOL@
++LIBUCB = @LIBUCB@
++LIBUTIL = @LIBUTIL@
++LIBZ = @LIBZ@
++LIB_KAB = @LIB_KAB@
++LIB_KABC = @LIB_KABC@
++LIB_KDECORE = @LIB_KDECORE@
++LIB_KDED = @LIB_KDED@
++LIB_KDEPIM = @LIB_KDEPIM@
++LIB_KDEPRINT = @LIB_KDEPRINT@
++LIB_KDEUI = @LIB_KDEUI@
++LIB_KDNSSD = @LIB_KDNSSD@
++LIB_KFILE = @LIB_KFILE@
++LIB_KFM = @LIB_KFM@
++LIB_KHTML = @LIB_KHTML@
++LIB_KIMPROXY = @LIB_KIMPROXY@
++LIB_KIO = @LIB_KIO@
++LIB_KJS = @LIB_KJS@
++LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
++LIB_KPARTS = @LIB_KPARTS@
++LIB_KSPELL = @LIB_KSPELL@
++LIB_KSYCOCA = @LIB_KSYCOCA@
++LIB_KUNITTEST = @LIB_KUNITTEST@
++LIB_KUTILS = @LIB_KUTILS@
++LIB_POLL = @LIB_POLL@
++LIB_QPE = @LIB_QPE@
++LIB_QT = @LIB_QT@
++LIB_SMB = @LIB_SMB@
++LIB_X11 = @LIB_X11@
++LIB_XEXT = @LIB_XEXT@
++LIB_XRENDER = @LIB_XRENDER@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
++MCOPIDL = @MCOPIDL@
++MEINPROC = @MEINPROC@
++MOC = @MOC@
++MSGFMT = @MSGFMT@
++NOOPT_CFLAGS = @NOOPT_CFLAGS@
++NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PERL = @PERL@
++QTE_NORTTI = @QTE_NORTTI@
++QT_INCLUDES = @QT_INCLUDES@
++QT_LDFLAGS = @QT_LDFLAGS@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++TOPSUBDIRS = @TOPSUBDIRS@
++UIC = @UIC@
++UIC_TR = @UIC_TR@
++USER_INCLUDES = @USER_INCLUDES@
++USER_LDFLAGS = @USER_LDFLAGS@
++USE_EXCEPTIONS = @USE_EXCEPTIONS@
++USE_RTTI = @USE_RTTI@
++USE_THREADS = @USE_THREADS@
++VERSION = @VERSION@
++WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
++XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
++XMLLINT = @XMLLINT@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_INCLUDES = @X_INCLUDES@
++X_LDFLAGS = @X_LDFLAGS@
++X_PRE_LIBS = @X_PRE_LIBS@
++X_RPATH = @X_RPATH@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++all_includes = @all_includes@
++all_libraries = @all_libraries@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++include_ARTS_FALSE = @include_ARTS_FALSE@
++include_ARTS_TRUE = @include_ARTS_TRUE@
++include_x11_FALSE = @include_x11_FALSE@
++include_x11_TRUE = @include_x11_TRUE@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++kde_appsdir = @kde_appsdir@
++kde_bindir = @kde_bindir@
++kde_confdir = @kde_confdir@
++kde_datadir = @kde_datadir@
++kde_htmldir = @kde_htmldir@
++kde_icondir = @kde_icondir@
++kde_includes = @kde_includes@
++kde_kcfgdir = @kde_kcfgdir@
++kde_libraries = @kde_libraries@
++kde_libs_htmldir = @kde_libs_htmldir@
++kde_libs_prefix = @kde_libs_prefix@
++kde_locale = @kde_locale@
++kde_mimedir = @kde_mimedir@
++kde_moduledir = @kde_moduledir@
++kde_qtver = @kde_qtver@
++kde_servicesdir = @kde_servicesdir@
++kde_servicetypesdir = @kde_servicetypesdir@
++kde_sounddir = @kde_sounddir@
++kde_styledir = @kde_styledir@
++kde_templatesdir = @kde_templatesdir@
++kde_wallpaperdir = @kde_wallpaperdir@
++kde_widgetdir = @kde_widgetdir@
++kdeinitdir = @kdeinitdir@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++qt_includes = @qt_includes@
++qt_libraries = @qt_libraries@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
++unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
++unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++x_includes = @x_includes@
++x_libraries = @x_libraries@
++xdg_appsdir = @xdg_appsdir@
++xdg_directorydir = @xdg_directorydir@
++xdg_menudir = @xdg_menudir@
++KDE_LANG = uz
++#>- POFILES = AUTO
++#>+ 2
++POFILES = kio_sysinfo.po
++GMOFILES = kio_sysinfo.gmo
++#>- all: all-am
++#>+ 1
++all: all-nls docs-am all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \
++#>- cd $(top_srcdir) && \
++#>- $(AUTOMAKE) --gnu po/uz/Makefile
++#>+ 12
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu po/uz/Makefile
++ cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++#>- distdir: $(DISTFILES)
++#>+ 1
++distdir: distdir-nls $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++#>- uninstall: uninstall-am
++#>+ 1
++uninstall: uninstall-nls uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++#>- clean: clean-am
++#>+ 1
++clean: kde-rpo-clean clean-am
++
++#>- clean-am: clean-generic clean-libtool mostlyclean-am
++#>+ 1
++clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++ -rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++#>- install-data-am:
++#>+ 1
++install-data-am: install-nls
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++#>- maintainer-clean: maintainer-clean-am
++#>+ 1
++maintainer-clean: clean-nls maintainer-clean-am
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++ distclean distclean-generic distclean-libtool distdir dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++ uninstall-info-am
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=kio_sysinfo.po Makefile.in Makefile.am
++
++#>+ 4
++kio_sysinfo.gmo: kio_sysinfo.po
++ rm -f kio_sysinfo.gmo; $(GMSGFMT) -o kio_sysinfo.gmo $(srcdir)/kio_sysinfo.po
++ test ! -f kio_sysinfo.gmo || touch kio_sysinfo.gmo
++
++#>+ 3
++clean-nls:
++ -rm -f kio_sysinfo.gmo
++
++#>+ 10
++install-nls:
++ $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES
++ @for base in kio_sysinfo ; do \
++ echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++ if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++ elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\
++ fi ;\
++ done
++
++
++#>+ 3
++uninstall-nls:
++ rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_sysinfo.mo
++
++#>+ 2
++all-nls: $(GMOFILES)
++
++#>+ 8
++distdir-nls:$(GMOFILES)
++ for file in $(POFILES); do \
++ cp $(srcdir)/$$file $(distdir); \
++ done
++ for file in $(GMOFILES); do \
++ cp $(srcdir)/$$file $(distdir); \
++ done
++
++#>+ 2
++docs-am:
++
++#>+ 15
++force-reedit:
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu po/uz/Makefile
++ cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in
++
++
++#>+ 21
++clean-bcheck:
++ rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-am
++
++bcheck-am:
++ @for i in ; do \
++ if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++ echo "$$i"; \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ rm -f $$i.bchecktest.cc; exit 1; \
++ fi ; \
++ echo "" >> $$i.bchecktest.cc.class; \
++ perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++ rm -f a.out; \
++ fi ; \
++ done
++
++
++#>+ 3
++final:
++ $(MAKE) all-am
++
++#>+ 3
++final-install:
++ $(MAKE) install-am
++
++#>+ 3
++no-final:
++ $(MAKE) all-am
++
++#>+ 3
++no-final-install:
++ $(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++ -rm -f *.rpo
++
++#>+ 3
++nmcheck:
++nmcheck-am: nmcheck
diff --git a/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png b/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png
new file mode 100644
index 000000000..2e88eacb3
--- /dev/null
+++ b/mandriva/2010.2/applications/kio-sysinfo/sysinfo.png
Binary files differ
diff --git a/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch b/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch
new file mode 100644
index 000000000..2e31a0a03
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav-0.41.1-pwd-echo.patch
@@ -0,0 +1,10 @@
+--- klamav-0.41.1/src/freshklam.cpp.pwd-echo 2007-07-24 22:51:54.000000000 +0300
++++ klamav-0.41.1/src/freshklam.cpp 2007-11-07 15:53:51.000000000 +0200
+@@ -225,6 +225,7 @@ Freshklam::Freshklam(QWidget *parent, co
+ //proxy_pass_label->setFixedSize(proxy_pass_label->sizeHint());
+ proxy_dir_layout->addWidget(proxy_pass_label,1,3);
+ proxyPass = new KLineEdit(proxy_hlp);
++ proxyPass->setEchoMode(KLineEdit::Password);
+ proxy_dir_layout->addWidget(proxyPass,1,4);
+ proxyPass->setText(proxyPassText);
+
diff --git a/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch b/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch
new file mode 100644
index 000000000..8ff6a65a1
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav-0.42-fix-window-size.patch
@@ -0,0 +1,343 @@
+--- src/specialfiletypes.ui.small 2008-03-29 03:37:21.000000000 +0100
++++ src/specialfiletypes.ui 2008-03-29 03:37:27.000000000 +0100
+@@ -8,7 +8,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>399</width>
++ <width>540</width>
+ <height>385</height>
+ </rect>
+ </property>
+@@ -34,7 +34,7 @@
+ <rect>
+ <x>20</x>
+ <y>30</y>
+- <width>330</width>
++ <width>480</width>
+ <height>210</height>
+ </rect>
+ </property>
+
+--- src/archivelimits.ui.small 2008-03-29 03:45:04.000000000 +0100
++++ src/archivelimits.ui 2008-03-29 03:46:18.000000000 +0100
+@@ -8,7 +8,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>388</width>
++ <width>474</width>
+ <height>377</height>
+ </rect>
+ </property>
+@@ -46,9 +46,9 @@
+ </property>
+ <property name="geometry">
+ <rect>
+- <x>11</x>
+- <y>11</y>
+- <width>366</width>
++ <x>10</x>
++ <y>10</y>
++ <width>430</width>
+ <height>230</height>
+ </rect>
+ </property>
+@@ -63,7 +63,7 @@
+ <rect>
+ <x>11</x>
+ <y>34</y>
+- <width>350</width>
++ <width>400</width>
+ <height>160</height>
+ </rect>
+ </property>
+
+
+--- src/autoscanoptions.ui.small 2008-03-29 03:51:50.000000000 +0100
++++ src/autoscanoptions.ui 2008-03-29 03:52:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>391</width>
++ <width>529</width>
+ <height>386</height>
+ </rect>
+ </property>
+@@ -48,7 +48,7 @@
+ <rect>
+ <x>10</x>
+ <y>10</y>
+- <width>370</width>
++ <width>460</width>
+ <height>180</height>
+ </rect>
+ </property>
+@@ -113,7 +113,7 @@
+ <rect>
+ <x>10</x>
+ <y>25</y>
+- <width>340</width>
++ <width>440</width>
+ <height>130</height>
+ </rect>
+ </property>
+
+--- src/archivetypes.ui.old 2008-03-29 12:37:00.000000000 +0100
++++ src/archivetypes.ui 2008-03-29 12:37:15.000000000 +0100
+@@ -35,7 +35,7 @@
+ <x>20</x>
+ <y>30</y>
+ <width>330</width>
+- <height>284</height>
++ <height>320</height>
+ </rect>
+ </property>
+ <grid>
+@@ -44,7 +44,7 @@
+ </property>
+ <widget class="QCheckBox" row="6" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanDeb</cstring>
++ <cstring>kcfg_ScanDeb</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Deb files using</string>
+@@ -55,7 +55,7 @@
+ </widget>
+ <widget class="QCheckBox" row="5" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanJar</cstring>
++ <cstring>kcfg_ScanJar</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Jar files using</string>
+@@ -66,7 +66,7 @@
+ </widget>
+ <widget class="QCheckBox" row="7" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanTar</cstring>
++ <cstring>kcfg_ScanTar</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Tar files using</string>
+@@ -77,7 +77,7 @@
+ </widget>
+ <widget class="QCheckBox" row="4" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanLzh</cstring>
++ <cstring>kcfg_ScanLzh</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Lzh files using</string>
+@@ -88,12 +88,12 @@
+ </widget>
+ <widget class="KURLComboRequester" row="7" column="1">
+ <property name="name">
+- <cstring>kcfg_TarUsing</cstring>
++ <cstring>kcfg_TarUsing</cstring>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="3" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanZoo</cstring>
++ <cstring>kcfg_ScanZoo</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Zoo files using</string>
+@@ -104,22 +104,22 @@
+ </widget>
+ <widget class="KURLComboRequester" row="3" column="1">
+ <property name="name">
+- <cstring>kcfg_ZooUsing</cstring>
++ <cstring>kcfg_ZooUsing</cstring>
+ </property>
+ </widget>
+ <widget class="KURLComboRequester" row="4" column="1">
+ <property name="name">
+- <cstring>kcfg_LzhUsing</cstring>
++ <cstring>kcfg_LzhUsing</cstring>
+ </property>
+ </widget>
+ <widget class="KURLComboRequester" row="0" column="1">
+ <property name="name">
+- <cstring>kcfg_ZipUsing</cstring>
++ <cstring>kcfg_ZipUsing</cstring>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="1" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanRar</cstring>
++ <cstring>kcfg_ScanRar</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Rar files using</string>
+@@ -130,7 +130,7 @@
+ </widget>
+ <widget class="QCheckBox" row="0" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanZip</cstring>
++ <cstring>kcfg_ScanZip</cstring>
+ </property>
+ <property name="text">
+ <string>Scan &amp;Zip files using</string>
+@@ -141,27 +141,27 @@
+ </widget>
+ <widget class="KURLComboRequester" row="5" column="1">
+ <property name="name">
+- <cstring>kcfg_JarUsing</cstring>
++ <cstring>kcfg_JarUsing</cstring>
+ </property>
+ </widget>
+ <widget class="KURLComboRequester" row="1" column="1">
+ <property name="name">
+- <cstring>kcfg_RarUsing</cstring>
++ <cstring>kcfg_RarUsing</cstring>
+ </property>
+ </widget>
+ <widget class="KURLComboRequester" row="6" column="1">
+ <property name="name">
+- <cstring>kcfg_DebUsing</cstring>
++ <cstring>kcfg_DebUsing</cstring>
+ </property>
+ </widget>
+ <widget class="KURLComboRequester" row="8" column="1">
+ <property name="name">
+- <cstring>kcfg_TgzUsing</cstring>
++ <cstring>kcfg_TgzUsing</cstring>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="8" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanTgz</cstring>
++ <cstring>kcfg_ScanTgz</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Tgz files using</string>
+@@ -172,12 +172,12 @@
+ </widget>
+ <widget class="KURLComboRequester" row="2" column="1">
+ <property name="name">
+- <cstring>kcfg_ArjUsing</cstring>
++ <cstring>kcfg_ArjUsing</cstring>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="2" column="0">
+ <property name="name">
+- <cstring>kcfg_ScanArj</cstring>
++ <cstring>kcfg_ScanArj</cstring>
+ </property>
+ <property name="text">
+ <string>Scan Arj files using</string>
+--- src/logoptions.ui.old 2008-03-29 12:46:38.000000000 +0100
++++ src/logoptions.ui 2008-03-29 12:47:18.000000000 +0100
+@@ -38,7 +38,7 @@
+ <rect>
+ <x>12</x>
+ <y>69</y>
+- <width>161</width>
++ <width>330</width>
+ <height>21</height>
+ </rect>
+ </property>
+@@ -48,13 +48,52 @@
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
++ <cstring>layout5</cstring>
++ </property>
++ <property name="geometry">
++ <rect>
++ <x>12</x>
++ <y>17</y>
++ <width>350</width>
++ <height>40</height>
++ </rect>
++ </property>
++ <grid>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QSpinBox" row="0" column="1">
++ <property name="name">
++ <cstring>kcfg_ExpireDays</cstring>
++ </property>
++ </widget>
++ <widget class="QLabel" row="0" column="0">
++ <property name="name">
++ <cstring>MaxMBsEx</cstring>
++ </property>
++ <property name="text">
++ <string>Expire events after</string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="0" column="2">
++ <property name="name">
++ <cstring>MaxMBsEx_2</cstring>
++ </property>
++ <property name="text">
++ <string>day(s)</string>
++ </property>
++ </widget>
++ </grid>
++ </widget>
++ <widget class="QLayoutWidget">
++ <property name="name">
+ <cstring>layout4</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>91</y>
+- <width>300</width>
++ <width>350</width>
+ <height>210</height>
+ </rect>
+ </property>
+@@ -141,45 +180,6 @@
+ </widget>
+ </vbox>
+ </widget>
+- <widget class="QLayoutWidget">
+- <property name="name">
+- <cstring>layout5</cstring>
+- </property>
+- <property name="geometry">
+- <rect>
+- <x>12</x>
+- <y>17</y>
+- <width>300</width>
+- <height>40</height>
+- </rect>
+- </property>
+- <grid>
+- <property name="name">
+- <cstring>unnamed</cstring>
+- </property>
+- <widget class="QSpinBox" row="0" column="1">
+- <property name="name">
+- <cstring>kcfg_ExpireDays</cstring>
+- </property>
+- </widget>
+- <widget class="QLabel" row="0" column="0">
+- <property name="name">
+- <cstring>MaxMBsEx</cstring>
+- </property>
+- <property name="text">
+- <string>Expire events after</string>
+- </property>
+- </widget>
+- <widget class="QLabel" row="0" column="2">
+- <property name="name">
+- <cstring>MaxMBsEx_2</cstring>
+- </property>
+- <property name="text">
+- <string>day(s)</string>
+- </property>
+- </widget>
+- </grid>
+- </widget>
+ </widget>
+ </widget>
+ <layoutdefaults spacing="6" margin="11"/>
diff --git a/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff b/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff
new file mode 100644
index 000000000..0ab8c22f7
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav-0.46-default-db-dir.diff
@@ -0,0 +1,12 @@
+diff -p -up klamav-0.46/src/klammail/clamdmail.c~ klamav-0.46/src/klammail/clamdmail.c
+--- klamav-0.46/src/klammail/clamdmail.c~ 2009-02-28 11:27:27.000000000 +0100
++++ klamav-0.46/src/klammail/clamdmail.c 2009-03-14 17:16:32.000000000 +0100
+@@ -576,7 +576,7 @@ void startclamd(struct optstruct *opt)
+ break;
+ }
+ }else{
+- fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n");
++ fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n");
+ }
+ //fprintf(tmp,"ScanMail\n");
+ if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7")))
diff --git a/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch b/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch
new file mode 100644
index 000000000..c81edd2eb
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav-0.46-gcc43.patch
@@ -0,0 +1,33 @@
+diff -p -up klamav-0.46/src/ctcron.cpp.gcc43 klamav-0.46/src/ctcron.cpp
+--- klamav-0.46/src/ctcron.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
++++ klamav-0.46/src/ctcron.cpp 2009-03-14 16:57:40.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include "ctvariable.h"
+ #include <pwd.h> // pwd, getpwnam(), getpwuid()
+ #include <assert.h>
++#include <stdlib.h> // system
+
+ #include <qfile.h>
+
+diff -p -up klamav-0.46/src/ctunit.cpp.gcc43 klamav-0.46/src/ctunit.cpp
+--- klamav-0.46/src/ctunit.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
++++ klamav-0.46/src/ctunit.cpp 2009-03-14 16:57:40.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include <stdlib.h> // sprintf
+ #include <stdio.h> // sprintf
+ #include <ctype.h> // tolower
++#include <stdlib.h> // atoi
+
+ using namespace std;
+
+diff -p -up klamav-0.46/src/ktview.cpp.gcc43 klamav-0.46/src/ktview.cpp
+--- klamav-0.46/src/ktview.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
++++ klamav-0.46/src/ktview.cpp 2009-03-14 16:57:40.000000000 +0100
+@@ -20,6 +20,7 @@
+ // #include <strstream.h>
+ // #endif
+
++#include <stdlib.h> // system
+
+ #include <qfileinfo.h>
+
diff --git a/mandriva/2010.2/applications/klamav/klamav.sh b/mandriva/2010.2/applications/klamav/klamav.sh
new file mode 100755
index 000000000..4f091eedb
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+KLAMAV_DIR=${HOME}/.klamav
+
+if [ ! -d ${KLAMAV_DIR}/database -o ! -d ${KLAMAV_DIR}/quarantine ]; then
+ mkdir -p ${KLAMAV_DIR}/{database,quarantine}
+fi
+
+if [ ! -f ${KLAMAV_DIR}/database/main.cvd -o ! -f ${KLAMAV_DIR}/database/daily.cvd ]; then
+ cp -f /var/lib/clamav/* ${KLAMAV_DIR}/database
+fi
+
+klamav-real
diff --git a/mandriva/2010.2/applications/klamav/klamav.spec b/mandriva/2010.2/applications/klamav/klamav.spec
new file mode 100644
index 000000000..d2be3c790
--- /dev/null
+++ b/mandriva/2010.2/applications/klamav/klamav.spec
@@ -0,0 +1,220 @@
+Summary: KDE frontend for the Clam AntiVirus virus scanner
+Name: klamav
+Version: 0.46
+Release: %mkrel 4
+License: GPLv2+
+Group: File tools
+URL: http://sourceforge.net/projects/klamav/
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
+Source1: klamav.sh
+Patch0: klamav-0.46-default-db-dir.diff
+Patch1: klamav-0.42-fix-window-size.patch
+Patch2: klamav-0.41.1-pwd-echo.patch
+Patch3: klamav-0.46-gcc43.patch
+BuildRequires: kdelibs-devel
+BuildRequires: clamav-devel >= 0.93
+BuildRequires: desktop-file-utils
+Requires: clamav >= 0.93
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+KlamAV provides ClamAV protection for the KDE desktop. It includes
+'on access' scanning, manual scanning, quarantine management,
+downloading of updates, mail scanning, and automated installation.
+
+%prep
+
+%setup -qn %{name}-%{version}-source/%{name}-%{version}
+#patch0 -p1 -b .default_db_directory
+%patch1 -p0 -b .fix_window_size
+%patch2 -p1 -b .pwd-echo
+%patch3 -p1 -b .gcc43
+
+%build
+%configure_kde3
+%make
+
+%install
+rm -Rf %{buildroot}
+
+%makeinstall_std
+
+mkdir -p %{buildroot}/{%{_menudir},%{_miconsdir},%{_liconsdir}}
+
+mkdir -p %{buildroot}%{_kde3_datadir}/applications/kde
+desktop-file-install --vendor='' --delete-original \
+ --dir=%{buildroot}%{_kde3_datadir}/applications/kde \
+ --remove-category="Application" \
+ --add-category="Security" \
+ %{buildroot}%{_kde3_datadir}/applnk/Utilities/klamav.desktop
+
+
+# Copy translated virus browser
+# Next release this shoul be made standard
+mv %{buildroot}%{_kde3_bindir}/klamav %{buildroot}%{_kde3_bindir}/klamav-real
+cp %SOURCE1 %{buildroot}%{_kde3_bindir}/klamav
+
+%find_lang %{name} --with-html --all-name
+
+%if %mdkversion < 200900
+%post
+%update_menus
+%endif
+
+%if %mdkversion < 200900
+%postun
+%clean_menus
+%endif
+
+%clean
+rm -Rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%attr (755,root,root) %{_kde3_bindir}/*
+%{_kde3_datadir}/apps/%{name}
+%{_kde3_iconsdir}/*/*/*/%{name}.png
+%{_kde3_datadir}/applications/kde/*.desktop
+%{_kde3_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
+%{_kde3_datadir}/config.kcfg/*.kcfg
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.46-4mdv2010.2
++ Rebuild for Trinity
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.46-3mdv2010.1
++ Rebuild for MDV 2010.1
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 0.46-2mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Sat Mar 14 2009 Buchan Milne <bgmilne@mandriva.org> 0.46-1mdv2009.1
++ Revision: 355062
+- New version 0.46
+- drop vlamav 0.nf patch, fixed upstream
+- rediff patches
+
+* Thu Sep 04 2008 Oden Eriksson <oeriksson@mandriva.com> 0.44-2mdv2009.0
++ Revision: 280731
+- fix build against clamav-0.94 libs
+- rebuild against new clamav libs
+
+* Sun Jul 06 2008 Funda Wang <fundawang@mandriva.org> 0.44-1mdv2009.0
++ Revision: 232258
+- New version 0.44
+- switch to /opt
+- drop patch4 not needed
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+
+* Wed May 21 2008 Oden Eriksson <oeriksson@mandriva.com> 0.42-4mdv2009.0
++ Revision: 209718
+- bump release
+- sync with fedora
+- rebuild
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Fix some UI issues
+
+* Sun Jan 20 2008 Funda Wang <fundawang@mandriva.org> 0.42-1mdv2008.1
++ Revision: 155212
+- New version 0.42
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - rebuild
+ - kill re-definition of %%buildroot on Pixel's request
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+* Thu Aug 09 2007 Funda Wang <fundawang@mandriva.org> 0.41.1-2mdv2008.0
++ Revision: 60769
+- drop old menu
+- New version 0.41.1
+
+
+* Sun Mar 04 2007 Emmanuel Andry <eandry@mandriva.org> 0.41-2mdv2007.0
++ Revision: 131925
+- rebuild for new libclamav
+
+* Sat Feb 24 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 0.41-1mdv2007.1
++ Revision: 125377
+- new version
+- use --disable-rpath
+- pass some other options into the %%configure
+- drop sources 2,4,5
+- use %%find_lang
+- some cleans in spec file
+
+* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-2mdv2007.1
++ Revision: 96844
+- remove support for version older than MDV10.1
+
+* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-1mdv2007.1
++ Revision: 96583
+- New version 0.39
+ drop patches 1 2 3 4 5
+
+ + Andreas Hasenack <andreas@mandriva.com>
+ - renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
+
+ + Helio Chissini de Castro <helio@mandriva.com>
+ - Fix for proxy cnofigurations. Not everyone use proxy with user and pwd.
+ - Fixed media:/ or devices:/ patch
+ - Added patch for translate html files. Still not the optimal solution, but
+ works for current requirements
+ - Added translation for .html about files
+ - Fixded pt_BR translation. Patch will be submitted upstream
+ - Added better ui handling by Gustavo Boiko <boiko@mandriva.com>, using media:/
+ on KDE 3.5
+ - No nrpoc compilation
+ - Upload packages with OEM fixes
+ - Created package structure for klamav.
+
+* Tue Nov 22 2005 Laurent MONTEL <lmontel@mandriva.com> 0.32-1
+- 0.32
+
+* Fri Nov 18 2005 Oden Eriksson <oeriksson@mandriva.com> 0.22.1-2mdk
+- rebuilt against openssl-0.9.8a
+
+* Fri Aug 26 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.22.1-1mdk
+- New release 0.22.1
+
+* Tue Jul 26 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.22-1mdk
+- New release 0.22
+
+* Wed Jul 13 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.20.1-1mdk
+- New release 0.20.1
+
+* Fri May 27 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.20-1mdk
+- 0.20
+
+* Tue May 24 2005 Eskild Hustvedt <eskild@mandriva.org> 0.17.2-3mdk
+- Rebuild
+
+* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-2mdk
+- Fix BuildRequires
+
+* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-1mdk
+- 0.17.2
+
+* Wed Apr 13 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.17-1mdk
+- 0.17
+- rediff P0
+- nuke rpath
+
+* Sat Apr 09 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.12.1-1mdk
+- 0.12.1
+- use the %%mkrel macro
+- fix description
+- fix P0, in another place
+
+* Sat Oct 16 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.06-1mdk
+- 0.06
+
+* Wed Sep 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 0.05-1mdk
+- first Mandrake package
+- p0 to use our clamav-db path
+
diff --git a/mandriva/2010.2/applications/kmetabar/kmetabar-fix.patch b/mandriva/2010.2/applications/kmetabar/kmetabar-fix.patch
new file mode 100644
index 000000000..6e8ef1a23
--- /dev/null
+++ b/mandriva/2010.2/applications/kmetabar/kmetabar-fix.patch
@@ -0,0 +1,84 @@
+diff -Naur kmetabar.orig/src/kmetabar_widget.cpp kmetabar/src/kmetabar_widget.cpp
+--- kmetabar.orig/src/kmetabar_widget.cpp 2006-11-06 18:48:04.000000000 +0200
++++ kmetabar/src/kmetabar_widget.cpp 2006-11-06 18:49:40.000000000 +0200
+@@ -141,7 +141,7 @@
+ //connect(config_button, SIGNAL(clicked()), this, SLOT(slotShowConfigDialog()));
+
+ icon = new KURLLabel(main_frame_bottom);
+- icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
++ //icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ connect(icon, SIGNAL(leftClickedURL()), this, SLOT(slotShowPropertiesDialog()));
+
+ name_label = new KSqueezedTextLabel(main_frame_bottom);
+@@ -176,28 +176,28 @@
+ top_action_frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+ action1 = new KURLLabel(top_action_frame);
+- action1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
++ //action1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+ action1->setAlignment ( Qt::AlignHCenter );
+ connect (action1, SIGNAL(leftClickedURL()), this, SLOT(slotaction1()));
+ connect (action1, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage1(const QString&)));
+ connect (action1, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
+
+ action2 = new KURLLabel(top_action_frame);
+- action2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
++ //action2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+ action2->setAlignment ( Qt::AlignHCenter );
+ connect (action2, SIGNAL(leftClickedURL()), this, SLOT(slotaction2()));
+ connect (action2, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage2(const QString&)));
+ connect (action2, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
+
+ action3 = new KURLLabel(top_action_frame);
+- action3->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
++ //action3->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+ action3->setAlignment ( Qt::AlignHCenter );
+ connect (action3, SIGNAL(leftClickedURL()), this, SLOT(slotaction3()));
+ connect (action3, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage3(const QString&)));
+ connect (action3, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
+
+ action4 = new KURLLabel(top_action_frame);
+- action4->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
++ //action4->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+ action4->setAlignment ( Qt::AlignHCenter );
+ connect (action4, SIGNAL(leftClickedURL()), this, SLOT(slotaction4()));
+ connect (action4, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage4(const QString&)));
+@@ -633,7 +633,7 @@
+ show_more = new KURLLabel(open_frame->mainWidget());
+ show_more->setURL("more");
+ show_more->setPixmap(SmallIcon("1downarrow"));
+- show_more->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
++ //show_more->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ show_more->setAlignment(Qt::AlignRight);
+ show_more->show();
+
+@@ -1801,7 +1801,7 @@
+ show_more_actions = new KURLLabel(action_frame->mainWidget());
+ show_more_actions->setURL("more");
+ show_more_actions->setPixmap(SmallIcon("1downarrow"));
+- show_more_actions->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
++ //show_more_actions->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ show_more_actions->setAlignment(Qt::AlignRight);
+
+ connect(show_more_actions, SIGNAL(leftClickedURL()), this, SLOT(slotShowMoreActions()));
+diff -Naur kmetabar.orig/src/metaframe.cpp kmetabar/src/metaframe.cpp
+--- kmetabar.orig/src/metaframe.cpp 2006-11-06 18:48:04.000000000 +0200
++++ kmetabar/src/metaframe.cpp 2006-11-06 18:56:07.000000000 +0200
+@@ -53,7 +53,7 @@
+ isToggled = false;
+
+ titleButton = new HeaderLabel(this, isToggled);
+- titleButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
++ //titleButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ titleButton->setAlignment( Qt::AlignHCenter );
+ connect (titleButton, SIGNAL(leftClickedURL()), this, SLOT(slotaction()));
+
+@@ -216,7 +216,7 @@
+ HeaderLabel::HeaderLabel(QWidget *parent, bool toggled) : KURLLabel(parent)
+ {
+ isToggled = toggled;
+- this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
++ //this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ this->setAlignment( Qt::AlignHCenter );
+ this->setGlow(false);
+ this->setFloat(true);
diff --git a/mandriva/2010.2/applications/kmetabar/kmetabar-kdemacros.diff b/mandriva/2010.2/applications/kmetabar/kmetabar-kdemacros.diff
new file mode 100644
index 000000000..1b796a0a6
--- /dev/null
+++ b/mandriva/2010.2/applications/kmetabar/kmetabar-kdemacros.diff
@@ -0,0 +1,52 @@
+--- src/kmetabar.h.orig 2005-09-06 12:12:39.000000000 +0200
++++ src/kmetabar.h 2005-09-06 12:12:59.000000000 +0200
+@@ -8,10 +8,15 @@
+ #include <konqsidebarplugin.h>
+ #include <qstring.h>
+ #include <qscrollview.h>
++#include <kdemacros.h>
+
+ #include "kmetabar_widget.h"
+ #include "metascrollview.h"
+
++#ifndef KDE_EXPORT
++#define KDE_EXPORT
++#endif
++
+ class Metabar : public KonqSidebarPlugin
+ {
+ Q_OBJECT
+--- src/kmetabar.cpp.orig 2005-09-06 12:00:33.000000000 +0200
++++ src/kmetabar.cpp 2005-09-06 12:16:13.000000000 +0200
+@@ -2,9 +2,13 @@
+ #include <kinstance.h>
+ #include <qwidget.h>
+ #include <kdebug.h>
++#include <kdemacros.h>
+ #include "kmetabar.h"
+ #include "kmetabar.moc"
+
++#ifndef KDE_EXPORT
++#define KDE_EXPORT
++#endif
+
+ Metabar::Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name):
+ KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
+@@ -40,7 +44,7 @@
+
+
+ extern "C" {
+- KDE_EXPORT bool add_konqsidebar_kmetabar(QString* fn, QString* param, QMap<QString,QString> *map) {
++ bool add_konqsidebar_kmetabar(QString* fn, QString* param, QMap<QString,QString> *map) {
+ Q_UNUSED(param);
+
+ map->insert("Type", "Link");
+@@ -55,7 +59,7 @@
+
+ extern "C"
+ {
+- KDE_EXPORT void* create_konqsidebar_kmetabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
++ void* create_konqsidebar_kmetabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
+ {
+ return new Metabar(instance,par,widp,desktopname,name);
+ }
diff --git a/mandriva/2010.2/applications/kmetabar/kmetabar.spec b/mandriva/2010.2/applications/kmetabar/kmetabar.spec
new file mode 100644
index 000000000..a454c37c9
--- /dev/null
+++ b/mandriva/2010.2/applications/kmetabar/kmetabar.spec
@@ -0,0 +1,68 @@
+%define realversion 0.2-beta2
+
+
+
+Summary: Konqueror Sidebar Plugin that shows Metadata and Information
+Name: kmetabar
+Version: 0.2beta2
+Release: %mkrel 3
+Source: http://kde-apps.org/content/files/28725-kmetabar-%{realversion}.tar.bz2
+URL: http://kde-apps.org/content/show.php?content=28725
+Patch0: kmetabar-fix.patch
+Patch1: kmetabar-kdemacros.diff
+Group: Graphical desktop/KDE3
+License: GPLv2+
+BuildRoot: %{_tmppath}/build-%{_name}-%{_version}
+Requires: kdelibs3
+Requires: arts, expat, fam, jack, kdebase3, libogg, libvorbis, glib2
+Requires: libart_lgpl, libpng, libstdc++, libgcc, resmgr, zlib
+BuildRequires: kdelibs3-devel,arts-devel, expat-devel, fam-devel
+BuildRequires: kdebase3-devel,libogg-devel
+BuildRequires: libvorbis-devel, glib2-devel
+BuildRequires: libart_lgpl-devel,libpng-devel
+
+%description
+A sidebar plugin for KDE's Konqueror which shows information and actions for
+selected files and directories.
+
+This is a fork of the "metabar" project: http://sourceforge.net/projects/metabar
+
+%prep
+%setup -q -n %{name}-0.2-beta2
+%patch0 -p0
+cd %{name}
+%patch1 -p0
+
+%configure_kde3
+
+%build
+cd %{name}
+%{make}
+
+%install
+%{__rm} -rf %{buildroot}
+cd %{name}
+%makeinstall_std
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%_kde3_libdir/kde3/konqsidebar_kmetabar.so
+%_kde3_libdir/kde3/konqsidebar_kmetabar.la
+%_kde3_appsdir/kmetabar
+%_kde3_appsdir/konqsidebartng/add/kmetabar_add.desktop
+%_kde3_appsdir/konqsidebartng/entries/kmetabar.desktop
+%_kde3_iconsdir/*/*x*/apps/kmetabar.png
+%_kde3_docdir/*
+
+%changelog
+* Mon Jul 18 2011 <tim@my-place.org.uk> 0.2.beta2-3mvt2010.2
+- Packaged for Trinity
+
+* Fri Jul 23 2010 <tim@my-place.org.uk> 0.2.beta2-2mvt2010.1
+- Packaged for 2010.1
+
+* Tue Dec 22 2009 <atilla_ontas@mandriva.org> 0.2.beta2-1mvt2010.0
+ - Packaged for 2010.0
diff --git a/mandriva/2010.2/applications/kmymoney/kmymoney-0.8.2-disable-visibility.patch b/mandriva/2010.2/applications/kmymoney/kmymoney-0.8.2-disable-visibility.patch
new file mode 100644
index 000000000..5ca21b3a8
--- /dev/null
+++ b/mandriva/2010.2/applications/kmymoney/kmymoney-0.8.2-disable-visibility.patch
@@ -0,0 +1,10 @@
+--- kmymoney2-0.8.2/configure.in.in-- 2006-01-02 01:27:19.000000000 +0100
++++ kmymoney2-0.8.2/configure.in.in 2006-01-02 01:27:25.000000000 +0100
+@@ -2,7 +2,6 @@
+
+ AM_INIT_AUTOMAKE(kmymoney2,0.8.2)
+
+-KDE_ENABLE_HIDDEN_VISIBILITY
+
+ dnl
+ dnl check for a recent autoconf version
diff --git a/mandriva/2010.2/applications/kmymoney/kmymoney2.desktop b/mandriva/2010.2/applications/kmymoney/kmymoney2.desktop
new file mode 100644
index 000000000..7b6ba4a0c
--- /dev/null
+++ b/mandriva/2010.2/applications/kmymoney/kmymoney2.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=KMyMoney
+GenericName=Personal Finance Manager
+GenericName[de]=Persönlicher Finanzassistent
+GenericName[fr]=Gestionnaire de finances personnelles
+GenericName[pt_BR]=Gerenciador Pessoal de Finanças
+GenericName[ru]=Учёт финансов
+GenericName[zh_CN]=个人财务管理软件
+Exec=kmymoney2
+Comment=Personal Finance Manager
+Comment[de]=Persönlicher Finanzassistent
+Comment[fr]=Gestionnaire de finances personnelles
+comment[pt_BR]=Gerenciador Pessoal de Finanças
+Comment[ru]=Учёт финансов
+Comment[zh_CN]=个人财务管理软件
+MimeType=application/x-kmymoney;application/vnd.intu.qfx;application/x-ofx;
+Type=Application
+DocPath=kmymoney2/index.html
+Icon=kmymoney2
+ServiceTypes=
+Categories=Office;Finance;Qt;KDE;
diff --git a/mandriva/2010.2/applications/kmymoney/kmymoney2.spec b/mandriva/2010.2/applications/kmymoney/kmymoney2.spec
new file mode 100644
index 000000000..8551f4029
--- /dev/null
+++ b/mandriva/2010.2/applications/kmymoney/kmymoney2.spec
@@ -0,0 +1,278 @@
+%define lib_name_orig %mklibname %name
+%define lib_major 0
+%define lib_name %mklibname %name %lib_major
+%define develname %mklibname -d %name
+
+Name: kmymoney2
+Version: 1.0.2
+Release: %mkrel 3
+Summary: Kmymoney2 The Personal Finances Manager for kde3
+Source0: http://kent.dl.sourceforge.net/sourceforge/kmymoney2/%{name}-%{version}.tar.bz2
+Source1: kmymoney2.desktop
+Url: http://kmymoney2.sourceforge.net/
+License: GPLv2+
+Group: Graphical desktop/KDE
+BuildRoot: %_tmppath/%name-%version-%release-root
+BuildRequires: kdelibs-devel
+BuildRequires: jpeg-devel mng-devel png-devel qt3-devel
+BuildRequires: aqhbci-devel > 0.3.0
+BuildRequires: OpenSP-devel libofx-devel
+Requires: %lib_name = %version-%release
+Patch0: kmymoney-0.8.2-disable-visibility.patch
+
+%description
+The Personal Finances Manager for KDE 3.
+
+%files -f %name.lang
+%defattr(-,root,root)
+%_kde3_bindir/*
+%_kde3_datadir/apps/%name
+%_kde3_iconsdir/*/*/*/*
+%_kde3_datadir/applications/kde/*.desktop
+%_kde3_datadir/services/*.desktop
+%_kde3_datadir/servicetypes/*.desktop
+%_kde3_datadir/apps/kmm_ofximport
+%_kde3_datadir/config.kcfg/kmymoney2.kcfg
+%_mandir/man1/*
+%_kde3_datadir/mimelnk/application/*.desktop
+%_kde3_datadir/icons/Tango/scalable/*
+%_kde3_datadir/icons/oxygen/scalable/*
+
+#--------------------------------------------------------------------
+
+%package -n %lib_name
+Group: Development/KDE and Qt
+Summary: Libraries for %name
+
+%description -n %lib_name
+Librairie for %name
+
+%if %mdkversion < 200900
+%post -n %lib_name -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %lib_name -p /sbin/ldconfig
+%endif
+
+%files -n %lib_name
+%defattr(-,root,root,-)
+%_kde3_libdir/kde3/kmm_ofximport.la
+%_kde3_libdir/kde3/kmm_ofximport.so
+%_kde3_libdir/libkmm_mymoney.la
+%_kde3_libdir/libkmm_mymoney.so.*
+%_kde3_libdir/libkmm_plugin.la
+%_kde3_libdir/libkmm_plugin.so.*
+%_kde3_libdir/libkmm_kdchart.so.*
+#--------------------------------------------------------------------
+
+%package -n %develname
+Group: Development/KDE and Qt
+Summary: Devel files for %name
+Requires: %lib_name = %{version}-%{release}
+Obsoletes: %lib_name-devel
+
+%description -n %develname
+Devel file for %name
+
+%files -n %develname
+%defattr(-,root,root,-)
+%dir %_kde3_includedir/kmymoney/
+%_kde3_includedir/kmymoney/*.h
+%_kde3_libdir/libkmm_mymoney.so
+%_kde3_libdir/libkmm_plugin.so
+%_kde3_libdir/libkmm_kdchart.la
+%_kde3_libdir/libkmm_kdchart.so
+
+#--------------------------------------------------------------------
+
+%prep
+
+%setup -q
+#%patch0 -p1 -b .disable_visibility
+
+%build
+%define _disable_ld_no_undefined 1
+%configure_kde3 \
+ --enable-ofxplugin \
+ --enable-ofxbanking --disable-final --disable-sqlite3
+#necessary to remove old files
+make clean
+
+%make
+
+%install
+%makeinstall_std
+
+# Translation team modified desktop file
+cp -f %SOURCE1 %buildroot/%_kde3_datadir/applications/kde/
+
+%find_lang %name --with-html
+
+%clean
+rm -fr %buildroot
+
+
+
+%changelog
+* Tue Jul 26 2011 Tim Williams <tim@my-place.org.uk> 1.0.2-3mdv2010.2
++ rebuild for Trinity
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1.0.2-2mdv2010.1
++ rebuild for MDV 2010.1
+
+* Thu Nov 19 2009 Tim Williams <tim@my-place.org.uk> 1.0.2-1mdv2010.0
++ Update source to 1.0.2
++ rebuild for MDV 2010.0
+
+* Wed Mar 04 2009 Nicolas Lécureuil <neoclust@mandriva.org> 0.9.3-1mdv2009.1
++ Revision: 348190
+- Update to 0.9.3
+ Disable sqlite3 support for now, the build must be fixed before
+
+* Sat Nov 08 2008 Oden Eriksson <oeriksson@mandriva.com> 0.8.9-5mdv2009.1
++ Revision: 301009
+- rebuilt against new libxcb
+
+ + Helio Chissini de Castro <helio@mandriva.com>
+ - Updated desktop file as requested by translation team
+
+* Sat Jul 26 2008 Nicolas Lécureuil <neoclust@mandriva.org> 0.8.9-3mdv2009.0
++ Revision: 250088
+- Disable enable final
+- Fix typo
+- Fix specfile layout
+- Rebuild because BS failure
+- Move to /opt
+ Move Kmoney2 out of "More"
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+ - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Thu Apr 17 2008 Funda Wang <fundawang@mandriva.org> 0.8.9-1mdv2009.0
++ Revision: 195065
+- disable kbanking as it does not exist any more
+- Bump requires on aqbanking
+- New version 0.8.9
+
+* Sat Mar 08 2008 Funda Wang <fundawang@mandriva.org> 0.8.8-2mdv2008.1
++ Revision: 182081
+- cleanup spec file
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+* Fri Dec 21 2007 Funda Wang <fundawang@mandriva.org> 0.8.8-1mdv2008.1
++ Revision: 136311
+- New version 0.8.8
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+ - replace %%_datadir/man by %%_mandir!
+
+* Mon Jul 23 2007 Funda Wang <fundawang@mandriva.org> 0.8.7-1mdv2008.0
++ Revision: 54782
+- New version
+
+* Fri Jul 13 2007 Funda Wang <fundawang@mandriva.org> 0.8.6-2mdv2008.0
++ Revision: 51845
+- New develpackage policy
+
+
+* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 0.8.6-1mdv2007.1
++ Revision: 140315
+- 0.8.6
+- Rebuild
+- Import kmymoney2
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Fix BuildRequires
+
+* Fri Sep 01 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.5-1
+- 0.8.5
+
+* Mon Jun 19 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.4-2mdk
+- Fix missing build requires
+
+* Sun May 21 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.4-1mdk
+- 0.8.4
+
+* Thu Apr 20 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-4mdk
+- Fix requires
+
+* Thu Apr 20 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-3mdk
+- Rebuild
+
+* Mon Feb 27 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-2mdk
+- Fix build kbanking plugins
+
+* Mon Feb 27 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-1mdk
+- 0.8.3
+
+* Tue Jan 03 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.2-2mdk
+- Fix compile under x86_64
+
+* Mon Jan 02 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.2-1mdk
+- 0.8.2
+
+* Sun Nov 06 2005 Laurent MONTEL <lmontel@mandriva.com> 0.8.1-1mdk
+- 0.8.1
+
+* Sun Aug 14 2005 Laurent MONTEL <lmontel@mandriva.com> 0.8.0-1mdk
+- 0.8.0
+
+* Sun Jul 31 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.5-1mdk
+- 0.7.5
+
+* Tue Jul 19 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.4-1mdk
+- 0.7.4
+
+* Sat Jul 09 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.3-1mdk
+- 0.7.3
+
+* Wed Jun 01 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-1mdk
+- 0.7.2
+
+* Tue May 24 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.1-2mdk
+- Add --enable-ofxplugin
+
+* Sun May 22 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.1-1mdk
+- 0.7.1
+
+* Fri May 20 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.0-2mdk
+- Enable --enable-kbanking
+
+* Sun May 15 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.0-1mdk
+- 0.7.0
+
+* Sat May 07 2005 Laurent MONTEL <lmontel@mandriva.com> 0.6.4-3mdk
+- fix build on x86_64
+
+* Thu Dec 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.4-2mdk
+- Fix menu
+
+* Thu Nov 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.4-1mdk
+- 06.4
+
+* Mon Nov 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.3-1mdk
+- 0.6.3
+
+* Thu Sep 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.2-2mdk
+- kde2 -> kde3 thanks (Eskild Hustvedt <eskild@mandrakehelp.com>)
+- clean spec file
+
+* Sat Sep 25 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.2-1mdk
+- New version
+
+* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.1-2mdk
+- Rebuild with new menu translation table
+
+* Wed Jul 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.1-1mdk
+- 0.6.1
+
+* Tue Jun 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-1mdk
+- 0.6
+
+* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.5.1-4mdk
+- Rebuild
+
diff --git a/mandriva/2010.2/applications/knoda/knoda-0.8.3-fix-icon-ext.patch b/mandriva/2010.2/applications/knoda/knoda-0.8.3-fix-icon-ext.patch
new file mode 100644
index 000000000..1072f8d1e
--- /dev/null
+++ b/mandriva/2010.2/applications/knoda/knoda-0.8.3-fix-icon-ext.patch
@@ -0,0 +1,19 @@
+--- knoda/knoda.desktop.orig 2007-10-22 20:32:37.000000000 +0800
++++ knoda/knoda.desktop 2007-10-22 20:32:50.000000000 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=knoda
+ Exec=knoda
+-Icon=knoda.png
++Icon=knoda
+ Type=Application
+ MimeType=application/x-sqlite3;application/x-sqlite2;application/x-hk_classes-sqlite3;application/x-hk_classes-sqlite2;application/x-msaccess;application/x-dbase;application/x-hk_connection;application/x-paradox;
+ DocPath=knoda/index.html
+@@ -12,5 +12,4 @@
+ Comment[fr]=Application base de données
+ Comment[it]=Un'applicazione base di dati
+ Terminal=false
+-Encoding=UTF-8
+-Categories=Qt;KDE;Office;Database;
+\ No newline at end of file
++Categories=Qt;KDE;Office;Database;
diff --git a/mandriva/2010.2/applications/knoda/knoda-0.8.3-remove-fr-comment.patch b/mandriva/2010.2/applications/knoda/knoda-0.8.3-remove-fr-comment.patch
new file mode 100644
index 000000000..56e635b20
--- /dev/null
+++ b/mandriva/2010.2/applications/knoda/knoda-0.8.3-remove-fr-comment.patch
@@ -0,0 +1,9 @@
+--- knoda/x-hk_classes-sqlite3.desktop.orig 2007-09-01 10:11:04.000000000 +0800
++++ knoda/x-hk_classes-sqlite3.desktop 2007-09-01 10:11:12.000000000 +0800
+@@ -6,6 +6,5 @@
+ Patterns=*.hk_sqlite3
+ Comment=Sqlite3 database (knoda)
+ Comment[de]=Sqlite3 Datenbank (knoda)
+-Comment[fr]=Sqlite3 base de donnes (knoda)
+ Comment[es]=Sqlite3 base de datos (knoda)
+
diff --git a/mandriva/2010.2/applications/knoda/knoda.spec b/mandriva/2010.2/applications/knoda/knoda.spec
new file mode 100644
index 000000000..d825dd70a
--- /dev/null
+++ b/mandriva/2010.2/applications/knoda/knoda.spec
@@ -0,0 +1,243 @@
+# THIS PACKAGE IS HOSTED AT MANDRIVA SVN
+# PLEASE DO NOT UPLOAD DIRECTLY BEFORE COMMIT
+
+%define LIBMAJ 0
+%define libname %mklibname %name %LIBMAJ
+%define develname %mklibname %name -d
+
+%define name knoda
+%define version 0.8.3
+%define hk_version 0.8.3
+%define release %mkrel 10
+
+Summary: Database frontend for KDE
+Name: %{name}
+Version: %{version}
+Release: %{release}
+License: GPL
+Group: Databases
+
+Source: http://hk-classes.sourceforge.net/%{name}-%{version}.tar.bz2
+Source1: http://hk-classes.sourceforge.net/%{name}python.tar.bz2
+Source2: lo48-app-knoda.png
+Patch0: knoda-0.8.3-remove-fr-comment.patch
+Patch1: knoda-0.8.3-fix-icon-ext.patch
+Url: http://www.knoda.org
+BuildRoot: %_tmppath/%name-%version-root
+
+BuildRequires: hk_classes-devel = %{hk_version}
+BuildRequires: kdelibs-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+
+Requires: hk_classes = %{hk_version}
+Obsoletes: %{libname}
+
+%description
+Knoda is a database frontend for KDE. It is based on hk_classes.
+Knoda allows you to:
+
+ * define and delete databases;
+ * create, alter and delete tables and indices;
+ * add, change and delete data in tables;
+ * define, execute and store sql queries;
+ * import and export CSV data;
+ * define and use forms; and
+ * define and print reports
+
+Its driver concept allows a uniform connection to different database
+servers.
+
+Note: If you've used knoda 0.6, you'll probably want to delete
+~/.hk_classes/preferences, as the driver paths have changed.
+
+%package devel
+Summary: Headers for hk_kdeclasses application development
+Group: Development/Databases
+Requires: %{name} = %{version}-%{release}
+Obsoletes: %{libname}-devel
+Obsoletes: %{develname}
+
+%description devel
+Hk_kdeclasses headers for application development
+
+
+%prep
+%setup -q -a 1 -n %{name}-%{version}
+%patch0 -p0
+%patch1 -p0
+
+%build
+%configure_kde3 --disable-final \
+ --with-hk_classes-dir=%{_libdir}/hk_classes \
+ --with-hk_classes-incdir=%{_includedir}/hk_classes
+%make
+
+%install
+rm -rf %{buildroot}
+%makeinstall_std
+
+# (sb) get rid of CVS in python docs
+rm -rf %{name}python/common/CVS
+
+mkdir -p $RPM_BUILD_ROOT%{_kde3_datadir}/applications/kde
+desktop-file-install --vendor="" --delete-original \
+ --dir $RPM_BUILD_ROOT%{_kde3_datadir}/applications/kde \
+ $RPM_BUILD_ROOT%{_kde3_datadir}/applnk/Office/%{name}.desktop
+
+%find_lang %name --with-html
+
+%if %mdkversion < 200900
+%post
+%update_menus
+%{update_desktop_database}
+%update_icon_cache hicolor
+%endif
+
+%if %mdkversion < 200900
+%postun
+%clean_menus
+%{update_desktop_database}
+%clean_icon_cache hicolor
+%endif
+
+%clean
+rm -fr %buildroot
+
+%files -f %name.lang
+%defattr(-,root,root)
+%doc ChangeLog COPYING NEWS INSTALL README
+%doc %{name}python/*
+%{_kde3_bindir}/*
+%{_kde3_datadir}/applications/kde/%{name}.desktop
+%{_kde3_datadir}/apps/hk_kdeclasses
+%{_kde3_datadir}/apps/%{name}
+%{_kde3_datadir}/config/magic/*.magic
+%{_kde3_datadir}/mimelnk/application/*.desktop
+%{_kde3_iconsdir}/*/*/apps/*.png
+%{_kde3_datadir}/services/hk_kde*.desktop
+%{_kde3_libdir}/*
+
+%files devel
+%defattr(-,root,root)
+%{_kde3_includedir}/*
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.8.3-9mdv2010.2
++ Rebuild for Trinity
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.8.3-9mdv2010.1
++ Rebuild for MDV 2010.1
+
+* Tue Nov 24 2009 Tim Williams <tim@my-place.org.uk> 0.8.3-8mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Thu Jul 31 2008 Funda Wang <fundawang@mandriva.org> 0.8.3-7mdv2009.0
++ Revision: 257899
+- switch to /opt
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - rebuild
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+
+* Mon Feb 18 2008 Thierry Vignaud <tvignaud@mandriva.com> 0.8.3-5mdv2008.1
++ Revision: 170929
+- rebuild
+- fix "foobar is blabla" summary (=> "blabla") so that it looks nice in rpmdrake
+- fix spacing at top of description
+- kill re-definition of %%buildroot on Pixel's request
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+* Tue Oct 23 2007 Funda Wang <fundawang@mandriva.org> 0.8.3-4mdv2008.1
++ Revision: 101432
+- cleanup spec file
+- fix desktop file icon ext
+- drop libpackage as it is wrongly introduced.
+
+* Sat Sep 01 2007 Funda Wang <fundawang@mandriva.org> 0.8.3-3mdv2008.0
++ Revision: 77297
+- Remove invalid fr comment of menu entry
+
+* Fri Aug 10 2007 Funda Wang <fundawang@mandriva.org> 0.8.3-2mdv2008.0
++ Revision: 61513
+- don't use chrpath
+
+* Tue Jun 26 2007 Funda Wang <fundawang@mandriva.org> 0.8.3-1mdv2008.0
++ Revision: 44338
+- new develpackage policy
+ drop old menu
+
+ + Per Øyvind Karlsen <peroyvind@mandriva.org>
+ - update to 0.8.3
+ - wipe out buildroot before install
+
+
+* Mon Jan 15 2007 Nicolas Lécureuil <neoclust@mandriva.org> 0.8.2-1mdv2007.0
++ Revision: 109306
+
+ + Lenny Cartier <lenny@mandriva.com>
+ - Update to 0.8.2
+
+* Mon Jul 10 2006 Nicolas Lécureuil <neoclust@mandriva.org> 0.8.1-1mdv2007.0
++ Revision: 38589
+- Fix xdg menu
+- right require on hk_version
+- 0.8.1
+- Fix Menu for xdg
+- Use macros
+- Increase release
+- Fix menu
+- Use macros
+- import knoda-0.8-1mdk
+
+* Sun Dec 11 2005 Gaetan Lehmann <gaetan.lehmann@jouy.inra.fr> 0.8-1mdk
+- 0.8
+- fix build on x86_64
+
+* Wed Oct 05 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-6mdk
+- Rebuild
+
+* Tue Oct 04 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-5mdk
+- BuildRequires fix
+
+* Sun Sep 18 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-4mdk
+- Fix Requires
+
+* Wed Jul 13 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-3mdk
+- Rebuild for new hk_classes
+
+* Tue Jul 05 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-2mdk
+- Remove conflict : i suxx
+
+* Sat Jul 02 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-1mdk
+- 0.7.4
+- Fix conflicts with mandrake-mime BR: 16672
+
+* Sat Apr 30 2005 Nicolas Lcureuil <neoclust@mandriva.org> 0.7.4-0.test1.1mdk
+- New release 0.7.4-test1
+
+* Mon Feb 07 2005 Stew Benedict <sbenedict@mandrakesoft.com> 0.7.2-2mdk
+- rebuild for new python
+
+* Tue Nov 30 2004 Stew Benedict <sbenedict@mandrakesoft.com> 0.7.2-1mdk
+- 0.7.2, make sure it requires hk_classes with the same version
+- roll python-knoda into the main package, since it's just docs
+
+* Sat Oct 02 2004 Stew Benedict <sbenedict@mandrakesoft.com> 0.7.1-2mdk
+- fix crash bug (missing /usr/lib/kde3/libhk*.la files - #11863)
+
+* Fri Sep 24 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.7.1-1mdk
+- 0.7.1
+
+* Thu Jun 17 2004 Stew Benedict <sbenedict@mandrakesoft.com> 0.6.3-2mdk
+- rebuild, patch to build with gcc-3.4.1 (patch0, extra ";"s)
+- some rpmlint fixes
+
+* Thu Apr 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.3-1mdk
+- 0.6.3
+
diff --git a/mandriva/2010.2/applications/knoda/knodapython.tar.bz2 b/mandriva/2010.2/applications/knoda/knodapython.tar.bz2
new file mode 100644
index 000000000..32168d16d
--- /dev/null
+++ b/mandriva/2010.2/applications/knoda/knodapython.tar.bz2
Binary files differ
diff --git a/mandriva/2010.2/applications/knoda/lo48-app-knoda.png b/mandriva/2010.2/applications/knoda/lo48-app-knoda.png
new file mode 100644
index 000000000..17dab3d10
--- /dev/null
+++ b/mandriva/2010.2/applications/knoda/lo48-app-knoda.png
Binary files differ
diff --git a/mandriva/2010.2/applications/kosd/kde3-kosd.spec b/mandriva/2010.2/applications/kosd/kde3-kosd.spec
new file mode 100644
index 000000000..54b128314
--- /dev/null
+++ b/mandriva/2010.2/applications/kosd/kde3-kosd.spec
@@ -0,0 +1,115 @@
+%define oname KOSD
+
+Name: kosd-kde3
+Version: 0.2.3
+Release: %mkrel 5
+Summary: An application showing OSD to respond volume buttons
+License: GPLv2+
+Group: Graphical desktop/KDE3
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL: http://www.kde-apps.org/content/show.php?content=81457
+Source: http://www.kde-apps.org/CONTENT/content-files/81457-%{oname}-%{version}.tar.bz2
+Patch0: kde-3.5.10-acinclude.patch
+Patch1: fix_autotools.patch
+BuildRequires: kde3-macros
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+BuildRequires: automake >= 1.6.1
+%else
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: automake >= 1.11
+%endif
+BuildRequires: kdelibs-devel
+Requires: kde3-kmix
+Obsoletes: kde3-kvolumeosd < %version
+
+%description
+KOSD is a simple KDE application that runs in the background and
+responds to volume buttons by showing a little OSD. It delegates the
+actual job of adjusting the volume to KMix.
+
+%prep
+%setup -q -n %{oname}
+%if %mdkversion >= 201000
+%patch0 -p1
+%patch1 -p1
+%endif
+
+%build
+make -f Makefile.cvs
+%configure_kde3
+%make
+
+%install
+rm -rf %buildroot
+%makeinstall_std
+
+%find_lang kosd --with-html
+
+mkdir -p %buildroot%_kde3_datadir/applications/kde
+mv %buildroot/share/applications/*.desktop %buildroot%_kde3_datadir/applications/kde
+
+%clean
+rm -rf %buildroot
+
+%if %mdkversion < 200900
+%post
+%{update_menus}
+%update_kde3_icon_cache hicolor
+%endif
+
+%if %mdkversion < 200900
+%postun
+%{clean_menus}
+%clean_kde3_icon_cache hicolor
+%endif
+
+%files -f kosd.lang
+%defattr(-,root,root)
+%{_kde3_bindir}/kosd
+%{_kde3_appsdir}/kosd
+%{_kde3_datadir}/applications/kde/*.desktop
+%{_kde3_iconsdir}/hicolor/*/apps/*
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.2.3-5mdv2010.2
++ Rebuild for Trinity
+
+* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.2.3-4mdv2010.1
++ Rebuild for MDV 2010.1
+
+* Sat Feb 13 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.2.3-3mdv2010.0
++ Fix built issues with autocnf 2.65 and automake 1.11
++ Change package group
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 0.2.3-2mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Fri Aug 01 2008 Funda Wang <fundawang@mandriva.org> 0.2.3-1mdv2009.0
++ Revision: 259119
+- New version 0.2.3
+
+* Wed Jul 30 2008 Funda Wang <fundawang@mandriva.org> 0.2.2-1mdv2009.0
++ Revision: 254587
+- New version 0.2.2
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+
+* Wed Jun 04 2008 Funda Wang <fundawang@mandriva.org> 0.2.1-1mdv2009.0
++ Revision: 214973
+- Rename to kosd
+- new version 0.2.1
+- rename to kosd
+
+* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-2mdv2009.0
++ Revision: 205328
+- fix post and postun script
+
+* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-1mdv2009.0
++ Revision: 205299
+- fix name
+- import source and spec
+- Created package structure for kde3-kvolumeosd.
+
diff --git a/mandriva/2010.2/applications/krandr/kde3-krandr.spec b/mandriva/2010.2/applications/krandr/kde3-krandr.spec
new file mode 100644
index 000000000..a7a8438bc
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/kde3-krandr.spec
@@ -0,0 +1,167 @@
+%define oname krandr
+Name: kde3-%{oname}
+Summary: Applet for configuring screen size and rotation
+Version: 0.5.2.1
+Release: %mkrel 19
+License: GPL
+Group: Graphical desktop/KDE3
+URL: http://git.mandriva.com/?p=projects/%{oname}.git
+Source0: %{oname}-%{version}.tar.gz
+Patch0: %{oname}-0.5.2.1-legacy_randr_on_single_output.patch
+Patch1: %{oname}-0.5.2-display_switch.patch
+Patch2: %{oname}-0.5.2.1-fix_rrate_display.patch
+Patch3: %{oname}-0.5.2.1-fix_autostart.patch
+Patch4: %{oname}-0.5.2.1-add-mandriva-translations.patch
+Patch5: %{oname}-0.5.2.1-change_the_way_crtcs_are_set.patch
+Patch6: %{oname}-0.5.2.1-grab_server_avoiding_crashes.patch
+Patch7: %{oname}-0.5.2.1-flush_after_ungrab.patch
+Patch8: kde-3.5.10-acinclude.patch
+Patch9: fix_autotools.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: kde3-macros
+BuildRequires: automake >= 1.6.1
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%else
+BuildRequires: autoconf >= 1:2.65
+%endif
+BuildRequires: qt3-devel >= 3.3.3
+BuildRequires: kdelibs-devel
+BuildRequires: kde3-macros
+Conflicts: kdebase-common <= 1:3.5.7-18mdv2008.0
+Conflicts: libkdebase4 <= 1:3.5.7-20mdv2008.0
+Provides: %{oname} = %version-%release
+Obsoletes: %{oname}
+
+%description
+KRandr is an applet for configuring screen size and rotation through the XRandR
+extension.
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch0 -p1 -b .legacyrandr
+%patch1 -p1 -b .displayswitch
+%patch2 -p1 -b .rrate_display
+%patch3 -p1 -b .fix_autostart
+%patch4 -p1 -b .test_translations
+%patch5 -p1 -b .crtc_set
+%patch6 -p1 -b .grab_server
+%patch7 -p1 -b .flush_after_ungrab
+%if %mdkversion >= 201000
+%patch8 -p1
+%patch9 -p1
+%endif
+
+%build
+%define _disable_ld_no_undefined 1
+make -f admin/Makefile.common cvs
+%configure_kde3
+%make
+
+%install
+rm -rf %buildroot
+%makeinstall_std
+
+# install %{oname}tray in kde autostart
+install -d -m 0755 %{buildroot}%{_kde3_datadir}/autostart
+cp -f %{buildroot}%{_kde3_datadir}/applications/kde/%{oname}tray.desktop %{buildroot}%{_kde3_datadir}/autostart/
+
+%files
+%defattr(-,root,root)
+%{_kde3_bindir}/%{oname}tray
+%{_kde3_libdir}/kde3/kcm_randr.*
+%{_kde3_datadir}/applications/kde/%{oname}tray.desktop
+%{_kde3_datadir}/applnk/.hidden/randr.desktop
+%{_kde3_datadir}/autostart/%{oname}tray.desktop
+# remove the non wanted files
+%exclude %{_kde3_datadir}/doc/HTML/en/%{oname}
+%exclude %{_kde3_datadir}/locale/*/LC_MESSAGES/%{oname}.mo
+
+
+%changelog
+* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 0.5.2.1-19mdv2010.1
++ Rebuild for MDV 2010.2/Trinity
+
+* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 0.5.2.1-18mdv2010.1
++ Rebuild for MDV 2010.1
+
+* Fri Feb 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.5.2.1-17mdv2010.0
++ KDE builds with autoconf 2.65, add patch for this and
+ set autoconf to version 2.65
+- Rename package name and group to avoid possible future kde4 conflicts
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 0.5.2.1-16mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Tue Jul 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-15mdv2009.0
++ Revision: 240518
+- Flush the X calls after calling XUngrabServer to avoid deadlocks
+
+* Sat Jun 14 2008 Anssi Hannula <anssi@mandriva.org> 0.5.2.1-14mdv2009.0
++ Revision: 219126
+- rebuild to get higher evr than 2008.1 updates (needed for kde4 conflicts)
+
+* Mon May 05 2008 Helio Chissini de Castro <helio@mandriva.com> 0.5.2.1-13mdv2009.0
++ Revision: 201520
+- Update %{oname} to new build of moved kde3
+
+* Mon Mar 31 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-12mdv2008.1
++ Revision: 191318
+- Grab the X server in order for the changes to be atomic
+
+* Fri Mar 28 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-11mdv2008.1
++ Revision: 190977
+- Fix the way the screen are upper-sized when the resolution of the CRTC is
+ changed. This avoids kicker and kwin getting lost on parsing X events.
+
+* Mon Mar 10 2008 Thierry Vignaud <tvignaud@mandriva.com> 0.5.2.1-10mdv2008.1
++ Revision: 183618
+- fix description
+
+* Mon Mar 10 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-9mdv2008.1
++ Revision: 183512
+- Use the correct autostart condition so that it is actually started (#38455)
+
+* Fri Feb 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 0.5.2.1-8mdv2008.1
++ Revision: 174021
+- Add translations for mandriva strings
+
+* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 0.5.2.1-7mdv2008.1
++ Revision: 141739
+- rebuilt against openldap-2.4.7 libs
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Wed Oct 03 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-6mdv2008.0
++ Revision: 94865
+- Make it possible to disable %{oname} autostart (#34378)
+
+* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-5mdv2008.0
++ Revision: 93579
+- Make %{oname} start at session startup (#34047)
+- Remove the dummy documentation files
+
+* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-4mdv2008.0
++ Revision: 89338
+- Fix displaying of refresh rates (#33710)
+
+* Thu Sep 13 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-3mdv2008.0
++ Revision: 85303
+- add a display switch shortcut
+- add proper conflicts to libkdebase4 (#32957)
+
+* Wed Sep 12 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-2mdv2008.0
++ Revision: 84651
+- Use the legacy randr interface when there is only one output available
+ (mostly drivers that do not support RandR1.2 yet)
+
+* Tue Aug 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-1mdv2008.0
++ Revision: 72849
+- Fix group and point the URL to the git repository of %{oname}
+- Import %{oname}
+
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2-display_switch.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2-display_switch.patch
new file mode 100644
index 000000000..366b6685c
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2-display_switch.patch
@@ -0,0 +1,187 @@
+--- krandr-0.5.2.1/randr/krandrtray.h.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.h 2007-09-03 18:29:15.000000000 -0300
+@@ -37,6 +37,9 @@ public:
+
+ void configChanged();
+
++public slots:
++ void slotSwitchDisplay();
++
+ protected slots:
+ void slotScreenActivated();
+ void slotResolutionChanged(int parameter);
+--- krandr-0.5.2.1/randr/randrdisplay.h.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/randrdisplay.h 2007-09-03 18:31:43.000000000 -0300
+@@ -51,6 +51,8 @@ public:
+
+ void refresh();
+
++ void switchOutput();
++
+ /**
+ * Loads saved settings.
+ *
+--- krandr-0.5.2.1/randr/randrscreen.h.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/randrscreen.h 2007-09-03 18:32:51.000000000 -0300
+@@ -40,6 +40,8 @@ public:
+
+ int index() const;
+
++ void switchOutput();
++
+ XRRScreenResources* resources() const;
+ Window rootWindow() const;
+
+--- krandr-0.5.2.1/randr/krandrtray.cpp.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-09-04 10:12:05.000000000 -0300
+@@ -17,6 +17,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#include <kglobalaccel.h>
+ #include <kapplication.h>
+ #include <kpopupmenu.h>
+ #include <khelpmenu.h>
+@@ -33,6 +34,7 @@
+ #include "randroutput.h"
+ #include "randrmode.h"
+
++#include <kdebug.h>
+ KRandRSystemTray::KRandRSystemTray(RandRDisplay *dpy, QWidget* parent, const char *name)
+ : KSystemTray(parent, name)
+ , m_popupUp(false), m_display(dpy)
+@@ -43,6 +45,16 @@ KRandRSystemTray::KRandRSystemTray(RandR
+ connect(this, SIGNAL(quitSelected()), kapp, SLOT(quit()));
+ QToolTip::add(this, i18n("Screen resize & rotate"));
+
++ KConfig cfg("kcmrandrrc");
++ cfg.setGroup("General");
++
++ KGlobalAccel *accel = new KGlobalAccel(this);
++ accel->insert( "DisplaySwitch", i18n("Switch displays"),
++ i18n("Switch between active displays."),
++ CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, SLOT(slotSwitchDisplay()) );
++
++ accel->readSettings(&cfg);
++ accel->updateConnections();
+ }
+
+ void KRandRSystemTray::mousePressEvent(QMouseEvent* e)
+@@ -456,3 +468,8 @@ void KRandRSystemTray::slotPrefs()
+ kcm->setPlainCaption( i18n( "Configure Display" ) );
+ kcm->exec();
+ }
++
++void KRandRSystemTray::slotSwitchDisplay()
++{
++ m_display->switchOutput();
++}
+--- krandr-0.5.2.1/randr/randrdisplay.cpp.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/randrdisplay.cpp 2007-09-03 18:32:35.000000000 -0300
+@@ -300,3 +300,10 @@ void RandRDisplay::applyProposed(bool co
+ }
+ }
+
++void RandRDisplay::switchOutput()
++{
++#ifdef HAS_RANDR_1_2
++ if (RandR::has_1_2)
++ currentScreen()->switchOutput();
++#endif
++}
+--- krandr-0.5.2.1/randr/randrscreen.cpp.orig 2007-09-03 18:05:43.000000000 -0300
++++ krandr-0.5.2.1/randr/randrscreen.cpp 2007-09-04 12:45:23.000000000 -0300
+@@ -581,6 +581,93 @@ void RandRScreen::slotOutputChanged(RROu
+ emit configChanged();
+ }
+
++void RandRScreen::switchOutput()
++{
++ //refresh settings so that the new monitor gets detected
++ loadSettings();
++
++ // if there is just one connected output, do not switch
++ if (connectedCount() < 2)
++ return;
++
++ // disable all outputs and activate the first connected one
++ if (activeCount() > 1)
++ {
++ bool first = true;
++ slotUnifyOutputs(0);
++ OutputMap::iterator it;
++ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
++ {
++ RandROutput *output = *it;
++ if (first && output->isActive())
++ first = false;
++ else if (first && output->isConnected())
++ {
++ SizeList sizes = output->sizes();
++ if (!sizes.count())
++ continue;
++
++ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
++ if (output->applyProposed(false))
++ first = false;
++ else
++ output->slotDisable();
++ }
++ else
++ output->slotDisable();
++ }
++
++ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
++ {
++ RandROutput *output = *it;
++ if (output->isConnected())
++ {
++ SizeList sizes = output->sizes();
++ if (!sizes.count())
++ continue;
++
++ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
++ if (output->applyProposed(RandR::ChangeRect, false))
++ break;
++ }
++ }
++ }
++ else
++ {
++ OutputMap::iterator it;
++ // first disable the currently active output and try to active the next
++ // connected one
++ bool found_active = false, found_connected = false;
++ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
++ {
++ RandROutput *output = *it;
++ if (!found_active && output->isActive())
++ {
++ output->slotDisable();
++ found_active = true;
++ }
++ else if (found_active && output->isConnected())
++ {
++ SizeList sizes = output->sizes();
++ if (!sizes.count())
++ continue;
++
++ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
++ if (output->applyProposed(RandR::ChangeRect, false))
++ {
++ found_connected = true;
++ break;
++ }
++ }
++ }
++
++ // if we could not find the next connected output after the active one,
++ // activate all
++ if (!found_connected)
++ slotUnifyOutputs(1);
++ } // if activeCount < 2
++}
++
+ #include "randrscreen.moc"
+
+ #endif
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-add-mandriva-translations.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-add-mandriva-translations.patch
new file mode 100644
index 000000000..043bae478
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-add-mandriva-translations.patch
@@ -0,0 +1,11 @@
+--- krandr-0.5.2.1/randr/krandrtray.cpp~ 2008-02-22 22:45:54.000000000 +0100
++++ krandr-0.5.2.1/randr/krandrtray.cpp 2008-02-22 22:59:44.000000000 +0100
+@@ -111,7 +111,7 @@
+ }
+
+ menu->insertSeparator();
+-
++ KGlobal::locale()->insertCatalogue("mandriva-kde-translation");
+ lastIndex = menu->insertItem(i18n( "Start KRandR when KDE starts" ));
+ menu->connectItem(lastIndex, this, SLOT(slotToggleRunStartup()));
+ menu->setItemChecked( lastIndex, m_runStartup );
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-change_the_way_crtcs_are_set.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-change_the_way_crtcs_are_set.patch
new file mode 100644
index 000000000..9a64c309e
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-change_the_way_crtcs_are_set.patch
@@ -0,0 +1,131 @@
+diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
+--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-03-28 13:56:38.000000000 -0300
++++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-03-28 16:15:57.000000000 -0300
+@@ -30,6 +30,13 @@ RandRCrtc::RandRCrtc(RandRScreen *parent
+ Q_ASSERT(m_screen);
+
+ m_id = id;
++
++ // just to make sure it gets initialized
++ m_proposedRect = m_currentRect;
++ m_proposedRotation = m_currentRotation;
++ m_proposedRate = m_currentRate;
++
++
+ loadSettings();
+ }
+
+@@ -116,11 +123,6 @@ void RandRCrtc::loadSettings(bool notify
+ changes |= RandR::ChangeRate;
+ }
+
+- // just to make sure it gets initialized
+- m_proposedRect = m_currentRect;
+- m_proposedRotation = m_currentRotation;
+- m_proposedRate = m_currentRate;
+-
+ // free the info
+ XRRFreeCrtcInfo(info);
+
+@@ -130,6 +132,7 @@ void RandRCrtc::loadSettings(bool notify
+
+ void RandRCrtc::handleEvent(XRRCrtcChangeNotifyEvent *event)
+ {
++#if 0
+ kdDebug() << "[CRTC] Event..." << endl;
+ int changed = 0;
+
+@@ -164,6 +167,7 @@ void RandRCrtc::handleEvent(XRRCrtcChang
+
+ if (changed)
+ emit crtcChanged(m_id, changed);
++#endif
+ }
+
+ RRMode RandRCrtc::mode() const
+@@ -241,6 +245,7 @@ bool RandRCrtc::applyProposed()
+ return false;
+
+ RROutput *outputs = new RROutput[m_connectedOutputs.count()];
++ int connectedCount = m_connectedOutputs.count();
+ for (int i = 0; i < m_connectedOutputs.count(); ++i)
+ outputs[i] = m_connectedOutputs[i];
+
+@@ -261,7 +266,7 @@ bool RandRCrtc::applyProposed()
+ if (!m_screen->rect().contains(r))
+ {
+ // try to adjust the screen size
+- if (!m_screen->adjustSize(r))
++ if (!adjustScreenSize(r, true))
+ return false;
+ }
+
+@@ -279,7 +284,7 @@ bool RandRCrtc::applyProposed()
+
+ // adjust the screen size
+ r = r.unite(m_currentRect);
+- if (!m_screen->adjustSize(r))
++ if (!adjustScreenSize(r,true))
+ return false;
+ }
+ }
+@@ -287,7 +292,7 @@ bool RandRCrtc::applyProposed()
+
+ Status s = XRRSetCrtcConfig(qt_xdisplay(), m_screen->resources(), m_id,
+ RandR::timestamp, m_proposedRect.x(), m_proposedRect.y(), mode.id(),
+- m_proposedRotation, outputs, m_connectedOutputs.count());
++ m_proposedRotation, outputs, connectedCount);
+
+ bool ret;
+ if (s == RRSetConfigSuccess)
+@@ -424,6 +429,19 @@ ModeList RandRCrtc::modes() const
+ return modeList;
+ }
+
++bool RandRCrtc::adjustScreenSize(const QRect &rect, bool disable)
++{
++ if (disable)
++ {
++ // disable the crtc before changing screen size
++ Status s = XRRSetCrtcConfig(qt_xdisplay(), m_screen->resources(), m_id,
++ RandR::timestamp, 0, 0, None,
++ RandR::Rotate0, NULL, 0);
++ }
++
++ return m_screen->adjustSize(rect);
++}
++
+ #include "randrcrtc.moc"
+
+ #endif
+diff -p -up krandr-0.5.2.1/randr/randroutput.cpp.orig krandr-0.5.2.1/randr/randroutput.cpp
+--- krandr-0.5.2.1/randr/randroutput.cpp.orig 2008-03-28 16:14:56.000000000 -0300
++++ krandr-0.5.2.1/randr/randroutput.cpp 2008-03-28 16:15:18.000000000 -0300
+@@ -107,6 +107,7 @@ void RandROutput::loadSettings(bool noti
+
+ void RandROutput::handleEvent(XRROutputChangeNotifyEvent *event)
+ {
++#if 0
+ int changed = 0;
+
+ if (event->crtc != m_currentCrtc)
+@@ -141,6 +142,7 @@ void RandROutput::handleEvent(XRROutputC
+
+ if (changed)
+ emit outputChanged(m_id, changed);
++#endif
+ }
+
+ void RandROutput::handlePropertyEvent(XRROutputPropertyNotifyEvent *event)
+diff -p -up krandr-0.5.2.1/randr/randrcrtc.h.orig krandr-0.5.2.1/randr/randrcrtc.h
+--- krandr-0.5.2.1/randr/randrcrtc.h.orig 2008-03-28 14:24:07.000000000 -0300
++++ krandr-0.5.2.1/randr/randrcrtc.h 2008-03-28 14:27:15.000000000 -0300
+@@ -62,6 +62,8 @@ public:
+
+ ModeList modes() const;
+
++ bool adjustScreenSize(const QRect &rect, bool disableCrtc = false);
++
+ signals:
+ void crtcChanged(RRCrtc c, int changes);
+
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_autostart.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_autostart.patch
new file mode 100644
index 000000000..6937687b1
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_autostart.patch
@@ -0,0 +1,62 @@
+--- krandr-0.5.2.1/randr/krandrtray.cpp.run_startup 2007-10-02 20:22:50.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-10-02 20:29:49.000000000 -0300
+@@ -48,6 +48,7 @@ KRandRSystemTray::KRandRSystemTray(RandR
+ KConfig cfg("kcmrandrrc");
+ cfg.setGroup("General");
+
++ m_runStartup = cfg.readBoolEntry("AutoStart", true);
+ KGlobalAccel *accel = new KGlobalAccel(this);
+ accel->insert( "DisplaySwitch", i18n("Switch displays"),
+ i18n("Switch between active displays."),
+@@ -111,6 +112,10 @@ void KRandRSystemTray::contextMenuAboutT
+
+ menu->insertSeparator();
+
++ lastIndex = menu->insertItem(i18n( "Start KRandR when KDE starts" ));
++ menu->connectItem(lastIndex, this, SLOT(slotToggleRunStartup()));
++ menu->setItemChecked( lastIndex, m_runStartup );
++
+ KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
+ SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotPrefs() ),
+ actionCollection() );
+@@ -469,6 +474,15 @@ void KRandRSystemTray::slotPrefs()
+ kcm->exec();
+ }
+
++void KRandRSystemTray::slotToggleRunStartup()
++{
++ m_runStartup = !m_runStartup;
++ KConfig cfg("kcmrandrrc");
++
++ cfg.setGroup("General");
++ cfg.writeEntry("AutoStart", m_runStartup);
++}
++
+ void KRandRSystemTray::slotSwitchDisplay()
+ {
+ m_display->switchOutput();
+--- krandr-0.5.2.1/randr/krandrtray.h.run_startup 2007-10-02 20:22:50.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.h 2007-10-02 20:22:50.000000000 -0300
+@@ -46,6 +46,7 @@ protected slots:
+ void slotOrientationChanged(int parameter);
+ void slotRefreshRateChanged(int parameter);
+ void slotPrefs();
++ void slotToggleRunStartup();
+
+ protected:
+ void mousePressEvent( QMouseEvent *e );
+@@ -62,6 +63,7 @@ private:
+ bool m_popupUp;
+ QValueList<KPopupMenu*> m_screenPopups;
+ RandRDisplay *m_display;
++ bool m_runStartup;
+ };
+
+ #endif
+--- krandr-0.5.2.1/randr/krandrtray.desktop.run_startup 2007-10-02 20:42:22.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.desktop 2007-10-02 20:29:27.000000000 -0300
+@@ -116,3 +116,4 @@ Icon=randr
+ Type=Application
+ OnlyShowIn=KDE;
+ Categories=Qt;KDE;System;
++X-KDE-autostart-condition=kcmrandrrc:General:AutoStart:true
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_rrate_display.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_rrate_display.patch
new file mode 100644
index 000000000..455298711
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-fix_rrate_display.patch
@@ -0,0 +1,28 @@
+--- krandr-0.5.2.1/randr/krandrtray.cpp.orig 2007-09-17 17:12:03.000000000 -0300
++++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-09-17 17:16:35.000000000 -0300
+@@ -383,7 +383,7 @@ void KRandRSystemTray::populateRates(KPo
+ RateList::const_iterator it;
+ for (it = rates.begin(); it != rates.end(); ++it)
+ {
+- lastIndex = menu->insertItem(i18n("%1 Hz", QString::number(*it, 'f', 1)));
++ lastIndex = menu->insertItem(i18n("%1 Hz").arg(QString::number(*it, 'f', 1)));
+ menu->setItemParameter(lastIndex, i);
+ if (*it == rate)
+ menu->setItemChecked(lastIndex, true);
+--- krandr-0.5.2.1/randr/legacyrandrscreen.cpp.orig 2007-09-17 17:24:23.000000000 -0300
++++ krandr-0.5.2.1/randr/legacyrandrscreen.cpp 2007-09-17 17:25:12.000000000 -0300
+@@ -246,12 +246,12 @@ QStringList LegacyRandRScreen::refreshRa
+
+ QString LegacyRandRScreen::refreshRateDirectDescription(int rate) const
+ {
+- return i18n("Refresh rate in Hertz (Hz)", "%1 Hz", rate);
++ return i18n("%1 Hz").arg(rate);
+ }
+
+ QString LegacyRandRScreen::refreshRateIndirectDescription(int size, int index) const
+ {
+- return i18n("Refresh rate in Hertz (Hz)", "%1 Hz", refreshRateIndexToHz(size, index));
++ return i18n("%1 Hz").arg(refreshRateIndexToHz(size, index));
+ }
+
+ QString LegacyRandRScreen::refreshRateDescription(int size, int index) const
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-flush_after_ungrab.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-flush_after_ungrab.patch
new file mode 100644
index 000000000..feea4ce8e
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-flush_after_ungrab.patch
@@ -0,0 +1,43 @@
+diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
+--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-05-15 13:45:35.000000000 -0300
++++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-05-15 13:44:02.000000000 -0300
+@@ -202,6 +202,7 @@ bool RandRCrtc::applyProposed()
+
+ // Grab server while messing around
+ XGrabServer(qt_xdisplay());
++ XFlush(qt_xdisplay());
+
+ RandRMode mode;
+ if (m_proposedRect.size() == m_currentRect.size() && m_proposedRate == m_currentRate)
+@@ -248,6 +249,7 @@ bool RandRCrtc::applyProposed()
+ else if (!mode.isValid())
+ {
+ XUngrabServer(qt_xdisplay());
++ XFlush(qt_xdisplay());
+ return false;
+ }
+
+@@ -268,6 +270,7 @@ bool RandRCrtc::applyProposed()
+ if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
+ {
+ XUngrabServer(qt_xdisplay());
++ XFlush(qt_xdisplay());
+ return false;
+ }
+
+@@ -279,6 +282,7 @@ bool RandRCrtc::applyProposed()
+ if (!adjustScreenSize(r, true))
+ {
+ XUngrabServer(qt_xdisplay());
++ XFlush(qt_xdisplay());
+ return false;
+ }
+ }
+@@ -331,6 +335,7 @@ bool RandRCrtc::applyProposed()
+
+ m_screen->adjustSize();
+ XUngrabServer(qt_xdisplay());
++ XFlush(qt_xdisplay());
+ return ret;
+ }
+
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-grab_server_avoiding_crashes.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-grab_server_avoiding_crashes.patch
new file mode 100644
index 000000000..57faa1cf6
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-grab_server_avoiding_crashes.patch
@@ -0,0 +1,74 @@
+diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
+--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-03-31 15:52:59.000000000 -0300
++++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-03-31 15:56:11.000000000 -0300
+@@ -199,6 +199,10 @@ bool RandRCrtc::applyProposed()
+ for (int i = 0; i < m_connectedOutputs.count(); ++i)
+ kdDebug() << " - " << m_screen->output(m_connectedOutputs[i])->name() << endl;
+ #endif
++
++ // Grab server while messing around
++ XGrabServer(qt_xdisplay());
++
+ RandRMode mode;
+ if (m_proposedRect.size() == m_currentRect.size() && m_proposedRate == m_currentRate)
+ {
+@@ -242,7 +246,10 @@ bool RandRCrtc::applyProposed()
+ if (!m_connectedOutputs.count())
+ mode = RandRMode();
+ else if (!mode.isValid())
++ {
++ XUngrabServer(qt_xdisplay());
+ return false;
++ }
+
+ RROutput *outputs = new RROutput[m_connectedOutputs.count()];
+ int connectedCount = m_connectedOutputs.count();
+@@ -259,7 +266,10 @@ bool RandRCrtc::applyProposed()
+ {
+ QRect r = QRect(0,0,0,0).unite(m_proposedRect);
+ if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
++ {
++ XUngrabServer(qt_xdisplay());
+ return false;
++ }
+
+ // if the desired mode is bigger than the current screen size, first change the
+ // screen size, and then the crtc size
+@@ -267,7 +277,10 @@ bool RandRCrtc::applyProposed()
+ {
+ // try to adjust the screen size
+ if (!adjustScreenSize(r, true))
++ {
++ XUngrabServer(qt_xdisplay());
+ return false;
++ }
+ }
+
+ }
+@@ -280,12 +293,18 @@ bool RandRCrtc::applyProposed()
+ // check if the rotated rect is smaller than the max screen size
+ r = m_screen->rect().unite(r);
+ if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
++ {
++ XUngrabServer(qt_xdisplay());
+ return false;
++ }
+
+ // adjust the screen size
+ r = r.unite(m_currentRect);
+ if (!adjustScreenSize(r,true))
++ {
++ XUngrabServer(qt_xdisplay());
+ return false;
++ }
+ }
+ }
+ }
+@@ -311,6 +330,7 @@ bool RandRCrtc::applyProposed()
+ }
+
+ m_screen->adjustSize();
++ XUngrabServer(qt_xdisplay());
+ return ret;
+ }
+
diff --git a/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-legacy_randr_on_single_output.patch b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-legacy_randr_on_single_output.patch
new file mode 100644
index 000000000..8b406daa5
--- /dev/null
+++ b/mandriva/2010.2/applications/krandr/krandr-0.5.2.1-legacy_randr_on_single_output.patch
@@ -0,0 +1,30 @@
+--- krandr-0.5.2.1/randr/randrdisplay.cpp.orig 2007-09-12 11:00:50.000000000 -0300
++++ krandr-0.5.2.1/randr/randrdisplay.cpp 2007-09-12 11:05:15.000000000 -0300
+@@ -64,6 +64,27 @@ RandRDisplay::RandRDisplay()
+ m_legacyScreens.append(new LegacyRandRScreen(i));
+ }
+
++#ifdef HAS_RANDR_1_2
++ // check if we have more than one output, if no, revert to the legacy behavior
++ if (RandR::has_1_2)
++ {
++ int count = 0;
++ for (int i = 0; i < m_numScreens; ++i)
++ count += m_screens[i]->outputs().count();
++
++ if (count < 2)
++ {
++ RandR::has_1_2 = false;
++ for (int i = 0; i < m_numScreens; ++i)
++ {
++ delete m_screens[i];
++ m_legacyScreens.append(new LegacyRandRScreen(i));
++ }
++ m_screens.clear();
++ }
++ }
++#endif
++
+ setCurrentScreen(QApplication::desktop()->primaryScreen());
+ }
+
diff --git a/mandriva/2010.2/applications/krozat/krozat-effect-0.1.tar.bz2 b/mandriva/2010.2/applications/krozat/krozat-effect-0.1.tar.bz2
new file mode 100644
index 000000000..4356c9eb4
--- /dev/null
+++ b/mandriva/2010.2/applications/krozat/krozat-effect-0.1.tar.bz2
Binary files differ
diff --git a/mandriva/2010.2/applications/krozat/krozat-printf.patch b/mandriva/2010.2/applications/krozat/krozat-printf.patch
new file mode 100644
index 000000000..0c43aef48
--- /dev/null
+++ b/mandriva/2010.2/applications/krozat/krozat-printf.patch
@@ -0,0 +1,12 @@
+--- krozat/krozat.cpp.orig 2009-11-17 13:40:31.000000000 +0000
++++ krozat/krozat.cpp 2009-11-17 13:50:20.000000000 +0000
+@@ -849,7 +849,8 @@
+
+ if (!mImage.load(fpath))
+ {
+- printf(i18n("Failed to load image \"%1\"\n").arg(fpath).local8Bit());
++ /***Adding %s seems to fix this - I hope. tmw***/
++ printf("%s", i18n("Failed to load image \"%1\"\n").arg(fpath).local8Bit());
+ mFileList.remove(fname);
+ if (!mFileList.isEmpty())
+ loadNextImage();
diff --git a/mandriva/2010.2/applications/krozat/krozat-trinity.patch b/mandriva/2010.2/applications/krozat/krozat-trinity.patch
new file mode 100644
index 000000000..4011fd0a2
--- /dev/null
+++ b/mandriva/2010.2/applications/krozat/krozat-trinity.patch
@@ -0,0 +1,11 @@
+--- krozat/krozat.cpp.orig 2011-07-22 15:28:02.429285443 +0100
++++ krozat/krozat.cpp 2011-07-22 15:28:06.356282951 +0100
+@@ -78,7 +78,7 @@
+ time(&t);
+ srand((unsigned int)t);
+
+- KImageIO::registerFormats();
++ //KImageIO::registerFormats();
+
+ //blank();
+
diff --git a/mandriva/2010.2/applications/krozat/krozat.spec b/mandriva/2010.2/applications/krozat/krozat.spec
new file mode 100644
index 000000000..ca5a9bcf7
--- /dev/null
+++ b/mandriva/2010.2/applications/krozat/krozat.spec
@@ -0,0 +1,266 @@
+%define effect_version 0.1
+Summary: Default Mandriva Linux screensaver for KDE
+Name: krozat
+Version: 2008.1.6
+Release: %mkrel 8
+Epoch: 2
+License: GPL
+URL: http://www.mandrivalinux.com/
+
+# get the source from our cvs repository (see
+# http://qa.mandriva.com/twiki/bin/view/Main/CvsGuide)
+# no extra source or patch are allowed here.
+Source: krozat-%{version}.tar.bz2
+Source1: krozat-effect-%{effect_version}.tar.bz2
+Patch0 : krozat-printf.patch
+Patch1: krozat-trinity.patch
+
+BuildRoot: %_tmppath/%name-%version-%release-root
+BuildRequires: X11-devel
+BuildRequires: arts-devel
+BuildRequires: fam-devel
+BuildRequires: kdelibs-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: jpeg-devel
+BuildRequires: png-devel
+BuildRequires: qt3-devel
+BuildRequires: zlib-devel
+BuildRequires: intltool
+# requires qt4 for the effect generation tool
+BuildRequires: qt4-devel
+
+Summary: Default Mandriva Linux screensaver for KDE
+Group: Graphical desktop/KDE3
+Requires: kdebase-progs
+Requires: mandriva-theme-screensaver
+
+%description
+This package contains the default Mandriva Linux screensaver for KDE.
+
+%prep
+
+%setup -q -a 1
+%patch0 -p0
+find . -type 'd' -name 'CVS' | xargs rm -fr
+%patch1 -p0
+
+%build
+%configure_kde3
+
+%make
+
+pushd krozat-effect-%{effect_version}
+ qmake
+ make
+popd
+
+%install
+rm -rf %buildroot
+
+%makeinstall_std
+%find_lang krozat
+
+pushd krozat-effect-%{effect_version}
+ mkdir -p %buildroot%_kde3_bindir
+ cp krozat-effect %buildroot%_kde3_bindir
+popd
+
+%clean
+rm -fr %buildroot
+
+%files -f krozat.lang
+%defattr(-,root,root)
+#
+%_kde3_bindir/krozat.kss
+%_kde3_bindir/krozat-effect
+#
+#
+%dir %_kde3_datadir/applnk/System/
+%dir %_kde3_datadir/applnk/System/ScreenSavers/
+%_kde3_datadir/applnk/System/ScreenSavers/*.desktop
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-8mvt2010.2
++ Rebuild for Trinity
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-7mvt2010.0
++ Rebuild for MDV 2010.1
+
+* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2:2008.1.6-6mvt2010.0
++ Fix group in specfile
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-5mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Sat Nov 08 2008 Oden Eriksson <oeriksson@mandriva.com> 2:2008.1.6-4mdv2009.1
++ Revision: 301006
+- rebuilt against new libxcb
+
+* Tue Jun 17 2008 Thierry Vignaud <tvignaud@mandriva.com> 2:2008.1.6-3mdv2009.0
++ Revision: 221993
+- rebuild
+
+* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 2:2008.1.6-2mdv2009.0
++ Revision: 204750
+- Move to /opt
+
+* Wed Mar 26 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.6-1mdv2008.1
++ Revision: 190515
+- New release fixing a string message in the config dialog (#38644)
+
+* Tue Mar 11 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.5-1mdv2008.1
++ Revision: 186866
+- New release adding a fake desktop fading effect
+
+* Wed Mar 05 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.4-1mdv2008.1
++ Revision: 180184
+- New release changing only the time the screensaver will wait on each image
+ and the transition speed.
+
+* Tue Mar 04 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.3-1mdv2008.1
++ Revision: 178440
+- New release enabling the setup option of the screensaver
+
+* Tue Mar 04 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.2-3mdv2008.1
++ Revision: 178432
+- Add a effect generation tool to help users creating their own themes for the
+ screensaver
+
+* Thu Feb 28 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.2-2mdv2008.1
++ Revision: 176403
+- new release (2008.1.2) adding support for extra slideshow themes
+
+* Mon Feb 18 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.1-1mdv2008.1
++ Revision: 171922
+- new release improving the crossfade effect
+
+* Thu Feb 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.0-1mdv2008.1
++ Revision: 167780
+- new release adding the crossfade effect for the machines that are able to
+ use it. For machines that don't have 2D acceleration, the screensaver will
+ revert its behavior to the previous one.
+
+* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 2:2008.0.1-2mdv2008.1
++ Revision: 141740
+- rebuilt against openldap-2.4.7 libs
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+ - fix summary-ended-with-dot
+ - buildrequires X11-devel instead of XFree86-devel
+
+* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.0.1-1mdv2008.0
++ Revision: 93139
+- new release fixing image downscaling.
+
+* Mon Sep 24 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.0-1mdv2008.0
++ Revision: 92499
+- New release including a fix from Neoclust for the desktop file
+
+* Fri Sep 21 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008-1mdv2008.0
++ Revision: 92021
+- new version fixing it for 2008.0
+- spec cleanup
+
+ + Anssi Hannula <anssi@mandriva.org>
+ - Import krozat
+
+
+
+
+* Sat Sep 16 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-4
+- Fix requires
+
+* Fri Sep 15 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-3
+- Only show krozat in kde
+
+* Wed May 10 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-1mdk
+- Rebuild to generate category
+
+* Tue Aug 30 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-4mdk
+- Fix other color
+
+* Tue Aug 30 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-3mdk
+- Adapt background color to distro
+
+* Tue Aug 16 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-2mdk
+- Rebuild
+
+* Mon Aug 15 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-1mdk
+- Rebuild
+
+* Wed Oct 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-3mdk
+- Fix translation pb (bug found by Gwenole)
+
+* Wed Oct 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-2mdk
+- Updtae po
+
+* Tue Aug 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-1mdk
+- Update po file
+
+* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-7mdk
+- Update version
+
+* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-6mdk
+- Rebuild with new gcc
+- Fix automake/autoconf
+- use %%mdkversion
+
+* Fri Feb 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-6mdk
+- Update po file
+
+* Fri Jan 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-5mdk
+- Fix requires (found by vdanen)
+
+* Thu Jan 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-4mdk
+- Fix other mem leak
+
+* Thu Jan 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-3mdk
+- Rebuild
+- update po file
+- Fix make clean
+- Fix mem leak
+
+* Thu Dec 04 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-2mdk
+- Translate po file
+
+* Tue Dec 02 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-1mdk
+- Add po file
+
+* Tue Sep 02 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-4mdk
+- Fix build
+
+* Thu Jul 17 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-3mdk
+- Rebuild
+
+* Tue Dec 24 2002 Stefan van der Eijk <stefan@eijk.nu. 9.1-2mdk
+- BuildRequires: libart_lgpl2-devel
+
+
+* Tue Dec 17 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-1mdk
+- 9.1
+
+* Fri Oct 18 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-7mdk
+- Rebuild
+
+* Sat Aug 31 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-6mdk
+- Fix about dialogbox
+
+* Fri Aug 23 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-5mdk
+- Fix MDK copyright.
+
+* Wed Aug 14 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-4mdk
+- Rebuild against new gcc-3.2
+
+* Fri Aug 9 2002 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 9.0-3mdk
+- lib64 fixes, again. They were split to nihil when mandrake_desk was split
+
+* Thu Aug 8 2002 Stefan van der Eijk <stefan@eijk.nu> 9.0-2mdk
+- BuildRequires
+
+* Fri Aug 02 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-1mdk
+- Initial package
diff --git a/mandriva/2010.2/applications/ksmoothdock/ksmoothdock-4.5-compile.patch b/mandriva/2010.2/applications/ksmoothdock/ksmoothdock-4.5-compile.patch
new file mode 100644
index 000000000..12961a9aa
--- /dev/null
+++ b/mandriva/2010.2/applications/ksmoothdock/ksmoothdock-4.5-compile.patch
@@ -0,0 +1,31 @@
+--- src/ksmoothdock.h.orig 2009-03-26 15:25:26.000000000 +0100
++++ src/ksmoothdock.h 2009-03-26 15:27:13.000000000 +0100
+@@ -26,6 +26,8 @@
+ #include <config.h>
+ #endif
+
++#include <iostream>
++#include <memory>
+ #include <vector>
+
+ #include <qwidget.h>
+--- src/ksmoothdock.cpp.orig 2009-03-26 15:28:35.000000000 +0100
++++ src/ksmoothdock.cpp 2009-03-26 15:28:53.000000000 +0100
+@@ -24,6 +24,7 @@
+
+ #include <iostream>
+ #include <iterator>
++#include <typeinfo>
+
+ #include <qdir.h>
+
+--- src/paraboliczoomstate.cpp.orig 2009-03-26 15:29:43.000000000 +0100
++++ src/paraboliczoomstate.cpp 2009-03-26 15:30:38.000000000 +0100
+@@ -21,6 +21,7 @@
+
+ #include <iostream>
+ #include <unistd.h>
++#include <cstdlib>
+
+ #include <qapplication.h>
+ #include <qbitmap.h>
diff --git a/mandriva/2010.2/applications/ksmoothdock/ksmoothdock.spec b/mandriva/2010.2/applications/ksmoothdock/ksmoothdock.spec
new file mode 100644
index 000000000..7f7d53f7c
--- /dev/null
+++ b/mandriva/2010.2/applications/ksmoothdock/ksmoothdock.spec
@@ -0,0 +1,157 @@
+%define name ksmoothdock
+%define version 4.5
+%define release %mkrel 8
+%define _liconsdir %_kde3_iconsdir/large
+%define _miconsdir %_kde3_iconsdir/mini
+
+Summary: Desktop panel for KDE3
+Name: %{name}
+Version: %{version}
+Release: %{release}
+License: GPL
+Url: http://ksmoothdock.sourceforge.net/
+Group: Graphical desktop/KDE3
+Source: %{name}-%{version}_automake-1.9.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: kdebase3-devel
+BuildRequires: chrpath
+Patch0: ksmoothdock-4.5-compile.patch
+
+%description
+KSmoothDock is a cool desktop panel (like KDE's kicker) for KDE 3.2 with
+smooth zooming (2 modes: normal & parabolic). Its aim is to provide
+a cool alternative/complement to kicker. As it is intended for KDE/Linux,
+its behaviour will be like that of kicker.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p0
+
+%build
+%configure_kde3
+
+%make
+
+%install
+rm -Rf %{buildroot}
+%makeinstall_std
+
+desktop-file-install --vendor="" \
+ --add-category="KDE" \
+ --add-category="X-MandrivaLinux-Multimedia-Sound" \
+ --add-only-show-in="KDE" \
+ --dir %{buildroot}%{_kde3_datadir}/applications %{buildroot}%{_kde3_datadir}/applnk/Utilities/*
+
+
+mkdir -p %{buildroot}/{%_kde3_iconsdir,%{_miconsdir},%{_liconsdir}}
+ln -s ../hicolor/16x16/apps/%{name}.png %{buildroot}/%{_miconsdir}
+ln -s ../hicolor/32x32/apps/%{name}.png %{buildroot}/%{_liconsdir}
+ln -s hicolor/32x32/apps/%{name}.png %{buildroot}/%_kde3_iconsdir
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%if %mdkversion < 200900
+%post
+%{update_menus}
+%endif
+
+%if %mdkversion < 200900
+%postun
+%{clean_menus}
+%endif
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL README TODO
+%_kde3_iconsdir/%{name}.png
+%{_liconsdir}/%{name}.png
+%{_miconsdir}/%{name}.png
+%{_kde3_bindir}/%{name}
+%{_kde3_datadir}/applications/ksmoothdock.desktop
+%{_kde3_datadir}/applnk/Utilities/ksmoothdock.desktop
+%{_kde3_datadir}/apps/ksmoothdock/ksmoothdockui.rc
+%dir %{_kde3_docdir}/HTML/en/ksmoothdock
+%{_kde3_docdir}/HTML/en/ksmoothdock/common
+%{_kde3_docdir}/HTML/en/ksmoothdock/index.cache.bz2
+%{_kde3_docdir}/HTML/en/ksmoothdock/index.docbook
+%{_kde3_iconsdir}/hicolor/16x16/apps/ksmoothdock.png
+%{_kde3_iconsdir}/hicolor/32x32/apps/ksmoothdock.png
+
+
+%changelog
+* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 4.5-8mvt2010.0
++ Rebuild for Trinity
+
+* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 4.5-7mvt2010.0
++ Rebuild for MDV 2010.1
+
+* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 4.5-6mvt2010.0
++ Fix spec file
+
+* Fri Dec 25 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 4.5-5mvt2010.0
++ Rebuild
+
+* Thu Mar 26 2009 Helio Chissini de Castro <helio@mandriva.com> 4.5-4mdv2009.1
++ Revision: 361356
+- Bump to rebuild against cooker
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - rebuild
+
+ + Pixel <pixel@mandriva.com>
+ - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
+
+* Wed Jan 02 2008 Olivier Blin <oblin@mandriva.com> 4.5-1mdv2008.1
++ Revision: 140918
+- restore BuildRoot
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Thu Jun 14 2007 Emmanuel Blindauer <blindauer@mandriva.org> 4.5-1mdv2008.0
++ Revision: 39330
+- 4.5 version and xdg menu
+
+
+* Wed Mar 14 2007 Emmanuel Blindauer <blindauer@mandriva.org> 4.3-1mdv2007.1
++ Revision: 143848
+- try to fix x86_64 compilation
+- new version
+- Import ksmoothdock
+
+* Mon Aug 14 2006 Emmanuel Blindauer <blindauer@mandriva.org> 3.6.1-3mdv2007.0
+- correct some rpmlint warning and errors
+
+* Sat May 20 2006 Christiaan Welvaart <cjw@daneel.dyndns.org> 3.6.1-2mdk
+- build with automake1.8
+
+* Sat Feb 11 2006 Nicolas L�cureuil <neoclust@mandriva.org> 3.6.1-1mdk
+- New release 3.6.1
+- Rediff patch 1, 2
+
+* Mon Dec 26 2005 Nicolas L�cureuil <neoclust@mandriva.org> 3.5.1-4mdk
+- Fix Build
+- use mkrel
+
+* Fri Feb 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.5.1-3mdk
+- Add patch2: fix mem leak
+
+* Fri Feb 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.5.1-2mdk
+- Add patch1: fix includemoc
+
+* Fri Feb 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.5.1-1mdk
+- 3.5.1
+
+* Tue Feb 22 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3-3mdk
+- Fix build on 64_x86
+
+* Fri Jul 23 2004 Michael Scherer <misc@mandrake.org> 3.3-2mdk
+- rebuild for new gcc
+- remove libtool hack
+- add description
+
+* Sat May 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 3.3-1mdk
+- first package
+
diff --git a/mandriva/2010.2/applications/ktorrent/kde3-ktorrent.spec b/mandriva/2010.2/applications/ktorrent/kde3-ktorrent.spec
new file mode 100644
index 000000000..0ea8308a1
--- /dev/null
+++ b/mandriva/2010.2/applications/ktorrent/kde3-ktorrent.spec
@@ -0,0 +1,147 @@
+#See here :http://wiki.mandriva.com/en/Underlinking#Problems_introduced_by_--no-undefined
+%define _disable_ld_no_undefined 1
+
+
+%define name kde3-ktorrent
+%define oname ktorrent
+%define version 3.5.12
+%define rel 1
+%define kde3_miconsdir %_kde3_iconsdir/mini
+%define kde3_liconsdir %_kde3_iconsdir/large
+# Note that this package does not follow the library policy as the
+# main package includes the libktorrent shared object. This is done
+# because 1) the library is only used internally by ktorrent, and so
+# it does never need to be installed separately, and 2) the %major
+# follows %version, thus resulting in one unuseful library package
+# in every ktorrent version upgrade. The only downside of not
+# following the library policy on this particular package I know is
+# rpmlint going nuts.
+#
+# Feel free to flame me if you do not like this...
+# -Anssi
+
+%define major %version
+
+Summary: BitTorrent program for KDE
+Name: %{name}
+Version: %{version}
+Release: %mkrel %{rel}
+Group: Networking/File transfer
+License: GPLv2+
+Url: http://ktorrent.org/
+Source0: http://ktorrent.org/downloads/%{version}/%{oname}-%{version}.tar.bz2
+Patch0: ktorrent-fix-KBytesPerSecToString.diff
+Patch1: ktorrent-php-path.patch
+Patch2: kde-3.5.10-acinclude.patch
+#Patch3: fix_autotools.patch
+Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
+Patch8: kdebase-3.5.12-config.patch
+BuildRoot: %{_tmppath}/%{oname}-%{version}-%{release}-buildroot
+BuildRequires: kde3-macros
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%else
+BuildRequires: autoconf >= 1:2.65
+%endif
+BuildRequires: automake >= 1.6.1
+BuildRequires: gmp-devel
+BuildRequires: kdelibs-devel
+BuildRequires: desktop-file-utils
+Obsoletes: %{_lib}ktorrent0 %{_lib}ktorrent2.1 %{_lib}ktorrent2.1.1
+Obsoletes: %{_lib}ktorrent2.1.2 %{_lib}ktorrent2.1.3
+
+%description
+KTorrent is a BitTorrent program for KDE. It's main features are:
+ o Downloads torrent files
+ o Upload speed capping, seeing that most people can't upload
+ infinite amounts of data.
+ o Internet searching using The Bittorrent website's search engine
+ o UDP Trackers
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch0
+%patch1
+%if %mdkversion >= 201000
+%patch2 -p1
+#%patch3 -p1
+%endif
+
+%patch7 -p0
+%patch8 -p0
+
+%build
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+make -f admin/Makefile.common
+%configure_kde3 --disable-debug \
+ --enable-mt \
+ --disable-static \
+ --enable-shared \
+ --disable-objprelink \
+ --with-pic \
+ --with-gnu-ld \
+ --disable-embedded \
+ --enable-fast-install=yes \
+ --with-qt-dir=%{qt3dir} \
+ --with-xinerama \
+ --enable-final
+%make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall_std
+
+desktop-file-install --vendor="" \
+ --add-category="P2P" \
+ --dir %{buildroot}%_kde3_datadir/applications/kde \
+ %{buildroot}%_kde3_datadir/applications/kde/ktorrent.desktop
+
+install -m644 apps/ktorrent/hi16-app-ktorrent.png -D $RPM_BUILD_ROOT%kde3_miconsdir/%{oname}.png
+install -m644 apps/ktorrent/hi32-app-ktorrent.png -D $RPM_BUILD_ROOT%_kde3_iconsdir/%{oname}.png
+install -m644 apps/ktorrent/hi48-app-ktorrent.png -D $RPM_BUILD_ROOT%kde3_liconsdir/%{oname}.png
+
+%find_lang %{oname}
+rm -f $RPM_BUILD_ROOT%_kde3_libdir/libktorrent.{so,la}
+
+#Fix Conflictss with kdelibs-common
+rm -f $RPM_BUILD_ROOT%_kde3_datadir/mimelnk/application/x-bittorrent.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%if %mdkversion < 200900
+%post
+/sbin/ldconfig
+%update_menus
+%update_desktop_database
+%update_icon_cache hicolor
+%endif
+
+%if %mdkversion < 200900
+%postun
+/sbin/ldconfig
+%clean_menus
+%clean_desktop_database
+%clean_icon_cache hicolor
+%endif
+
+%files -f %{oname}.lang
+%defattr(-,root,root)
+%doc AUTHORS README
+%_kde3_bindir/*
+%_kde3_libdir/kde3/*
+%_kde3_libdir/libktorrent-2.2.6.so
+%_kde3_datadir/services/*
+%_kde3_datadir/servicetypes/*
+%_kde3_datadir/apps/%{oname}
+%_kde3_datadir/applications/kde/%{oname}.desktop
+%_kde3_datadir/config.kcfg/*.kcfg
+%_kde3_iconsdir/hicolor/scalable/apps/%{oname}.svgz
+%kde3_miconsdir/%{oname}.png
+%_kde3_iconsdir/%{oname}.png
+%kde3_liconsdir/%{oname}.png
+%_kde3_iconsdir/hicolor/*/apps/*.png
+%_kde3_iconsdir/hicolor/*/mimetypes/*.png
+%_kde3_iconsdir/hicolor/*/mimetypes/*.svgz
diff --git a/mandriva/2010.2/applications/ktorrent/ktorrent-fix-KBytesPerSecToString.diff b/mandriva/2010.2/applications/ktorrent/ktorrent-fix-KBytesPerSecToString.diff
new file mode 100644
index 000000000..cdd85d4ec
--- /dev/null
+++ b/mandriva/2010.2/applications/ktorrent/ktorrent-fix-KBytesPerSecToString.diff
@@ -0,0 +1,15 @@
+--- libktorrent/interfaces/functions.cpp.orig 2006-05-21 00:06:28.000000000 +0200
++++ libktorrent/interfaces/functions.cpp 2006-05-21 00:06:54.000000000 +0200
+@@ -46,7 +46,11 @@
+ QString KBytesPerSecToString(double speed,int precision)
+ {
+ KLocale* loc = KGlobal::locale();
+- return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
++ QString tmp = loc->formatNumber(speed,precision);
++ if (tmp.startsWith("inf"))
++ return i18n("%1 KB/sec").arg("> 0.0");
++ else
++ return i18n("%1 KB/sec").arg(tmp);
+ }
+
+ QString DurationToString(Uint32 nsecs)
diff --git a/mandriva/2010.2/applications/ktorrent/ktorrent-php-path.patch b/mandriva/2010.2/applications/ktorrent/ktorrent-php-path.patch
new file mode 100644
index 000000000..9f97c3ca8
--- /dev/null
+++ b/mandriva/2010.2/applications/ktorrent/ktorrent-php-path.patch
@@ -0,0 +1,11 @@
+--- plugins/webinterface/ktwebinterfaceplugin.kcfg.orig 2007-02-05 23:43:07.000000000 +0100
++++ plugins/webinterface/ktwebinterfaceplugin.kcfg 2007-02-05 23:43:15.000000000 +0100
+@@ -26,7 +26,7 @@
+ </entry>
+ <entry name="phpExecutablePath" type ="String">
+ <label>php executable path</label>
+- <default></default>
++ <default>/usr/bin/php</default>
+ </entry>
+
+ <entry name="username" type ="String">
diff --git a/mandriva/2010.2/applications/kvolumeosd/kde3-kvolumeosd.spec b/mandriva/2010.2/applications/kvolumeosd/kde3-kvolumeosd.spec
new file mode 100644
index 000000000..51b22059c
--- /dev/null
+++ b/mandriva/2010.2/applications/kvolumeosd/kde3-kvolumeosd.spec
@@ -0,0 +1,94 @@
+%define oname KVolumeOSD
+
+Name: kde3-kvolumeosd
+Version: 0.1
+Release: %mkrel 6
+Summary: An application showing OSD to respond volume buttons
+License: GPLv2+
+Group: Graphical desktop/KDE3
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL: http://www.kde-apps.org/content/show.php?content=80354
+Source: http://www.kde-apps.org/CONTENT/content-files/80354-%{oname}-%{version}.tar.gz
+Patch0: kde-3.5.10-acinclude.patch
+Patch1: fix_autotools.patch
+BuildRequires: kde3-macros
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+BuildRequires: automake >= 1.6.1
+%else
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: automake >= 1.11
+%endif
+BuildRequires: kdelibs-devel
+BuildRequires: desktop-file-utils
+Requires: kdemultimedia-kmix
+
+%description
+KVolumeOSD is a simple KDE application that runs in the background and
+responds to volume buttons by showing a little OSD. It delegates the
+actual job of adjusting the volume to KMix.
+
+%prep
+%setup -q -n %{oname}
+%if %mdkversion >= 201000
+%patch0 -p1
+%patch1 -p1
+%endif
+
+%build
+make -f Makefile.cvs
+%configure_kde3
+%make
+
+%install
+rm -rf %buildroot
+%makeinstall_std
+
+desktop-file-install --vendor='' --delete-original \
+ --dir %buildroot%_kde3_datadir/applications/kde \
+ --add-category='Audio;Mixer' \
+ %buildroot%_kde3_datadir/applnk/Utilities/kvolumeosd.desktop
+
+%clean
+rm -rf %buildroot
+
+%if %mdkversion < 200900
+%post
+%{update_menus}
+%update_kde3_icon_cache hicolor
+
+%postun
+%{clean_menus}
+%clean_kde3_icon_cache hicolor
+%endif
+
+%files
+%defattr(-,root,root)
+%{_kde3_bindir}/kvolumeosd
+%{_kde3_appsdir}/kvolumeosd
+%{_kde3_datadir}/doc/HTML/en/kvolumeosd
+%{_kde3_datadir}/applications/kde/*.desktop
+%{_kde3_iconsdir}/hicolor/*/apps/*
+
+
+%changelog
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 0.1-6mdv2010.2
++ Rebuild for Trinity
+
+* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.1-5mdv2010.1
++ Rebuild MDV 2010.1
+
+* Sun Feb 14 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-4mvt2010.0
++ Fix build with autoconf 2.65 and automake 1.11
++ Change package group
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 0.1-3mdv2010.0
++ Rebuild MDV 2010.0
+
+* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-2mdv2009.0
++ Revision: 205328
+- fix post and postun script
+- fix name
+- import source and spec
+- Created package structure for kde3-kvolumeosd.
+
diff --git a/mandriva/2010.2/common-patches/ac264.patch b/mandriva/2010.2/common-patches/ac264.patch
new file mode 100644
index 000000000..284545fa6
--- /dev/null
+++ b/mandriva/2010.2/common-patches/ac264.patch
@@ -0,0 +1,24 @@
+--- kdelibs-3.5.10/admin/configure.in.min~ 2008-08-19 22:28:39.000000000 +0200
++++ kdelibs-3.5.10/admin/configure.in.min 2009-08-17 19:13:01.823156420 +0200
+@@ -44,6 +44,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+--- kdelibs-3.5.10/configure.in.in~ 2006-05-22 20:14:23.000000000 +0200
++++ kdelibs-3.5.10/configure.in.in 2009-08-17 19:16:04.549804009 +0200
+@@ -25,6 +25,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_LIBLTDL_CONVENIENCE
+
diff --git a/mandriva/2010.2/common-patches/fix_autotools.patch b/mandriva/2010.2/common-patches/fix_autotools.patch
new file mode 100644
index 000000000..60382d25d
--- /dev/null
+++ b/mandriva/2010.2/common-patches/fix_autotools.patch
@@ -0,0 +1,34 @@
+diff -Naur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-yeni/admin/cvs.sh
+--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 23:28:39.000000000 +0300
++++ kdelibs-3.5.10-yeni/admin/cvs.sh 2010-01-01 21:30:35.039582467 +0200
+@@ -29,10 +29,10 @@
+
+ check_autotool_versions()
+ {
+-required_autoconf_version="2.53 or newer"
++required_autoconf_version="2.53 or newer up to 2.65"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
++ Autoconf*2.5* | autoconf*2.5* | autoconf*2.60 | autoconf*2.61 | autoconf*2.62 | autoconf*2.63 | autoconf*2.65 ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -47,7 +47,7 @@
+
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
++ Autoconf*2.5* | autoheader*2.5* | autoheader*2.60 | autoheader*2.61 | autoheader*2.62 | autoheader*2.63 | autoheader*2.65 ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -68,7 +68,7 @@
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
+ echo "*** $AUTOMAKE_STRING found."
+ UNSERMAKE=no
+ ;;
diff --git a/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
new file mode 100644
index 000000000..0610d6df5
--- /dev/null
+++ b/mandriva/2010.2/common-patches/kde-3.5.10-acinclude.patch
@@ -0,0 +1,66 @@
+2009-12-10 Stepan Kasal <skasal@redhat.com>
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
++++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[
++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++ CFLAGS=" $CFLAGS"
++ AC_PROG_CC
++ CXXFLAGS=" $CXXFLAGS"
++ AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
+ [
+@@ -3141,11 +3151,6 @@
+ [kde_use_profiling="no"]
+ )
+
+- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+- CFLAGS=" $CFLAGS"
+-
+- AC_PROG_CC
+-
+ AC_PROG_CPP
+
+ if test "$GCC" = "yes"; then
+@@ -3174,10 +3179,6 @@
+ LDFLAGS=""
+ fi
+
+- CXXFLAGS=" $CXXFLAGS"
+-
+- AC_PROG_CXX
+-
+ KDE_CHECK_FOR_BAD_COMPILER
+
+ if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+@@ -3503,8 +3504,8 @@
+ AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+ AC_REQUIRE([KDE_CHECK_LIB64])
+
+-AC_OBJEXT
+-AC_EXEEXT
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
+
+ AM_PROG_LIBTOOL
+ AC_LIBTOOL_CXX
diff --git a/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch b/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch
new file mode 100644
index 000000000..922315b6e
--- /dev/null
+++ b/mandriva/2010.2/common-patches/kdebase-3.5.12-config.patch
@@ -0,0 +1,12 @@
+--- admin/configure.in.min.orig 2011-07-13 14:02:37.735906184 +0100
++++ admin/configure.in.min 2011-07-13 14:03:14.916906166 +0100
+@@ -44,6 +44,9 @@
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
++
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
diff --git a/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch b/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch
new file mode 100644
index 000000000..1deb924c0
--- /dev/null
+++ b/mandriva/2010.2/common-patches/kdebase-3.5.12-move-xdg-menu-dir.patch
@@ -0,0 +1,11 @@
+--- admin/acinclude.m4.in.orig 2010-08-12 23:39:22.000000000 +0100
++++ admin/acinclude.m4.in 2011-07-19 13:40:17.619311049 +0100
+@@ -527,7 +527,7 @@
+ xdg_appsdir='\${datadir}/applications/kde'
+ fi
+ if test -z "$xdg_menudir"; then
+- xdg_menudir='\${sysconfdir}/xdg/menus'
++ xdg_menudir='\${sysconfdir}/xdg/kde/menus'
+ fi
+ if test -z "$xdg_directorydir"; then
+ xdg_directorydir='\${datadir}/desktop-directories'
diff --git a/mandriva/2010.2/common-patches/readme.txt b/mandriva/2010.2/common-patches/readme.txt
new file mode 100644
index 000000000..282020b80
--- /dev/null
+++ b/mandriva/2010.2/common-patches/readme.txt
@@ -0,0 +1,2 @@
+This directory contains some common patches which are applied to the majority
+of the Trinity sources.
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
new file mode 100644
index 000000000..1a2323267
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
@@ -0,0 +1,13 @@
+--- arts-1.5.3/mcop/mcoputils.cc 2005-12-22 21:20:23.000000000 -0200
++++ arts-1.5.3/mcop/mcoputils.cc.new 2006-07-19 14:44:08.000000000 -0300
+@@ -371,7 +371,9 @@
+ }
+ if (!mcop_dir)
+ {
+- arts_fatal("can't create mcop directory");
++ return "Unable to create mcop directory";
++
++ // arts_fatal("can't create mcop directory");
+ }
+ string tmpdir = mcop_dir;
+ return tmpdir+"/"+name;
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
new file mode 100644
index 000000000..2adce7f91
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
@@ -0,0 +1,70 @@
+? flow/audioiooss.cc,v
+? flow/audioioossthreaded.cc,v
+Index: flow/Makefile.am
+===================================================================
+RCS file: /home/kde/arts/flow/Makefile.am,v
+retrieving revision 1.79
+diff -u -3 -p -r1.79 Makefile.am
+--- flow/Makefile.am 18 Nov 2004 20:19:59 -0000 1.79
++++ flow/Makefile.am 25 Feb 2005 13:58:07 -0000
+@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
+
+ libartsflow_idl_la_SOURCES = artsflow.cc
+ libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+-libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
++libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4) -lresmgr
+
+ libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
+ $(top_builddir)/flow/gsl/libgsl.la
+Index: flow/audioiooss.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioiooss.cc,v
+retrieving revision 1.17
+diff -u -3 -p -r1.17 audioiooss.cc
+--- flow/audioiooss.cc 20 Nov 2004 04:55:21 -0000 1.17
++++ flow/audioiooss.cc 25 Feb 2005 13:58:07 -0000
+@@ -49,6 +49,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -157,7 +158,9 @@ bool AudioIOOSS::open()
+ return false;
+ }
+
+- audio_fd = ::open(_deviceName.c_str(), mode, 0);
++ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++ if(audio_fd == -1)
++ audio_fd = ::open(_deviceName.c_str(), mode, 0);
+
+ if(audio_fd == -1)
+ {
+Index: flow/audioioossthreaded.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioioossthreaded.cc,v
+retrieving revision 1.6
+diff -u -3 -p -r1.6 audioioossthreaded.cc
+--- flow/audioioossthreaded.cc 20 Jan 2005 12:34:01 -0000 1.6
++++ flow/audioioossthreaded.cc 25 Feb 2005 13:58:07 -0000
+@@ -50,6 +50,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -202,7 +203,9 @@ bool AudioIOOSSThreaded::open()
+ return false;
+ }
+
+- audio_fd = ::open(_deviceName.c_str(), mode, 0);
++ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++ if(audio_fd == -1)
++ audio_fd = ::open(_deviceName.c_str(), mode, 0);
+
+ if(audio_fd == -1)
+ {
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
new file mode 100644
index 000000000..d5de29ace
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
@@ -0,0 +1,20 @@
+--- arts-1.5.9/mcop/mcoputils.cc.orig 2008-06-02 09:28:23.000000000 -0300
++++ arts-1.5.9/mcop/mcoputils.cc 2008-06-02 09:28:42.000000000 -0300
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <limits.h>
+ #include <netdb.h>
+ #include <errno.h>
+ #include <config.h>
+--- arts-1.5.9/artsc/artsdsp.c.orig 2008-06-02 09:27:24.000000000 -0300
++++ arts-1.5.9/artsc/artsdsp.c 2008-06-02 09:27:52.000000000 -0300
+@@ -21,6 +21,7 @@
+ */
+
+ #define _GNU_SOURCE 1
++#undef _FORTIFY_SOURCE
+
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/mandriva/2010.2/dependencies/arts/arts3.spec b/mandriva/2010.2/dependencies/arts/arts3.spec
new file mode 100644
index 000000000..ab0bb5d6c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts3.spec
@@ -0,0 +1,347 @@
+%define compile_apidox 1
+%{?_no_apidox: %{expand: %%global compile_apidox 0}}
+%define oname arts
+%define epoch_arts 30000001
+
+# Define short-cuts for libification
+%define major 1
+
+%define libname %mklibname arts %{major}
+
+%define lib_name_orig libarts
+
+Name: arts3
+Summary: Arts - Libraries
+Version: 1.5.12
+Release: %mkrel 1
+Epoch: %{epoch_arts}
+Group: Graphical desktop/KDE3
+License: ARTISTIC BSD GPL_V2 LGPL_V2 QPL_V1.0
+BuildRoot: %_tmppath/%name-%version-%release-root
+Requires(pre): %{libname} = %{epoch_arts}:%version-%release
+URL: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
+Patch0: arts-1.5.3-resmgr.patch
+Patch2: arts-1.5.3-mcop-msgkill.patch
+Patch4: arts-1.5.9-gcc4.3.x-compile.patch
+Patch5: kde-3.5.10-acinclude.patch
+BuildRequires: kde3-macros
+BuildRequires: audiofile-devel
+BuildRequires: qt3-devel
+BuildRequires: glib2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: resmgr-devel
+BuildRequires: X11-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires: esound-devel
+BuildRequires: multiarch-utils >= 1.0.3
+BuildRequires: jackit-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libtqtinterface-devel >= 3.5.12
+BuildConflicts: mas-devel
+Obsoletes: aethera =< 0.9.3-5mdk
+Obsoletes: brahms =< 1.02-3mdk
+Obsoletes: dotNETStyle =< 0.9.2-2mdk
+Obsoletes: drivetweak-kde- =< 0.9.1-1mdk
+Obsoletes: guarddog =< 1.9.14-1mdk
+Obsoletes: k3b =< 0.5.1-2mdk
+Obsoletes: karchiver =< 2.0.5-3mdk
+Obsoletes: kdestudio =< 2.0.0-10mdk
+Obsoletes: kdevmon =< 0.4.5-2mdk
+Obsoletes: keduca =< 0.4-6mdk
+Obsoletes: keurocalc =< 0.5.8-1mdk
+Obsoletes: kfontinst =< 0.10-1mdk
+Obsoletes: kgesture =< 0.3-6mdk
+Obsoletes: kguitar =< 0.4-2mdk
+Obsoletes: kinkatta =< 1.00-1mdk
+Obsoletes: kmag =< 0.7-1mdk
+Obsoletes: kmymoney2 =< 0.4-1mdk
+Obsoletes: knetfilter =< 2.2.5-1mdk
+Obsoletes: komba2 =< 0.72-1mdk
+Obsoletes: koncd =< 1.0rc2-2mdk
+Obsoletes: konnector =< 0.5-4mdk
+Obsoletes: konverse =< 0.2-3mdk
+Obsoletes: kover =< 0.8.3-2mdk
+Obsoletes: kreatecd =< 1.1.0-2mdk
+Obsoletes: krpmbuilder =< 0.2.6-4mdk
+Obsoletes: krusader =< 1.01-1mdk
+Obsoletes: kshowmail =< 2.2.3-1mdk
+Obsoletes: ksnuffle =< 2.2-6mdk
+Obsoletes: ksplashml =< 0.92-1mdk
+Obsoletes: kstars =< 0.8.5-1mdk
+Obsoletes: kstocks =< 2.0.2-8mdk
+Obsoletes: ktexmaker2 =< 1.7-2mdk
+Obsoletes: ktouch =< 1.0-4mdk
+Obsoletes: kuickshow =< 0.8.2-3mdk
+Obsoletes: kwatch =< 2.2.0-1mdk
+Obsoletes: kwave =< 0.6.3-3mdk
+Obsoletes: kwintv =< 0.8.11-5mdk
+Obsoletes: kxicq2 =< 0.7.6-1mdk
+Obsoletes: kxmleditor =< 0.7.1-2mdk
+Obsoletes: libbrahms0 =< 1.02-3mdk
+Obsoletes: libkarchiver2 =< 2.0.5-3mdk
+Obsoletes: libkguitar1 =< 0.4-2mdk
+Obsoletes: libxmms-kde1 =< 6.5-5mdk
+Obsoletes: sakuraplayer =< 1.0.6-1mdk umlmodeller =< 1.0.3-5mdk
+Obsoletes: cervisia =< 1.4.1-7mdk
+Obsoletes: kbiff =< 3.5.4-3mdk
+Obsoletes: kcpuload =< 1.90-11mdk
+Obsoletes: kdbg =< 1.2.5-1mdk
+Obsoletes: kdeaddons3
+Obsoletes: kdeadmin3
+Obsoletes: kdeartwork3
+Obsoletes: kdebindings3
+Obsoletes: kdemultimedia3
+Obsoletes: kdemultimedia3-aktion
+Obsoletes: kdenetwork3
+Obsoletes: kdepim3
+Obsoletes: kdesdk3
+Obsoletes: kdetoys3
+Obsoletes: kdeutils3
+Obsoletes: kdevelop3
+Obsoletes: klogic =< 1.35-1mdk
+Obsoletes: klyx =< 2.0-17mdk
+Obsoletes: kmago =< 1.1.2-5mdk
+Obsoletes: knetload =< 1.91-8mdk
+Obsoletes: koffice =< 1.1.1-14mdk
+Obsoletes: kpl2 =< 2.3.0-1mdk
+Obsoletes: krootwarning =< 8.2-13mdk
+Obsoletes: krozat =< 8.2-13mdk
+Obsoletes: ksetiwatch =< 2.2.5-1mdk
+Obsoletes: ktelnet =< 0.7b1-13mdk
+Obsoletes: kvirc =< 2.1.1-5mdk
+Obsoletes: libqt2-devel =< 2.3.1-29mdk
+Obsoletes: licq-kde =< 1.0.4-2mdk
+Obsoletes: qt2-designer =< 2.3.1-29mdk
+Obsoletes: qtrans =< 0.1.1-7mdk
+Obsoletes: quanta =< 2.0.1-2mdk
+Obsoletes: kdelibs-sound
+Obsoletes: %{libname}-static-devel
+Obsoletes: arts3 < %{epoch_arts}:1.5.3
+Provides: arts3 = %{epoch_arts}:%version-%release
+BuildConflicts: unsermake
+Conflicts: arts < 30000001:1.5.10-4
+Provides: arts = %epoch_arts:%version-%release
+
+%description
+aRts is a short form for "analog realtime synthesizer". The idea of the whole
+thing is to create/process sound using small modules which do certain tasks.
+These may be create a waveform (oscillators), play samples, filter data, add
+signals, perform effects like delay/flanger/chorus, or output the data to the
+soundcard.
+
+%files
+%defattr(-,root,root,-)
+%_kde3_bindir/artscat
+%_kde3_bindir/artsd
+%_kde3_bindir/artsplay
+%_kde3_bindir/artsshell
+%_kde3_bindir/artsdsp
+%_kde3_bindir/artsrec
+%_kde3_bindir/artswrapper
+
+#----------------------------------------------------------------------
+
+%package -n %{libname}
+Group: System/Libraries
+Summary: The libraries for arts
+Obsoletes: libarts2, libarts3
+Requires: libtqtinterface >= 3.5.12-1
+
+%description -n %{libname}
+Libraries needed for arts.
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%files -n %{libname}
+%defattr(-,root,root,-)
+%_kde3_libdir/*.la
+%_kde3_libdir/*.so.*
+%dir %_kde3_libdir/mcop/
+%_kde3_libdir/mcop/*
+%_sysconfdir/ld.so.conf.d/*
+
+#----------------------------------------------------------------------
+
+%package devel
+Group: Development/KDE and Qt
+Summary: Development files for arts
+Requires: %{libname} = %{epoch_arts}:%version-%release
+Obsoletes: %{_lib}arts1-devel
+Obsoletes: libarts2-devel
+Obsoletes: libarts3-devel
+Provides: arts-devel
+Provides: libarts-devel
+Conflicts: arts <= %epoch_arts:1.5.3-5mdv2007
+
+%description devel
+Development libraries for arts.
+
+%files devel
+%defattr(-,root,root,-)
+%_kde3_bindir/artsc-config
+%multiarch %_kde3_bindir/*/artsc-config
+%_kde3_bindir/mcopidl
+%_kde3_libdir/*.so
+%_kde3_includedir/*
+
+#----------------------------------------------------------------------
+
+%prep
+%setup -q -n %oname-%version
+%patch0 -p0 -b .resmgr
+%patch2 -p1 -b .msgkill
+%patch4 -p1 -b .gcc4.3
+%patch5 -p1
+
+%build
+# Patch from resmgr needs rebuild builsystem
+make -f admin/Makefile.common
+QTDIR=%qt3dir
+export QTDIR
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+
+%configure_kde3 \
+ --without-nas \
+
+%make
+
+
+%install
+rm -fr %buildroot
+
+%makeinstall_std
+%multiarch_binaries $RPM_BUILD_ROOT%{_kde3_bindir}/artsc-config
+%multiarch_includes $RPM_BUILD_ROOT%{_kde3_includedir}/arts/gsl/gslconfig.h
+
+install -d %buildroot/%_sysconfdir/ld.so.conf.d
+cat > %buildroot/%_sysconfdir/ld.so.conf.d/%{libname}.conf <<EOF
+%_kde3_libdir
+EOF
+
+
+%clean
+rm -fr %buildroot
+
+
+
+
+
+%changelog
+* Thu Feb 03 2011 Tim Williams <tim@my-place.org.uk> 30000001:1.5.12-11mdf2010.2
++ Add Trinity KDE 3.5.12 sources
++ Add libtqtinterface dependencies
+- Remove arts-1.5.0-check_tmp_dir.patch and fix_autotools.patch, no longer necessary
+
+* Tue May 04 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.1
++ Rebuild
+
+* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.0
++ Use automake 1.11 and above
++ Patch for built with autoconf 2.65
++ Fix package group
+
+* Tue Nov 14 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-10mdv2010.0
+- Remove some of the obsoletes which are causing problems
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-9mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-8mdv2009.1
++ Revision: 361978
+- fix apparent typo in provides/conflicts change of r356949
+
+* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-7mdv2009.1
++ Revision: 361677
+- fix new obsolete for biarch
+
+* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-6mdv2009.1
++ Revision: 361121
+- The return of undead. Changing name from libarts1-devel to a real arts3-devel
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-5mdv2009.1
++ Revision: 356949
+- Add provides
+
+* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-4mdv2009.1
++ Revision: 355208
+- Remove old spec file
+- Update to new name
+- Change arts to arts3 ( kde3 reintroduction step 1 )
+
+* Sat Feb 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-3mdv2009.1
++ Revision: 345972
+- rebuild due to removed i586 binaries
+
+* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000001:1.5.10-2mdv2009.1
++ Revision: 300956
+- rebuild for xcb changes
+
+* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-1mdv2009.0
++ Revision: 276164
+- Update for probably the last upstream arts from kde3
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 30000001:1.5.9-8mdv2009.0
++ Revision: 264319
+- rebuild early 2009.0 package (before pixel changes)
+
+ + Pixel <pixel@mandriva.com>
+ - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-7mdv2009.0
++ Revision: 214278
+- Fix compilations against gcc 4.3.x. Close bug https://qa.mandriva.com/show_bug.cgi?id=41171
+
+ + Funda Wang <fundawang@mandriva.org>
+ - rebuild for new qt3
+
+ + Nicolas Lécureuil <neoclust@mandriva.org>
+ - Rebuild because of qt3 move
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-3mdv2009.0
++ Revision: 200792
+- Begin changes for kde. Time to go to /opt
+- Added arts.conf on ld.so.conf.d
+
+* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.9-2mdv2008.1
++ Revision: 189485
+- Fix groups ( tks to pterjan)
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-1mdv2008.1
++ Revision: 167752
+- Last arts ever arrived. 1.5.9. This will be the last update for old codebase and closing the cycle of stable releases of KDE3
+
+ + Thierry Vignaud <tvignaud@mandriva.com>
+ - fix description-line-too-long
+ - kill re-definition of %%buildroot on Pixel's request
+
+ + Olivier Blin <oblin@mandriva.com>
+ - restore BuildRoot
+
+* Tue Oct 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.8-1mdv2008.1
++ Revision: 101650
+- Arts 1.5.8 from kde 3.5.8
+- Add Patch5, it fixes problems between aRts and Knotify
+
+ + Per Øyvind Karlsen <peroyvind@mandriva.org>
+ - add buildconflict on unsermake as it gets used by default if installed and breaks building
+
+ + Anssi Hannula <anssi@mandriva.org>
+ - remove hardcoded packager tag
+
+* Mon May 21 2007 Olivier Blin <oblin@mandriva.com> 30000001:1.5.7-2mdv2008.0
++ Revision: 29295
+- build with esound support
+
+* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.7-1mdv2008.0
++ Revision: 27452
+- 1.5.7 release
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
new file mode 100644
index 000000000..7d9a65452
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
@@ -0,0 +1,116 @@
+Name: kde3-macros
+Version: 3.5.12
+Release: %mkrel 1
+Group: Development/KDE and Qt
+Summary: Base install macros for kde 3
+Source: kde3.macros
+URL: http://www.mandriva.com
+License: GPL
+BuildArch: noarch
+Requires: rpm-manbo-setup-build >= 2-7
+BuildRoot: %{_tmppath}/%{name}-buildroot
+
+%description
+Base install macros for kde 3
+
+%files
+%defattr(-,root,root)
+%_sysconfdir/rpm/macros.d/kde3.macros
+
+%install
+rm -rf %buildroot
+install -d -m 755 %buildroot%_sysconfdir/rpm/macros.d
+install -m 644 %SOURCE0 %buildroot%_sysconfdir/rpm/macros.d/
+
+%clean
+rm -rf %buildroot
+
+
+
+
+%changelog
+* Thu Feb 16 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.1
++ Rebuild for Trinity 3.5.12
++ Add extra-libs and extra-includes so build can find tqtinterface
++ Add --enable-closure
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.1
++ Rebuild for MDV 2010.1
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-4mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Mon Oct 27 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-3mdv2009.1
++ Revision: 297523
+- specify qt3 dir
+
+* Wed Sep 24 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
++ Revision: 287688
+- add libdir to pkgconfig dir
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
++ Revision: 285306
+- Update version and fix bug 43876 - /etc/profile.d/91kde3.sh should contain redefination of PKG_CONFIG_PATH
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-15mdv2009.0
++ Revision: 264759
+- rebuild early 2009.0 package (before pixel changes)
+
+* Fri Jun 06 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-14mdv2009.0
++ Revision: 216405
+- Requires rpm-manbo-setup-build for %%before_configure
+
+* Thu Jun 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-13mdv2009.0
++ Revision: 215104
+- change configure_kde3 to use %%before_configure
+
+* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-12mdv2009.0
++ Revision: 213551
+- Proper new qtdir libraries
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-11mdv2009.0
++ Revision: 212725
+- Revert of the previous commit
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
++ Revision: 212717
+- Fix macros
+
+* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-9mdv2009.0
++ Revision: 205308
+- Fix typo
+
+* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-8mdv2009.0
++ Revision: 204698
+- Add clean_kde3_icon_cache and update_kde3_icon_cache macros
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-7mdv2009.0
++ Revision: 200791
+- Yes, we need a copy. Sometimes we loose a lot of time that we don't have
+ because some nitpicking pointing.
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-6mdv2009.0
++ Revision: 200553
+- Using again configure2_5x. Some impatient people can't wait some work in progress...
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-4mdv2009.0
++ Revision: 200535
+- Added xinerama and alsa
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
++ Revision: 200534
+- Added mitshm and enable-libfam
+
+* Fri May 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-2mdv2009.0
++ Revision: 200518
+- Created configure_kde macro to make kde3 build easier too like kde4 and make transition to /opt less painfull. Thanks to Blino for the help.
+ There's no need anymore add all define switches, even for libsuffix detection, so if you want:
+- Disable enable-final: use --define _disable_final=1
+- Compile with debug full: use --define _unstable=1
+- Compile in non 32bits arch: No need add the usual lib test
+
+* Sun Apr 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-1mdv2009.0
++ Revision: 192655
+- import kde3-macros
+
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3.macros b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
new file mode 100644
index 000000000..688ee04f6
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
@@ -0,0 +1,57 @@
+%use_enable_final %{!?_disable_final:--enable-final}
+%use_unstable %{?_unstable:--enable-debug=full}
+
+%_kde3_prefix /opt/kde3
+%_kde3_libdir %_kde3_prefix/%_lib
+%_kde3_iconsdir %_kde3_prefix/share/icons
+%_kde3_sysconfdir %_sysconfdir
+%_kde3_datadir %_kde3_prefix/share
+%_kde3_configdir %_kde3_datadir/config
+%_kde3_appsdir %_kde3_datadir/apps
+%_kde3_docdir %_kde3_prefix/share/doc
+%_kde3_bindir %_kde3_prefix/bin
+%_kde3_sbindir %_kde3_prefix/sbin
+%_kde3_includedir %_kde3_prefix/include
+%_kde3_mandir %_kde3_prefix/share/man
+%_kde3_autostart %_kde3_prefix/share/autostart
+
+%configure_kde3 \\\
+ %before_configure ; \
+ %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+ [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
+ CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
+ PKG_CONFIG_PATH="%{_kde3_libdir}/pkgconfig:%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" \
+ $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
+ --prefix=%{_kde3_prefix} \\\
+ --bindir=%{_kde3_bindir} \\\
+ --sbindir=%{_kde3_sbindir} \\\
+ --sysconfdir=%{_sysconfdir} \\\
+ --datadir=%{_kde3_datadir} \\\
+ --includedir=%{_kde3_includedir} \\\
+ --libdir=%{_kde3_libdir} %use_unstable %use_enable_final \\\
+ --infodir=%{_infodir} \\\
+ --mandir=%{_mandir} \\\
+ --disable-static \\\
+ --enable-mitshm \\\
+ --with-ipv6-lookup=auto \\\
+ --with-pic \\\
+ --with-xinerama \\\
+ --with-alsa \\\
+ --enable-libfam \\\
+ --enable-pcre \\\
+ --with-qt-dir=%{qt3dir} --with-qt-includes=%{qt3include} --with-qt-libraries=%{qt3lib}\\\
+ --with-extra-libs=%{_kde3_libdir} --with-extra-includes=%{_kde3_includedir}/tqt \\\
+ %if "%{_lib}" != "lib" \
+ --enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \\\
+ %endif \
+ --disable-rpath \\\
+ --enable-closure \\\
+ $CONFIGURE_XPATH
+# Rebuild icon cache
+%update_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true; fi \
+%{nil}
+
+%clean_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_kde3_iconsdir}/%{1}/index.theme ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true ; fi \
+%{nil}
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
new file mode 100644
index 000000000..3bba9bb56
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
@@ -0,0 +1,135 @@
+# TODO
+# - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
+# libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
+# /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
+# workarounded in spec r1.2 commit
+#
+# Conditional build:
+%bcond_with qt4 # Enable Qt4 support (this will disable all Qt3 support)
+
+%define epoch_kdelibs 30000000
+
+Summary: Interface and abstraction library for Qt and Trinity
+Name: libtqtinterface
+Version: 3.5.12
+Release: %mkrel 1
+#Epoch: %epoch_kdelibs
+License: GPL v2
+Group: Graphical desktop/KDE3
+Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/%{version}/dependencies/tqtinterface-%{version}.tar.gz
+# Source0-md5: 361c45961184f01f95d3b771138c8229
+Patch0: tqt-comments.patch
+Patch1: tqglobal-comments.patch
+Patch2: tqt-r1217318.diff
+URL: http://trinity.pearsoncomputing.net/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libltdl-devel
+BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRequires: qt3-devel
+BuildRequires: sed >= 4.0
+#BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %_tmppath/%name-%version-%release-root
+
+
+%description
+This package includes libraries that abstract the underlying Qt system
+from the actual Trinity code, allowing easy, complete upgrades to new
+versions of Qt.
+
+It also contains various functions that have been removed from newer
+versions of Qt, but are completely portable and isolated from other
+APIs such as Xorg. This allows the Trinity project to efficiently
+perform certain operations that are infeasible or unneccessarily
+difficult when using pure Qt4 or above.
+
+%package devel
+Summary: Header files for libtqtinterface library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libtqtinterface
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header files for libtqtinterface library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libtqtinterface.
+
+%prep
+%setup -qc
+mv dependencies/tqtinterface/* .
+%patch0 -p0
+%patch1 -p0
+%patch2 -p2
+
+# libtool copy
+rm -r libltdl
+%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
+
+# remove copy of QtCore and QtGui devel headers
+rm -r qtinterface/qt4 qtinterface/tqt4
+%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
+
+%build
+make -f admin/Makefile.common cvs
+
+QTDIR=%qt3dir ; export QTDIR;
+PATH=%{qt3dir}/bin:$PATH; export PATH;
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+
+%configure_kde3 \
+ --includedir=%{_kde3_includedir}/tqt \
+%if "%{_lib}" == "lib64"
+ --enable-libsuffix=64 \
+%endif
+ %{?with_qt4:--enable-qt4}
+
+%{__make} \
+ LIBTOOL="%{_bindir}/libtool -v"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# force -j1 or USE_QTX is replaced _after_ file is installed
+%{__make} -j1 install \
+ DESTDIR=$RPM_BUILD_ROOT \
+
+# --disable-static did not work, rm it again
+#rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_kde3_libdir}/libtqt.so.*.*.*
+%attr(755,root,root) %{_kde3_libdir}/libtqt.a
+%ghost %attr(755,root,root) %{_kde3_libdir}/libtqt.so.4
+
+%files devel
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING README
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt1
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt2
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt3
+%attr(755,root,root) %{_kde3_bindir}/dcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidl2cpp-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidlng-tqt
+%attr(755,root,root) %{_kde3_bindir}/mcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/moc-tqt
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace-stream
+%dir %{_kde3_includedir}/tqt
+%{_kde3_includedir}/tqt/tq*.h
+%{_kde3_libdir}/libtqt.la
+%{_kde3_libdir}/libtqt.so
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* Wed Feb 1 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvf2010.2
++ Rewrite for MDV 2010.2
++ Spec based on revision 1.4 from PLD linux
++ Add tqt-comments.patch, tqglobal-comments.patch. My compiler doesn't like // comments.
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
new file mode 100644
index 000000000..332a7d57c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
@@ -0,0 +1,26 @@
+--- qtinterface/tqglobal.h.orig 2011-02-04 12:35:10.215472605 +0000
++++ qtinterface/tqglobal.h 2011-02-04 12:35:45.537474675 +0000
+@@ -26,18 +26,18 @@
+
+ #ifdef USE_QT3
+
+-// Pull in all Qt3 global defines
++/* Pull in all Qt3 global defines */
+
+ #include <qglobal.h>
+
+-#endif // USE_QT3
++#endif /* USE_QT3 */
+
+ #ifdef USE_QT4
+
+-// Pull in all Qt4 global defines
++/* Pull in all Qt4 global defines */
+
+ #include <Qt/qglobal.h>
+
+-#endif // USE_QT4
++#endif /* USE_QT4 */
+
+ #endif /* TQGLOBAL_H */
+\ No newline at end of file
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
new file mode 100644
index 000000000..e367613f8
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
@@ -0,0 +1,23 @@
+--- qtinterface/tqt.h.orig 2010-08-31 00:37:01.000000000 +0100
++++ qtinterface/tqt.h 2011-02-03 13:48:47.483987570 +0000
+@@ -42,7 +42,7 @@
+ #define TQT_METHOD(a) METHOD(a)
+ #define TQT_SLOT(a) SLOT(a)
+ #define TQT_SIGNAL(a) SIGNAL(a)
+-#endif // __cplusplus
++#endif
+
+ #ifdef USE_QT3
+ #define qint64 long
+@@ -1319,11 +1319,4 @@
+ #define TQXmlDefaultHandler QXmlDefaultHandler
+ #endif
+
+-// Undo any damage caused by the tqt-replace utility
+-//#define QCStringList TQCStringList
+-//#define QtWIN TQtWIN
+-
+-//#include "kdemacros.h.in"
+-//#define TQT_EXPORT KDE_EXPORT
+-
+ #endif /* TQT_H */
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
new file mode 100644
index 000000000..cd9ca03bd
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
@@ -0,0 +1,12 @@
+Index: dependencies/tqtinterface/qtinterface/tqt.h
+===================================================================
+--- dependencies/tqtinterface/qtinterface/tqt.h (revision 1217317)
++++ dependencies/tqtinterface/qtinterface/tqt.h (revision 1217318)
+@@ -85,6 +85,7 @@
+ #define TQ_ControlButton ControlButton
+ #define TQ_AltButton AltButton
+ #define TQ_MetaButton MetaButton
++#define TQ_WFlags TQt::WFlags
+ #define TQIODevice_OpenModeFlag int
+
+ #define TQAlignCenter AlignCenter
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
new file mode 100644
index 000000000..c901da7a1
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
@@ -0,0 +1,35 @@
+diff -Naur mandriva-kde-config-2009.0/kdm/backgroundrc mandriva-kde-config.yeni/kdm/backgroundrc
+--- mandriva-kde-config-2009.0/kdm/backgroundrc 2006-08-23 20:58:15.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/backgroundrc 2009-11-24 21:35:26.592448000 +0200
+@@ -13,6 +13,6 @@
+ Program=
+ ReverseBlending=false
+ UseSHM=false
+-Wallpaper=/usr/share/mdk/backgrounds/default.png
++Wallpaper=/usr/share/mdk/backgrounds/default.jpg
+ WallpaperList=
+ WallpaperMode=Scaled
+diff -Naur mandriva-kde-config-2009.0/kdm/kdmrc mandriva-kde-config.yeni/kdm/kdmrc
+--- mandriva-kde-config-2009.0/kdm/kdmrc 2008-06-23 21:03:31.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/kdmrc 2009-12-15 00:27:11.727822403 +0200
+@@ -451,7 +451,7 @@
+ # The theme to use for the greeter. Can point to either a directory or an XML
+ # file.
+ # Default is ""
+-Theme=/usr/share/mdk/dm
++Theme=/opt/kde3/share/config/kdm/themes/2010
+
+ # Core config for local displays
+ [X-:*-Core]
+diff -Naur mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml mandriva-kde-config.yeni/kdm/themes/2008/2008.xml
+--- mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml 2007-09-12 01:17:40.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/themes/2008/2008.xml 2009-11-25 02:13:17.273313000 +0200
+@@ -2,7 +2,7 @@
+ <!DOCTYPE greeter SYSTEM "greeter.dtd">
+ <greeter>
+ <item type="pixmap">
+- <normal file="/usr/share/mdk/backgrounds/default.png"/>
++ <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
+ <pos x="0" y="0" width="100%" height="100%"/>
+ </item>
+
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
new file mode 100644
index 000000000..ac58f6a1e
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
Binary files differ
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
new file mode 100644
index 000000000..5bb7c8d31
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
@@ -0,0 +1,907 @@
+%define epoch_kdelibs 30000000
+%define oname mandriva-kde-config
+
+Name: mandriva-kde3-config
+Summary: Mandriva KDE configuration
+Version: 2010.2
+Release: %mkrel 1
+URL: http://www.mandriva.com
+Group: Graphical desktop/KDE3
+BuildRoot: %_tmppath/%name-buildroot
+BuildRequires: kde3-macros
+Source0: %{oname}-%{version}.tar.bz2
+# OpenOffice.org icons. Should be in a separate package
+# in the future, since they're shared between kde, OOo
+# and maybe others
+Source1: ooo-icons.tar.bz2
+Source2: opendocument-mime.tar.bz2
+Patch0: fix_kdmtheme.patch
+License: GPL
+BuildArch: noarch
+Obsoletes: %{name} < %version-%release
+Obsoletes: mandriva-kde-config
+Provides: mandriva-kde-config = %version-%release
+
+
+%description
+This package regroups all specific Mandriva config file for KDE.
+(kicker config etc.)
+
+#--------------------------------------------------------------------
+
+%package common
+Group: Graphical desktop/KDE3
+Summary: Common configs used for Mandriva theme
+Requires(pre): update-alternatives
+Requires: urw-fonts
+Obsoletes: %{name}-common < %version-%release
+Obsoletes: mandriva-kde-config-common
+Provides: mandriva-kde-config-common = %version-%release
+
+%description common
+common configs used for Mandriva theme
+
+%post common
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config 9
+
+%postun common
+if ! [ -e /var/lib/mandriva/kde-profiles/common/upstream-kde-config ]; then
+ update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/common/upstream-kde-config
+fi
+
+%files common
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/
+%dir %_localstatedir/lib/mandriva/kde-profiles/common
+%_localstatedir/lib/mandriva/kde-profiles/common/*
+
+#--------------------------------------------------------------------
+
+%package -n powerpack-kde3-config
+Summary: Mandriva KDE configuration
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Obsoletes: powerpackplus-kde-config < 2008.0
+Provides: powerpack-kde-config = %version-%release
+Provides: powerpackplus-kde-config = %version-%release
+Obsoletes: powerpack-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: powerpack-kde3-config < %version-%release
+
+%pre -n powerpack-kde3-config
+if [ "$1" = "2" ]; then
+ [ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop ]; then
+ rm -rf %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop
+fi
+
+%post -n powerpack-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/powerpack/kderc 10
+
+%postun -n powerpack-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/powerpack/kderc ]; then
+ update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/powerpack/kderc
+fi
+
+%description -n powerpack-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%files -n powerpack-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/powerpack
+%_localstatedir/lib/mandriva/kde-profiles/powerpack/*
+
+#--------------------------------------------------------------------
+
+%package -n one-kde3-config
+Summary: Mandriva KDE configuration
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: one-kde-config = %version-%release
+Obsoletes: one-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: one-kde3-config < %version-%release
+
+%description -n one-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n one-kde3-config
+if [ "$1" = "2" ]; then
+ [ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop ]; then
+ rm -rf %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop
+fi
+
+%post -n one-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/one/kderc 10
+
+%postun -n one-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/one/kderc ]; then
+ update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/one/kderc
+fi
+
+%files -n one-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/one
+%_localstatedir/lib/mandriva/kde-profiles/one/*
+
+
+#--------------------------------------------------------------------
+
+%package -n flash-kde3-config
+Summary: Mandriva KDE configuration
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: flash-kde-config = %version-%release
+Obsoletes: flash-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: flash-kde3-config < %version-%release
+
+%description -n flash-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n flash-kde3-config
+if [ "$1" = "2" ]; then
+ [ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop ]; then
+ rm -rf %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop
+fi
+
+%post -n flash-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/flash/kderc 10
+
+%postun -n flash-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/flash/kderc ]; then
+ update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/flash/kderc
+fi
+
+%files -n flash-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/flash
+%_localstatedir/lib/mandriva/kde-profiles/flash/*
+
+
+#--------------------------------------------------------------------
+
+%package -n free-kde3-config
+Summary: Mandriva KDE configuration
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: qt4-style-iaora
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: download-kde-config-2007 < 2008.0
+Provides: download-kde-config-2007
+Obsoletes: discovery-kde-config < 2008.0
+Provides: discovery-kde-config = %version-%release
+Provides: free-kde-config = %version-%release
+Obsoletes: free-kde-config
+Obsoletes: free-kde3-config < %version-%release
+
+%description -n free-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n free-kde3-config
+if [ "$1" = "2" ]; then
+ [ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop ]; then
+ rm -rf %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop
+fi
+
+%post -n free-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/free/kderc 10
+
+%postun -n free-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/free/kderc ]; then
+ update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/free/kderc
+fi
+
+%files -n free-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/free
+%_localstatedir/lib/mandriva/kde-profiles/free/*
+
+
+#--------------------------------------------------------------------
+# KDM
+
+%package -n mandriva-kdm3-config
+Summary: Mandriva KDM config file
+Group: Graphical desktop/KDE3
+Obsoletes: kdebase-kdm-config-file < 2008.0
+Provides: kdm-config-file = %version-%release
+# For upgrade
+Provides: kdebase-kdm-config-file = 2:%version
+Conflicts: kdebase-progs <= 3.5.1-15.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(post): perl-MDK-Common
+Obsoletes: mandriva-kdm-config
+Provides: mandriva-kdm-config = %version-%release
+
+
+%description -n mandriva-kdm3-config
+Mandriva KDM config file
+
+%trigger -n mandriva-kdm3-config -- kdebase-kdm-config-file
+perl -MMDK::Common -e 'update_gnomekderc("%{_kde3_configdir}/kdm/kdmrc", "General", "ConsoleTTYs", "tty1,tty2,tty3,tty4,tty5,tty6", "ServerVTs", "-7")'
+
+%files -n mandriva-kdm3-config
+%defattr(0644,root,root,0755)
+%config(noreplace) %_kde3_configdir/kdm/backgroundrc
+%config(noreplace) %_kde3_configdir/kdm/kdmrc
+%_kde3_configdir/kdm/themes
+
+#---------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version} -a 1 -a 2
+%patch0 -p1
+
+%install
+rm -rf %buildroot
+# Create profile dirs
+mkdir -p %buildroot/%{_kde3_configdir}
+mkdir -p %buildroot/%_localstatedir/lib/mandriva
+
+mv kde-profiles %buildroot/%_localstatedir/lib/mandriva
+mv kdm %buildroot/%{_kde3_configdir}
+
+# openoffice icons, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+cp -a ooo-icons/hicolor %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+
+# openoffice mimetypes, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+cp -a opendocument-mime/* %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+# XXX we have to rename them to the same name provided by kdelibs-common, otherwise the
+# global ones are used.
+pushd %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+ mv openoffice.org2.4-oasis-drawing.desktop vnd.oasis.opendocument.graphics.desktop
+ mv openoffice.org2.4-oasis-drawing-template.desktop vnd.oasis.opendocument.graphics-template.desktop
+ mv openoffice.org2.4-oasis-master-document.desktop vnd.oasis.opendocument.text-master.desktop
+ mv openoffice.org2.4-oasis-formula.desktop vnd.oasis.opendocument.formula.desktop
+ mv openoffice.org2.4-oasis-spreadsheet.desktop vnd.oasis.opendocument.spreadsheet.desktop
+ mv openoffice.org2.4-oasis-spreadsheet-template.desktop vnd.oasis.opendocument.spreadsheet-template.desktop
+ mv openoffice.org2.4-oasis-text.desktop vnd.oasis.opendocument.text.desktop
+ mv openoffice.org2.4-oasis-text-template.desktop vnd.oasis.opendocument.text-template.desktop
+ mv openoffice.org2.4-oasis-web-template.desktop vnd.oasis.opendocument.text-web.desktop
+ mv openoffice.org2.4-oasis-presentation.desktop vnd.oasis.opendocument.presentation.desktop
+ mv openoffice.org2.4-oasis-presentation-template.desktop vnd.oasis.opendocument.presentation-template.desktop
+ mv openoffice.org2.4-spreadsheet.desktop vnd.sun.xml.calc.desktop
+ mv openoffice.org2.4-spreadsheet-template.desktop vnd.sun.xml.calc.template.desktop
+ mv openoffice.org2.4-presentation.desktop vnd.sun.xml.impress.desktop
+ mv openoffice.org2.4-presentation-template.desktop vnd.sun.xml.impress.template.desktop
+ mv openoffice.org2.4-drawing.desktop vnd.sun.xml.draw.desktop
+ mv openoffice.org2.4-drawing-template.desktop vnd.sun.xml.draw.template.desktop
+ mv openoffice.org2.4-text.desktop vnd.sun.xml.writer.desktop
+ mv openoffice.or