rev 3126 - in people/jriddell/KDE/3.5: . arts/debian arts/debian/cdbs kde-i18n-af kde-i18n-af/debian kdeaccessibility/debian kdeaccessibility/debian/cdbs kdeaddons kdeaddons/debian kdeaddons/debian/patches kdeadmin kdeadmin/debian kdeadmin/debian/cdbs kdeadmin/debian/icons kdeadmin/debian/man kdeadmin/debian/patches kdeadmin/debian/patches/common kdeartwork kdeartwork/debian kdeartwork/debian/cdbs kdeartwork/debian/dfsg kdeartwork/debian/man kdeartwork/debian/patches kdeartwork/debian/patches/common kdebase/debian kdebase/debian/cdbs kdebase/debian/patches kdebindings kdebindings/debian kdebindings/debian/cdbs kdebindings/debian/local kdebindings/debian/patches kdebindings/debian/patches/common kdeedu kdeedu/debian kdeedu/debian/patches kdegames kdegames/debian kdegames/debian/cdbs kdegames/debian/icons kdegames/debian/man kdegames/debian/patches kdegames/debian/patches/common kdegraphics kdegraphics/debian kdegraphics/debian/cdbs kdegraphics/debian/icons kdegraphics/debian/man kdegraphics/debian/patches kdegraphics/debian/patches/common kdelibs/debian kdelibs/debian/cdbs kdemultimedia kdemultimedia/debian kdemultimedia/debian/cdbs kdemultimedia/debian/icons kdemultimedia/debian/man kdemultimedia/debian/patches kdemultimedia/debian/patches/common kdenetwork/debian kdenetwork/debian/cdbs kdenetwork/debian/patches kdepim kdepim/debian kdepim/debian/cdbs kdepim/debian/icons kdepim/debian/man kdepim/debian/patches kdepim/debian/patches/common kdepim/debian/po kdesdk kdesdk/debian kdesdk/debian/cdbs kdesdk/debian/icons kdesdk/debian/man kdesdk/debian/patches kdesdk/debian/patches/common kdetoys kdetoys/debian kdetoys/debian/cdbs kdetoys/debian/icons kdetoys/debian/man kdetoys/debian/patches kdetoys/debian/patches/common kdeutils kdeutils/debian kdeutils/debian/cdbs kdeutils/debian/icons kdeutils/debian/man kdeutils/debian/patches kdeutils/debian/patches/common kdevelop3 kdevelop3/debian kdevelop3/debian/cdbs kdevelop3/debian/patches kdevelop3/debian/patches/common kdevelop3/debian/po kdewebdev kdewebdev/debian kdewebdev/debian/cdbs kdewebdev/debian/docrc kdewebdev/debian/icons kdewebdev/debian/man kdewebdev/debian/patches kdewebdev/debian/patches/common

[Jonathan Riddell]

Author: jriddell-guest
Date: 2006-02-14 17:44:09 +0000 (Tue, 14 Feb 2006)
New Revision: 3126

Added:
   people/jriddell/KDE/3.5/kde-i18n-af/
   people/jriddell/KDE/3.5/kde-i18n-af/debian/
   people/jriddell/KDE/3.5/kde-i18n-af/debian/changelog
   people/jriddell/KDE/3.5/kde-i18n-af/debian/compat
   people/jriddell/KDE/3.5/kde-i18n-af/debian/control
   people/jriddell/KDE/3.5/kde-i18n-af/debian/copyright
   people/jriddell/KDE/3.5/kde-i18n-af/debian/debiandirs
   people/jriddell/KDE/3.5/kde-i18n-af/debian/debianrules
   people/jriddell/KDE/3.5/kde-i18n-af/debian/rules
   people/jriddell/KDE/3.5/kdeaddons/
   people/jriddell/KDE/3.5/kdeaddons/debian/
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.1
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.install
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.manpages
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.menu
   people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.xpm
   people/jriddell/KDE/3.5/kdeaddons/debian/changelog
   people/jriddell/KDE/3.5/kdeaddons/debian/compat
   people/jriddell/KDE/3.5/kdeaddons/debian/control
   people/jriddell/KDE/3.5/kdeaddons/debian/copyright
   people/jriddell/KDE/3.5/kdeaddons/debian/exif.py.1
   people/jriddell/KDE/3.5/kdeaddons/debian/fsview.1
   people/jriddell/KDE/3.5/kdeaddons/debian/fsview.xpm
   people/jriddell/KDE/3.5/kdeaddons/debian/jpegorient.1
   people/jriddell/KDE/3.5/kdeaddons/debian/kaddressbook-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.override
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.install
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.manpages
   people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.install
   people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.override
   people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.install
   people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.links
   people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.manpages
   people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.menu
   people/jriddell/KDE/3.5/kdeaddons/debian/kontact-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.1
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.README.Debian
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.install
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.manpages
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.menu
   people/jriddell/KDE/3.5/kdeaddons/debian/ksig.xpm
   people/jriddell/KDE/3.5/kdeaddons/debian/lnkforward.1
   people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.docs
   people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.install
   people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.manpages
   people/jriddell/KDE/3.5/kdeaddons/debian/noatunsynaescope.bin.1
   people/jriddell/KDE/3.5/kdeaddons/debian/noatuntippecanoe.bin.1
   people/jriddell/KDE/3.5/kdeaddons/debian/noatuntyler.bin.1
   people/jriddell/KDE/3.5/kdeaddons/debian/orient.py.1
   people/jriddell/KDE/3.5/kdeaddons/debian/patches/
   people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_googlebar_suggest.diff
   people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdeaddons/debian/rules
   people/jriddell/KDE/3.5/kdeaddons/debian/source.lintian-overrides
   people/jriddell/KDE/3.5/kdeadmin/
   people/jriddell/KDE/3.5/kdeadmin/debian/
   people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/
   people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdeadmin/debian/changelog
   people/jriddell/KDE/3.5/kdeadmin/debian/compat
   people/jriddell/KDE/3.5/kdeadmin/debian/control
   people/jriddell/KDE/3.5/kdeadmin/debian/copyright
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron-16.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat-16.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage-16.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv-16.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser-16.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser.xpm
   people/jriddell/KDE/3.5/kdeadmin/debian/kcron.install
   people/jriddell/KDE/3.5/kdeadmin/debian/kcron.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/kcron.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/kdat.install
   people/jriddell/KDE/3.5/kdeadmin/debian/kdat.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/kdat.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
   people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-kfile-plugins.install
   people/jriddell/KDE/3.5/kdeadmin/debian/knetworkconf.install
   people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.install
   people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.mime
   people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.install
   people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/kuser.install
   people/jriddell/KDE/3.5/kdeadmin/debian/kuser.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/kuser.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.install
   people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.lintian
   people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.menu
   people/jriddell/KDE/3.5/kdeadmin/debian/man/
   people/jriddell/KDE/3.5/kdeadmin/debian/man/kcron.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/man/kdat.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/man/kpackage.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/man/ksysv.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/man/kuser.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/man/secpolicy.sgml
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/README
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdeadmin/debian/rules
   people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.install
   people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.manpages
   people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.menu
   people/jriddell/KDE/3.5/kdeartwork/
   people/jriddell/KDE/3.5/kdeartwork/debian/
   people/jriddell/KDE/3.5/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
   people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/
   people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdeartwork/debian/changelog
   people/jriddell/KDE/3.5/kdeartwork/debian/compat
   people/jriddell/KDE/3.5/kdeartwork/debian/control
   people/jriddell/KDE/3.5/kdeartwork/debian/copyright
   people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/
   people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/README.Packaging
   people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/clean-sources
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-emoticons.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-misc.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-style.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-icon.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-window.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork.README.Debian
   people/jriddell/KDE/3.5/kdeartwork/debian/kdewallpapers.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.README.Debian
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.manpages
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.README.Debian
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.install
   people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.manpages
   people/jriddell/KDE/3.5/kdeartwork/debian/man/
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kbanner.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kblob.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kclock.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/keuphoria.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kfiresaver.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kflux.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kfountain.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kgravity.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/klines.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/klorenz.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kpartsaver.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kpendulum.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kpolygon.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/krotation.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kscience.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kslideshow.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/ksolarwinds.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kspace.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kswarm.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kvm.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kwave.kss.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsconfig.1
   people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsrun.1
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/README
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdeartwork/debian/rules
   people/jriddell/KDE/3.5/kdebindings/
   people/jriddell/KDE/3.5/kdebindings/debian/
   people/jriddell/KDE/3.5/kdebindings/debian/cdbs/
   people/jriddell/KDE/3.5/kdebindings/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdebindings/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdebindings/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdebindings/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdebindings/debian/changelog
   people/jriddell/KDE/3.5/kdebindings/debian/compat
   people/jriddell/KDE/3.5/kdebindings/debian/control
   people/jriddell/KDE/3.5/kdebindings/debian/copyright
   people/jriddell/KDE/3.5/kdebindings/debian/juic.install
   people/jriddell/KDE/3.5/kdebindings/debian/juic.manpages
   people/jriddell/KDE/3.5/kdebindings/debian/kdebindings-java.links
   people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.install
   people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.links
   people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.menu
   people/jriddell/KDE/3.5/kdebindings/debian/konqueror-kjsembed-plugin.install
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.install
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.install
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.links
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.manpages
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java.install
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java.links
   people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-jni.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.README.Debian
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.dirs
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.links
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.dirs
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.links
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed1.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed1.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.install
   people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.manpages
   people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.install
   people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.manpages
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.README.Debian
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.dirs
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.install
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.links
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.docs
   people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.install
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.install
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.links
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde1.install
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.install
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.links
   people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt1.install
   people/jriddell/KDE/3.5/kdebindings/debian/local/
   people/jriddell/KDE/3.5/kdebindings/debian/local/dcopidl2java.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/juic.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/krubyinit.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/qtrubyinit.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdeapi.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdesh.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtapi.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtsh.1
   people/jriddell/KDE/3.5/kdebindings/debian/local/rbuic.1
   people/jriddell/KDE/3.5/kdebindings/debian/patches/
   people/jriddell/KDE/3.5/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/018-juic-uixsldir.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/023-dont-install-jsaccess.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/028-make-cmdline.js-executable.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/040-configure-give-kde_java_libgcjdir.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/README
   people/jriddell/KDE/3.5/kdebindings/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdebindings/debian/patches/kubuntu_01_dcopjava_paths.diff
   people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.docs
   people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.examples
   people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.install
   people/jriddell/KDE/3.5/kdebindings/debian/rules
   people/jriddell/KDE/3.5/kdeedu/
   people/jriddell/KDE/3.5/kdeedu/debian/
   people/jriddell/KDE/3.5/kdeedu/debian/blinken.docs
   people/jriddell/KDE/3.5/kdeedu/debian/blinken.install
   people/jriddell/KDE/3.5/kdeedu/debian/celestrongps.1
   people/jriddell/KDE/3.5/kdeedu/debian/changelog
   people/jriddell/KDE/3.5/kdeedu/debian/control
   people/jriddell/KDE/3.5/kdeedu/debian/copyright
   people/jriddell/KDE/3.5/kdeedu/debian/fliccd.1
   people/jriddell/KDE/3.5/kdeedu/debian/indiserver.1
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.1
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kalzium.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.1
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kanagram.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.1
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kbruch.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kig
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kmessedwords
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.install
   people/jriddell/KDE/3.5/kdeedu/debian/kdeedu.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker
   people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker.1
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.1
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.docs
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.install
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.menu
   people/jriddell/KDE/3.5/kdeedu/debian/keduca.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/keducabuilder.1
   people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.1
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.docs
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.install
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.menu
   people/jriddell/KDE/3.5/kdeedu/debian/khangman.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kig.1
   people/jriddell/KDE/3.5/kdeedu/debian/kig.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kig.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kig.install
   people/jriddell/KDE/3.5/kdeedu/debian/kig.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kig.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kig.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.1
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.install
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kiten.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kitengen.1
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.1
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.install
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.menu
   people/jriddell/KDE/3.5/kdeedu/debian/klatin.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.install
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.1
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.docs
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.install
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.menu
   people/jriddell/KDE/3.5/kdeedu/debian/klettres.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kmessedwords.install
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.1
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kmplot.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.1
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.install
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.1
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.install
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kstars.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.1
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.docs
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.menu
   people/jriddell/KDE/3.5/kdeedu/debian/ktouch.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.1
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kturtle.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.1
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kverbos.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.1
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.1
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.README.Debian
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.docs
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.menu
   people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.xpm
   people/jriddell/KDE/3.5/kdeedu/debian/langen2kvtml.1
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.docs
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.install
   people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override
   people/jriddell/KDE/3.5/kdeedu/debian/libkiten-dev.install
   people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install
   people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.links
   people/jriddell/KDE/3.5/kdeedu/debian/lx200_16.1
   people/jriddell/KDE/3.5/kdeedu/debian/lx200autostar.1
   people/jriddell/KDE/3.5/kdeedu/debian/lx200classic.1
   people/jriddell/KDE/3.5/kdeedu/debian/lx200generic.1
   people/jriddell/KDE/3.5/kdeedu/debian/lx200gps.1
   people/jriddell/KDE/3.5/kdeedu/debian/patches/
   people/jriddell/KDE/3.5/kdeedu/debian/patches/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdeedu/debian/patches/libtool.diff
   people/jriddell/KDE/3.5/kdeedu/debian/rules
   people/jriddell/KDE/3.5/kdeedu/debian/shlibs.local
   people/jriddell/KDE/3.5/kdeedu/debian/source.lintian-overrides
   people/jriddell/KDE/3.5/kdeedu/debian/spotlight2kvtml.1
   people/jriddell/KDE/3.5/kdeedu/debian/temma.1
   people/jriddell/KDE/3.5/kdeedu/debian/test_extdate.1
   people/jriddell/KDE/3.5/kdeedu/debian/test_extdatepicker.1
   people/jriddell/KDE/3.5/kdeedu/debian/v4ldriver.1
   people/jriddell/KDE/3.5/kdeedu/debian/v4lphilips.1
   people/jriddell/KDE/3.5/kdegames/
   people/jriddell/KDE/3.5/kdegames/debian/
   people/jriddell/KDE/3.5/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
   people/jriddell/KDE/3.5/kdegames/debian/atlantik-dev.install
   people/jriddell/KDE/3.5/kdegames/debian/atlantik.install
   people/jriddell/KDE/3.5/kdegames/debian/atlantik.links
   people/jriddell/KDE/3.5/kdegames/debian/atlantik.manpages
   people/jriddell/KDE/3.5/kdegames/debian/atlantik.menu
   people/jriddell/KDE/3.5/kdegames/debian/cdbs/
   people/jriddell/KDE/3.5/kdegames/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdegames/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdegames/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdegames/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdegames/debian/changelog
   people/jriddell/KDE/3.5/kdegames/debian/compat
   people/jriddell/KDE/3.5/kdegames/debian/control
   people/jriddell/KDE/3.5/kdegames/debian/copyright
   people/jriddell/KDE/3.5/kdegames/debian/icons/
   people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/katomic-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/katomic.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/klickety-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/klickety.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/klines-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/klines.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kmines-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kmines.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kolf-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kolf.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/konquest-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/konquest.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kpat-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kpat.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksame-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksame.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ktron-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ktron.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/lskat-16.xpm
   people/jriddell/KDE/3.5/kdegames/debian/icons/lskat.xpm
   people/jriddell/KDE/3.5/kdegames/debian/kasteroids.install
   people/jriddell/KDE/3.5/kdegames/debian/kasteroids.links
   people/jriddell/KDE/3.5/kdegames/debian/kasteroids.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kasteroids.menu
   people/jriddell/KDE/3.5/kdegames/debian/katomic.install
   people/jriddell/KDE/3.5/kdegames/debian/katomic.links
   people/jriddell/KDE/3.5/kdegames/debian/katomic.manpages
   people/jriddell/KDE/3.5/kdegames/debian/katomic.menu
   people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.install
   people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.links
   people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.menu
   people/jriddell/KDE/3.5/kdegames/debian/kbattleship.install
   people/jriddell/KDE/3.5/kdegames/debian/kbattleship.links
   people/jriddell/KDE/3.5/kdegames/debian/kbattleship.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kbattleship.menu
   people/jriddell/KDE/3.5/kdegames/debian/kblackbox.install
   people/jriddell/KDE/3.5/kdegames/debian/kblackbox.links
   people/jriddell/KDE/3.5/kdegames/debian/kblackbox.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kblackbox.menu
   people/jriddell/KDE/3.5/kdegames/debian/kbounce.install
   people/jriddell/KDE/3.5/kdegames/debian/kbounce.links
   people/jriddell/KDE/3.5/kdegames/debian/kbounce.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kbounce.menu
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-card-data.install
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.atlantik
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.katomic
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbounce
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.klines
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kmines
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kolf
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.konquest
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kpat
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kpoker
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kreversi
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksame
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kshisen
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksnake
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ktron
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kwin4
   people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.lskat
   people/jriddell/KDE/3.5/kdegames/debian/kenolaba.install
   people/jriddell/KDE/3.5/kdegames/debian/kenolaba.links
   people/jriddell/KDE/3.5/kdegames/debian/kenolaba.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kenolaba.menu
   people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.install
   people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.links
   people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.menu
   people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.install
   people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.links
   people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.menu
   people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.install
   people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.links
   people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.menu
   people/jriddell/KDE/3.5/kdegames/debian/klickety.install
   people/jriddell/KDE/3.5/kdegames/debian/klickety.links
   people/jriddell/KDE/3.5/kdegames/debian/klickety.manpages
   people/jriddell/KDE/3.5/kdegames/debian/klickety.menu
   people/jriddell/KDE/3.5/kdegames/debian/klines.install
   people/jriddell/KDE/3.5/kdegames/debian/klines.links
   people/jriddell/KDE/3.5/kdegames/debian/klines.manpages
   people/jriddell/KDE/3.5/kdegames/debian/klines.menu
   people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.install
   people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.menu
   people/jriddell/KDE/3.5/kdegames/debian/kmines.install
   people/jriddell/KDE/3.5/kdegames/debian/kmines.links
   people/jriddell/KDE/3.5/kdegames/debian/kmines.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kmines.menu
   people/jriddell/KDE/3.5/kdegames/debian/knetwalk.install
   people/jriddell/KDE/3.5/kdegames/debian/kolf-dev.install
   people/jriddell/KDE/3.5/kdegames/debian/kolf.install
   people/jriddell/KDE/3.5/kdegames/debian/kolf.links
   people/jriddell/KDE/3.5/kdegames/debian/kolf.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kolf.menu
   people/jriddell/KDE/3.5/kdegames/debian/konquest.install
   people/jriddell/KDE/3.5/kdegames/debian/konquest.links
   people/jriddell/KDE/3.5/kdegames/debian/konquest.manpages
   people/jriddell/KDE/3.5/kdegames/debian/konquest.menu
   people/jriddell/KDE/3.5/kdegames/debian/kpat.install
   people/jriddell/KDE/3.5/kdegames/debian/kpat.links
   people/jriddell/KDE/3.5/kdegames/debian/kpat.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kpat.menu
   people/jriddell/KDE/3.5/kdegames/debian/kpoker.install
   people/jriddell/KDE/3.5/kdegames/debian/kpoker.links
   people/jriddell/KDE/3.5/kdegames/debian/kpoker.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kpoker.menu
   people/jriddell/KDE/3.5/kdegames/debian/kreversi.install
   people/jriddell/KDE/3.5/kdegames/debian/kreversi.links
   people/jriddell/KDE/3.5/kdegames/debian/kreversi.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kreversi.menu
   people/jriddell/KDE/3.5/kdegames/debian/ksame.install
   people/jriddell/KDE/3.5/kdegames/debian/ksame.links
   people/jriddell/KDE/3.5/kdegames/debian/ksame.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ksame.menu
   people/jriddell/KDE/3.5/kdegames/debian/kshisen.install
   people/jriddell/KDE/3.5/kdegames/debian/kshisen.links
   people/jriddell/KDE/3.5/kdegames/debian/kshisen.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kshisen.menu
   people/jriddell/KDE/3.5/kdegames/debian/ksirtet.install
   people/jriddell/KDE/3.5/kdegames/debian/ksirtet.links
   people/jriddell/KDE/3.5/kdegames/debian/ksirtet.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ksirtet.menu
   people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.install
   people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.menu
   people/jriddell/KDE/3.5/kdegames/debian/ksnake.install
   people/jriddell/KDE/3.5/kdegames/debian/ksnake.links
   people/jriddell/KDE/3.5/kdegames/debian/ksnake.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ksnake.menu
   people/jriddell/KDE/3.5/kdegames/debian/ksokoban.install
   people/jriddell/KDE/3.5/kdegames/debian/ksokoban.links
   people/jriddell/KDE/3.5/kdegames/debian/ksokoban.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ksokoban.menu
   people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.install
   people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.links
   people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.menu
   people/jriddell/KDE/3.5/kdegames/debian/ktron.install
   people/jriddell/KDE/3.5/kdegames/debian/ktron.links
   people/jriddell/KDE/3.5/kdegames/debian/ktron.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ktron.menu
   people/jriddell/KDE/3.5/kdegames/debian/ktuberling.install
   people/jriddell/KDE/3.5/kdegames/debian/ktuberling.links
   people/jriddell/KDE/3.5/kdegames/debian/ktuberling.manpages
   people/jriddell/KDE/3.5/kdegames/debian/ktuberling.menu
   people/jriddell/KDE/3.5/kdegames/debian/kwin4.install
   people/jriddell/KDE/3.5/kdegames/debian/kwin4.links
   people/jriddell/KDE/3.5/kdegames/debian/kwin4.manpages
   people/jriddell/KDE/3.5/kdegames/debian/kwin4.menu
   people/jriddell/KDE/3.5/kdegames/debian/libkdegames-dev.install
   people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.doc-base
   people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.install
   people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.links
   people/jriddell/KDE/3.5/kdegames/debian/libkdegames1.install
   people/jriddell/KDE/3.5/kdegames/debian/lskat.install
   people/jriddell/KDE/3.5/kdegames/debian/lskat.links
   people/jriddell/KDE/3.5/kdegames/debian/lskat.manpages
   people/jriddell/KDE/3.5/kdegames/debian/lskat.menu
   people/jriddell/KDE/3.5/kdegames/debian/man/
   people/jriddell/KDE/3.5/kdegames/debian/man/atlantik.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kasteroids.man
   people/jriddell/KDE/3.5/kdegames/debian/man/katomic.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kbackgammon.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kbattleship.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kblackbox.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kbounce.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kdeopt.part
   people/jriddell/KDE/3.5/kdegames/debian/man/kenolaba.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kfouleggs.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kgoldrunner.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kjumpingcube.man
   people/jriddell/KDE/3.5/kdegames/debian/man/klickety.man
   people/jriddell/KDE/3.5/kdegames/debian/man/klines.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kmahjongg.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kmines.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kolf.man
   people/jriddell/KDE/3.5/kdegames/debian/man/konquest.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kpat.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kpoker.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kreversi.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ksame.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kshisen.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ksirtet.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ksmiletris.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ksnake.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ksokoban.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kspaceduel.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ktron.man
   people/jriddell/KDE/3.5/kdegames/debian/man/ktuberling.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kwin4.man
   people/jriddell/KDE/3.5/kdegames/debian/man/kwin4proc.man
   people/jriddell/KDE/3.5/kdegames/debian/man/lskat.man
   people/jriddell/KDE/3.5/kdegames/debian/man/lskatproc.man
   people/jriddell/KDE/3.5/kdegames/debian/patches/
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/README
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdegames/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdegames/debian/rules
   people/jriddell/KDE/3.5/kdegraphics/
   people/jriddell/KDE/3.5/kdegraphics/debian/
   people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/
   people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdegraphics/debian/changelog
   people/jriddell/KDE/3.5/kdegraphics/debian/compat
   people/jriddell/KDE/3.5/kdegraphics/debian/control
   people/jriddell/KDE/3.5/kdegraphics/debian/copyright
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview-16.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview.xpm
   people/jriddell/KDE/3.5/kdegraphics/debian/kamera.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-dev.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
   people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-kfile-plugins.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.mime
   people/jriddell/KDE/3.5/kdegraphics/debian/kfax.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kfax.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kfax.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kfax.mime
   people/jriddell/KDE/3.5/kdegraphics/debian/kfaxview.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kgamma.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.mime
   people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.lintian
   people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kooka.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kooka.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kooka.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.mime
   people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kruler.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kruler.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kruler.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.install
   people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/ksvg.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.lintian
   people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kview.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kview.lintian
   people/jriddell/KDE/3.5/kdegraphics/debian/kview.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/kview.menu
   people/jriddell/KDE/3.5/kdegraphics/debian/kview.mime
   people/jriddell/KDE/3.5/kdegraphics/debian/kviewshell.install
   people/jriddell/KDE/3.5/kdegraphics/debian/kviewshell.manpages
   people/jriddell/KDE/3.5/kdegraphics/debian/libkscan-dev.install
   people/jriddell/KDE/3.5/kdegraphics/debian/libkscan1.install
   people/jriddell/KDE/3.5/kdegraphics/debian/man/
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kcolorchooser.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kcoloredit.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kdvi.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kfax.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kghostview.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kiconedit.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kolourpaint.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kooka.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kpovmodeler.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kruler.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/ksnapshot.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kuickshow.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kview.1
   people/jriddell/KDE/3.5/kdegraphics/debian/man/kviewshell.1
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/10_correct-nedit-invocation.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/11_djvu-lib.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/README
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_03_kmenu_tidy_kghostview.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_04_kpdf_dont_overwrite_file.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_05_poppler.diff
   people/jriddell/KDE/3.5/kdegraphics/debian/rules
   people/jriddell/KDE/3.5/kdemultimedia/
   people/jriddell/KDE/3.5/kdemultimedia/debian/
   people/jriddell/KDE/3.5/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
   people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/
   people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdemultimedia/debian/changelog
   people/jriddell/KDE/3.5/kdemultimedia/debian/compat
   people/jriddell/KDE/3.5/kdemultimedia/debian/control
   people/jriddell/KDE/3.5/kdemultimedia/debian/copyright
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artsbuilder.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artscontrol.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun-16.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun.xpm
   people/jriddell/KDE/3.5/kdemultimedia/debian/juk.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/juk.manpages
   people/jriddell/KDE/3.5/kdemultimedia/debian/juk.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.manpages
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.manpages
   people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-dev.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kfile-plugins.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kio-plugins.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.README.Debian
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.lintian
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.manpages
   people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/krec.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/krec.lintian
   people/jriddell/KDE/3.5/kdemultimedia/debian/krec.manpages
   people/jriddell/KDE/3.5/kdemultimedia/debian/krec.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/kscd.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/kscd.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-akode.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.lintian
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-mpeglib.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.lintian
   people/jriddell/KDE/3.5/kdemultimedia/debian/libkcddb1.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/juk.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaboodle.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaudiocreator.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmix.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmixctrl.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/man/krec.1
   people/jriddell/KDE/3.5/kdemultimedia/debian/mpeglib.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.install
   people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.lintian
   people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.menu
   people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.mime
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/11_applications_menu_move.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/12_noatun_kconf.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/README
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_02_hide_arts_menu_entries.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_03_autostart_kdeonly.diff
   people/jriddell/KDE/3.5/kdemultimedia/debian/rules
   people/jriddell/KDE/3.5/kdepim/
   people/jriddell/KDE/3.5/kdepim/debian/
   people/jriddell/KDE/3.5/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
   people/jriddell/KDE/3.5/kdepim/debian/akregator.install
   people/jriddell/KDE/3.5/kdepim/debian/akregator.manpages
   people/jriddell/KDE/3.5/kdepim/debian/akregator.menu
   people/jriddell/KDE/3.5/kdepim/debian/cdbs/
   people/jriddell/KDE/3.5/kdepim/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdepim/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdepim/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdepim/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdepim/debian/changelog
   people/jriddell/KDE/3.5/kdepim/debian/compat
   people/jriddell/KDE/3.5/kdepim/debian/control
   people/jriddell/KDE/3.5/kdepim/debian/copyright
   people/jriddell/KDE/3.5/kdepim/debian/icons/
   people/jriddell/KDE/3.5/kdepim/debian/icons/akregator-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/akregator.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/karm-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/karm.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kmail-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kmail.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/knode-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/knode.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/knotes-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/knotes.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kontact-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kontact.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/korn-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/korn.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/ksync-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/ksync.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef-16.xpm
   people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef.xpm
   people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.install
   people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.links
   people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.menu
   people/jriddell/KDE/3.5/kdepim/debian/kalarm.install
   people/jriddell/KDE/3.5/kdepim/debian/kalarm.links
   people/jriddell/KDE/3.5/kdepim/debian/kalarm.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kalarm.menu
   people/jriddell/KDE/3.5/kdepim/debian/kandy.install
   people/jriddell/KDE/3.5/kdepim/debian/kandy.links
   people/jriddell/KDE/3.5/kdepim/debian/kandy.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kandy.menu
   people/jriddell/KDE/3.5/kdepim/debian/karm.install
   people/jriddell/KDE/3.5/kdepim/debian/karm.links
   people/jriddell/KDE/3.5/kdepim/debian/karm.manpages
   people/jriddell/KDE/3.5/kdepim/debian/karm.menu
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kalarm
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kandy
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.karm
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kmail
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.knode
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.knotes
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kontact
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.korganizer
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.korn
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kpilot
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.ktnef
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.multisynk
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.doc-base
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-kfile-plugins.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-kio-plugins.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-kresources.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.install
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.menu
   people/jriddell/KDE/3.5/kdepim/debian/kitchensync.install
   people/jriddell/KDE/3.5/kdepim/debian/kitchensync.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kitchensync.menu
   people/jriddell/KDE/3.5/kdepim/debian/kleopatra.README.Debian
   people/jriddell/KDE/3.5/kdepim/debian/kleopatra.install
   people/jriddell/KDE/3.5/kdepim/debian/kleopatra.links
   people/jriddell/KDE/3.5/kdepim/debian/kleopatra.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kleopatra.menu
   people/jriddell/KDE/3.5/kdepim/debian/kmail.install
   people/jriddell/KDE/3.5/kdepim/debian/kmail.links
   people/jriddell/KDE/3.5/kdepim/debian/kmail.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kmail.menu
   people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.install
   people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.menu
   people/jriddell/KDE/3.5/kdepim/debian/knode.install
   people/jriddell/KDE/3.5/kdepim/debian/knode.links
   people/jriddell/KDE/3.5/kdepim/debian/knode.manpages
   people/jriddell/KDE/3.5/kdepim/debian/knode.menu
   people/jriddell/KDE/3.5/kdepim/debian/knotes.install
   people/jriddell/KDE/3.5/kdepim/debian/knotes.links
   people/jriddell/KDE/3.5/kdepim/debian/knotes.manpages
   people/jriddell/KDE/3.5/kdepim/debian/knotes.menu
   people/jriddell/KDE/3.5/kdepim/debian/knotes.preinst
   people/jriddell/KDE/3.5/kdepim/debian/kode.install
   people/jriddell/KDE/3.5/kdepim/debian/kode.manpages
   people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.install
   people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.links
   people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kontact.install
   people/jriddell/KDE/3.5/kdepim/debian/kontact.links
   people/jriddell/KDE/3.5/kdepim/debian/kontact.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kontact.menu
   people/jriddell/KDE/3.5/kdepim/debian/korganizer.install
   people/jriddell/KDE/3.5/kdepim/debian/korganizer.links
   people/jriddell/KDE/3.5/kdepim/debian/korganizer.manpages
   people/jriddell/KDE/3.5/kdepim/debian/korganizer.menu
   people/jriddell/KDE/3.5/kdepim/debian/korn.install
   people/jriddell/KDE/3.5/kdepim/debian/korn.links
   people/jriddell/KDE/3.5/kdepim/debian/korn.manpages
   people/jriddell/KDE/3.5/kdepim/debian/korn.menu
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.config
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.install
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.links
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.manpages
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.menu
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.postinst
   people/jriddell/KDE/3.5/kdepim/debian/kpilot.templates
   people/jriddell/KDE/3.5/kdepim/debian/ksync.install
   people/jriddell/KDE/3.5/kdepim/debian/ksync.manpages
   people/jriddell/KDE/3.5/kdepim/debian/ksync.menu
   people/jriddell/KDE/3.5/kdepim/debian/ktnef.install
   people/jriddell/KDE/3.5/kdepim/debian/ktnef.links
   people/jriddell/KDE/3.5/kdepim/debian/ktnef.manpages
   people/jriddell/KDE/3.5/kdepim/debian/ktnef.menu
   people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.docs
   people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libindex0.install
   people/jriddell/KDE/3.5/kdepim/debian/libkcal2-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libkcal2b.install
   people/jriddell/KDE/3.5/kdepim/debian/libkdepim1-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libkdepim1a.install
   people/jriddell/KDE/3.5/kdepim/debian/libkgantt0-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libkgantt0.install
   people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1.install
   people/jriddell/KDE/3.5/kdepim/debian/libkmime2.install
   people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1.install
   people/jriddell/KDE/3.5/kdepim/debian/libkpimidentities1.install
   people/jriddell/KDE/3.5/kdepim/debian/libksieve0-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libksieve0.install
   people/jriddell/KDE/3.5/kdepim/debian/libktnef1-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libktnef1.install
   people/jriddell/KDE/3.5/kdepim/debian/libmimelib1-dev.install
   people/jriddell/KDE/3.5/kdepim/debian/libmimelib1c2a.install
   people/jriddell/KDE/3.5/kdepim/debian/man/
   people/jriddell/KDE/3.5/kdepim/debian/man/akregator.man
   people/jriddell/KDE/3.5/kdepim/debian/man/egroupwarewizard.man
   people/jriddell/KDE/3.5/kdepim/debian/man/exchangewizard.man
   people/jriddell/KDE/3.5/kdepim/debian/man/groupwarewizard.man
   people/jriddell/KDE/3.5/kdepim/debian/man/groupwisewizard.man
   people/jriddell/KDE/3.5/kdepim/debian/man/ical2vcal.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kabc2mutt.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kaddressbook.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kalarm.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kalarmd.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kandy.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kandy_client.man
   people/jriddell/KDE/3.5/kdepim/debian/man/karm.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kdeopt.part
   people/jriddell/KDE/3.5/kdepim/debian/man/kitchensync.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kleopatra.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmail.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmail_antivir.sh.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmail_clamav.sh.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmail_fprot.sh.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmail_sav.sh.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kmailcvt.man
   people/jriddell/KDE/3.5/kdepim/debian/man/knode.man
   people/jriddell/KDE/3.5/kdepim/debian/man/knotes.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kode.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kolabwizard.man
   people/jriddell/KDE/3.5/kdepim/debian/man/konsolekalendar.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kontact.man
   people/jriddell/KDE/3.5/kdepim/debian/man/korgac.man
   people/jriddell/KDE/3.5/kdepim/debian/man/korganizer.man
   people/jriddell/KDE/3.5/kdepim/debian/man/korn.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kpalmdoc.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kpilot.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kpilotDaemon.man
   people/jriddell/KDE/3.5/kdepim/debian/man/ksync.man
   people/jriddell/KDE/3.5/kdepim/debian/man/ktnef.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kwatchgnupg.man
   people/jriddell/KDE/3.5/kdepim/debian/man/kxml_compiler.man
   people/jriddell/KDE/3.5/kdepim/debian/man/multisynk.man
   people/jriddell/KDE/3.5/kdepim/debian/man/networkstatustestservice.man
   people/jriddell/KDE/3.5/kdepim/debian/man/sloxwizard.man
   people/jriddell/KDE/3.5/kdepim/debian/networkstatus.install
   people/jriddell/KDE/3.5/kdepim/debian/networkstatus.manpages
   people/jriddell/KDE/3.5/kdepim/debian/patches/
   people/jriddell/KDE/3.5/kdepim/debian/patches/11_lib_link.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/12_kmail_nofinal.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/13_mimelib_self_contained.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/README
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_01_kmenu_tidy.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_04_kpalmdoc_kmenu_tidy.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_05_ktnef_kmenu_tidy.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_06_add_akregator_feed.diff
   people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_07_autostart_kdeonly.diff
   people/jriddell/KDE/3.5/kdepim/debian/po/
   people/jriddell/KDE/3.5/kdepim/debian/po/POTFILES.in
   people/jriddell/KDE/3.5/kdepim/debian/po/da.po
   people/jriddell/KDE/3.5/kdepim/debian/po/de.po
   people/jriddell/KDE/3.5/kdepim/debian/po/fr.po
   people/jriddell/KDE/3.5/kdepim/debian/po/ja.po
   people/jriddell/KDE/3.5/kdepim/debian/po/nl.po
   people/jriddell/KDE/3.5/kdepim/debian/po/pt_BR.po
   people/jriddell/KDE/3.5/kdepim/debian/po/templates.pot
   people/jriddell/KDE/3.5/kdepim/debian/po/vi.po
   people/jriddell/KDE/3.5/kdepim/debian/rules
   people/jriddell/KDE/3.5/kdepim/debian/shlibs.local
   people/jriddell/KDE/3.5/kdesdk/
   people/jriddell/KDE/3.5/kdesdk/debian/
   people/jriddell/KDE/3.5/kdesdk/debian/cdbs/
   people/jriddell/KDE/3.5/kdesdk/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdesdk/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdesdk/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdesdk/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdesdk/debian/cervisia.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/cervisia.docs
   people/jriddell/KDE/3.5/kdesdk/debian/cervisia.install
   people/jriddell/KDE/3.5/kdesdk/debian/cervisia.menu
   people/jriddell/KDE/3.5/kdesdk/debian/cervisia.override
   people/jriddell/KDE/3.5/kdesdk/debian/changelog
   people/jriddell/KDE/3.5/kdesdk/debian/compat
   people/jriddell/KDE/3.5/kdesdk/debian/control
   people/jriddell/KDE/3.5/kdesdk/debian/copyright
   people/jriddell/KDE/3.5/kdesdk/debian/icons/
   people/jriddell/KDE/3.5/kdesdk/debian/icons/catalogmanager.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/cervisia.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabel.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabeldict.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kbugbuster.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kcachegrind.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kompare.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/kuiviewer.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/icons/umbrello.xpm
   people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.install
   people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.override
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel-dev.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel-dev.install
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.install
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.menu
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.mime
   people/jriddell/KDE/3.5/kdesdk/debian/kbabel.override
   people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.install
   people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.menu
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.install
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.install
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.menu
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kfile-plugins.install
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kio-plugins.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kio-plugins.install
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.install
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.links
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.install
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.override
   people/jriddell/KDE/3.5/kdesdk/debian/kdesdk.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.install
   people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kompare.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kompare.install
   people/jriddell/KDE/3.5/kdesdk/debian/kompare.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kompare.menu
   people/jriddell/KDE/3.5/kdesdk/debian/kompare.override
   people/jriddell/KDE/3.5/kdesdk/debian/kspy.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kspy.install
   people/jriddell/KDE/3.5/kdesdk/debian/kspy.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kspy.override
   people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.install
   people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.menu
   people/jriddell/KDE/3.5/kdesdk/debian/kunittest.docs
   people/jriddell/KDE/3.5/kdesdk/debian/kunittest.install
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.docs
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.install
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.docs
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.install
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.override
   people/jriddell/KDE/3.5/kdesdk/debian/man/
   people/jriddell/KDE/3.5/kdesdk/debian/man/adddebug.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/build-progress.sh.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/catalogmanager.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cheatmake.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/create_cvsignore.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefile.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefiles.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvs-clean.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvs2dist.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvsaskpass.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvsbackport.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvscheck.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvsforwardport.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastchange.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastlog.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvsrevertlast.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cvsservice.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/cxxmetric.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/demangle.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/dprof2calltree.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/extend_dmalloc.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/extractattr.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/extractrc.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/findmissingcrystal.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/fixkdeincludes.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/fixuifiles.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/hotshot2calltree.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kapptemplate.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kbabel.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kbabeldict.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kbugbuster.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kcachegrind.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kdedoc.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kdekillall.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kdelnk2desktop.py.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kdemangen.pl.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kminspector.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kmmatch.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kmtrace.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kompare.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/kuiviewer.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/licensecheck.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/makeobj.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/memprof2calltree.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/op2calltree.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/package_crystalsvg.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/png2mng.pl.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/po2xml.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/pprof2calltree.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/pruneemptydirs.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/qtdoc.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/split2po.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/swappo.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/testkspy.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/transxx.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/umbrello.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/xml2pot.1
   people/jriddell/KDE/3.5/kdesdk/debian/man/zonetab2pot.py.1
   people/jriddell/KDE/3.5/kdesdk/debian/patches/
   people/jriddell/KDE/3.5/kdesdk/debian/patches/02_env.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/03_kde-buildrc.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/04_kmtrace.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/05_paths.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/06_pod2man.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/README
   people/jriddell/KDE/3.5/kdesdk/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdesdk/debian/poxml.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/poxml.install
   people/jriddell/KDE/3.5/kdesdk/debian/poxml.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/rules
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.README.Debian
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.docs
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.install
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.manpages
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.menu
   people/jriddell/KDE/3.5/kdesdk/debian/umbrello.override
   people/jriddell/KDE/3.5/kdetoys/
   people/jriddell/KDE/3.5/kdetoys/debian/
   people/jriddell/KDE/3.5/kdetoys/debian/amor.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/amor.docs
   people/jriddell/KDE/3.5/kdetoys/debian/amor.install
   people/jriddell/KDE/3.5/kdetoys/debian/amor.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/amor.menu
   people/jriddell/KDE/3.5/kdetoys/debian/cdbs/
   people/jriddell/KDE/3.5/kdetoys/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdetoys/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdetoys/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdetoys/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdetoys/debian/changelog
   people/jriddell/KDE/3.5/kdetoys/debian/compat
   people/jriddell/KDE/3.5/kdetoys/debian/control
   people/jriddell/KDE/3.5/kdetoys/debian/copyright
   people/jriddell/KDE/3.5/kdetoys/debian/eyesapplet.install
   people/jriddell/KDE/3.5/kdetoys/debian/fifteenapplet.install
   people/jriddell/KDE/3.5/kdetoys/debian/icons/
   people/jriddell/KDE/3.5/kdetoys/debian/icons/amor.xpm
   people/jriddell/KDE/3.5/kdetoys/debian/icons/kodo.xpm
   people/jriddell/KDE/3.5/kdetoys/debian/icons/kteatime.xpm
   people/jriddell/KDE/3.5/kdetoys/debian/icons/ktux.xpm
   people/jriddell/KDE/3.5/kdetoys/debian/icons/kworldclock.xpm
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.amor
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
   people/jriddell/KDE/3.5/kdetoys/debian/kdetoys.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kmoon.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kmoon.docs
   people/jriddell/KDE/3.5/kdetoys/debian/kmoon.install
   people/jriddell/KDE/3.5/kdetoys/debian/kodo.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kodo.install
   people/jriddell/KDE/3.5/kdetoys/debian/kodo.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/kodo.menu
   people/jriddell/KDE/3.5/kdetoys/debian/kteatime.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kteatime.docs
   people/jriddell/KDE/3.5/kdetoys/debian/kteatime.install
   people/jriddell/KDE/3.5/kdetoys/debian/kteatime.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/kteatime.menu
   people/jriddell/KDE/3.5/kdetoys/debian/ktux.docs
   people/jriddell/KDE/3.5/kdetoys/debian/ktux.install
   people/jriddell/KDE/3.5/kdetoys/debian/ktux.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/ktux.menu
   people/jriddell/KDE/3.5/kdetoys/debian/kweather.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kweather.docs
   people/jriddell/KDE/3.5/kdetoys/debian/kweather.install
   people/jriddell/KDE/3.5/kdetoys/debian/kweather.lintian
   people/jriddell/KDE/3.5/kdetoys/debian/kweather.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.README.Debian
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.install
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.manpages
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.menu
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.postinst
   people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.prerm
   people/jriddell/KDE/3.5/kdetoys/debian/man/
   people/jriddell/KDE/3.5/kdetoys/debian/man/amor.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/kodo.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/kteatime.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/ktux.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherreport.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherservice.1
   people/jriddell/KDE/3.5/kdetoys/debian/man/kworldclock.1
   people/jriddell/KDE/3.5/kdetoys/debian/patches/
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/README
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdetoys/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdetoys/debian/rules
   people/jriddell/KDE/3.5/kdeutils/
   people/jriddell/KDE/3.5/kdeutils/debian/
   people/jriddell/KDE/3.5/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
   people/jriddell/KDE/3.5/kdeutils/debian/ark.install
   people/jriddell/KDE/3.5/kdeutils/debian/ark.lintian
   people/jriddell/KDE/3.5/kdeutils/debian/ark.menu
   people/jriddell/KDE/3.5/kdeutils/debian/ark.mime
   people/jriddell/KDE/3.5/kdeutils/debian/cdbs/
   people/jriddell/KDE/3.5/kdeutils/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdeutils/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdeutils/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdeutils/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdeutils/debian/changelog
   people/jriddell/KDE/3.5/kdeutils/debian/compat
   people/jriddell/KDE/3.5/kdeutils/debian/control
   people/jriddell/KDE/3.5/kdeutils/debian/copyright
   people/jriddell/KDE/3.5/kdeutils/debian/icons/
   people/jriddell/KDE/3.5/kdeutils/debian/icons/ark-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/ark.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba-16.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba.xpm
   people/jriddell/KDE/3.5/kdeutils/debian/kcalc.install
   people/jriddell/KDE/3.5/kdeutils/debian/kcalc.lintian
   people/jriddell/KDE/3.5/kdeutils/debian/kcalc.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.install
   people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.manpages
   people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.install
   people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.lintian
   people/jriddell/KDE/3.5/kdeutils/debian/kdessh.install
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-dev.install
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.ark
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
   people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc.install
   people/jriddell/KDE/3.5/kdeutils/debian/kdf.install
   people/jriddell/KDE/3.5/kdeutils/debian/kdf.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kedit.install
   people/jriddell/KDE/3.5/kdeutils/debian/kedit.lintian
   people/jriddell/KDE/3.5/kdeutils/debian/kedit.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kedit.mime
   people/jriddell/KDE/3.5/kdeutils/debian/kfloppy.install
   people/jriddell/KDE/3.5/kdeutils/debian/kfloppy.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kgpg.install
   people/jriddell/KDE/3.5/kdeutils/debian/kgpg.manpages
   people/jriddell/KDE/3.5/kdeutils/debian/kgpg.menu
   people/jriddell/KDE/3.5/kdeutils/debian/khexedit.install
   people/jriddell/KDE/3.5/kdeutils/debian/khexedit.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kjots.install
   people/jriddell/KDE/3.5/kdeutils/debian/kjots.menu
   people/jriddell/KDE/3.5/kdeutils/debian/klaptopdaemon.install
   people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install
   people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install.powerpc
   people/jriddell/KDE/3.5/kdeutils/debian/kregexpeditor.install
   people/jriddell/KDE/3.5/kdeutils/debian/kregexpeditor.menu
   people/jriddell/KDE/3.5/kdeutils/debian/ksim.install
   people/jriddell/KDE/3.5/kdeutils/debian/ksim.preinst
   people/jriddell/KDE/3.5/kdeutils/debian/ktimer.install
   people/jriddell/KDE/3.5/kdeutils/debian/ktimer.menu
   people/jriddell/KDE/3.5/kdeutils/debian/kwalletmanager.install
   people/jriddell/KDE/3.5/kdeutils/debian/man/
   people/jriddell/KDE/3.5/kdeutils/debian/man/kcharselect.1
   people/jriddell/KDE/3.5/kdeutils/debian/man/kgpg.1
   people/jriddell/KDE/3.5/kdeutils/debian/man/superkaramba.1
   people/jriddell/KDE/3.5/kdeutils/debian/patches/
   people/jriddell/KDE/3.5/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/11_floppy_nodes.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/README
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_01_kmenu_tidy.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_04_use_pmi.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_06_lock_on_hibernate.diff
   people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff
   people/jriddell/KDE/3.5/kdeutils/debian/rules
   people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.examples
   people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.install
   people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.manpages
   people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.menu
   people/jriddell/KDE/3.5/kdevelop3/
   people/jriddell/KDE/3.5/kdevelop3/debian/
   people/jriddell/KDE/3.5/kdevelop3/debian/README.Debian
   people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/
   people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdevelop3/debian/changelog
   people/jriddell/KDE/3.5/kdevelop3/debian/compat
   people/jriddell/KDE/3.5/kdevelop3/debian/config
   people/jriddell/KDE/3.5/kdevelop3/debian/control
   people/jriddell/KDE/3.5/kdevelop3/debian/copyright
   people/jriddell/KDE/3.5/kdevelop3/debian/create_lang_links.sh
   people/jriddell/KDE/3.5/kdevelop3/debian/cron.weekly
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-data.install
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-dev.install
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-doc.install
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-doc.links
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-plugins.install
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.install
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postinst
   people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postrm
   people/jriddell/KDE/3.5/kdevelop3/debian/menu
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/app_name.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/07_disable-visibility.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/README
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kde.pot
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdevelop3/debian/patches/profiledir.diff
   people/jriddell/KDE/3.5/kdevelop3/debian/po/
   people/jriddell/KDE/3.5/kdevelop3/debian/po/POTFILES.in
   people/jriddell/KDE/3.5/kdevelop3/debian/po/cs.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/de.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/fr.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/ja.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/nl.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/pt_BR.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/sv.po
   people/jriddell/KDE/3.5/kdevelop3/debian/po/templates.pot
   people/jriddell/KDE/3.5/kdevelop3/debian/po/vi.po
   people/jriddell/KDE/3.5/kdevelop3/debian/rules
   people/jriddell/KDE/3.5/kdevelop3/debian/templates
   people/jriddell/KDE/3.5/kdevelop3/debian/update_doc_index.sh
   people/jriddell/KDE/3.5/kdewebdev/
   people/jriddell/KDE/3.5/kdewebdev/debian/
   people/jriddell/KDE/3.5/kdewebdev/debian/.cvsignore
   people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/
   people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdewebdev/debian/changelog
   people/jriddell/KDE/3.5/kdewebdev/debian/compat
   people/jriddell/KDE/3.5/kdewebdev/debian/control
   people/jriddell/KDE/3.5/kdewebdev/debian/copyright
   people/jriddell/KDE/3.5/kdewebdev/debian/docrc/
   people/jriddell/KDE/3.5/kdewebdev/debian/docrc/css.docrc
   people/jriddell/KDE/3.5/kdewebdev/debian/docrc/docbook.docrc
   people/jriddell/KDE/3.5/kdewebdev/debian/docrc/html.docrc
   people/jriddell/KDE/3.5/kdewebdev/debian/docrc/php.docrc
   people/jriddell/KDE/3.5/kdewebdev/debian/icons/
   people/jriddell/KDE/3.5/kdewebdev/debian/icons/kimagemapeditor.xpm
   people/jriddell/KDE/3.5/kdewebdev/debian/icons/klinkstatus.xpm
   people/jriddell/KDE/3.5/kdewebdev/debian/icons/quanta.xpm
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
   people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
   people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.install
   people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.install
   people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.manpages
   people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.menu
   people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.install
   people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.manpages
   people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.menu
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.install
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.install
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.manpages
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.menu
   people/jriddell/KDE/3.5/kdewebdev/debian/kommander.shlibs
   people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.install
   people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.manpages
   people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.menu
   people/jriddell/KDE/3.5/kdewebdev/debian/man/
   people/jriddell/KDE/3.5/kdewebdev/debian/man/extractkmdr.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kimagemapeditor.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/klinkstatus.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-editor.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-executor.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-plugins.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr2po.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/kxsldbg.1
   people/jriddell/KDE/3.5/kdewebdev/debian/man/quanta.1
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/02_kmdr_i18n.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/README
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
   people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.install
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.lintian
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.README.Debian
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.docs
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.install
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.links
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.lintian
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.manpages
   people/jriddell/KDE/3.5/kdewebdev/debian/quanta.menu
   people/jriddell/KDE/3.5/kdewebdev/debian/rules
Modified:
   people/jriddell/KDE/3.5/arts/debian/KUBUNTU-DEBIAN-CHANGES
   people/jriddell/KDE/3.5/arts/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/arts/debian/changelog
   people/jriddell/KDE/3.5/arts/debian/control
   people/jriddell/KDE/3.5/arts/debian/rules
   people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog
   people/jriddell/KDE/3.5/kdeaccessibility/debian/control
   people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install
   people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install
   people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install
   people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install
   people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install
   people/jriddell/KDE/3.5/kdeaccessibility/debian/rules
   people/jriddell/KDE/3.5/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
   people/jriddell/KDE/3.5/kdebase/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdebase/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdebase/debian/changelog
   people/jriddell/KDE/3.5/kdebase/debian/control
   people/jriddell/KDE/3.5/kdebase/debian/kcontrol.install
   people/jriddell/KDE/3.5/kdebase/debian/kdebase-bin.install
   people/jriddell/KDE/3.5/kdebase/debian/kdeprint.install
   people/jriddell/KDE/3.5/kdebase/debian/kdesktop.install
   people/jriddell/KDE/3.5/kdebase/debian/konsole.install
   people/jriddell/KDE/3.5/kdebase/debian/patches/18_default_fonts.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/22_default_backgrounds.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_17_hide_desktop_trash.diff
   people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff
   people/jriddell/KDE/3.5/kdebase/debian/rules
   people/jriddell/KDE/3.5/kdelibs/debian/KUBUNTU-DEBIAN-CHANGES
   people/jriddell/KDE/3.5/kdelibs/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdelibs/debian/changelog
   people/jriddell/KDE/3.5/kdelibs/debian/compat
   people/jriddell/KDE/3.5/kdelibs/debian/control
   people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4-doc.install
   people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4c2.install
   people/jriddell/KDE/3.5/kdelibs/debian/rules
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdenetwork/debian/changelog
   people/jriddell/KDE/3.5/kdenetwork/debian/control
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/rules
Log:
Add packaging for KDE 3.5.1
Forked from debian around October
See KUBUNTU-DEBIAN-DIFFERENCES files for delta from debian
Also one of the kde-i18n- packages


Modified: people/jriddell/KDE/3.5/arts/debian/KUBUNTU-DEBIAN-CHANGES
===================================================================
--- people/jriddell/KDE/3.5/arts/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/arts/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,2 +1,3 @@
 No jack build-dep
 libarts1c2 depends on kdelibs-bin for lnusertemp
+libstdc++ mt-allicator transition

Modified: people/jriddell/KDE/3.5/arts/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/arts/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/arts/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -72,6 +72,10 @@
 	fi
 	touch debian/stamp-apidox
 
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
 common-install-arch common-install-indep:: install-apidox
 install-apidox::
 	if test -n "$(DEB_KDE_APIDOX)"; then \
@@ -80,6 +84,7 @@
 
 clean::
 	rm -f debian/stamp-apidox
+	rm -rf po
 
 buildprep: clean apply-patches
 	make -f admin/Makefile.common dist

Modified: people/jriddell/KDE/3.5/arts/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/arts/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/arts/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,6 +1,31 @@
+arts (1.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * control-breezy and control-dapper hack to make backports work
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:05 +0000
+
+arts (1.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:42:22 +0000
+
+arts (1.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Disable visibility
+  * libstdc++ transition, rename libartsc2 to libartsc2a
+  * Remove libarts1c2a depend on kdelibs-bin, lnusertemp now built in
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 12:14:13 +0000
+
 arts (1.5-rc1-1ubuntu1) dapper; urgency=low
 
   * Sync with Debian
+  * Build with GCC 3.4 to prevent segfault
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Nov 2005 15:23:47 +0000
 

Modified: people/jriddell/KDE/3.5/arts/debian/control
===================================================================
--- people/jriddell/KDE/3.5/arts/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/arts/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4, cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.4), libvorbis-dev, sharutils, texinfo, lsb-release, base-files
 Build-Conflicts: libmas-dev
 Standards-Version: 3.6.2
 
 Package: arts
 Architecture: all
 Section: sound
-Depends: libartsc0 (>= ${Source-Version}), libarts1c2 (>= ${Source-Version})
+Depends: libartsc0 (>= ${Source-Version}), libarts1c2a (>= ${Source-Version})
 Description: sound system from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -20,13 +20,13 @@
  This metapackage includes the complete aRts sound system, without
  development packages. aRts is the core sound system for KDE.
 
-Package: libarts1c2
+Package: libarts1c2a
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, kdelibs-bin
+Depends: ${shlibs:Depends}
 Recommends: akode
-Conflicts: libarts1
-Replaces: libarts1
+Conflicts: libarts1, libarts1c2
+Replaces: libarts1, libarts1c2
 Description: aRts sound system core components
  aRts is a short form for "analog realtime synthesizer". aRts is highly
  modular, creating and processing sound using small modules performing
@@ -47,7 +47,7 @@
 Package: libarts1-dev
 Architecture: any
 Section: libdevel
-Depends: libarts1c2 (= ${Source-Version}), libartsc0-dev (= ${Source-Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.4-4), libvorbis-dev
+Depends: libarts1c2a (= ${Source-Version}), libartsc0-dev (= ${Source-Version}), ${libasound2-dev}, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.4-4), libvorbis-dev
 Description: development files for the aRts sound system core components
  This package contains the header files needed to build applications that
  use the aRts sound system.

Modified: people/jriddell/KDE/3.5/arts/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/arts/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/arts/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -15,19 +15,6 @@
 #shlibs_ver = 1.4.3-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-###
-
-#GCC4_ICES_HERE := arm m68k hppa
-#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-#ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
-export CC=gcc-3.4
-export CPP=cpp-3.4
-export CXX=g++-3.4
-#endif
-
-### 
-
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 binary-predeb/libarts1-dev::
@@ -35,3 +22,6 @@
 	    echo "libasound2-dev=libasound2-dev" >>debian/libarts1-dev.substvars
 endif
 
+debian/control::
+	cp debian/control-dapper debian/control
+	-grep -q breezy /etc/lsb-release && cp debian/control-breezy debian/control

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,30 @@
+kde-i18n-af (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 21:52:57 +0000
+
+kde-i18n-af (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Lower kdelibs build-dep to 3.5-rc2
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 00:58:52 +0000
+
+kde-i18n-af (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 22 Nov 2005 19:58:59 +0000
+
+kde-i18n-af (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 03:42:59 +0100
+
+kde-i18n-af (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Initial Afrikaans package
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 29 May 2005 21:31:25 +0000

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/compat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/compat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+Source: kde-i18n-af
+Build-Depends: autoconf, automake1.9, debhelper (>> 4.2.0), kdelibs4-dev (>= 4:3.5.1), gawk, gettext
+Section: kde
+Priority: optional
+Maintainer: Jonathan Riddell <jriddell at ubuntu.com>
+Standards-Version: 3.6.2
+
+Package: kde-i18n-af
+Architecture: all
+Section: kde
+Depends: kdelibs4c2a (>= 4:3.5.1)
+Replaces: kdebase-i18n, kde-i18n
+Suggests: kde
+Conflicts: kdebase-i18n, koffice (<< 1.3.0-2), juk (<<4:3.2.1-1), kcachegrind (<<4:3.2.1-1)
+Provides: kde-i18n
+Description: Afrikaans internationalized (i18n) files for KDE
+ This package contains the Afrikaans internationalized (i18n)
+ files for all KDE core applications.

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+This package was created by
+Jonathan Riddell <jr at jriddell.org> Sun, 29 May 2005 21:31:25 +0000
+
+based on kde-i18n created by
+
+Ivan E. Moore II <rkrusty at debian.org>.
+Noèl Köthe <noel at debian.org> on Thu, 3 Oct 2002 11:46:00 +0200
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/
+
+Copyright:
+
+Released under the terms of the GPL; see
+/usr/share/common-licenses/GPL.

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/debiandirs
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/debiandirs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/debiandirs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+export kde_prefix=/usr
+export sysconfdir=/etc
+export kde_includedir=/usr/include/kde
+export infodir=/usr/share/info
+export mandir=/usr/share/man
+export qtdir=/usr/share/qt3
+export kde_cgidir=/usr/lib/cgi-bin
+export kde_confdir=/etc/kde3
+export kde_htmldir=/usr/share/doc/kde/HTML
+configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/debianrules
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/debianrules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/debianrules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+#!/usr/bin/perl -w
+
+use Shell qw(mv cp mkdir rm) ;
+use File::Find;
+use Cwd;
+
+$origPwd = `pwd`;
+chomp $origPwd;
+
+$kde_prefix	=	"/usr";
+$sysconfdir	=	"/etc";
+$kde_includedir	=	"$kde_prefix/include/kde";
+$infodir	=	"$kde_prefix/share/info";
+$mandir		=	"$kde_prefix/share/man";
+$qtdir		=	"/usr/share/qt3";
+
+$kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
+$kde_confdir	=	"$sysconfdir/kde3";
+$kde_htmldir	=	"$kde_prefix/share/doc/kde/HTML";
+
+if (defined $ENV{DEB_BUILD_OPTIONS} &&
+    $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
+	$enable_debug="--enable-debug=full";
+} else {
+	$enable_debug="--disable-debug";
+}
+
+if (@ARGV && $ARGV[0] eq 'echodirs') {
+  print STDOUT "export kde_prefix=$kde_prefix\n";
+  print STDOUT "export sysconfdir=$sysconfdir\n";
+  print STDOUT "export kde_includedir=$kde_includedir\n";
+  print STDOUT "export infodir=$infodir\n";
+  print STDOUT "export mandir=$mandir\n";
+  print STDOUT "export qtdir=$qtdir\n";
+
+  print STDOUT "export kde_cgidir=$kde_cgidir\n";
+  print STDOUT "export kde_confdir=$kde_confdir\n";
+  print STDOUT "export kde_htmldir=$kde_htmldir\n";
+
+  print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
+
+  exit
+}

Added: people/jriddell/KDE/3.5/kde-i18n-af/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kde-i18n-af/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kde-i18n-af/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,139 @@
+#!/usr/bin/make -f
+
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+stampfiles=build-stamp install-stamp
+
+build: build-stamp
+
+-include debian/debiandirs
+
+debian/debiandirs: debian/debianrules
+	perl -w debian/debianrules echodirs > debian/debiandirs
+
+build-stamp:
+	dh_testdir
+	./configure $(configkde)
+	$(MAKE)
+
+	touch build-stamp
+
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
+	#$(MAKE) install DESTDIR=`pwd`/debian/`dh_listpackages -i`
+	touch $@
+
+clean: debian-clean
+	dh_clean
+	rm -f $(stampfiles)
+	rm -f debian/missing-{install,package}-list
+
+debian-clean:
+	dh_testdir
+	if test ! -f configure; then \
+	  $(MAKE) distclean;\
+	fi 
+	# Remove .gmo files which cannot be represented by dpkg-source
+	find `cat subdirs` -type f -name '*.gmo' -exec rm {} \;
+
+binary-indep: install-stamp
+	dh_testroot
+	dh_testdir
+
+	#for i in `dh_listpackages -i`; do rm -rf debian/$$i; done
+	# Loop over all languages to install
+	# de is transitioning to de_DE, so look for de_DE files too
+
+	for i in af; do \
+	case $$i in \
+	  en_GB) \
+	    p=engb ;\
+          ;; \
+          no_NY) \
+	    p=nony ;\
+          ;; \
+          pt_BR) \
+	    p=ptbr ;\
+	  ;; \
+	  zh_CN) \
+	    p=zhcn ;\
+	  ;; \
+	  zh_TW) \
+	    p=zhtw ;\
+	  ;; \
+	  de_DE) \
+	    p=de ;\
+	  ;; \
+	  fr_FR) \
+	    p=fr ;\
+	  ;; \
+	  sr at Latn) \
+	    p=srlatn ;\
+	  ;; \
+	 *) \
+	    p=$$i ;\
+	esac ;\
+	echo p is: $$p;\
+	installlist= ;\
+	for f in locale/$$i \
+	         doc/kde/HTML/$$i \
+	         apps/katepart/syntax/logohighlightstyle.$$i.xml \
+		 apps/khangman/$$i.txt \
+		 apps/khangman/data/$$i \
+		 apps/klatin/data/vocabs/$$i \
+		 apps/klettres/$$i \
+		 apps/ktuberling/sounds/$$i \
+		 apps/kturtle/data/logokeywords.$$i.xml \
+		 apps/kturtle/examples/$$i ;\
+	  do \
+	    if test -e debian/tmp/usr/share/$$f; then \
+	      installlist="$$installlist usr/share/$$f" ;\
+	    fi ;\
+	done ;\
+	echo installing into kde-i18n-$$p: $$installlist ;\
+	dh_install --autodest --sourcedir=debian/tmp -pkde-i18n-$$p \
+		$$installlist || exit 1 ;\
+	done
+
+	dh_installdocs
+	dh_installmenu
+	dh_installchangelogs
+	dh_strip
+	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb       	
+
+binary-arch:
+	dh_testdir
+	dh_testroot
+# There are no architecture-dependent files to be uploaded
+# generated by this package.  If there were any they would be
+# made here.
+
+list-missing:
+	# based on cdbs list-missing rule
+	rm -f debian/missing-{install,package}-list
+	if test -d debian/tmp; then \
+	 (cd debian/tmp && find . -type f -o -type l | grep -v '/DEBIAN/' | sort) > debian/missing-install-list; \
+          (for package in `dh_listpackages`; do \
+             (cd debian/$$package && find . -type f -o -type l); \
+           done) | sort -u > debian/missing-package-list; \
+          diff -u debian/missing-install-list debian/missing-package-list | egrep '^-' || true; \
+        else \
+          echo "All files were installed."; \
+        fi
+
+# Below here is fairly generic really
+
+binary:		binary-indep binary-arch
+
+.PHONY: build binary binary-arch binary-indep clean list-missing


Property changes on: people/jriddell/KDE/3.5/kde-i18n-af/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/debian-qt-kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -37,11 +37,20 @@
 	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_ALL_PACKAGES); do \
+	for p in $(DEB_ARCH_PACKAGES); do \
 	    cat $$tmpf >>debian/$$p.substvars; \
 	done; \
 	rm -f $$tmpf )

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -72,6 +72,10 @@
 	fi
 	touch debian/stamp-apidox
 
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
 common-install-arch common-install-indep:: install-apidox
 install-apidox::
 	if test -n "$(DEB_KDE_APIDOX)"; then \
@@ -80,6 +84,7 @@
 
 clean::
 	rm -f debian/stamp-apidox
+	rm -rf po
 
 buildprep: clean apply-patches
 	make -f admin/Makefile.common dist

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,12 +1,36 @@
-kdeaccessibility (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+kdeaccessibility (4:3.5.1-0ubuntu1) dapper; urgency=low
 
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:05 +0000
+
+kdeaccessibility (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:26:30 +0000
+
+kdeaccessibility (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
   * New upstream pre-release
   * Sync with Debian
-  * Remove 02_kttsd-makefiles-fix.diff, merged upstream
-  * Change ./configure --enable-kttsd-gstreamer to --with-gstreamer
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 19:43:26 +0000
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2005 13:33:38 +0000
 
+kdeaccessibility (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  +++ Changes by Josh Metzler:
+
+  * Add libakode-dev build dependency to build akode plugin.
+
+  * Remove epos, flite, and festival build dependencies.  The plugins
+    are still built without them installed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 14 Nov 2005 21:31:29 -0400
+ 
 kdeaccessibility (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.
@@ -36,49 +60,12 @@
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Sep 2005 17:31:25 +0200
 
-kdeaccessibility (4:3.4.3-0ubuntu1) breezy; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 19:37:07 +0000
-
-kdeaccessibility (4:3.4.2-0ubuntu1) breezy; urgency=low
-
-  * New upstream version
-  * Build using unsermake
-
- -- Jonathan Riddell <jr at jriddell.org>  Tue, 26 Jul 2005 12:09:40 +0000
-
-kdeaccessibility (4:3.4.1-0ubuntu1) breezy; urgency=low
-
-  * Update version number following KDE 3.4.1 release.
-
- -- Jonathan Riddell <jr at jriddell.org>  Tue, 31 May 2005 23:43:07 +0000
-
-kdeaccessibility (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
-
-  * Sync with Debian
-
- -- Jonathan Riddell <jr at jriddell.org>  Tue, 24 May 2005 19:03:03 +0000
-
 kdeaccessibility (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
 
-kdeaccessibility (4:3.4.0-0ubuntu1) hoary; urgency=low
-
-  * Update version number now KDE 3.4 is released.
-
- -- Jonathan Riddell <jr at jriddell.org>  Thu, 24 Mar 2005 14:56:21 +0000
-
-kdeaccessibility (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
-
-  * Sync with Debian
-
- -- Jonathan Riddell <jr at jriddell.org>  Sun,  6 Mar 2005 15:11:31 +0000
-
 kdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
 
   * New upstream release.

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -2,8 +2,8 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, sharutils, groff-base, kdelibs4-dev (>= 4:3.4.3), libxtst-dev, libgstreamer0.8-dev (>> 0.8.5), libgstreamer-plugins0.8-dev (>> 0.8.5), kdemultimedia-dev (>= 4:3.4.3), epos, flite, festival
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at the-barrel.org>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>, Josh Metzler <joshdeb at metzlers.org>
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.1), kdemultimedia-dev (>= 4:3.5.1), libakode-dev, libgstreamer0.8-dev (>> 0.8.7), libgstreamer-plugins0.8-dev (>> 0.8.7), libxtst-dev, sharutils
 Standards-Version: 3.6.2
 
 Package: kdeaccessibility
@@ -108,6 +108,8 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kttsd (<< 4:3.5.0)
+Conflicts: kttsd (<< 4:3.5.0)
 Suggests: khelpcenter
 Description: a frontend for the KDE Text-to-Speech system
  Text-to-speech front-end to kttsd.

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmag.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -14,5 +14,5 @@
 debian/tmp/usr/share/icons/locolor/16x16/apps/kmag.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kmag.png
 
+debian/icons/kmag.xpm		/usr/share/pixmaps
 debian/icons/kmag-16.xpm	/usr/share/pixmaps
-debian/icons/kmag.xpm		/usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmousetool.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -14,5 +14,5 @@
 debian/tmp/usr/share/icons/hicolor/16x16/apps/kmousetool.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kmousetool.png
 
+debian/icons/kmousetool.xpm		/usr/share/pixmaps
 debian/icons/kmousetool-16.xpm		/usr/share/pixmaps
-debian/icons/kmousetool.xpm		/usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kmouth.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -74,24 +74,24 @@
 debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthwizard.eps
 debian/tmp/usr/share/doc/kde/HTML/en/kmouth/kmouthwizard.png
 debian/tmp/usr/share/doc/kde/HTML/en/kmouth/man-kmouth.1.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/actions/speak.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/nospeak.png
-debian/tmp/usr/share/icons/hicolor/16x16/actions/speak.png
-debian/tmp/usr/share/icons/hicolor/16x16/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/speak.png
 debian/tmp/usr/share/icons/hicolor/22x22/actions/nospeak.png
-debian/tmp/usr/share/icons/hicolor/22x22/actions/speak.png
-debian/tmp/usr/share/icons/hicolor/22x22/apps/kmouth.png
 debian/tmp/usr/share/icons/hicolor/32x32/actions/nospeak.png
 debian/tmp/usr/share/icons/hicolor/32x32/actions/speak.png
-debian/tmp/usr/share/icons/hicolor/32x32/apps/kmouth.png
 debian/tmp/usr/share/icons/hicolor/48x48/actions/nospeak.png
 debian/tmp/usr/share/icons/hicolor/48x48/actions/speak.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kmouth.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmouth.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kmouth.png
 debian/tmp/usr/share/icons/locolor/16x16/actions/speak.png
+debian/tmp/usr/share/icons/locolor/32x32/actions/speak.png
+debian/tmp/usr/share/icons/locolor/22x22/actions/speak.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kmouth.png
-debian/tmp/usr/share/icons/locolor/22x22/actions/speak.png
 debian/tmp/usr/share/icons/locolor/22x22/apps/kmouth.png
-debian/tmp/usr/share/icons/locolor/32x32/actions/speak.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kmouth.png
 
+debian/icons/kmouth.xpm		/usr/share/pixmaps
 debian/icons/kmouth-16.xpm	/usr/share/pixmaps
-debian/icons/kmouth.xpm		/usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/ksayit.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -16,5 +16,5 @@
 debian/tmp/usr/share/services/ksayit_libFreeverb.desktop
 debian/tmp/usr/share/servicetypes/ksayit_libFreeverb_service.desktop
 
+debian/icons/ksayit.xpm		/usr/share/pixmaps
 debian/icons/ksayit-16.xpm	/usr/share/pixmaps
-debian/icons/ksayit.xpm		/usr/share/pixmaps

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/kttsd.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,6 +4,8 @@
 debian/tmp/usr/lib/kde3/kcm_kttsd.so
 debian/tmp/usr/lib/kde3/ktexteditor_kttsd.la
 debian/tmp/usr/lib/kde3/ktexteditor_kttsd.so
+debian/tmp/usr/lib/kde3/libkttsd_akodeplugin.la
+debian/tmp/usr/lib/kde3/libkttsd_akodeplugin.so
 debian/tmp/usr/lib/kde3/libkttsd_alsaplugin.la
 debian/tmp/usr/lib/kde3/libkttsd_alsaplugin.so
 debian/tmp/usr/lib/kde3/libkttsd_artsplugin.la
@@ -49,6 +51,7 @@
 debian/tmp/usr/share/apps/kttsd/stringreplacer/polish_festival_fixes.xml
 debian/tmp/usr/share/apps/kttsd/stringreplacer/polish_festival_unspeakables.xml
 debian/tmp/usr/share/apps/kttsd/stringreplacer/qt2plaintext.xml
+debian/tmp/usr/share/apps/kttsd/stringreplacer/chat-de.xml
 debian/tmp/usr/share/apps/kttsd/talkerchooser/female_notifications_rc
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
@@ -73,6 +76,7 @@
 debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
 debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
 debian/tmp/usr/share/services/kttsd.desktop
+debian/tmp/usr/share/services/kttsd_akodeplugin.desktop
 debian/tmp/usr/share/services/kttsd_alsaplugin.desktop
 debian/tmp/usr/share/services/kttsd_artsplugin.desktop
 debian/tmp/usr/share/services/kttsd_commandplugin.desktop

Modified: people/jriddell/KDE/3.5/kdeaccessibility/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeaccessibility/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaccessibility/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -6,25 +6,12 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-ksayit-audio-plugins --with-gstreamer
+	--enable-ksayit-audio-plugins --with-gstreamer --with-akode
 
 PACKAGES_WITH_LIBS := kttsd ksayit
 
-DEB_DH_MAKESHLIBS_ARGS_kttsd	:= -V'kttsd (>= 4:3.4.3-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksayit	:= -V'ksayit (>= 4:3.4.3-1)'
+DEB_DH_MAKESHLIBS_ARGS_kttsd	:= -V'kttsd (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksayit	:= -V'ksayit (>= 4:3.5-rc1-1)'
 
-###
-
-GCC4_ICES_HERE := arm m68k hppa
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
-    export CC=gcc-3.4
-    export CPP=cpp-3.4
-    export CXX=g++-3.4
-endif
-
-###
-
-#shlibs_ver = 4:3.4.3-1
+#shlibs_ver = 4:3.5-rc1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,42 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ATLANTIKDESIGNER 1 "October 14, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+atlantikdesigner \- game board designer for Atlantik
+.SH SYNOPSIS
+.B atlantikdesigner
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBAtlantik Designer\fP is a game board designer for Atlantik.
+.PP
+Atlantik is a KDE client for playing Monopoly-like board games on the
+monopd network.  It can play any board supported by the network
+server, including the classic Monopoly game as well as the Atlantik
+game in which the properties include several major cities in North
+America and Europe.
+.PP
+This application is part of the official KDE add-ons module.
+.SH OPTIONS
+For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
+.SH SEE ALSO
+.BR atlantik (6).
+.SH AUTHOR
+Atlantik Designer was written by Jason Katz-Brown <jason at katzbrown.com>
+and Rob Kaper <cap at capsi.com>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+atlantikdesigner/TODO

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+usr/bin/atlantikdesigner
+usr/share/apps/atlantikdesigner
+usr/share/applications/kde/atlantikdesigner.desktop
+usr/share/icons/hicolor/32x32/apps/atlantikdesigner.png
+usr/share/icons/hicolor/16x16/apps/atlantikdesigner.png
+../atlantikdesigner.xpm usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/atlantikdesigner.1

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(atlantikdesigner):needs="X11"\
+  section="Games/Board"\
+  hints="KDE,Monopoly"\
+  title="Atlantik Designer"\
+  longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
+  command="/usr/bin/atlantikdesigner"\
+  icon="/usr/share/pixmaps/atlantikdesigner.xpm"

Added: people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/atlantikdesigner.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,181 @@
+/* XPM */
+static char * cr32_app_atlantikdesigner_xpm[] = {
+"32 32 146 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #020204",
+"@ 	c #030306",
+"# 	c #0000FF",
+"$ 	c #303030",
+"% 	c #800080",
+"& 	c #C00000",
+"* 	c #2831F3",
+"= 	c #008000",
+"- 	c #C000C0",
+"; 	c #7A5B7A",
+"> 	c #567956",
+", 	c #7E5E7E",
+"' 	c #5E775E",
+") 	c #C05800",
+"! 	c #677F67",
+"~ 	c #658365",
+"{ 	c #6D7E6D",
+"] 	c #688468",
+"^ 	c #28B128",
+"/ 	c #688568",
+"( 	c #6A856A",
+"_ 	c #698669",
+": 	c #6A886A",
+"< 	c #6E876E",
+"[ 	c #6E886E",
+"} 	c #6C8A6C",
+"| 	c #6D8A6D",
+"1 	c #6D8B6D",
+"2 	c #6E8C6E",
+"3 	c #6F8C6F",
+"4 	c #6F8D6F",
+"5 	c #708E70",
+"6 	c #728E72",
+"7 	c #718F71",
+"8 	c #748E74",
+"9 	c #739073",
+"0 	c #778E77",
+"a 	c #739173",
+"b 	c #749274",
+"c 	c #759375",
+"d 	c #7A907A",
+"e 	c #7A917A",
+"f 	c #769476",
+"g 	c #779477",
+"h 	c #799379",
+"i 	c #7C917C",
+"j 	c #7F88A5",
+"k 	c #789478",
+"l 	c #799479",
+"m 	c #7A947A",
+"n 	c #7D927D",
+"o 	c #7A957A",
+"p 	c #7C947C",
+"q 	c #7B957B",
+"r 	c #7D957D",
+"s 	c #7F947F",
+"t 	c #7E957E",
+"u 	c #7F957F",
+"v 	c #8592A8",
+"w 	c #8895AA",
+"x 	c #989897",
+"y 	c #FF8000",
+"z 	c #8C9BAC",
+"A 	c #8E9DAD",
+"B 	c #92A2AF",
+"C 	c #A0A0A0",
+"D 	c #93A4B0",
+"E 	c #95A5B1",
+"F 	c #98A9B2",
+"G 	c #9AADB4",
+"H 	c #95B792",
+"I 	c #9BAEB4",
+"J 	c #9CAFB5",
+"K 	c #C0C000",
+"L 	c #9EB1B6",
+"M 	c #7ABAFF",
+"N 	c #A1B6B8",
+"O 	c #A2B7B8",
+"P 	c #90C990",
+"Q 	c #A4B9B9",
+"R 	c #A7BDBB",
+"S 	c #A8BFBB",
+"T 	c #A9C0BC",
+"U 	c #FFA858",
+"V 	c #ABC2BD",
+"W 	c #ADC5BE",
+"X 	c #AFC8BF",
+"Y 	c #B0C9C0",
+"Z 	c #B1CAC0",
+"` 	c #C2C2C0",
+" .	c #B4CDC2",
+"..	c #B6D1C3",
+"+.	c #B7D1C3",
+"@.	c #ADDCAD",
+"#.	c #AEDCAE",
+"$.	c #B8D3C4",
+"%.	c #B0DEB0",
+"&.	c #BAD6C5",
+"*.	c #B3DFB3",
+"=.	c #B5E1B5",
+"-.	c #BDDAC7",
+";.	c #BEDAC7",
+">.	c #BFDCC8",
+",.	c #C1DEC9",
+"'.	c #BEE8BE",
+").	c #C4E3CB",
+"!.	c #C5E3CB",
+"~.	c #C1E9C1",
+"{.	c #C6E5CB",
+"].	c #FFC0FF",
+"^.	c #C7E7CC",
+"/.	c #C6ECC6",
+"(.	c #C8EDC8",
+"_.	c #CBECCF",
+":.	c #CCECCF",
+"<.	c #C5F2C5",
+"[.	c #CCEECF",
+"}.	c #FFDCA8",
+"|.	c #C5F6C5",
+"1.	c #CEF0D0",
+"2.	c #C6F6C6",
+"3.	c #C7F6C7",
+"4.	c #FFFF00",
+"5.	c #C8F6C8",
+"6.	c #C7F7C7",
+"7.	c #C8F7C8",
+"8.	c #C9F7C9",
+"9.	c #CAF7CA",
+"0.	c #CBF7CB",
+"a.	c #CCF7CC",
+"b.	c #F2FA55",
+"c.	c #D1F4D1",
+"d.	c #CCF8CC",
+"e.	c #CFF7CF",
+"f.	c #D2F5D2",
+"g.	c #F4FB56",
+"h.	c #D2F6D2",
+"i.	c #D3F6D3",
+"j.	c #D1F8D1",
+"k.	c #D3F7D3",
+"l.	c #F5FD57",
+"m.	c #D3F8D3",
+"n.	c #FDFDFB",
+"o.	c #FFFFFF",
+"  @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @           ",
+"@ ` n.n.n.x n.n.x n.n.x n.n.x n.n.x n.n.x n.n.x n.n.n.` @         ",
+"@ n.H H H f H H 3 H H / @.%.~ './.d c.i.u j.e.p d.0.9.P @         ",
+"@ n.H H H c H H 2 H H / @.*.~ ~.(.i f.k.u j.e.q 0.9.9.P @         ",
+"@ n.H H H b H H 1 H H / #.=.~ b.g.n i.m.t l.l.q a.9.9.P @         ",
+"+ x f f f b 7 3 | : / ] ( [ ~ 0 e n s u r p p o m l l > +         ",
+"@ n.H H H a F B A z A B F L Q V Z $.>.{.[.h.h.m ^ 9.9.P @         ",
+"@ n.H H H 9 E A w v w A E I O T Y +.;.!.:.h.h.l ^ 9.9.P @         ",
+"+ x f f b 7 D z v j v z D G N S X ..-.)._.f.h.m l l l > +         ",
+"@ n.H H H 7 E A w v w A E I O T Y . . . . . h.l ^ 9.8.P @         ",
+"@ n.H H H 5 F B A z A B F L Q . . }.}.}.}.}.. l ^ 9.8.P @         ",
+"+ x f b 7 4 J F E D . F J N . }.& & o.# # o.. l l l l > +         ",
+"@ n.H H H 2 N L I G I . N . }.4.o.o.o.o.o.o.}.. 9.8.7.P @         ",
+"@ n.H H H } R Q O N O Q . }.o.K K o.o.o.= = }.. 9.8.7.P @         ",
+"+ x b 6 1 _ W V T S T V . . }.o.o.}.}.o.o.o.}.. l l k > +         ",
+"@ n.H H H '  .Z Y X Y . y }.. }.}.o.o.].].o.}.. * 7.6.P @         ",
+"@ n.H H H { &.$.+...+.. U }.}.. o.}.}.- % }.. C * 7.3.P @         ",
+"+ x f b 7 4 ,.>.;.-.;.. y }.o.}.. C o.}.}.}.. l l k g > +         ",
+"@ n.H H H 2 ^.{.!.).. y }.. }.}.o.. }.}.}.. C l 8.7.3.P @         ",
+"@ n.H H H } 1.[.:._.. U . . C }.}.}.. o.. C h.l 7.3.2.P @         ",
+"+ x f b 7 4 h.h.h.f.. ) y U U U U y ) . . . h.l k g g > +         ",
+"@ n.H H H 2 h.h.h.h.C . ) ) ) ) ) . . C . C . l * 3.2.P @         ",
+"@ n.H H H } h.h.h.h.h.C . . . . . C C h.h.. $ k * 3.2.P @         ",
+"+ > f g g k 8 h g 8 h g C C C C C g 8 h g 8 . . g g f > +         ",
+"@ P |.2.3.k M M ! M M ! M M ! <.<.! ; , ! ; , k 3.2.|.P @         ",
+"@ P |.2.3.k <.5.< <.5.< <.5.< <.5.< <.5.< <.5.k 3.2.|.P @         ",
+"@ P |.|.2.g 8.7.h 8.7.h 8.7.h 8.7.h 8.7.h 8.7.g 2.|.|.P @         ",
+"@ P P P P > P P > P P > P P > P P > P P > P P > P P P P @         ",
+"  @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @           ",
+"          . . .                                                   ",
+"                                                                  ",
+"                                                                  "};

Added: people/jriddell/KDE/3.5/kdeaddons/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,470 @@
+kdeaddons (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Remove build-dep on xmms-dev to get xmms out of main
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  2 Feb 2006 22:37:52 +0000
+
+kdeaddons (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdeaddons (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Rebuild because libXft.la is gone
+
+ -- Stephan Hermann <sh at sourcecode.de>  Sat, 14 Jan 2006 16:17:16 +0100
+
+kdeaddons (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add back an updated kubuntu_01_googlebar_suggest.diff from 
+    Tobi Vollebregt <tobivollebregt at gmail.com>
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  7 Dec 2005 18:46:05 +0000
+
+kdeaddons (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:26:46 +0000
+
+kdeaddons (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 24 Nov 2005 01:13:18 +0000
+
+kdeaddons (4:3.4.2-2.1) unstable; urgency=low
+
+  * NMU.
+  * Build with gcc-3.4 on arm, m68k, and hppa, to avoid ICEs.
+    (Closes: #334985)
+  
+ -- Christopher Martin <chrsmrtn at debian.org>  Fri, 21 Oct 2005 14:57:37 -0400
+
+kdeaddons (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 19:53:04 +0000
+
+kdeaddons (4:3.4.2-2ubuntu2) breezy; urgency=low
+
+  * Update kubuntu_01_googlebar_suggest.diff fixes bar going blank
+    when no suggest items are returned, and blank icons
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon,  3 Oct 2005 19:41:44 +0100
+
+kdeaddons (4:3.4.2-2ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+  * Add kubuntu_01_googlebar_suggest.diff for Google suggest support
+    Summer of Code patch from Tobi Vollebregt
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 12 Sep 2005 16:52:21 +0100
+
+kdeaddons (4:3.4.2-2) unstable; urgency=low
+
+  * Built against libfam-dev, not libgamin-dev (closes: #326535).
+
+ -- Ben Burton <bab at debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
+
+kdeaddons (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * First g++-4 upload to sid.
+  * Adjusted build-dependencies for the C++ ABI transition.
+  * Transitioned from aalib1 to libaa1 (closes: #320879).
+  * Transitioned from slang1 to libslang2 (closes: #322200).
+  * Transitioned from libjack0.80.0-0 to libjack0.100.0-0 (closes: #317201).
+  * Temporarily remove the Oblique plugin for noatun until libdb4.2++ has
+    transitioned to the new C++ ABI.
+  * Removed build-depends on xlibs-pic (now xlibs-static-pic), which is no
+    longer necessary.
+  * Konqueror now includes an extension manager (closes: #280490).
+  * Updated FSF address in the copyright file.
+  * Bumped standards-version to 3.6.2.1 (no changes required).
+
+ -- Ben Burton <bab at debian.org>  Sun,  4 Sep 2005 01:14:27 +1000
+
+kdeaddons (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue, 31 May 2005 23:49:48 +0000
+
+kdeaddons (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Fri, 27 May 2005 09:26:43 +0000
+
+kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
+
+  * Merge in recent packaging changes from the 3.3 branch.
+  * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
+    for the time being.
+
+ -- Ben Burton <bab at debian.org>  Sat, 14 May 2005 19:20:58 +1000
+
+kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
+
+  * New major upstream release.
+  * Removed obsolete kderemove tags from menu items.
+  * Re-enable the rellinks konqueror plugin, which is in rather better
+    shape than it was for KDE 3.3.x (closes: #276633).
+
+ -- Ben Burton <bab at debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
+
+kdeaddons (4:3.3.2-4) unstable; urgency=low
+
+  * Replaced vimpart's long list of GUI vim dependencies with the single
+    (vim-gtk | gvim).  This removes an indirect (and unnecessary) conflict
+    between vimpart and the new vim-full package, and should avoid similar
+    such problems in the future (closes: #306538).
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 May 2005 13:41:04 +1000
+
+kdeaddons (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Sync with Debian to install missing files
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  6 Apr 2005 03:31:29 +0000
+
+kdeaddons (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * New upstream release
+
+ -- Andreas Mueller <amu at ubuntu.com>  Fri, 11 Mar 2005 10:29:39 +0000
+
+kdeaddons (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream bugfix release. 
+
+ -- Andreas Mueller <amu at canonical.com>  Sun, 16 Jan 2005 13:31:15 +0100
+
+kdeaddons (4:3.3.2-3) unstable; urgency=low
+
+  * Made the default vimpart dependency vim-gtk (closes: #304189).
+    Previously it was kvim, but kvim has since been removed from debian.
+  * Added a note in vimpart.README.Debian that the above change may require
+    you to reconfigure your vimpart in the control centre.
+  * Don't use 'libsuff=64' on amd64 or ppc64 (closes: #301794).
+
+ -- Ben Burton <bab at debian.org>  Mon, 25 Apr 2005 23:08:18 +1000
+
+kdeaddons (4:3.3.2-2) unstable; urgency=low
+
+  * Include the full text of the GFDL in debian/copyright, since all of the
+    docbook documentation is under this license.
+
+ -- Ben Burton <bab at debian.org>  Sat, 26 Mar 2005 09:55:33 +1100
+
+kdeaddons (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Jan 2005 06:53:59 +1100
+
+kdeaddons (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
+    distinguish between drive and path information.  Previously, lnkforward
+    would lose path information altogether (and thus fail to work).
+  * Removed the rellinks plugin, which is terribly broken at this stage
+    (see Debian bug #276633 and KDE bugs #84966 and #86113).
+  * Force a rerun of admin/Makefile.common when building (not just after a
+    clean), since the debian patches affect Makefile.ams.
+  * Build-conflict with autoconf2.13, since admin/Makefile.common does not
+    operate correctly in its presence.
+
+ -- Ben Burton <bab at debian.org>  Sat, 23 Oct 2004 15:17:56 +1000
+
+kdeaddons (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #270161).
+  * Package kontact-plugins no longer exists (closes: #268892, #238971).
+  * Now includes a konqueror search bar (closes: #103073, #269106).
+  * Changed kate-plugins to depend on tidy instead of just suggest it.
+  * Happy anniversarymits!
+
+ -- Ben Burton <bab at debian.org>  Thu, 14 Oct 2004 00:10:01 +1000
+
+kdeaddons (4:3.2.3-2) unstable; urgency=low
+
+  * Patched vimpart so that the kvim process is reliably caught and embedded
+    by the vimpart parent.  This is still hit-and-miss though when using
+    vim-gtk or vim-gnome.
+  * Made vimpart depend on kcontrol >= 4:3.2.0, since it must be configured
+    before it can be used (closes: #247684).
+
+ -- Ben Burton <bab at debian.org>  Thu,  1 Jul 2004 08:21:20 +1000
+
+kdeaddons (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Don't have atlantikdesigner suggest atlantik since it already depends
+    on it.
+  * Suggests (konqueror | www-browser) for kdeaddons-doc-html instead of
+    just www-browser.
+
+ -- Ben Burton <bab at debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
+
+kdeaddons (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab at debian.org>  Sat, 24 Apr 2004 08:53:43 +1000
+
+kdeaddons (4:3.2.1-1) unstable; urgency=low
+
+  * First KDE 3.2 upload to sid.
+  * Expanded list of vimpart dependencies to include all available graphical
+    vims (closes: #234523).
+  * Web archiver now saves original URL as <!-- saved from: ... -->
+    (closes: #120277).
+  * Control applet for vimpart integrates properly with KDE 3.2
+    (closes: #230290).
+
+ -- Ben Burton <bab at debian.org>  Sat, 13 Mar 2004 09:58:54 +1100
+
+kdeaddons (4:3.2.0-2) experimental; urgency=low
+
+  * First KDE 3.2 upload to experimental.
+  * Sync from KDE_3_2_BRANCH for recent bugfixes.
+  * Using versioned dependencies for the kdeaddons metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdeaddons (4:3.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
+  * Thanks to Mickael Marchand for previous packaging work on vimpart.
+  * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
+    vimpart.
+  * Note that the rename dialog plugins have been merged into the
+    kdeaddons-kfile-plugins package.
+
+ -- Ben Burton <bab at debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdeaddons (4:3.1.5-2) unstable; urgency=low
+
+  * Build-depend on libxine-dev as a temporary workaround for
+    libtool bug #199423.
+
+ -- Ben Burton <bab at debian.org>  Wed, 21 Jan 2004 11:40:51 +1100
+
+kdeaddons (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
+
+kdeaddons (4:3.1.4-2) unstable; urgency=low
+
+  * New pull from BRANCH; includes bugfixes for atlantikdesigner and
+    knewsticker-scripts.
+  * Fixed syntax errors and other problems with stock.pl (closes: #221845).
+
+ -- Ben Burton <bab at debian.org>  Sat, 13 Dec 2003 09:10:25 +1100
+
+kdeaddons (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed SDL patches which it seems are no longer necessary.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Sun, 12 Oct 2003 19:52:13 +1000
+
+kdeaddons (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab at debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
+
+kdeaddons (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Using new libtool (closes: #194647).
+  * Debian menu pixmaps no longer use a restricted colour map.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdeaddons (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
+
+kdeaddons (4:3.1.0-4) unstable; urgency=low
+
+  * Rebuilt against libvorbis0a (closes: #184713).
+  * Removed alpha compile flags.
+  * Fresh admin/ sync.
+
+ -- Ben Burton <bab at debian.org>  Sun, 16 Mar 2003 16:00:19 +1100
+
+kdeaddons (4:3.1.0-3) unstable; urgency=low
+
+  * New binary package atlantikdesigner.
+  * Build-depends on atlantik-dev, libkdegames-dev and libqt3-compat-headers.
+
+ -- Ben Burton <bab at debian.org>  Sat, 15 Feb 2003 15:47:37 +1100
+
+kdeaddons (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian!
+  * Applied Ewald Snel's patch for xine support.
+  * Rolled the epoch to aid upgrades from the unofficial repository on
+    ftp.kde.org.. *sigh*
+
+ -- Ben Burton <bab at debian.org>  Thu,  6 Feb 2003 16:44:26 +1100
+
+kdeaddons (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdeaddons (3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built with g++-3.2.
+  * Build-depends on automake1.7.
+
+ -- Ben Burton <benb at acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
+
+kdeaddons (3.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to Chris Cheney's style of debian/rules.
+  * Build-depends on automake1.6.
+
+ -- Ben Burton <benb at acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
+
+kdeaddons (3.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on automake1.5.
+
+ -- Ben Burton <benb at acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
+
+kdeaddons (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdeaddons (3.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Sun, 19 May 2002 18:44:16 +1000
+
+kdeaddons (2.2.2-4) unstable; urgency=low
+
+  * Fixed documentation conflicts.
+
+ -- Ben Burton <benb at acm.org>  Mon,  1 Apr 2002 16:42:29 +1000
+
+kdeaddons (2.2.2-3) unstable; urgency=low
+
+  * Build-Depends: xlibs-pic (closes: Bug#129716).
+  * Build requires newer kdemultimedia-dev to fix libesd0-dev bug.
+
+ -- Ben Burton <benb at acm.org>  Sun, 20 Jan 2002 22:10:37 +1100
+
+kdeaddons (2.2.2-2) unstable; urgency=low
+
+  * Uses sdlconfig --plugin-libs (closes: Bug#117053).
+
+ -- Ben Burton <benb at acm.org>  Sun, 30 Dec 2001 12:40:14 +1000
+
+kdeaddons (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
+
+kdeaddons (2.2.1-4) unstable; urgency=low
+
+  * Uses automake again to solve new alpha problems.
+  * Updated to reflect new python policy.
+
+ -- Ben Burton <benb at acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
+
+kdeaddons (2.2.1-3) unstable; urgency=low
+
+  * The "finally finished the AIC marking!" upload.
+  * SDL scopes now included in noatun-plugins (closes: Bug#114307).
+  * No longer uses automake.
+  * HTML documentation generation only uses index.docbook files.
+
+ -- Ben Burton <benb at acm.org>  Tue, 23 Oct 2001 09:18:03 -0500
+
+kdeaddons (2.2.1-2) unstable; urgency=low
+
+  * Updated parameters for alpha build (closes: Bug#113099).
+
+ -- Ben Burton <benb at acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
+
+kdeaddons (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed doc-base entries to refer to real directories instead of symlinks.
+
+ -- Ben Burton <benb at acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
+
+kdeaddons (2.2.0-final-2) unstable; urgency=low
+
+  * Requires newer version of kdemultimedia-dev (closes: #104369).
+
+ -- Ben Burton <benb at acm.org>  Tue, 21 Aug 2001 22:59:30 -0500
+
+kdeaddons (2.2.0-final-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added packages knewsticker-scripts and kdeaddons-doc-html.
+  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Added suggests: konqueror to packages including docbook documentation.
+  * Ensures .bz2 files are not recompressed.
+  * Bumped standards-version to 3.5.6.
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
+
+kdeaddons (2.2-beta1-4) unstable; urgency=low
+
+  * Builds on alpha.
+
+ -- Ben Burton <benb at acm.org>  Fri, 27 Jul 2001 03:23:10 +1000
+
+kdeaddons (2.2-beta1-3) unstable; urgency=low
+
+  * Build-Depends: added kdebase-dev (closes: Bug#104058).
+
+ -- Ben Burton <benb at acm.org>  Tue, 10 Jul 2001 14:37:45 +1000
+
+kdeaddons (2.2-beta1-2) unstable; urgency=low
+
+  * Build-Depends: versioned some KDE libraries; added kate
+    (closes: Bug#103515).
+
+ -- Ben Burton <benb at acm.org>  Wed,  4 Jul 2001 11:41:50 -0500
+
+kdeaddons (2.2-beta1-1) unstable; urgency=low
+
+  * Initial Release (closes: Bug#101347).
+
+ -- Ben Burton <benb at acm.org>  Mon, 18 Jun 2001 02:52:26 -0500
+
+Local variables:
+mode: debian-changelog
+End:

Added: people/jriddell/KDE/3.5/kdeaddons/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/compat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/compat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kdeaddons/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,199 @@
+Source: kdeaddons
+Section: kde
+Priority: optional
+Maintainer: Ben Burton <bab at debian.org>
+Build-Depends: atlantik-dev (>= 4:3.5.0), automake1.7, debhelper (>> 4.0.0), gawk, gettext, kdebase-dev (>> 4:3.5.0), kdelibs4-dev (>= 4:3.5.1), kdemultimedia-dev (>= 4:3.5.1), libkdegames-dev (>= 4:3.5.1), libkonq4-dev (>= 4:3.5.1), kdepim-dev (>> 4:3.5.1), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.6.2.1
+
+Package: kdeaddons
+Architecture: all
+Section: kde
+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), kdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
+Suggests: kdeaddons-doc-html
+Description: add-on plugins and applets provided with KDE
+ This is a collection of add-on plugins and applets provided with the official
+ release of KDE (the K Desktop Environment).
+
+Package: kdeaddons-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdeaddons
+Description: KDE add-ons documentation in HTML format
+ By default the add-on plugins and applets provided with KDE (the K Desktop
+ Environment) only provide their documentation in KDE docbook format,
+ which can only be read by Konqueror or KHelpCenter.  This package
+ provides all of the KDE add-ons documentation converted to HTML format
+ so it can be read with any web browser.
+ .
+ The documentation will be installed into the usual directories
+ /usr/share/doc/kde/HTML/<language>/<package>/, for instance
+ /usr/share/doc/kde/HTML/en/kicker-applets/.  Documentation is
+ provided for packages kate-plugins, kicker-applets and konq-plugins.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: atlantikdesigner
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Enhances: atlantik
+Description: game board designer for Atlantik
+ Atlantik Designer is a game board designer for Atlantik.
+ .
+ Atlantik is a KDE client for playing Monopoly-like board games on the
+ monopd network.  It can play any board supported by the network
+ server, including the classic Monopoly game as well as the Atlantik
+ game in which the properties include several major cities in North
+ America and Europe.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: kaddressbook-plugins
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Suggests: kworldclock, khelpcenter, kdeaddons-doc-html
+Enhances: kaddressbook
+Description: plugins for KAddressBook, the KDE address book
+ This package contains a variety of useful plugins for the KDE address
+ book.  These plugins can be loaded through the KDE address book settings.
+ .
+ Highlights include exporting postal addresses as flags in KWorldClock,
+ as well as importing and exporting contacts in the native format used
+ by the German freemail provider GMX.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: kate-plugins
+Architecture: any
+Section: editors
+Depends: ${shlibs:Depends}, kaddressbook, tidy
+Suggests: khelpcenter, kdeaddons-doc-html
+Enhances: kate
+Description: plugins for Kate, the KDE Advanced Text Editor
+ This package contains a variety of useful plugins for Kate, the KDE
+ Advanced Text Editor.  These plugins can be loaded through the plugin
+ manager in Kate settings.
+ .
+ Highlights include spell checking, text filtering, HTML/XML construction
+ and validation, vim/emacs modeline handling, templates for new files
+ and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
+ a tab bar, a Python browser and even more.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: kdeaddons-kfile-plugins
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Conflicts: renamedlg-plugins (<= 4:3.2.0-1)
+Replaces: renamedlg-plugins (<= 4:3.2.0-1)
+Provides: renamedlg-plugins
+Description: KDE file dialog plugins for text files and folders
+ This is a collection of plugins for the KDE file dialog.  These plugins
+ extend the file dialog to offer advanced meta-information for text,
+ HTML and desktop files, as well as for folders, Windows .lnk files,
+ MIME archives and X.509 certificates.
+ .
+ This package also includes plugins for the KDE file rename dialog,
+ allowing a user to more easily decide what to do when faced with a
+ decision regarding conflicting filenames.  Rename dialog plugins are
+ provided for audio and image files.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: kicker-applets
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kicker
+Suggests: khelpcenter, kdeaddons-doc-html
+Conflicts: ktimemon (<< 4:2.2-alpha1-0)
+Replaces: ktimemon (<< 4:2.2-alpha1-0)
+Provides: ktimemon
+Enhances: kicker
+Description: applets for Kicker, the KDE panel
+ This package contains a variety of applets for Kicker, the KDE panel.
+ These applets will appear in the panel's Add--Applet menu.
+ .
+ Included are a system monitor, a colour picker, a media player controller,
+ a mathematical evaluator and a binary clock.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: knewsticker-scripts
+Architecture: all
+Section: kde
+Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
+Recommends: knewsticker
+Enhances: knewsticker
+Description: scripts for KNewsTicker, the KDE news ticker
+ This package contains a variety of scripts that provide additional news
+ sources for KNewsTicker, the news ticker applet for the KDE panel.  See
+ /usr/share/doc/knewsticker-scripts/README.Debian for usage details.
+ .
+ Highlights include newsgroup handling, stock data retrieval, sports scores
+ and various local news sources.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: konq-plugins
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, akregator, ark, imagemagick, libjpeg-progs, python
+Suggests: khelpcenter, kdeaddons-doc-html
+Enhances: konqueror, akregator
+Replaces: akregator (<< 1.1), akregator-konq-plugin (<< 1.1)
+Conflicts: akregator-konq-plugin (<< 1.1)
+Provides: akregator-konq-plugin
+Description: plugins for Konqueror, the KDE file/web/doc browser
+ This package contains a variety of useful plugins for Konqueror, the
+ file manager, web browser and document viewer for KDE.  Many of these
+ plugins will appear in Konqueror's Tools menu.
+ .
+ Highlights for web browsing include web page translation, web page archiving,
+ auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
+ sidebar news ticker, fast access to common options, bookmarklets, a crash
+ monitor and integration with the aKregator RSS feed reader.
+ .
+ Highlights for directory browsing include directory filters, image gallery
+ creation, archive compression and extraction, quick copy/move, a sidebar
+ media player, a graphical disk usage viewer and image conversions and
+ transformations.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: ksig
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Suggests: kmail
+Enhances: kmail
+Description: graphical tool for managing multiple email signatures
+ KSig is a graphical tool for keeping track of many different email
+ signatures.  The signatures themselves can be edited through KSig's
+ graphical user interface.  A command-line interface is then available
+ for generating random or daily signatures from this list.
+ .
+ The command-line interface makes a suitable plugin for generating
+ signatures in external mail clients such as KMail.  See
+ /usr/share/doc/ksig/README.Debian for details on how this can be done.
+ .
+ This package is part of the KDE add-ons module.
+
+Package: noatun-plugins
+Architecture: any
+Section: sound
+Depends: ${shlibs:Depends}
+Enhances: noatun
+Description: plugins for Noatun, the KDE media player
+ This package contains a variety of useful plugins for Noatun, the audio and
+ video media player for KDE.  These plugins can be loaded through the plugin
+ manager in Noatun settings.
+ .
+ Highlights include an alarm clock, guessing tags from filenames, adjustable
+ playback speed, capture to wave file and displaying lyrics, plus a variety
+ of user interfaces, playlists and visualisation plugins.
+ .
+ This package is part of the KDE add-ons module.

Added: people/jriddell/KDE/3.5/kdeaddons/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,728 @@
+This package was debianised by Ben Burton <bab at debian.org> on
+Mon, 18 Jun 2001 02:52:26 -0500.
+Thanks to Mickael Marchand for originally packaging vimpart.
+
+The kdeaddons sources were downloaded via CVS from cvs.kde.org.
+
+The patch for xine support was downloaded from
+http://rambo.its.tudelft.nl/~ewald/xine/.
+
+Upstream authors:
+
+  Many and varied; this package is simply a collection of add-ons and
+  plugins.  See http://www.kde.org/ for further details.
+
+Copyright:
+
+  All components of this package are released under the GPL (GNU General
+  Public License), with the following exceptions:
+
+  DocBook Documentation:
+
+    Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Documentation License,
+    Version 1.1 or any later version published by the Free Software
+    Foundation; with no Invariant Sections, with no Front-Cover Texts,
+    and with no Back-Cover Texts.
+
+    A copy of the GNU Free Documentation License (Version 1.2) is
+    included at the end of this file.
+
+  Kate Plugins:
+
+    KJS Wrapper:
+      LGPL (GNU Library General Public License)
+
+  Kicker Applets:
+
+    KBinaryClock:
+      Mixture of LGPL (GNU Lesser General Public License) and the following:
+
+      Copyright (c) 1996-2002 the kicker authors. See file AUTHORS.
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+      CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Math Expression Evaluator:
+      Mixture of GPL and the following:
+
+      Based on code 'Run' applet code, copyright (c) 2000 Matthias Elter
+      <elter at kde.org>
+
+      Modifications made by Andrew Coles, 2004 <andrew_coles at yahoo.co.uk>
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+      CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  KNewsTicker Scripts:
+
+    All scripts surrendered to the knewsticker scripts section which are
+    distributed WITH KDE are subject to the licensing restrictions of the
+    KDE project.  Should you use any of those scripts in conjuction with
+    any KDE product you are also subject to their licensing.  If the
+    script is used without a KDE affiliation, if not otherwise stated
+    within the script, or if no co-author is present, those scripts are
+    believed to be in the public domain.
+
+    bbc.pl:
+      Copyright (c) 2001 Malte Starostik <malte at kde.org>
+
+      Unlimited use, modification and distribution granted as long as the
+      above copyright statement and this sentence remain intact.
+
+    newsrss.pl:
+      This file is not released under any specific License.  All Licenses,
+      which might be requirered by knewsticker are explicitly accepted by
+      the author whenver this file comes with knewsticker.
+      Commonly this file simply underlies the regulations of
+      international copyright.  This file is copyrighted by anonymous
+      coder <bio at gmx.net>.  A lot of help has been offered to me by
+      malte, so thank him as well.
+
+  Konqueror Plugins:
+
+    Babelfish, crash monitor, directory filter, image gallery,
+    minitools bookmarklets, sidebar news ticker, user agent changer,
+    HTML/CSS validators:
+      LGPL (GNU Lesser General Public License)
+
+    DOM tree viewer, kuick copy and move, web archiver:
+      Mixture of GPL and LGPL
+
+    Image rotation:
+      Mixture of GPL and the following:
+
+      Copyright 2002 Gene Cash All rights reserved.
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions
+      are met:
+
+         1. Redistributions of source code must retain the above copyright
+            notice, this list of conditions and the following disclaimer.
+         2. Redistributions in binary form must reproduce the above copyright
+            notice, this list of conditions and the following disclaimer in
+            the documentation and/or other materials provided with the
+            distribution.
+
+      THIS SOFTWARE IS PROVIDED BY GENE CASH ``AS IS'' AND ANY EXPRESS
+      OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+      OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+      BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+      OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+      EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+      This means you may do anything you want with this code, except
+      claim you wrote it. Also, if it breaks you get to keep both pieces.
+
+    Sidebar media player:
+      Mixture of GPL, LGPL and the following:
+
+      Copyright (c) 2000-2001 the noatun authors. See file AUTHORS.
+
+      Permission is hereby granted, free of charge, to any person obtaining
+      a copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject
+      to the following conditions:
+
+      The above copyright notice and this permission notice shall be included
+      in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+      IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      LIAB\ILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+
+  Noatun Plugins:
+
+    Alarm:
+      Mixture of GPL and the following:
+
+      Copyright (C) 2001 Neil Stevens <multivac at fcmail.com>
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT.  IN NO EVENT SHALL THE THE AUTHOR(S) BE LIABLE
+      FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+      CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name(s) of the author(s)
+      shall not be used in advertising or otherwise to promote the sale,
+      use or other dealings in this Software without prior written
+      authorization from the author(s).
+
+    AlsaPlayer, Blurscope, Dead Man's Interface, Lucky Tag Reader:
+      Permission is hereby granted, free of charge, to any person obtaining
+      a copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject
+      to the following conditions:
+
+      The above copyright notice and this permission notice shall be included
+      in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+      IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+
+    French Foreign Region:
+      Permission is hereby granted, free of charge, to any person obtaining
+      a copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject
+      to the following conditions:
+
+      The above copyright notice and this permission notice shall be included
+      in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+      IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name(s) of the author(s) shall
+      not be used in advertising or otherwise to promote the sale, use or
+      other dealings in this Software without prior written authorization
+      from the author(s).
+
+    Lyrics:
+      BSD License
+
+    NexScope:
+      Mixture of GPL and LGPL (GNU Lesser General Public License)
+
+    Oblique:
+      Mixture of LGPL and the following:
+
+      This file is hereby licensed under the GNU General Public License
+      version 2 or later at your option.
+
+      This file is licensed under the Qt Public License version 1 with
+      the condition that the licensed will be governed under the Laws of
+      California (USA) instead of Norway.  Disputes will be settled in
+      Santa Clara county courts.
+
+      This file is licensed under the following additional license.  Be
+      aware that it is identical to the BSD license, except for the
+      added clause 3:
+
+        Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the following
+        conditions are met:
+
+        1. Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+        2. Redistributions in binary form must reproduce the above copyright
+           notice, this list of conditions and the following disclaimer in the
+           documentation and/or other materials provided with the distribution.
+        3. By integrating this software into any other software codebase, you
+           waive all rights to any patents associated with the stated codebase.
+
+        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+        EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+        THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+        PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
+        BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+        TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+        THE POSSIBILITY OF SUCH DAMAGE.
+
+    Synaescope:
+      Mixture of GPL and the following:
+
+      Copyright (c) 2001 Neil Stevens <multivac at fcmail.com>
+
+      Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without
+      restriction, including without limitation the rights to use, copy,
+      modify, merge, publish, distribute, sublicense, and/or sell copies
+      of the Software, and to permit persons to whom the Software is
+      furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+      CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  On Debian GNU/Linux systems, the complete texts of the GPL, the LGPL and
+  the BSD license can be found in the files `/usr/share/common-licenses/GPL',
+  `/usr/share/common-licenses/LGPL' and `/usr/share/common-licenses/BSD'.
+
+  --------------------
+
+
+                  GNU Free Documentation License
+                    Version 1.2, November 2002
+
+
+   Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+       51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+  The purpose of this License is to make a manual, textbook, or other
+  functional and useful document "free" in the sense of freedom: to
+  assure everyone the effective freedom to copy and redistribute it,
+  with or without modifying it, either commercially or noncommercially.
+  Secondarily, this License preserves for the author and publisher a way
+  to get credit for their work, while not being considered responsible
+  for modifications made by others.
+
+  This License is a kind of "copyleft", which means that derivative
+  works of the document must themselves be free in the same sense.  It
+  complements the GNU General Public License, which is a copyleft
+  license designed for free software.
+
+  We have designed this License in order to use it for manuals for free
+  software, because free software needs free documentation: a free
+  program should come with manuals providing the same freedoms that the
+  software does.  But this License is not limited to software manuals;
+  it can be used for any textual work, regardless of subject matter or
+  whether it is published as a printed book.  We recommend this License
+  principally for works whose purpose is instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+  This License applies to any manual or other work, in any medium, that
+  contains a notice placed by the copyright holder saying it can be
+  distributed under the terms of this License.  Such a notice grants a
+  world-wide, royalty-free license, unlimited in duration, to use that
+  work under the conditions stated herein.  The "Document", below,
+  refers to any such manual or work.  Any member of the public is a
+  licensee, and is addressed as "you".  You accept the license if you
+  copy, modify or distribute the work in a way requiring permission
+  under copyright law.
+
+  A "Modified Version" of the Document means any work containing the
+  Document or a portion of it, either copied verbatim, or with
+  modifications and/or translated into another language.
+
+  A "Secondary Section" is a named appendix or a front-matter section of
+  the Document that deals exclusively with the relationship of the
+  publishers or authors of the Document to the Document's overall subject
+  (or to related matters) and contains nothing that could fall directly
+  within that overall subject.  (Thus, if the Document is in part a
+  textbook of mathematics, a Secondary Section may not explain any
+  mathematics.)  The relationship could be a matter of historical
+  connection with the subject or with related matters, or of legal,
+  commercial, philosophical, ethical or political position regarding
+  them.
+
+  The "Invariant Sections" are certain Secondary Sections whose titles
+  are designated, as being those of Invariant Sections, in the notice
+  that says that the Document is released under this License.  If a
+  section does not fit the above definition of Secondary then it is not
+  allowed to be designated as Invariant.  The Document may contain zero
+  Invariant Sections.  If the Document does not identify any Invariant
+  Sections then there are none.
+
+  The "Cover Texts" are certain short passages of text that are listed,
+  as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+  the Document is released under this License.  A Front-Cover Text may
+  be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+  A "Transparent" copy of the Document means a machine-readable copy,
+  represented in a format whose specification is available to the
+  general public, that is suitable for revising the document
+  straightforwardly with generic text editors or (for images composed of
+  pixels) generic paint programs or (for drawings) some widely available
+  drawing editor, and that is suitable for input to text formatters or
+  for automatic translation to a variety of formats suitable for input
+  to text formatters.  A copy made in an otherwise Transparent file
+  format whose markup, or absence of markup, has been arranged to thwart
+  or discourage subsequent modification by readers is not Transparent.
+  An image format is not Transparent if used for any substantial amount
+  of text.  A copy that is not "Transparent" is called "Opaque".
+
+  Examples of suitable formats for Transparent copies include plain
+  ASCII without markup, Texinfo input format, LaTeX input format, SGML
+  or XML using a publicly available DTD, and standard-conforming simple
+  HTML, PostScript or PDF designed for human modification.  Examples of
+  transparent image formats include PNG, XCF and JPG.  Opaque formats
+  include proprietary formats that can be read and edited only by
+  proprietary word processors, SGML or XML for which the DTD and/or
+  processing tools are not generally available, and the
+  machine-generated HTML, PostScript or PDF produced by some word
+  processors for output purposes only.
+
+  The "Title Page" means, for a printed book, the title page itself,
+  plus such following pages as are needed to hold, legibly, the material
+  this License requires to appear in the title page.  For works in
+  formats which do not have any title page as such, "Title Page" means
+  the text near the most prominent appearance of the work's title,
+  preceding the beginning of the body of the text.
+
+  A section "Entitled XYZ" means a named subunit of the Document whose
+  title either is precisely XYZ or contains XYZ in parentheses following
+  text that translates XYZ in another language.  (Here XYZ stands for a
+  specific section name mentioned below, such as "Acknowledgements",
+  "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+  of such a section when you modify the Document means that it remains a
+  section "Entitled XYZ" according to this definition.
+
+  The Document may include Warranty Disclaimers next to the notice which
+  states that this License applies to the Document.  These Warranty
+  Disclaimers are considered to be included by reference in this
+  License, but only as regards disclaiming warranties: any other
+  implication that these Warranty Disclaimers may have is void and has
+  no effect on the meaning of this License.
+
+
+  2. VERBATIM COPYING
+
+  You may copy and distribute the Document in any medium, either
+  commercially or noncommercially, provided that this License, the
+  copyright notices, and the license notice saying this License applies
+  to the Document are reproduced in all copies, and that you add no other
+  conditions whatsoever to those of this License.  You may not use
+  technical measures to obstruct or control the reading or further
+  copying of the copies you make or distribute.  However, you may accept
+  compensation in exchange for copies.  If you distribute a large enough
+  number of copies you must also follow the conditions in section 3.
+
+  You may also lend copies, under the same conditions stated above, and
+  you may publicly display copies.
+
+
+  3. COPYING IN QUANTITY
+
+  If you publish printed copies (or copies in media that commonly have
+  printed covers) of the Document, numbering more than 100, and the
+  Document's license notice requires Cover Texts, you must enclose the
+  copies in covers that carry, clearly and legibly, all these Cover
+  Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+  the back cover.  Both covers must also clearly and legibly identify
+  you as the publisher of these copies.  The front cover must present
+  the full title with all words of the title equally prominent and
+  visible.  You may add other material on the covers in addition.
+  Copying with changes limited to the covers, as long as they preserve
+  the title of the Document and satisfy these conditions, can be treated
+  as verbatim copying in other respects.
+
+  If the required texts for either cover are too voluminous to fit
+  legibly, you should put the first ones listed (as many as fit
+  reasonably) on the actual cover, and continue the rest onto adjacent
+  pages.
+
+  If you publish or distribute Opaque copies of the Document numbering
+  more than 100, you must either include a machine-readable Transparent
+  copy along with each Opaque copy, or state in or with each Opaque copy
+  a computer-network location from which the general network-using
+  public has access to download using public-standard network protocols
+  a complete Transparent copy of the Document, free of added material.
+  If you use the latter option, you must take reasonably prudent steps,
+  when you begin distribution of Opaque copies in quantity, to ensure
+  that this Transparent copy will remain thus accessible at the stated
+  location until at least one year after the last time you distribute an
+  Opaque copy (directly or through your agents or retailers) of that
+  edition to the public.
+
+  It is requested, but not required, that you contact the authors of the
+  Document well before redistributing any large number of copies, to give
+  them a chance to provide you with an updated version of the Document.
+
+
+  4. MODIFICATIONS
+
+  You may copy and distribute a Modified Version of the Document under
+  the conditions of sections 2 and 3 above, provided that you release
+  the Modified Version under precisely this License, with the Modified
+  Version filling the role of the Document, thus licensing distribution
+  and modification of the Modified Version to whoever possesses a copy
+  of it.  In addition, you must do these things in the Modified Version:
+
+  A. Use in the Title Page (and on the covers, if any) a title distinct
+     from that of the Document, and from those of previous versions
+     (which should, if there were any, be listed in the History section
+     of the Document).  You may use the same title as a previous version
+     if the original publisher of that version gives permission.
+  B. List on the Title Page, as authors, one or more persons or entities
+     responsible for authorship of the modifications in the Modified
+     Version, together with at least five of the principal authors of the
+     Document (all of its principal authors, if it has fewer than five),
+     unless they release you from this requirement.
+  C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+  D. Preserve all the copyright notices of the Document.
+  E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+  F. Include, immediately after the copyright notices, a license notice
+     giving the public permission to use the Modified Version under the
+     terms of this License, in the form shown in the Addendum below.
+  G. Preserve in that license notice the full lists of Invariant Sections
+     and required Cover Texts given in the Document's license notice.
+  H. Include an unaltered copy of this License.
+  I. Preserve the section Entitled "History", Preserve its Title, and add
+     to it an item stating at least the title, year, new authors, and
+     publisher of the Modified Version as given on the Title Page.  If
+     there is no section Entitled "History" in the Document, create one
+     stating the title, year, authors, and publisher of the Document as
+     given on its Title Page, then add an item describing the Modified
+     Version as stated in the previous sentence.
+  J. Preserve the network location, if any, given in the Document for
+     public access to a Transparent copy of the Document, and likewise
+     the network locations given in the Document for previous versions
+     it was based on.  These may be placed in the "History" section.
+     You may omit a network location for a work that was published at
+     least four years before the Document itself, or if the original
+     publisher of the version it refers to gives permission.
+  K. For any section Entitled "Acknowledgements" or "Dedications",
+     Preserve the Title of the section, and preserve in the section all
+     the substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+  L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+  M. Delete any section Entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+  N. Do not retitle any existing section to be Entitled "Endorsements"
+     or to conflict in title with any Invariant Section.
+  O. Preserve any Warranty Disclaimers.
+
+  If the Modified Version includes new front-matter sections or
+  appendices that qualify as Secondary Sections and contain no material
+  copied from the Document, you may at your option designate some or all
+  of these sections as invariant.  To do this, add their titles to the
+  list of Invariant Sections in the Modified Version's license notice.
+  These titles must be distinct from any other section titles.
+
+  You may add a section Entitled "Endorsements", provided it contains
+  nothing but endorsements of your Modified Version by various
+  parties--for example, statements of peer review or that the text has
+  been approved by an organization as the authoritative definition of a
+  standard.
+
+  You may add a passage of up to five words as a Front-Cover Text, and a
+  passage of up to 25 words as a Back-Cover Text, to the end of the list
+  of Cover Texts in the Modified Version.  Only one passage of
+  Front-Cover Text and one of Back-Cover Text may be added by (or
+  through arrangements made by) any one entity.  If the Document already
+  includes a cover text for the same cover, previously added by you or
+  by arrangement made by the same entity you are acting on behalf of,
+  you may not add another; but you may replace the old one, on explicit
+  permission from the previous publisher that added the old one.
+
+  The author(s) and publisher(s) of the Document do not by this License
+  give permission to use their names for publicity for or to assert or
+  imply endorsement of any Modified Version.
+
+
+  5. COMBINING DOCUMENTS
+
+  You may combine the Document with other documents released under this
+  License, under the terms defined in section 4 above for modified
+  versions, provided that you include in the combination all of the
+  Invariant Sections of all of the original documents, unmodified, and
+  list them all as Invariant Sections of your combined work in its
+  license notice, and that you preserve all their Warranty Disclaimers.
+
+  The combined work need only contain one copy of this License, and
+  multiple identical Invariant Sections may be replaced with a single
+  copy.  If there are multiple Invariant Sections with the same name but
+  different contents, make the title of each such section unique by
+  adding at the end of it, in parentheses, the name of the original
+  author or publisher of that section if known, or else a unique number.
+  Make the same adjustment to the section titles in the list of
+  Invariant Sections in the license notice of the combined work.
+
+  In the combination, you must combine any sections Entitled "History"
+  in the various original documents, forming one section Entitled
+  "History"; likewise combine any sections Entitled "Acknowledgements",
+  and any sections Entitled "Dedications".  You must delete all sections
+  Entitled "Endorsements".
+
+
+  6. COLLECTIONS OF DOCUMENTS
+
+  You may make a collection consisting of the Document and other documents
+  released under this License, and replace the individual copies of this
+  License in the various documents with a single copy that is included in
+  the collection, provided that you follow the rules of this License for
+  verbatim copying of each of the documents in all other respects.
+
+  You may extract a single document from such a collection, and distribute
+  it individually under this License, provided you insert a copy of this
+  License into the extracted document, and follow this License in all
+  other respects regarding verbatim copying of that document.
+
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+  A compilation of the Document or its derivatives with other separate
+  and independent documents or works, in or on a volume of a storage or
+  distribution medium, is called an "aggregate" if the copyright
+  resulting from the compilation is not used to limit the legal rights
+  of the compilation's users beyond what the individual works permit.
+  When the Document is included in an aggregate, this License does not
+  apply to the other works in the aggregate which are not themselves
+  derivative works of the Document.
+
+  If the Cover Text requirement of section 3 is applicable to these
+  copies of the Document, then if the Document is less than one half of
+  the entire aggregate, the Document's Cover Texts may be placed on
+  covers that bracket the Document within the aggregate, or the
+  electronic equivalent of covers if the Document is in electronic form.
+  Otherwise they must appear on printed covers that bracket the whole
+  aggregate.
+
+
+  8. TRANSLATION
+
+  Translation is considered a kind of modification, so you may
+  distribute translations of the Document under the terms of section 4.
+  Replacing Invariant Sections with translations requires special
+  permission from their copyright holders, but you may include
+  translations of some or all Invariant Sections in addition to the
+  original versions of these Invariant Sections.  You may include a
+  translation of this License, and all the license notices in the
+  Document, and any Warranty Disclaimers, provided that you also include
+  the original English version of this License and the original versions
+  of those notices and disclaimers.  In case of a disagreement between
+  the translation and the original version of this License or a notice
+  or disclaimer, the original version will prevail.
+
+  If a section in the Document is Entitled "Acknowledgements",
+  "Dedications", or "History", the requirement (section 4) to Preserve
+  its Title (section 1) will typically require changing the actual
+  title.
+
+
+  9. TERMINATION
+
+  You may not copy, modify, sublicense, or distribute the Document except
+  as expressly provided for under this License.  Any other attempt to
+  copy, modify, sublicense or distribute the Document is void, and will
+  automatically terminate your rights under this License.  However,
+  parties who have received copies, or rights, from you under this
+  License will not have their licenses terminated so long as such
+  parties remain in full compliance.
+
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+  The Free Software Foundation may publish new, revised versions
+  of the GNU Free Documentation License from time to time.  Such new
+  versions will be similar in spirit to the present version, but may
+  differ in detail to address new problems or concerns.  See
+  http://www.gnu.org/copyleft/.
+
+  Each version of the License is given a distinguishing version number.
+  If the Document specifies that a particular numbered version of this
+  License "or any later version" applies to it, you have the option of
+  following the terms and conditions either of that specified version or
+  of any later version that has been published (not as a draft) by the
+  Free Software Foundation.  If the Document does not specify a version
+  number of this License, you may choose any version ever published (not
+  as a draft) by the Free Software Foundation.
+
+
+  ADDENDUM: How to use this License for your documents
+
+  To use this License in a document you have written, include a copy of
+  the License in the document and put the following copyright and
+  license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.2
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts.  A copy of the license is included in the section entitled
+      "GNU Free Documentation License".
+
+  If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+  replace the "with...Texts." line with this:
+
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+  If you have Invariant Sections without Cover Texts, or some other
+  combination of the three, merge those two alternatives to suit the
+  situation.
+
+  If your document contains nontrivial examples of program code, we
+  recommend releasing these examples in parallel under your choice of
+  free software license, such as the GNU General Public License,
+  to permit their use in free software.

Added: people/jriddell/KDE/3.5/kdeaddons/debian/exif.py.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/exif.py.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/exif.py.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,44 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH EXIF.PY 1 "February 4, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+exif.py \- extract EXIF information from digital camera image files
+.SH SYNOPSIS
+.B exif.py
+\fIimage-file\fP ...
+.SH DESCRIPTION
+This is a Python library for extracting EXIF tags from digital camera
+image files.  It contains a command-line testing and debugging interface,
+which reads EXIF tags from the given files and dumps them to the
+console.
+.PP
+This library is provided with the image conversion and transformation
+plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
+part of the same set of plugins, makes use of this library.
+.PP
+This utility is part of the official KDE add-ons module.
+.SH SEE ALSO
+.BR jpegorient (1),
+.BR konqueror (1),
+.BR orient.py (1).
+.SH AUTHOR
+The EXIF extraction library was written by Thierry Bousch
+<bousch at topo.math.u-psud.fr>, Gene Cash <gcash at cfl.rr.com> and
+Leif Jensen <jensen at math.columbia.edu>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/fsview.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/fsview.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/fsview.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH FSVIEW 1 "February 4, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+fsview \- a filesystem viewer that graphically shows disk usage
+.SH SYNOPSIS
+.B fsview
+.RI "[ " generic-options " ]"
+[ \fIfolder\fP ]
+.SH DESCRIPTION
+\fBFSView\fP is a tool for showing disc utilization in a graphical form, much
+like the UNIX command 'du'.  The visualisation type choosen is a
+treemap.  Each directory is represented by a rectangle whose area is
+proportional to its size.  Each directory rectangle contains smaller
+rectangles for its contents, and so on down.
+.PP
+FSView is provided both as a Konqueror plugin for viewing directories,
+and as a standalone executable.
+.PP
+This application is part of the official KDE add-ons module.
+.SH OPTIONS
+Below are the fsview-specific options.
+For a full summary of options, run \fIfsview \-\-help\fP.
+.TP
+\fIfolder\fP
+View the filesystem starting from this folder.
+.SH SEE ALSO
+.BR du (1),
+.BR kdirstat (1),
+.BR konqueror (1).
+.PP
+For a full featured graphical 'du', see KDirStat.  It's quite similar
+to FSView, but allows for lot of cleanup actions.
+.SH AUTHOR
+FSView was written by Josef Weidendorfer <Josef.Weidendorfer at gmx.de>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/fsview.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/fsview.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/fsview.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,281 @@
+/* XPM */
+static char * fsview_xpm[] = {
+"32 32 246 2",
+"  	c None",
+". 	c #0032A4",
+"+ 	c #0133A5",
+"@ 	c #0235A6",
+"# 	c #0231C5",
+"$ 	c #0438A8",
+"% 	c #0330D9",
+"& 	c #033ABB",
+"* 	c #063CAB",
+"= 	c #0840AD",
+"- 	c #053FBF",
+"; 	c #0641C1",
+"> 	c #0A44B0",
+", 	c #0844C3",
+"' 	c #0C47B2",
+") 	c #0A48C5",
+"! 	c #0E4BB5",
+"~ 	c #0347FD",
+"{ 	c #0E4CC7",
+"] 	c #114FB7",
+"^ 	c #0349FF",
+"/ 	c #044AFF",
+"( 	c #054BFF",
+"_ 	c #1352B9",
+": 	c #1151C8",
+"< 	c #094FFF",
+"[ 	c #1556BC",
+"} 	c #1455CA",
+"| 	c #0B50FF",
+"1 	c #0C52FF",
+"2 	c #175ABE",
+"3 	c #0F55FF",
+"4 	c #185ACC",
+"5 	c #195EC1",
+"6 	c #1157FF",
+"7 	c #1B5ECE",
+"8 	c #1359FF",
+"9 	c #1B62C3",
+"0 	c #165BFF",
+"a 	c #1D65C6",
+"b 	c #1E63D0",
+"c 	c #185EFF",
+"d 	c #1A5FFF",
+"e 	c #2069C8",
+"f 	c #2167D2",
+"g 	c #1C62FF",
+"h 	c #1E64FF",
+"i 	c #226DCB",
+"j 	c #256BD3",
+"k 	c #2066FF",
+"l 	c #2470CD",
+"m 	c #2368FF",
+"n 	c #2870D5",
+"o 	c #256BFF",
+"p 	c #2674CF",
+"q 	c #276CFF",
+"r 	c #2B74D7",
+"s 	c #296FFF",
+"t 	c #2878D2",
+"u 	c #2979D3",
+"v 	c #2C71FF",
+"w 	c #2A7BD4",
+"x 	c #2E79D9",
+"y 	c #2B7CD5",
+"z 	c #2E73FF",
+"A 	c #2C7ED6",
+"B 	c #3075FF",
+"C 	c #2C7FD7",
+"D 	c #327DDB",
+"E 	c #3277FF",
+"F 	c #2D81D8",
+"G 	c #2E82D9",
+"H 	c #2F83DA",
+"I 	c #00C10F",
+"J 	c #347AFF",
+"K 	c #367BFF",
+"L 	c #3085DA",
+"M 	c #3582DD",
+"N 	c #3186DB",
+"O 	c #3188DC",
+"P 	c #397EFF",
+"Q 	c #3289DD",
+"R 	c #3886DE",
+"S 	c #3B80FF",
+"T 	c #338BDE",
+"U 	c #D56106",
+"V 	c #348CDF",
+"W 	c #3C82FF",
+"X 	c #3B8AE0",
+"Y 	c #358EE0",
+"Z 	c #3F84FF",
+"` 	c #368FE1",
+" .	c #3690E2",
+"..	c #4186FF",
+"+.	c #3792E3",
+"@.	c #3F8FE2",
+"#.	c #4388FF",
+"$.	c #3893E4",
+"%.	c #3994E5",
+"&.	c #3995E5",
+"*.	c #458BFF",
+"=.	c #4293E4",
+"-.	c #488DFF",
+";.	c #498EFF",
+">.	c #4597E6",
+",.	c #4C91FF",
+"'.	c #4E93FF",
+").	c #489BE8",
+"!.	c #4F94FF",
+"~.	c #DE790E",
+"{.	c #5297FF",
+"].	c #4BA0E9",
+"^.	c #768CE3",
+"/.	c #FF6D1F",
+"(.	c #559AFF",
+"_.	c #4EA4EB",
+":.	c #589DFF",
+"<.	c #E18515",
+"[.	c #5BA0FF",
+"}.	c #00D1FF",
+"|.	c #5EA3FF",
+"1.	c #61A6FF",
+"2.	c #64A9FF",
+"3.	c #7DA0FC",
+"4.	c #7DA0FD",
+"5.	c #67ABFF",
+"6.	c #7EA1FD",
+"7.	c #68ACFF",
+"8.	c #7FA2FE",
+"9.	c #6AAFFF",
+"0.	c #82A5FE",
+"a.	c #6CB1FF",
+"b.	c #6EB2FF",
+"c.	c #85A8FF",
+"d.	c #70B5FF",
+"e.	c #71B6FF",
+"f.	c #6EBBF5",
+"g.	c #89ACFF",
+"h.	c #C0C000",
+"i.	c #74B8FF",
+"j.	c #76BAFF",
+"k.	c #77BBFF",
+"l.	c #8DB0FF",
+"m.	c #7ABEFF",
+"n.	c #90B3FF",
+"o.	c #7BBFFF",
+"p.	c #7BC0FF",
+"q.	c #93B6FF",
+"r.	c #80C4FF",
+"s.	c #96B9FF",
+"t.	c #80C5FF",
+"u.	c #9ABCFF",
+"v.	c #84C8FF",
+"w.	c #85C9FF",
+"x.	c #9DBFFF",
+"y.	c #A0C2FF",
+"z.	c #8ACEFF",
+"A.	c #A3C5FF",
+"B.	c #A6C8FF",
+"C.	c #A9CBFF",
+"D.	c #C8C7D4",
+"E.	c #ACCEFF",
+"F.	c #AFD1FF",
+"G.	c #CDCBD8",
+"H.	c #CDCCD9",
+"I.	c #CECCD9",
+"J.	c #B1D4FF",
+"K.	c #CECDD9",
+"L.	c #CFCDD9",
+"M.	c #CFCEDA",
+"N.	c #D0CEDA",
+"O.	c #B4D6FF",
+"P.	c #D0CFDA",
+"Q.	c #B1E7B4",
+"R.	c #FFC4A4",
+"S.	c #D2D1DC",
+"T.	c #B7D9FF",
+"U.	c #D4D3DD",
+"V.	c #D4D3DE",
+"W.	c #B9DBFF",
+"X.	c #D6D4DF",
+"Y.	c #D6D5DF",
+"Z.	c #BBDEFF",
+"`.	c #D8D6E0",
+" +	c #D8D7E1",
+".+	c #BDE0FF",
+"++	c #DAD8E2",
+"@+	c #BFE1FF",
+"#+	c #DAD9E3",
+"$+	c #DBDAE3",
+"%+	c #DDDCE4",
+"&+	c #DDDCE5",
+"*+	c #DFDEE6",
+"=+	c #E7E6AD",
+"-+	c #DFDFEC",
+";+	c #E1E0E7",
+">+	c #E1E0E8",
+",+	c #E0E0EC",
+"'+	c #B7F2FF",
+")+	c #E3E2E9",
+"!+	c #E2E2ED",
+"~+	c #E3E3EE",
+"{+	c #E5E4EB",
+"]+	c #E4E4EF",
+"^+	c #E5E5EF",
+"/+	c #E7E6EC",
+"(+	c #E6E6EF",
+"_+	c #E6E6F0",
+":+	c #E7E7F0",
+"<+	c #E9E8ED",
+"[+	c #E8E8F1",
+"}+	c #E9E9F2",
+"|+	c #EBEAEF",
+"1+	c #EAEAF2",
+"2+	c #EBEBF3",
+"3+	c #ECECF0",
+"4+	c #ECECF3",
+"5+	c #EDEDF4",
+"6+	c #EEEEF2",
+"7+	c #EEEEF4",
+"8+	c #EEEEF5",
+"9+	c #EFEFF5",
+"0+	c #F0F0F3",
+"a+	c #F0F0F6",
+"b+	c #F1F1F6",
+"c+	c #F1F1F7",
+"d+	c #F2F2F5",
+"e+	c #F2F2F7",
+"f+	c #F3F3F7",
+"g+	c #F3F3F8",
+"h+	c #F4F4F8",
+"i+	c #F4F4F9",
+"j+	c #F5F5F9",
+"k+	c #F6F6F9",
+"l+	c #F6F6FA",
+"m+	c #F7F7FA",
+"n+	c #F8F8FB",
+"o+	c #F9F9FB",
+"p+	c #FAFAFC",
+"q+	c #FBFBFC",
+"r+	c #FBFBFD",
+"s+	c #FCFCFD",
+"t+	c #FDFDFE",
+"u+	c #FEFEFE",
+"v+	c #FEFEFF",
+"w+	c #FFFFFF",
+"                                                                ",
+"                                                                ",
+"  &._.].).>.=. at .X R M D x r n j f b 7 4 } : { ) , ; - & +       ",
+"&.f.z.w.r.m.i.b.7.1.[.(.'.-...S J z q k d 8 1 ( ^ ^ ^ ~ # .     ",
+"&.z.w.t.o.j.d.9.2.|.:.{.,.*.Z P E v o h c 6 | / ^ ^ ^ ^ % .     ",
+"&.v.r.p.k.e.a.5.1.[.(.!.;.#.W K B s m g 0 3 < ^ ^ ^ ^ ^ % .     ",
+"&. at +.+Z.W.T.O.J.F.E.C.B.A.y.x.u.s.q.n.l.g.c.0.8.6.6.4.3.^..     ",
+"%.w+w+w+w+w+w+w+w+w+w+w+w+w+w+w+w+w+w+w+u+t+r+p+o+m+l+j+/+.     ",
+"$.w+w+~.~.~.~.~.~.~.~.~.~.~.w+~.<.<.<.<.<.<.<.<.<.<.j+h+{+.     ",
+"+.w+w+<.R.R.R.R.R.R.R./.U ~.w+~.'+'+'+'+'+'+'+'+}.U h+f+)+.     ",
+" .w+w+<.R./././././././.U ~.w+~.'+}.}.}.}.}.}.}.}.U f+c+;+.     ",
+"` w+w+<.R./././././././.U ~.w+~.'+}.}.}.}.}.}.}.}.U c+a+*+.     ",
+"Y w+w+<.R./././././././.U ~.w+~.'+}.}.}.}.}.}.}.}.U a+9+%+.     ",
+"V w+w+~.R./././././././.U ~.u+~.'+}.}.}.}.}.}.}.}.U 9+7+#+.     ",
+"T w+w+U /./././././././.U ~.t+~.}.}.}.}.}.}.}.}.}.U 9+5+ +.     ",
+"Q w+w+~.<.<.<.<.<.<.<.<.~.~.s+~.<.<.<.<.<.<.<.<.<.<.5+2+Y..     ",
+"O w+w+w+w+w+w+w+w+w+w+v+w+s+q+o+n+m+j+h+g+e+a+9+8+5+2+1+V..     ",
+"N w+w+~.<.<.<.<.<.<.<.<.~.~.o+~.<.<.<.<.<.<.<.<.<.<.1+}+S..     ",
+"L w+w+<.=+=+=+=+=+=+=+h.h.~.n+~.Q.Q.Q.Q.Q.Q.Q.Q.I U }+[+N..     ",
+"H w+w+<.=+h.h.h.h.h.h.h.h.~.m+~.Q.I I I I I I I I U [+_+L..     ",
+"G w+w+<.=+h.h.h.h.h.h.h.h.~.k+~.Q.I I I I I I I I U _+^+K..     ",
+"F w+w+<.=+h.h.h.h.h.h.h.h.~.i+~.Q.I I I I I I I I U ^+]+K..     ",
+"C w+w+~.=+h.h.h.h.h.h.h.h.~.g+~.Q.I I I I I I I I U ]+~+I..     ",
+"A w+w+U h.h.h.h.h.h.h.h.h.~.e+~.I I I I I I I I I <.1+1+H..     ",
+"y w+w+~.~.~.~.~.~.~.~.~.~.~.b+~.<.<.<.<.<.<.<.<.<.<.!+,+H..     ",
+"w w+w+w+s+q+p+n+m+k+j+g+e+b+a+8+5+4+1+}+[+:+(+]+~+!+,+-+G..     ",
+"u d+0+6+3+|+<+/+{+)+>+*+&+$+++`.X.U.S.P.M.L.K.K.I.H.H.G.D..     ",
+"t p l i e a 9 5 2 [ _ ] ! ' > = * $ @ . . . . . . . . . . .     ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeaddons/debian/jpegorient.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/jpegorient.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/jpegorient.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,68 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH JPEGORIENT 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+jpegorient \- change the orientations of JPEG images
+.SH SYNOPSIS
+.B jpegorient
+{ \fB\-90\fP | \fB\-180\fP | \fB\-270\fP | \fB\-v\fP | \fB\-h\fP }
+\fIimage-file\fP ...
+.SH DESCRIPTION
+This is a simple utility for changing the orientations of one or more
+JPEG images.
+It is provided as part of the image conversion and transformation
+plugins for Konqueror.
+.PP
+A single option must be passed before any filenames to specify how the
+orientations of the images are to be changed.  Each new image will be
+saved over the old one.
+.PP
+This utility makes use of
+.BR orient.py (1),
+which is designed to work with certain types of digital camera image
+files.  Instead of modifying the image data, it alters the EXIF
+tags stored with the image to reflect the new orientation.  For this
+reason only images with the correct types of EXIF tags can be changed
+using this tool.
+.PP
+This utility is part of the official KDE add-ons module.
+.SH OPTIONS
+.TP
+\fB\-90\fP
+Rotate each image by 90 degrees clockwise.
+.TP
+\fB\-180\fP
+Rotate each image by a half turn (i.e., 180 degrees).
+.TP
+\fB\-270\fP
+Rotate each image by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
+.TP
+\fB\-v\fP
+Flip each image vertically.
+.TP
+\fB\-h\fP
+Flip each image horizontally.
+.SH SEE ALSO
+.BR exif.py (1),
+.BR konqueror (1),
+.BR orient.py (1).
+.SH AUTHOR
+The image transformation plugins were written by
+Leif Jensen <jensen at math.columbia.edu>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kaddressbook-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kaddressbook-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kaddressbook-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+usr/lib/kde3/libkaddrbk_geo_xxport.la
+usr/lib/kde3/libkaddrbk_geo_xxport.so
+usr/lib/kde3/libkaddrbk_gmx_xxport.la
+usr/lib/kde3/libkaddrbk_gmx_xxport.so
+usr/share/apps/kaddressbook
+usr/share/services/kaddressbook

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kate Plugins for Debian
+-----------------------
+
+This package provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeaddons-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+README

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+usr/lib/kde3/kate*
+usr/lib/kde3/libkate*
+usr/share/applnk/.hidden/katefll.desktop
+usr/share/apps/kate
+usr/share/apps/katepart
+usr/share/apps/katexmltools
+usr/share/doc/kde/HTML/en/kate-plugins/common
+usr/share/doc/kde/HTML/en/kate-plugins/index.cache.bz2
+usr/share/doc/kde/HTML/en/kate-plugins/*.docbook
+usr/share/services/kate*
+../../kate/xmltools/README usr/share/doc/kate-plugins/xmltools

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.override
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kate-plugins.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+# Doesn't need to be executable - only run from within kate.
+kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdeaddons-doc-html_kate-plugins
+Title: Kate Plugins Handbook
+Author: Various
+Abstract: This is the handbook for the plugins for Kate, KDE's Advanced Text
+ Editor.
+Section: Apps/Editors
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kate-plugins/index.html
+Files: /usr/share/doc/kde/HTML/en/kate-plugins/*.html
+

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeaddons-doc-html_kicker-applets
+Title: Kicker Applets Handbook
+Author: Various
+Abstract: This is the handbook for the addon applets for Kicker, KDE's panel.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kicker-applets/index.html
+Files: /usr/share/doc/kde/HTML/en/kicker-applets/*.html
+

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdeaddons-doc-html_konq-plugins
+Title: Konqueror Plugins Handbook
+Author: Lauri Watts <lauri at kde.org> and others
+Abstract: This is the handbook for the additional plugins for Konqueror, the
+ KDE file manager and web browser.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konq-plugins/index.html
+Files: /usr/share/doc/kde/HTML/en/konq-plugins/*.html
+

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-doc-html.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+usr/share/doc/kde/HTML/en/kate-plugins/*.html
+usr/share/doc/kde/HTML/en/kicker-applets/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/babel/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/crashes/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/dirfilter/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/fsview/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/imgallery/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/kuick/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/mediaplayer/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/uachanger/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/validators/*.html
+usr/share/doc/kde/HTML/en/konq-plugins/webarchiver/*.html

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+usr/bin/lnkforward
+usr/lib/kde3/kfile_*
+usr/lib/kde3/libren*
+usr/share/applnk/.hidden/lnkforward.desktop
+usr/share/mimelnk/application/x-win-lnk.desktop
+usr/share/services/kfile_*
+usr/share/services/ren*
+usr/share/doc/kdeaddons-kfile-plugins
+../../kfile-plugins/lnk/README usr/share/doc/kdeaddons-kfile-plugins/lnk

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons-kfile-plugins.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/lnkforward.1

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kdeaddons.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Add-On Plugins and Applets for Debian
+-----------------------------------------
+
+Package kdeaddons is a metapackage that depends on the full set of add-on
+plugins and applets provided with the official release of KDE.
+
+Some packages provide documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeaddons-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kicker Applets for Debian
+-------------------------
+
+This package provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeaddons-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+README

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+usr/lib/kde3/kolourpicker_panelapplet.*
+usr/lib/kde3/ktimemon_panelapplet.*
+usr/lib/kde3/math_panelapplet.*
+usr/lib/kde3/mediacontrol_panelapplet.*
+usr/lib/kde3/kbinaryclock_panelapplet.*
+usr/share/apps/kicker/applets
+usr/share/apps/mediacontrol
+usr/share/config.kcfg/kbinaryclock.kcfg
+usr/share/doc/kde/HTML/en/kicker-applets/common
+usr/share/doc/kde/HTML/en/kicker-applets/index.cache.bz2
+usr/share/doc/kde/HTML/en/kicker-applets/*.docbook
+usr/share/icons/locolor/16x16/apps/ktimemon.png
+usr/share/icons/locolor/32x32/apps/ktimemon.png
+usr/share/icons/crystalsvg/16x16/apps/ktimemon.png
+usr/share/icons/crystalsvg/32x32/apps/ktimemon.png
+../../kicker-applets/kolourpicker/TODO usr/share/doc/kicker-applets/kolourpicker
+../../kicker-applets/mediacontrol/AUTHORS usr/share/doc/kicker-applets/mediacontrol
+../../kicker-applets/mediacontrol/README usr/share/doc/kicker-applets/mediacontrol
+../../kicker-applets/mediacontrol/TODO usr/share/doc/kicker-applets/mediacontrol
+../../kicker-applets/ktimemon/README usr/share/doc/kicker-applets/ktimemon
+../../kicker-applets/ktimemon/TODO usr/share/doc/kicker-applets/ktimemon

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.override
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kicker-applets.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+# Call is inserted by debhelper and is correct.
+kicker-applets: postinst-has-useless-call-to-ldconfig
+kicker-applets: postrm-has-useless-call-to-ldconfig

Added: people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+knewsticker-scripts for Debian
+------------------------------
+
+This package contains a variety of scripts that provide additional news
+sources for KNewsTicker, the KDE news ticker applet for the KDE panel.
+
+Documentation for the individual scripts can be found in directory
+/usr/share/doc/knewsticker-scripts/.
+
+The scripts themselves can be found in directory
+/usr/share/apps/knewsticker/scripts/.  Some of the scripts may need to be
+hand-modified before they can be used, in which case the documentation
+and/or the script itself will contain additional instructions.
+
+To specify a script as a news source, open up the KNewsTicker
+configuration, select the News Sources tab and add a new source.  The
+source file should be the script you wish to use and the checkbox for
+"The file is a program" should be checked.
+
+ -- Ben Burton <bab at debian.org>, Mon,  2 Feb 2004 20:06:43 +1100

Added: people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+README

Added: people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+usr/share/apps/knewsticker/scripts/Generic.* usr/share/doc/knewsticker-scripts
+usr/share/apps/knewsticker/scripts/Readme.* usr/share/doc/knewsticker-scripts
+usr/share/apps/knewsticker/scripts/bbc.pl
+usr/share/apps/knewsticker/scripts/fyensget.py
+usr/share/apps/knewsticker/scripts/newsrss.pl
+usr/share/apps/knewsticker/scripts/stock.pl
+usr/share/apps/knewsticker/scripts/sportscores.py

Added: people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.links
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/knewsticker-scripts.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/knewsticker-scripts/README.Debian usr/share/apps/knewsticker/scripts/README.Debian

Added: people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Konqueror Plugins for Debian
+----------------------------
+
+This package provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package kdeaddons-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+konq-plugins/README

Added: people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,171 @@
+etc/kde3/translaterc
+usr/bin/exif.py
+usr/bin/fsview
+usr/bin/jpegorient
+usr/bin/orient.py
+usr/bin/kio_media_realfolder
+usr/lib/kde3/kcm_kuick.la
+usr/lib/kde3/kcm_kuick.so
+usr/lib/kde3/konq_sidebarnews.la
+usr/lib/kde3/konq_sidebarnews.so
+usr/lib/kde3/konqsidebar_delicious.la
+usr/lib/kde3/konqsidebar_delicious.so
+usr/lib/kde3/konqsidebar_mediaplayer.la
+usr/lib/kde3/konqsidebar_mediaplayer.so
+usr/lib/kde3/konqsidebar_metabar.la
+usr/lib/kde3/konqsidebar_metabar.so
+usr/lib/kde3/libakregatorkonqfeedicon.la
+usr/lib/kde3/libakregatorkonqfeedicon.so
+usr/lib/kde3/libakregatorkonqplugin.la
+usr/lib/kde3/libakregatorkonqplugin.so
+usr/lib/kde3/libarkplugin.la
+usr/lib/kde3/libarkplugin.so
+usr/lib/kde3/libautorefresh.la
+usr/lib/kde3/libautorefresh.so
+usr/lib/kde3/libbabelfishplugin.la
+usr/lib/kde3/libbabelfishplugin.so
+usr/lib/kde3/libcrashesplugin.la
+usr/lib/kde3/libcrashesplugin.so
+usr/lib/kde3/libdirfilterplugin.la
+usr/lib/kde3/libdirfilterplugin.so
+usr/lib/kde3/libdomtreeviewerplugin.la
+usr/lib/kde3/libdomtreeviewerplugin.so
+usr/lib/kde3/libfsviewpart.la
+usr/lib/kde3/libfsviewpart.so
+usr/lib/kde3/libkhtmlsettingsplugin.la
+usr/lib/kde3/libkhtmlsettingsplugin.so
+usr/lib/kde3/libkimgallery.la
+usr/lib/kde3/libkimgallery.so
+usr/lib/kde3/libkuickplugin.la
+usr/lib/kde3/libkuickplugin.so
+usr/lib/kde3/libmfkonqmficon.la
+usr/lib/kde3/libmfkonqmficon.so
+usr/lib/kde3/libminitoolsplugin.la
+usr/lib/kde3/libminitoolsplugin.so
+usr/lib/kde3/librellinksplugin.la
+usr/lib/kde3/librellinksplugin.so
+usr/lib/kde3/libsearchbarplugin.la
+usr/lib/kde3/libsearchbarplugin.so
+usr/lib/kde3/libuachangerplugin.la
+usr/lib/kde3/libuachangerplugin.so
+usr/lib/kde3/libvalidatorsplugin.la
+usr/lib/kde3/libvalidatorsplugin.so
+usr/lib/kde3/libwebarchiverplugin.la
+usr/lib/kde3/libwebarchiverplugin.so
+usr/lib/kde3/webarchivethumbnail.la
+usr/lib/kde3/webarchivethumbnail.so
+usr/share/applnk/.hidden/arkplugin.desktop
+usr/share/applnk/.hidden/kcmkuick.desktop
+usr/share/applnk/.hidden/kuickplugin.desktop
+usr/share/applnk/.hidden/mediaplayerplugin.desktop
+usr/share/apps/akregator
+usr/share/apps/domtreeviewer
+usr/share/apps/fsview
+usr/share/apps/khtml/kpartplugins
+usr/share/apps/konqiconview
+usr/share/apps/konqiconview/kpartplugins/dirfilterplugin.desktop
+usr/share/apps/konqiconview/kpartplugins/kimgalleryplugin.desktop
+usr/share/apps/konqlistview
+usr/share/apps/konqlistview/kpartplugins/dirfilterplugin.desktop
+usr/share/apps/konqlistview/kpartplugins/kimgalleryplugin.desktop
+usr/share/apps/konqsidebartng
+usr/share/apps/konqueror/icons
+usr/share/apps/konqueror/kpartplugins
+usr/share/apps/konqueror/servicemenus
+usr/share/apps/metabar/iconsrc
+usr/share/apps/metabar/themes/default/default.css
+usr/share/apps/metabar/themes/default/layout.html
+usr/share/apps/microformat/pics/microformat.png
+usr/share/config.kcfg/konq_sidebarnews.kcfg
+usr/share/doc/kde/HTML/en/konq-plugins/babel/*.png
+usr/share/doc/kde/HTML/en/konq-plugins/babel/common
+usr/share/doc/kde/HTML/en/konq-plugins/babel/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/babel/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/common
+usr/share/doc/kde/HTML/en/konq-plugins/crashes/common
+usr/share/doc/kde/HTML/en/konq-plugins/crashes/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/crashes/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/dirfilter/common
+usr/share/doc/kde/HTML/en/konq-plugins/dirfilter/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/dirfilter/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/common
+usr/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/fsview/common
+usr/share/doc/kde/HTML/en/konq-plugins/fsview/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/fsview/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/imgallery/*.png
+usr/share/doc/kde/HTML/en/konq-plugins/imgallery/common
+usr/share/doc/kde/HTML/en/konq-plugins/imgallery/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/imgallery/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/common
+usr/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/kuick/common
+usr/share/doc/kde/HTML/en/konq-plugins/kuick/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/kuick/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/mediaplayer/common
+usr/share/doc/kde/HTML/en/konq-plugins/mediaplayer/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/mediaplayer/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/smbmounter/common
+usr/share/doc/kde/HTML/en/konq-plugins/smbmounter/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/smbmounter/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/smbmounter/index.html
+usr/share/doc/kde/HTML/en/konq-plugins/uachanger/common
+usr/share/doc/kde/HTML/en/konq-plugins/uachanger/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/uachanger/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/validators/common
+usr/share/doc/kde/HTML/en/konq-plugins/validators/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/validators/index.docbook
+usr/share/doc/kde/HTML/en/konq-plugins/webarchiver/common
+usr/share/doc/kde/HTML/en/konq-plugins/webarchiver/index.cache.bz2
+usr/share/doc/kde/HTML/en/konq-plugins/webarchiver/index.docbook
+usr/share/icons/crystalsvg/16x16/actions/babelfish.png
+usr/share/icons/crystalsvg/16x16/actions/cssvalidator.png
+usr/share/icons/crystalsvg/16x16/actions/domtreeviewer.png
+usr/share/icons/crystalsvg/16x16/actions/htmlvalidator.png
+usr/share/icons/crystalsvg/16x16/actions/imagegallery.png
+usr/share/icons/crystalsvg/16x16/actions/minitools.png
+usr/share/icons/crystalsvg/16x16/actions/validators.png
+usr/share/icons/crystalsvg/16x16/actions/webarchiver.png
+usr/share/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
+usr/share/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
+usr/share/icons/crystalsvg/16x16/apps/konqsidebar_news.png
+usr/share/icons/crystalsvg/22x22/actions/babelfish.png
+usr/share/icons/crystalsvg/22x22/actions/cssvalidator.png
+usr/share/icons/crystalsvg/22x22/actions/domtreeviewer.png
+usr/share/icons/crystalsvg/22x22/actions/htmlvalidator.png
+usr/share/icons/crystalsvg/22x22/actions/imagegallery.png
+usr/share/icons/crystalsvg/22x22/actions/minitools.png
+usr/share/icons/crystalsvg/22x22/actions/validators.png
+usr/share/icons/crystalsvg/22x22/actions/webarchiver.png
+usr/share/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
+usr/share/icons/crystalsvg/32x32/actions/minitools.png
+usr/share/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
+usr/share/icons/crystalsvg/48x48/actions/minitools.png
+usr/share/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
+usr/share/icons/hicolor/128x128/apps/metabar.png
+usr/share/icons/hicolor/16x16/apps/metabar.png
+usr/share/icons/hicolor/22x22/apps/fsview.png
+usr/share/icons/hicolor/32x32/apps/fsview.png
+usr/share/icons/hicolor/32x32/apps/metabar.png
+usr/share/icons/hicolor/48x48/apps/metabar.png
+usr/share/icons/hicolor/64x64/apps/metabar.png
+usr/share/icons/hicolor/scalable/apps/metabar.svgz
+usr/share/icons/locolor/16x16/apps/autorefresh.png
+usr/share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+usr/share/services/akregator_konqplugin.desktop
+usr/share/services/ark_plugin.desktop
+usr/share/services/fsview_part.desktop
+usr/share/services/kuick_plugin.desktop
+usr/share/services/webarchivethumbnail.desktop
+../../konq-plugins/fsview/README usr/share/doc/konq-plugins/fsview
+../../konq-plugins/rellinks/AUTHORS usr/share/doc/konq-plugins/rellinks
+../../konq-plugins/rellinks/ChangeLog usr/share/doc/konq-plugins/rellinks
+../../konq-plugins/rellinks/README usr/share/doc/konq-plugins/rellinks
+../../konq-plugins/rellinks/TODO usr/share/doc/konq-plugins/rellinks
+../../konq-plugins/sidebar/mediaplayer/AUTHORS usr/share/doc/konq-plugins/sidebar-mediaplayer
+../../konq-plugins/sidebar/newsticker/README usr/share/doc/konq-plugins/sidebar-newsticker
+../fsview.xpm usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+debian/exif.py.1
+debian/fsview.1
+debian/jpegorient.1
+debian/orient.py.1

Added: people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/konq-plugins.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(konq-plugins):needs="X11"\
+  section="Apps/System"\
+  hints="KDE"\
+  title="FSView"\
+  longtitle="FSView (Graphical Disk Usage / Filesystem Viewer)"\
+  command="/usr/bin/fsview"\
+  icon="/usr/share/pixmaps/fsview.xpm"

Added: people/jriddell/KDE/3.5/kdeaddons/debian/kontact-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/kontact-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/kontact-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+usr/lib/kde3/kcm_kontactknt.so
+usr/lib/kde3/kcm_kontactknt.la
+usr/lib/kde3/libkontact_newstickerplugin.so
+usr/lib/kde3/libkontact_newstickerplugin.la
+usr/share/services/kcmkontactknt.desktop
+usr/share/services/kontact

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSIG 1 "February 4, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ksig \- a graphical tool for managing multiple email signatures
+.SH SYNOPSIS
+.B ksig
+.RI "[ " generic-options " ]"
+[ \fB\-\-random\fP | \fB\-\-daily\fP ]
+.SH DESCRIPTION
+\fBKSig\fP is a graphical tool for keeping track of many different email
+signatures.  The signatures themselves can be edited through KSig's
+graphical user interface.  This is done by starting KSig in the usual way
+through the menus, or by running KSig without either of the special
+options \-\-random or \-\-daily.
+.PP
+A direct command-line interface is then available for generating random
+or daily signatures from this list.  This is achieved by running KSig
+with one of the options \-\-random or \-\-daily, both of which are
+described below.
+.PP
+The command-line interface makes a suitable plugin for generating
+signatures in external mail clients such as KMail.  See
+\fI/usr/share/doc/ksig/README.Debian\fP for details on how this can be
+done.
+.PP
+This application is part of the official KDE add-ons module.
+.SH OPTIONS
+Below are the ksig-specific options.
+For a full summary of options, run \fIksig \-\-help\fP.
+.TP
+\fB\-\-random\fP
+Write a random signature from the list to the console.
+.TP
+\fB\-\-daily\fP
+Write a signature for the day to the console.  The signature will change
+from day to day, but multiple calls on the same day will always return
+the same signature.
+.SH SEE ALSO
+.BR kmail (1).
+.SH AUTHOR
+KSig was written by Scott Wheeler <wheeler at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+KSig for Debian
+---------------
+
+To use KSig to generate automatic signatures in KMail, perform the
+following steps.
+
+- Set up your list of signatures in KSig.
+- In KMail, go to Settings / Configure KMail.
+- Click on the Identities tab and choose an identity to modify.
+- When modifying the identity, click on the Signature tab.
+- Check "Enable signature".
+- In the "Obtain signature text from:" list, select "Output of Command".
+- In the "Specify command:" area, type either "ksig --random" or
+  "ksig --daily".
+
+Now whenever you are using that identity, all of your new mails will
+have signatures generated automatically by KSig.
+
+ -- Ben Burton <bab at debian.org>, Wed,  4 Feb 2004 07:56:56 +1100

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+usr/bin/ksig
+usr/share/applications/kde/ksig.desktop
+usr/share/apps/ksig/ksigui.rc
+usr/share/icons/hicolor/16x16/apps/ksig.png
+usr/share/icons/hicolor/32x32/apps/ksig.png
+../ksig.xpm usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/ksig.1

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(ksig):needs="X11"\
+  section="Apps/Net"\
+  hints="KDE"\
+  title="KSig"\
+  longtitle="KSig (Signature Editor)"\
+  command="/usr/bin/ksig"\
+  icon="/usr/share/pixmaps/ksig.xpm"

Added: people/jriddell/KDE/3.5/kdeaddons/debian/ksig.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/ksig.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/ksig.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * ksig_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #000100",
+"+ 	c #07025D",
+"@ 	c #191B18",
+"# 	c #271867",
+"$ 	c #281968",
+"% 	c #291968",
+"& 	c #271E58",
+"* 	c #2A1A69",
+"= 	c #2C1C6B",
+"- 	c #2A2C29",
+"; 	c #303029",
+"> 	c #393156",
+", 	c #413176",
+"' 	c #443479",
+") 	c #413781",
+"! 	c #46367B",
+"~ 	c #464845",
+"{ 	c #4D4C45",
+"] 	c #524B45",
+"^ 	c #4A4481",
+"/ 	c #4D4F4C",
+"( 	c #544D47",
+"_ 	c #515149",
+": 	c #53524B",
+"< 	c #58487D",
+"[ 	c #55544D",
+"} 	c #59497E",
+"| 	c #574B85",
+"1 	c #5B4B80",
+"2 	c #5C554F",
+"3 	c #565755",
+"4 	c #594D87",
+"5 	c #5A5951",
+"6 	c #5B4F89",
+"7 	c #5D5957",
+"8 	c #5D518B",
+"9 	c #5C5C54",
+"0 	c #635A4F",
+"a 	c #5F538D",
+"b 	c #655C51",
+"c 	c #645D57",
+"d 	c #615590",
+"e 	c #675E53",
+"f 	c #60625F",
+"g 	c #6A6055",
+"h 	c #6B6256",
+"i 	c #646563",
+"j 	c #6D6458",
+"k 	c #656664",
+"l 	c #70665B",
+"m 	c #686A67",
+"n 	c #706286",
+"o 	c #72695D",
+"p 	c #746A5F",
+"q 	c #786B55",
+"r 	c #70658E",
+"s 	c #706C6A",
+"t 	c #7A6D57",
+"u 	c #716790",
+"v 	c #796D5C",
+"w 	c #776D62",
+"x 	c #776590",
+"y 	c #726891",
+"z 	c #736F6D",
+"A 	c #7B6F5E",
+"B 	c #716A98",
+"C 	c #7C7060",
+"D 	c #726B9A",
+"E 	c #727471",
+"F 	c #7E7261",
+"G 	c #747673",
+"H 	c #807463",
+"I 	c #77709F",
+"J 	c #827665",
+"K 	c #7673A7",
+"L 	c #847868",
+"M 	c #7A7C79",
+"N 	c #877B6A",
+"O 	c #887C6B",
+"P 	c #867E78",
+"Q 	c #887E73",
+"R 	c #8B7F6E",
+"S 	c #857E95",
+"T 	c #8F816A",
+"U 	c #9B7F55",
+"V 	c #8A827C",
+"W 	c #838582",
+"X 	c #897E9C",
+"Y 	c #8F8372",
+"Z 	c #868885",
+"` 	c #8B83A7",
+" .	c #8A86A3",
+"..	c #8C8B83",
+"+.	c #908D7F",
+"@.	c #8D8F8C",
+"#.	c #90928F",
+"$.	c #928EB8",
+"%.	c #9F8E96",
+"&.	c #9F919E",
+"*.	c #A093A0",
+"=.	c #9B9A92",
+"-.	c #A294A1",
+";.	c #A3988C",
+">.	c #A297AA",
+",.	c #A398AB",
+"'.	c #A499AC",
+").	c #AB9E8D",
+"!.	c #BB9D6B",
+"~.	c #A79F98",
+"{.	c #ADA08F",
+"].	c #A1A3A0",
+"^.	c #BC9F73",
+"/.	c #C19D73",
+"(.	c #BFA276",
+"_.	c #A5A7A4",
+":.	c #B4A48D",
+"<.	c #BBA387",
+"[.	c #B7A588",
+"}.	c #BFA37D",
+"|.	c #BDA383",
+"1.	c #AEA69F",
+"2.	c #B5A68E",
+"3.	c #ABA3BC",
+"4.	c #B6A78F",
+"5.	c #BBA784",
+"6.	c #C0A585",
+"7.	c #BAA88B",
+"8.	c #AAA6C4",
+"9.	c #AFA9A8",
+"0.	c #BDA986",
+"a.	c #B7A8A3",
+"b.	c #BEAA87",
+"c.	c #ADA8C6",
+"d.	c #BCAB8E",
+"e.	c #ADAFAC",
+"f.	c #AFAAC8",
+"g.	c #C5AB8A",
+"h.	c #C5AD92",
+"i.	c #BFB098",
+"j.	c #B4B3AB",
+"k.	c #B2B2BC",
+"l.	c #BDB0B1",
+"m.	c #C4B294",
+"n.	c #C2B29A",
+"o.	c #C3B49C",
+"p.	c #B7B7AE",
+"q.	c #C7B79F",
+"r.	c #B9BBB8",
+"s.	c #BEB7C3",
+"t.	c #C6B9A6",
+"u.	c #BFB8C4",
+"v.	c #C0B9C5",
+"w.	c #C8BBA9",
+"x.	c #C7BCB0",
+"y.	c #CBBEAB",
+"z.	c #C9BEB2",
+"A.	c #BFC1BE",
+"B.	c #D1BCAC",
+"C.	c #C6C2B4",
+"D.	c #C1C3BF",
+"E.	c #C6C1C0",
+"F.	c #C9C1BA",
+"G.	c #C7C3B5",
+"H.	c #C4C4BB",
+"I.	c #C5C7C4",
+"J.	c #D4C2B7",
+"K.	c #C8C7BE",
+"L.	c #CEC6BF",
+"M.	c #C7C9C6",
+"N.	c #D2C8BB",
+"O.	c #E3C59D",
+"P.	c #D1C8C1",
+"Q.	c #E5C7A0",
+"R.	c #E1CAA0",
+"S.	c #CECDC4",
+"T.	c #D8C9C3",
+"U.	c #DFCBA7",
+"V.	c #D1CCCA",
+"W.	c #D4CCC5",
+"X.	c #D9CAC5",
+"Y.	c #E1CDA9",
+"Z.	c #D6CEC7",
+"`.	c #E2CEAA",
+" +	c #D7CFC8",
+".+	c #D0D2CF",
+"++	c #DDCFBD",
+"@+	c #E4CFAB",
+"#+	c #E9CDAB",
+"$+	c #D6D0CF",
+"%+	c #D4D3CA",
+"&+	c #DED1BE",
+"*+	c #E6D1AD",
+"=+	c #D3D5D2",
+"-+	c #E5D2B4",
+";+	c #D9D3D2",
+">+	c #D4D6D3",
+",+	c #E6D3B5",
+"'+	c #E7D5B6",
+")+	c #DCD7D5",
+"!+	c #E9D6B8",
+"~+	c #E7D6BE",
+"{+	c #DBD9DD",
+"]+	c #EBD8BA",
+"^+	c #E7D9C7",
+"/+	c #EDDABB",
+"(+	c #DEDBE0",
+"_+	c #EBDAC2",
+":+	c #ECDBC3",
+"<+	c #DCDFDB",
+"[+	c #EDDCC4",
+"}+	c #DEE0DD",
+"|+	c #EEDEC5",
+"1+	c #EDDFCC",
+"2+	c #F0E0C7",
+"3+	c #E4E3DA",
+"4+	c #E7E3D4",
+"5+	c #EFE1CE",
+"6+	c #F0E2CF",
+"7+	c #E3E3EE",
+"8+	c #EBE5E4",
+"9+	c #E7E9E6",
+"0+	c #F4E6D3",
+"a+	c #F2E6D9",
+"b+	c #F5E7D4",
+"c+	c #EEEADB",
+"d+	c #F3E8DB",
+"e+	c #F4E9DC",
+"f+	c #F2E9E2",
+"g+	c #EAECE9",
+"h+	c #EDECE3",
+"i+	c #F0ECDD",
+"j+	c #ECEEEB",
+"k+	c #EFEFE5",
+"l+	c #F8ECDF",
+"m+	c #EEF0ED",
+"n+	c #F7EEE7",
+"o+	c #F2F2E8",
+"p+	c #F9F0E9",
+"q+	c #F7F1F0",
+"r+	c #FAF1EA",
+"s+	c #FBF2EB",
+"t+	c #F3F5F2",
+"u+	c #F6F5EC",
+"v+	c #FCF3EC",
+"w+	c #FDF5ED",
+"x+	c #FEF6EE",
+"y+	c #FCF6F5",
+"z+	c #F7F9F6",
+"A+	c #FDF7F6",
+"B+	c #F8FAF7",
+"C+	c #F9FBF8",
+"D+	c #FFF9F8",
+"E+	c #FAFCF9",
+"F+	c #FCFEFB",
+"G+	c #FEFFFC",
+"              Y R O L J F A w p l j g c 9 5 W                     ",
+"              T V.V.M.M.M.M.M.I.M.E.r.9. at .P W f                   ",
+"              O I.D+D+D+D+D+F+F+F+F+z+8+$+9.W #..                 ",
+"              R E.G+G+G+G+G+G+G+F+F+E+z+9+v.z E.Z .               ",
+"              O M.G+G+G+G+G+G+G+D+F+F+F+E+m+k D+M.Z .             ",
+"              L V.G+G+G+G+G+G+G+G+F+D+F+F+D+3 G+D+E.Z .           ",
+"              J M.F+G+G+G+G+G+G+D+G+G+G+F+D+/ <+F+D+M.Z .         ",
+"              L E.G+G+G+G+G+G+G+F+D+G+G+G+D+3 E.<+G+D+E.#.f       ",
+"              L M.G+G+G+G+G+G+G+F+G+G+G+F+D+/ @ @ - ~ i z k Z     ",
+"              w V.G+G+G+G+G+G+G+F+D+G+G+F+F+q+{+E.9.~.P z 7 i     ",
+"              w M.F+G+G+G+G+G+G+F+G+G+G+G+E+C+9+}+E.].I...s ~     ",
+"              F E.G+G+G+G+G+G+G+G+G+G+G+G+D+D+j+9+.+9. +1.V ;     ",
+"              w M.G+G+7+f.7+G+G+G+7+f.G+G+E+D+q+8+9+<+>+j...;     ",
+"              p V.G+$.$.d + 7+G+G+= K G+E+B+z+j+h+W.L.P.N.;.-     ",
+"              l M.I $.G+G+= 7+G+G+8+F+D+B+v+v+n+i+W.~.m+N.{.;     ",
+"              l s.+ G+G+G+G+G+G+F+E+D+z+v+u+o+n+f+S.=.q+N.{.-     ",
+"              j  .+ 7+G+G+G+G+G+K ) z+z+t+;+) + * 4 )+k+&+4.;     ",
+"              j k.+ = 7+G+G+7+$.) a v+s+;+D i+c+x S x.^+&+h.-     ",
+"              h I.f.+ = f.G+G+D+' 3.u+s+! v.l+ ++ y.Q E+++:.;     ",
+"              g V.F+8+= = E+A+u++ (+i+v.+ e+0+'., y.Q C+~+<.-     ",
+"              c M.E+F+$.+ C+A+3.* s+l+X 6 c+Z.$ r |+E+C+~+<.;     ",
+"              9 E.D+G+8.a z+u+a 6 )+` 6 , >.X $ -.o.n.,+!+g.-     ",
+"          +   c M.G+G+d (+v+o+' + y X.y $ >.N.+ N.t.w F+,+6.;     ",
+"          + + > V.7+I (+v+u+n+` s.l+ +X J.2+-.# ~+n.t G+,+}.-     ",
+"              & < 8.q+t+n+o+i+l+d+X.x 0+2+[+< < !+!+G+G+*+6.;     ",
+"              2 I.y+u+l+n+n+l+c+Z.4 6+2+^+/+# a.,+i.d. at +@+/.-     ",
+"              2 I.A+u+o+l+e+0+0+r % >.-.-.n %.,+ at +h.q F+U.(.;     ",
+"              / $+i+n+f+i+c+a+6+l.} < } &.B.-+-+#+5.q D+O.}.-     ",
+"              _ E.v+i+l+a+0+6+6+|+]+/+!+,+-+*+ at +#+#+D+D+O./.;     ",
+"              ] M.m+f+h+a+6+5+6+1+^+/+]+-+#+-+Y.U.O.R.O.Q.!.-     ",
+"              ( H.z.C.w.t.o.t.o.m.n.h.b.m.6.6.|.}.}.(.!./.U ;     ",
+"              / ; - ; - - - ; ; - ; ; - ; ; ; ; - ; - - ; ; -     "};

Added: people/jriddell/KDE/3.5/kdeaddons/debian/lnkforward.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/lnkforward.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/lnkforward.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH LNKFORWARD 1 "October 23, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+lnkforward \- open an URL in a Windows .lnk file under KDE
+.SH SYNOPSIS
+.B lnkforward
+[ \fIgeneric-options\fP ]
+[ \fB\-\-map\fP \fIdrive\fP=\fIpath\fP ... ]
+\fIURL\fP
+.SH DESCRIPTION
+\fBlnkforward\fP examines a Windows .lnk file, determines its target and
+then opens this target file.  In deciding how to open the target file,
+the usual KDE file associations will be used.
+.PP
+The given URL must include a protocol.  Specifically, if it is simply a
+file on the local filesystem, it must be given in the form
+\fIfile:/path/to/file.lnk\fP.
+.PP
+Drive mappings must be supplied (via \-\-map) for any Windows drive
+referred to in the .lnk file.  See the OPTIONS section below for details.
+.PP
+This utility is used by the .lnk kfile plugin, and is
+part of the official KDE add-ons module.
+.SH OPTIONS
+Below are the lnkforward-specific options.
+For a full summary of options, run \fIlnkforward \-\-help\fP.
+.TP
+\fB\-\-map\fP \fIdrive\fP=\fIpath\fP
+Map the given Windows drive to the given path on the local filesystem
+(generally its mount point).
+This option may be passed multiple times.
+.SH EXAMPLE
+Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
+\fId:\\foo\\bar.txt\fP.  Then the following command will open the file
+\fI/mnt/data/foo/bar.txt\fP in the usual KDE text editor:
+.PP
+.RS
+\fIprompt$\fP
+lnkforward \-\-map c=/mnt/windows \-\-map d=/mnt/data /mnt/windows/readme.lnk
+.RE
+.SH AUTHOR
+This utility was written by Martin Koller <m.koller at surfeu.at>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+README

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+usr/bin/noatun*
+usr/lib/kde3/noatun*
+usr/share/apps/noatun/alsaplayerui.plugin
+usr/share/apps/noatun/blurscope.plugin
+usr/share/apps/noatun/charlatanui.plugin
+usr/share/apps/noatun/dub.plugin
+usr/share/apps/noatun/ffrs.plugin
+usr/share/apps/noatun/luckytag.plugin
+usr/share/apps/noatun/lyrics.plugin
+usr/share/apps/noatun/lyricsui.rc
+usr/share/apps/noatun/madness.plugin
+usr/share/apps/noatun/pitchablespeed.plugin
+usr/share/apps/noatun/synaescope.plugin
+usr/share/apps/noatun/tippecanoe.plugin
+usr/share/apps/noatun/tyler.plugin
+usr/share/apps/noatun/tylerstates
+usr/share/apps/noatun/wakeup.plugin
+usr/share/apps/noatun/wavecapture.plugin
+usr/share/icons/crystalsvg/16x16/apps/synaescope.png
+../../noatun-plugins/dub/AUTHORS usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/BUGS usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/ChangeLog usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/design.txt usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/NEWS usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/README usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/dub/TODO usr/share/doc/noatun-plugins/dub
+../../noatun-plugins/lyrics/TODO usr/share/doc/noatun-plugins/lyrics
+../../noatun-plugins/tyler/AUTHORS usr/share/doc/noatun-plugins/tyler
+../../noatun-plugins/tyler/README usr/share/doc/noatun-plugins/tyler

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatun-plugins.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/noatunsynaescope.bin.1
+debian/noatuntippecanoe.bin.1
+debian/noatuntyler.bin.1

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatunsynaescope.bin.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatunsynaescope.bin.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatunsynaescope.bin.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,38 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH NOATUNSYNAESCOPE.BIN 1 "January 31, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
+.SH SYNOPSIS
+.B noatunsynaescope.bin
+.SH DESCRIPTION
+This program starts the Synaescope visualisation plugin for Noatun, the audio
+and video media player for KDE.
+.PP
+This program is for Noatun's internal use and should \fBnot\fP be run
+directly.  To start the plugin, run Noatun and select Plugins from the
+configuration dialog.
+.PP
+This plugin is part of the KDE addons module.
+.SH SEE ALSO
+.BR noatun (1).
+.SH AUTHOR
+The Synaescope plugin was written by Charles Samuels <charles at kde.org>,
+Paul Francis Harrison <pfh at yoyo.cc.monash.edu.au> et al.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatuntippecanoe.bin.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatuntippecanoe.bin.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatuntippecanoe.bin.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH NOATUNTIPPECANOE.BIN 1 "January 31, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
+.SH SYNOPSIS
+.B noatuntippecanoe.bin
+.SH DESCRIPTION
+This program starts the Tippecanoe visualisation plugin for Noatun, the audio
+and video media player for KDE.
+.PP
+This program is for Noatun's internal use and should \fBnot\fP be run
+directly.  To start the plugin, run Noatun and select Plugins from the
+configuration dialog.
+.PP
+This plugin is part of the KDE addons module.
+.SH SEE ALSO
+.BR noatun (1).
+.SH AUTHOR
+The Tippecanoe plugin was written by Neil Stevens <multivac at fcmail.com>,
+Charles Samuels <charles at kde.org> and
+Paul Francis Harrison <pfh at yoyo.cc.monash.edu.au>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/noatuntyler.bin.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/noatuntyler.bin.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/noatuntyler.bin.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH NOATUNTYLER.BIN 1 "January 31, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
+.SH SYNOPSIS
+.B noatuntyler.bin
+.SH DESCRIPTION
+This program starts the Tyler visualisation plugin for Noatun, the audio
+and video media player for KDE.
+.PP
+This program is for Noatun's internal use and should \fBnot\fP be run
+directly.  To start the plugin, run Noatun and select Plugins from the
+configuration dialog.
+.PP
+This plugin is part of the KDE addons module.
+.SH SEE ALSO
+.BR noatun (1).
+.SH AUTHOR
+The Tyler plugin was written by Neil Stevens <multivac at fcmail.com>,
+Julien Carme <julien.carme at acm.org>, Charles Samuels <charles at kde.org>
+and Mitja Horvat <Mitja.Horvat at hermes.si>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/orient.py.1
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/orient.py.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/orient.py.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ORIENT.PY 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+orient.py \- change the orientation of a digital camera image file
+.SH SYNOPSIS
+.B orient.py
+.I image-file
+.br
+.B orient.py
+[1-8]
+.I image-file
+.SH DESCRIPTION
+This is a small script for changing the orientation of certain types
+of digital camera image files.  The image data is not modified, but
+rather the EXIF tags stored with the image are altered to reflect the
+new orientation.  For this reason only images with the correct types of
+EXIF tags can be changed using this script.
+.PP
+When called with with a numeric argument from 1 to 8, the orientation
+will be changed as described in the options section below.  When called
+with only a filename, the current orientation will be written to the
+console (also as a number from 1 to 8).
+.PP
+If the image contains no EXIF information or if the EXIF information is not
+of the correct type, an error will be displayed and this script will
+exit immediately.
+.PP
+This script is provided with the image conversion and transformation
+plugins for Konqueror.  For a more general-purpose JPEG rotation/reflection
+tool, see
+.BR jpegorient (1)
+which is also a part of this same set of plugins.
+.PP
+This utility is part of the official KDE add-ons module.
+.SH OPTIONS
+The possible orientations are represented by the numbers 1 to 8 as
+follows.
+.TP
+.B 1
+No change of orientation.
+.TP
+.B 2
+Flip horizontally.
+.TP
+.B 3
+Rotate by a half turn (i.e., 180 degrees).
+.TP
+.B 4
+Flip vertically.
+.TP
+.B 5
+Transpose image (i.e., reflect across the upper-left to lower-right
+diagonal axis).
+.TP
+.B 6
+Rotate by 90 degrees clockwise.
+.TP
+.B 7
+Transverse transpose image (i.e., reflect across the upper-right to
+lower-left diagonal axis).
+.TP
+.B 8
+Rotate by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
+.SH SEE ALSO
+.BR exif.py (1),
+.BR jpegorient (1),
+.BR konqueror (1).
+.SH AUTHOR
+The image transformation plugins were written by
+Leif Jensen <jensen at math.columbia.edu>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_googlebar_suggest.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_googlebar_suggest.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_googlebar_suggest.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,739 @@
+diff -ur kdeaddons-3.5.0-rc2.orig/konq-plugins/searchbar/searchbar.cpp kdeaddons-3.5.0-rc2/konq-plugins/searchbar/searchbar.cpp
+--- kdeaddons-3.5.0-rc2.orig/konq-plugins/searchbar/searchbar.cpp	2005-11-19 11:43:35.000000000 +0100
++++ kdeaddons-3.5.0-rc2/konq-plugins/searchbar/searchbar.cpp	2005-11-24 22:05:15.000000000 +0100
+@@ -1,4 +1,6 @@
+ /* This file is part of the KDE project
++   Copyright (C) 2005 by Tobi Vollebregt <tobivollebregt at gmail.com>
++   Copyright (C) 2004 by Vinay Khaitan <vkhaitan at iitk.ac.in>
+    Copyright (C) 2004 Arend van Beelen jr. <arend at auton.nl>
+ 
+    This program is free software; you can redistribute it and/or
+@@ -17,9 +19,31 @@
+    Boston, MA 02110-1301, USA.
+ */
+ 
++/* Changes between 01/08/2005 and 31/08/2005 by Tobi Vollebregt:
++- Merged Google Suggest code from the googlebar by Vinay Khaitan into
++  this searchbar.
++*/
++
++/* Changes between 26/9/2005 and 30/9/2005 by Tobi Vollebregt:
++- Fixed two possible crash conditions
++- Fixed a bug which caused the editbox to be cleared if google suggest
++  had no results.
++- Made the plugin try harder to find suitable icons, in particular
++  for the default favorite search engines.
++- Removed some leftover code without any effect.
++- Fixed a bug if no searchengine is selected (neither a default nor
++  favorites).
++- Fixed a bug which caused the searchbar to be unusable if keyword
++  delimiter was set to space (as opposed to colon).
++- Popup menu is now regenerated in showSelectionMenu() after
++  invocation of startSearch(). (No need to restart konqueror before
++  new favicons show up in the menu.) [DISABLED]
++*/
++
+ #include <unistd.h>
+ 
+ #include <dcopclient.h>
++#include <dcopref.h>
+ #include <kapplication.h>
+ #include <kaction.h>
+ #include <kconfig.h>
+@@ -32,16 +56,18 @@
+ #include <klocale.h>
+ #include <kmimetype.h>
+ #include <kprocess.h>
++#include <kprotocolinfo.h>
+ #include <kprotocolmanager.h>
+ #include <kstandarddirs.h>
+ #include <kurifilter.h>
+ 
++#include <kio/job.h>
++
+ #include <kparts/mainwindow.h>
+ #include <kparts/partmanager.h>
+ 
+ #include <qpainter.h>
+ #include <qpopupmenu.h>
+-#include <qtimer.h>
+ #include <qstyle.h>
+ #include <qwhatsthis.h>
+ #include "searchbar.h"
+@@ -50,19 +76,20 @@
+ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin,
+                            SearchBarPluginFactory("searchbarplugin"))
+ 
+-
+ SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name,
+                                  const QStringList &) :
+   KParts::Plugin(parent, name),
+   m_searchCombo(0),
+   m_searchMode(UseSearchProvider),
+-  m_urlEnterLock(false)
++  m_urlEnterLock(false),
++  m_gsTimer(this)
+ {
+ 	m_searchCombo = new SearchBarCombo(0L, "search combo");
+ 	m_searchCombo->setDuplicatesEnabled(false);
+ 	m_searchCombo->setMaxCount(5);
+ 	m_searchCombo->setFixedWidth(180);
+ 	m_searchCombo->lineEdit()->installEventFilter(this);
++	m_searchCombo->listBox()->setFocusProxy(m_searchCombo);
+ 
+ 	m_popupMenu = 0;
+ 
+@@ -70,8 +97,7 @@
+ 	                                                     0, 0, actionCollection(), "toolbar_search_bar");
+ 	m_searchComboAction->setShortcutConfigurable(false);
+ 
+-	connect(m_searchCombo, SIGNAL(activated(const QString &)),
+-	                       SLOT(startSearch(const QString &)));
++	connect(m_searchCombo, SIGNAL(activated(const QString &)), SLOT(startSearch(const QString &)));
+ 	connect(m_searchCombo, SIGNAL(iconClicked()), SLOT(showSelectionMenu()));
+ 
+ 	QWhatsThis::add(m_searchCombo, i18n("Search Bar<p>"
+@@ -89,10 +115,14 @@
+ 	KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager"));
+ 	if (partMan)
+ 	{
+-		connect(partMan, SIGNAL(activePartChanged(KParts::Part*)),
+-		                 SLOT  (partChanged      (KParts::Part*)));
++		connect(partMan, SIGNAL(activePartChanged(KParts::Part*)), SLOT(partChanged(KParts::Part*)));
+ 		partChanged(partMan->activePart());
+ 	}
++
++	connect(this, SIGNAL(gsCompleteDelayed()), SLOT(gsStartDelay()));
++	connect(&m_gsTimer, SIGNAL(timeout()), SLOT(gsMakeCompletionList()));
++	connect(m_searchCombo->listBox(), SIGNAL(highlighted(const QString&)), SLOT(gsSetCompletedText(const QString&)));
++	connect(m_searchCombo, SIGNAL(activated(const QString&)), SLOT(gsPutTextInBox(const QString&)));
+ }
+ 
+ SearchBarPlugin::~SearchBarPlugin()
+@@ -115,39 +145,71 @@
+ 
+ bool SearchBarPlugin::eventFilter(QObject *o, QEvent *e)
+ {
+-	if( o==m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress ) 
++	if( o == m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress )
+ 	{
+-		QKeyEvent *k = (QKeyEvent *)e;
+-		if(k->state() & ControlButton)
++		QKeyEvent* k = (QKeyEvent*) e;
++		QString text = k->text();
++		if(!text.isEmpty())
++		{
++			if(k->key() != Qt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape)
++			{
++				emit gsCompleteDelayed();
++			}
++		}
++		if (k->state() & ControlButton)
+ 		{
+-			if(k->key()==Key_Down)
++			if(k->key() == Key_Down)
+ 			{
+ 				nextSearchEntry();
+ 				return true;
+ 			}
+-			if(k->key()==Key_Up)
++			if(k->key() == Key_Up)
+ 			{
+ 				previousSearchEntry();
+ 				return true;
+ 			}
+ 		}
++		else
++		{
++			if (k->key() == Key_Up || k->key() == Key_Down)
++			{
++				if(m_searchCombo->listBox()->isVisible())
++				{
++					qApp->sendEvent(m_searchCombo->listBox(), e);
++					return true;
++				}
++			}
++		}
++		if (k->key() == Key_Enter || k->key() == Key_Return)
++		{
++			if(m_searchCombo->listBox()->isVisible())
++			{
++				qApp->sendEvent(m_searchCombo->listBox(),e);
++			}
++		}
++		if (k->key() == Key_Escape)
++		{
++			m_searchCombo->listBox()->hide();
++			if (m_searchCombo->lineEdit()->hasSelectedText())
++			{
++				m_searchCombo->lineEdit()->setText(m_searchCombo->currentText().left(m_searchCombo->lineEdit()->selectionStart()));
++			}
++			m_gsTimer.stop();
++		}
+ 	}
+ 	return false;
+ }
+ 
+ void SearchBarPlugin::nextSearchEntry()
+ {
++	m_searchCombo->listBox()->hide();
+ 	if(m_searchMode == FindInThisPage)
+ 	{
+-		m_searchMode = UseSearchProvider;
+ 		if(m_searchEngines.count())
+ 		{
++			m_searchMode = UseSearchProvider;
+ 			m_currentEngine = *m_searchEngines.at(0);
+ 		}
+-		else
+-		{
+-			m_currentEngine = "google";
+-		}
+ 	}
+ 	else
+ 	{
+@@ -167,17 +229,14 @@
+ 
+ void SearchBarPlugin::previousSearchEntry()
+ {
++	m_searchCombo->listBox()->hide();
+ 	if(m_searchMode == FindInThisPage)
+ 	{
+-		m_searchMode = UseSearchProvider;
+ 		if(m_searchEngines.count())
+ 		{
++			m_searchMode = UseSearchProvider;
+ 			m_currentEngine = *m_searchEngines.fromLast();
+ 		}
+-		else
+-		{
+-			m_currentEngine = "google";
+-		}
+ 	}
+ 	else
+ 	{
+@@ -195,62 +254,78 @@
+ 	setIcon();
+ }
+ 
+-void SearchBarPlugin::startSearch(const QString &search)
++void SearchBarPlugin::startSearch(const QString &search1)
+ {
+-	if(m_urlEnterLock || search.isEmpty() || !m_part)
++	if(m_urlEnterLock || search1.isEmpty() || !m_part)
+ 		return;
+ 
++	m_gsTimer.stop();
++	m_searchCombo->listBox()->hide();
++
++	QString search = search1.section('(', 0, 0).stripWhiteSpace();
++
+ 	if(m_searchMode == FindInThisPage)
+ 	{
+-		m_part->findText(search, 0);
+-		m_part->findTextNext();
++		KHTMLPart *htmlPart = ::qt_cast<KHTMLPart*> (m_part);
++		if (htmlPart)
++		{
++			htmlPart->findText(search, 0);
++			htmlPart->findTextNext();
++		}
++		else if (KProtocolInfo::isKnownProtocol(QString("locate")))
++		{
++			//locate is a protocol, so we use a colon instead of keyword delimiter
++			openGivenURL("locate:" + search);
++		}
+ 	}
+ 	else if(m_searchMode == UseSearchProvider)
+ 	{
+ 		m_urlEnterLock = true;
+-	        KService::Ptr service;
+-		KURIFilterData data;
+-		QStringList list;
+-		list << "kurisearchfilter" << "kuriikwsfilter";
++		KService::Ptr service;
+ 
+ 		service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine));
+-                if (service) {
+-		    const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
+-		    data.setData( searchProviderPrefix + search );
+-                }
+-
+-		if(!service || !KURIFilter::self()->filterURI(data, list))
++		if (service) //fix crash when no default searchengine nor favorite searchengines are selected
+ 		{
+-			data.setData( QString::fromLatin1( "google" ) + delimiter() + search );
+-			KURIFilter::self()->filterURI( data, list );
+-		}
++			KURIFilterData data;
++			QStringList list;
++			list << "kurisearchfilter" << "kuriikwsfilter";
++			const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
++			data.setData( searchProviderPrefix + search );
+ 
+-		if(KApplication::keyboardMouseState() & Qt::ControlButton) 
+-		{
+-			KParts::URLArgs args;
+-			args.setNewTab(true);
+-			emit m_part->browserExtension()->createNewWindow( data.uri(), args );
+-		}
+-		else
+-		{
+-		        emit m_part->browserExtension()->openURLRequest(data.uri());
++			if(!KURIFilter::self()->filterURI(data, list))
++			{
++				data.setData( QString::fromLatin1( "google" ) + delimiter() + search );
++				KURIFilter::self()->filterURI( data, list );
++			}
++			openGivenURL(data.uri().url());
+ 		}
+ 	}
+ 
+-	if(m_searchCombo->text(0).isEmpty())
++	m_searchCombo->setCurrentText("");
++	m_urlEnterLock = false;
++
++	//it's quite probable a new favicon will be loaded if a new searchengine was used,
++	//so we regenerate the menu next time showSelectionMenu() is called.
++	//this eats some cpu cycles if the user selects a new engine through the popup menu,
++	//but I think it's worth it (no need to restart konqueror before favicons are shown
++	//in the menu).
++	//delete m_popupMenu;
++	//m_popupMenu = 0;
++}
++
++void SearchBarPlugin::openGivenURL(const QString& url)
++{
++	KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent());
++	DCOPRef toOpenURL(kapp->dcopClient()->appId(), mainWin->name());
++
++	if(KApplication::keyboardMouseState() & Qt::ControlButton)
+ 	{
+-		m_searchCombo->changeItem(m_searchIcon, search, 0);
++		toOpenURL.call("newTab", url);
+ 	}
+ 	else
+ 	{
+-		if(m_searchCombo->findHistoryItem(search) == -1)
+-		{
+-			m_searchCombo->insertItem(m_searchIcon, search, 0);
+-		}
++		toOpenURL.call("openURL", url);
+ 	}
+-
+-	m_searchCombo->setCurrentText("");
+-	m_urlEnterLock = false;
+ }
+ 
+ void SearchBarPlugin::setIcon()
+@@ -261,42 +336,20 @@
+ 	}
+ 	else
+ 	{
+-		KService::Ptr service;
+-		KURIFilterData data;
+-		QStringList list;
+-		list << "kurisearchfilter" << "kuriikwsfilter";
+-
+-		service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine));
+-                if (service) {
+-		    const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
+-		    data.setData( searchProviderPrefix + "some keyword" );
+-                }
+-
+-		if (service && KURIFilter::self()->filterURI(data, list))
+-		{
+-			QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
+-			if(iconPath.isEmpty())
+-			{
+-				m_searchIcon = SmallIcon("unknown");
+-			}
+-			else
+-			{
+-				m_searchIcon = QPixmap(iconPath);
+-			}
+-		}
+-		else
++		QString name;
++		if (!loadIcon(m_searchIcon, name, m_currentEngine))
+ 		{
+-			m_searchIcon = SmallIcon("google");
++			m_searchIcon = SmallIcon("unknown");
+ 		}
+ 	}
+ 
+-        // Create a bit wider icon with arrow
++	// Create a bit wider icon with arrow
+ 	QPixmap arrowmap = QPixmap(m_searchIcon.width()+5,m_searchIcon.height()+5);
+ 	arrowmap.fill(m_searchCombo->lineEdit()->backgroundColor());
+ 	QPainter p( &arrowmap );
+ 	p.drawPixmap(0, 2, m_searchIcon);
+ 	QStyle::SFlags arrowFlags = QStyle::Style_Default;
+-	m_searchCombo->style().drawPrimitive(QStyle::PE_ArrowDown, &p, QRect(arrowmap.width()-6, 
++	m_searchCombo->style().drawPrimitive(QStyle::PE_ArrowDown, &p, QRect(arrowmap.width()-6,
+ 	    arrowmap.height()-5, 6, 5), m_searchCombo->colorGroup(), arrowFlags, QStyleOption() );
+ 	p.end();
+ 	m_searchIcon = arrowmap;
+@@ -308,40 +361,18 @@
+ {
+ 	if(!m_popupMenu)
+ 	{
+-		KService::Ptr service;
+-		QPixmap icon;
+-		KURIFilterData data;
+-		QStringList list;
+-		list << "kurisearchfilter" << "kuriikwsfilter";
+-
+ 		m_popupMenu = new QPopupMenu(m_searchCombo, "search selection menu");
+ 		m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()),  0, 999);
+ 		m_popupMenu->insertSeparator();
+ 
+-		int i=-1;
+-		for (QStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it )
++		int i=0;
++		for (QStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it, ++i)
+ 		{
+-			i++;
+-			service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(*it));
+-			if(!service)
+-			{
+-				continue;
+-			}
+-			const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
+-			data.setData( searchProviderPrefix + "some keyword" );
+-
+-			if(KURIFilter::self()->filterURI(data, list))
++			QPixmap icon;
++			QString name;
++			if (loadIcon(icon, name, *it))
+ 			{
+-				QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
+-				if(iconPath.isEmpty())
+-				{
+-					icon = SmallIcon("unknown");
+-				}
+-				else
+-				{
+-					icon = QPixmap( iconPath );
+-				}
+-			m_popupMenu->insertItem(icon, service->name(), i);
++				m_popupMenu->insertItem(icon, name, i);
+ 			}
+ 		}
+ 
+@@ -401,7 +432,7 @@
+ 
+ void SearchBarPlugin::configurationChanged()
+ {
+-	KConfig *config = new KConfig("kuriikwsfilterrc");
++	KConfig *config = new KConfig("kuriikwsfilterrc", true, false);
+ 	config->setGroup("General");
+ 	QString engine = config->readEntry("DefaultSearchEngine", "google");
+ 
+@@ -412,36 +443,26 @@
+ 	delete m_popupMenu;
+ 	m_popupMenu = 0;
+ 	m_searchEngines.clear();
+-	m_searchEngines << engine;
++	if (!engine.isEmpty())
++		m_searchEngines << engine;
+ 	for (QStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it )
++	{
+ 		if(*it!=engine)
+ 			m_searchEngines << *it;
+-
+-	delete config;
+-	if(engine.isEmpty())
+-	{
+-		m_providerName = "Google";
+-	}
+-	else
+-	{
+-		KDesktopFile file("searchproviders/" + engine + ".desktop", true, "services");
+-		m_providerName = file.readName();
+ 	}
++	delete config;
+ 
+ 	config = kapp->config();
+ 	config->setGroup("SearchBar");
+ 	m_searchMode = (SearchModes) config->readNumEntry("Mode", (int) UseSearchProvider);
+-	m_currentEngine = config->readEntry("CurrentEngine", engine);
+-
+-	if ( m_currentEngine.isEmpty() )
+-	    m_currentEngine = "google";
++	m_currentEngine = config->readEntry("CurrentEngine", "google");
+ 
+ 	setIcon();
+ }
+ 
+ void SearchBarPlugin::partChanged(KParts::Part *newPart)
+ {
+-	m_part = ::qt_cast<KHTMLPart*>(newPart);
++	m_part = ::qt_cast<KParts::ReadOnlyPart*>(newPart); //::qt_cast<KHTMLPart*>(newPart);
+ 
+ 	//Delay since when destroying tabs part 0 gets activated for a bit, before the proper part
+ 	QTimer::singleShot(0, this, SLOT(updateComboVisibility()));
+@@ -497,19 +518,6 @@
+ 	}
+ }
+ 
+-int SearchBarCombo::findHistoryItem(const QString &searchText)
+-{
+-	for(int i = 0; i < count(); i++)
+-	{
+-		if(text(i) == searchText)
+-		{
+-			return i;
+-		}
+-	}
+-
+-	return -1;
+-}
+-
+ void SearchBarCombo::mousePressEvent(QMouseEvent *e)
+ {
+ 	int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ), this ).x();
+@@ -544,4 +552,165 @@
+ 	}
+ }
+ 
++// Google Suggest code
++
++// adapted and modified by Tobi Vollebregt
++// original code from Googlebar by Vinay Khaitan
++
++void SearchBarPlugin::gsStartDelay()
++{
++	m_gsTimer.stop();
++	m_searchCombo->listBox()->hide();
++	// FIXME: make configurable
++	m_gsTimer.start(500, true);
++}
++
++void SearchBarPlugin::gsMakeCompletionList()
++{
++	if (!m_searchCombo->currentText().isEmpty())
++	{
++		KIO::TransferJob* tj =
++				KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
++		connect(tj, SIGNAL(data(KIO::Job*, const QByteArray&)), this, SLOT(gsDataArrived(KIO::Job*, const QByteArray&)));
++		connect(tj, SIGNAL(result(KIO::Job*)), this, SLOT(gsJobFinished(KIO::Job*)));
++	}
++}
++
++void SearchBarPlugin::gsDataArrived(KIO::Job*, const QByteArray& data)
++{
++	m_gsData += data;
++}
++
++static QString reformatNumber(const QString& number)
++{
++	static const char suffix[] = { 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' };
++	QString s = number.stripWhiteSpace();
++	uint c = 0;
++	for (int i = s.length() - 1; i > 0 && s[i] == '0'; --i) ++c;
++	c /= 3;
++	if (c >= sizeof(suffix)/sizeof(suffix[0]))
++		c = sizeof(suffix)/sizeof(suffix[0]) - 1;
++	s = s.left(s.length() - c * 3) + suffix[c];
++	return s;
++}
++
++void SearchBarPlugin::gsJobFinished(KIO::Job* job)
++{
++	if (((KIO::TransferJob*)job)->error() == 0)
++	{
++		QString temp;
++		temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
++		temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1);
++		temp.remove('"');
++		QStringList compList1 = QStringList::split(',', temp);
++		temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
++		temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1);
++		temp.remove('"');
++		temp.remove(',');
++		temp.remove('s');
++		QStringList compList2 = QStringList::split("reult", temp);
++		QStringList finalList;
++		for(uint j = 0; j < compList1.count(); j++)
++		{
++			finalList.append(compList1[j].stripWhiteSpace() + " (" + reformatNumber(compList2[j]) + ")");
++		}
++		//store text so that we can restore it if it gets erased after GS returns no results
++		temp = m_searchCombo->currentText();
++		m_searchCombo->listBox()->clear();
++		m_searchCombo->listBox()->insertStringList(finalList);
++		m_searchCombo->setIcon(m_searchIcon);
++		if (finalList.count() == 0)
++		{
++			//restore text
++			m_searchCombo->lineEdit()->setText(temp);
++		}
++		else if (!m_gsTimer.isActive())
++		{
++			m_searchCombo->popup();
++		}
++	}
++	m_gsData = "";
++}
++
++void SearchBarPlugin::gsSetCompletedText(const QString& text)
++{
++	QString currentText;
++	if (m_searchCombo->lineEdit()->hasSelectedText())
++		currentText = m_searchCombo->currentText().left(m_searchCombo->lineEdit()->selectionStart());
++	else
++		currentText = m_searchCombo->currentText();
++	if (currentText == text.left(currentText.length()))
++	{
++		m_searchCombo->lineEdit()->setText(text.left(text.find('(') - 1));
++		m_searchCombo->lineEdit()->setCursorPosition(currentText.length());
++		m_searchCombo->lineEdit()->setSelection(currentText.length(), m_searchCombo->currentText().length() - currentText.length());
++	}
++}
++
++void SearchBarPlugin::gsPutTextInBox(const QString& text)
++{
++	m_searchCombo->lineEdit()->setText(text.section('(', 0, 0).stripWhiteSpace());
++}
++
++bool SearchBarPlugin::loadIcon(QPixmap& icon, QString& name, const QString& searchProvider)
++{
++	//returns false if service for searchProvider doesn't exist, true otherwise.
++	KService::Ptr service;
++	KURIFilterData data;
++	QStringList list;
++	list << "kurisearchfilter" << "kuriikwsfilter";
++
++	service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(searchProvider));
++	if(!service)
++	{
++		return false;
++	}
++	name = service->name();
++	const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin());
++	data.setData( searchProviderPrefix + delimiter() + "some keyword" );
++
++	if(KURIFilter::self()->filterURI(data, list))
++	{
++		QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png");
++		if(iconPath.isEmpty())
++		{
++			//try to use a local icon instead
++			loadLocalIcon( icon, searchProvider );
++			return true;
++		}
++		else
++		{
++			//load from favicon cache
++			icon = QPixmap( iconPath );
++			return true;
++		}
++	}
++	else
++	{
++		//try to use a local icon instead
++		loadLocalIcon( icon, searchProvider );
++		return true;
++	}
++}
++
++void SearchBarPlugin::loadLocalIcon(QPixmap& icon, const QString& searchProvider)
++{
++	if (searchProvider.startsWith("google"))
++	{
++		icon = SmallIcon("google");
++	}
++	else if (searchProvider == "webster" || searchProvider == "dmoz" || searchProvider == "wikipedia")
++	{
++		icon = SmallIcon(searchProvider);
++	}
++	else if (searchProvider == "locate")
++	{
++		icon = SmallIcon("find");
++	}
++	else
++	{
++		icon = SmallIcon("unknown");
++	}
++}
++
+ #include "searchbar.moc"
+diff -ur kdeaddons-3.5.0-rc2.orig/konq-plugins/searchbar/searchbar.h kdeaddons-3.5.0-rc2/konq-plugins/searchbar/searchbar.h
+--- kdeaddons-3.5.0-rc2.orig/konq-plugins/searchbar/searchbar.h	2005-10-10 16:53:13.000000000 +0200
++++ kdeaddons-3.5.0-rc2/konq-plugins/searchbar/searchbar.h	2005-11-24 22:04:17.000000000 +0100
+@@ -1,4 +1,6 @@
+ /* This file is part of the KDE project
++   Copyright (C) 2005 by Tobi Vollebregt <tobivollebregt at gmail.com>
++   Copyright (C) 2004 by Vinay Khaitan <vkhaitan at iitk.ac.in>
+    Copyright (C) 2004 Arend van Beelen jr. <arend at auton.nl>
+ 
+    This program is free software; you can redistribute it and/or
+@@ -28,6 +30,7 @@
+ #include <qguardedptr.h>
+ #include <qpixmap.h>
+ #include <qstring.h>
++#include <qtimer.h>
+ 
+ class KHTMLPart;
+ class KProcess;
+@@ -57,12 +60,6 @@
+ 		void setIcon(const QPixmap &icon);
+ 
+ 		/**
+-		 * Finds a history item by its text.
+-		 * @return The item number, or -1 if the item is not found.
+-		 */
+-		int findHistoryItem(const QString &text);
+-
+-		/**
+ 		 * Sets whether the plugin is active. It can be inactive
+ 		 * in case the current Konqueror part isn't a KHTML part.
+ 		 */
+@@ -149,20 +146,43 @@
+ 		void updateComboVisibility();
+ 
+ 		void focusSearchbar();
++
++		// Google Suggest private slots
++
++		void gsStartDelay();
++		void gsMakeCompletionList();
++		void gsDataArrived(KIO::Job*, const QByteArray& data);
++		void gsJobFinished(KIO::Job* job);
++		void gsSetCompletedText(const QString& text);
++		void gsPutTextInBox(const QString& text);
++
++	signals:
++
++		// Google Suggest signals
++
++		void gsCompleteDelayed();
++
+ 	private:
+ 		void nextSearchEntry();
+ 		void previousSearchEntry();
++		void openGivenURL(const QString& url);
++		bool loadIcon(QPixmap& icon, QString& name, const QString& searchProvider);
++		void loadLocalIcon(QPixmap& icon, const QString& searchProvider);
+ 
+-		QGuardedPtr<KHTMLPart> m_part;
++		QGuardedPtr<KParts::ReadOnlyPart> m_part;
+ 		SearchBarCombo        *m_searchCombo;
+-                KWidgetAction         *m_searchComboAction;
++		KWidgetAction         *m_searchComboAction;
+ 		QPopupMenu            *m_popupMenu;
+ 		QPixmap                m_searchIcon;
+ 		SearchModes            m_searchMode;
+-		QString                m_providerName;
+ 		bool                   m_urlEnterLock;
+ 		QString                m_currentEngine;
+ 		QStringList            m_searchEngines;
++
++		// Google Suggest private members
++
++		QTimer                 m_gsTimer;
++		QString                m_gsData;
+ };
+ 
+ #endif // SEARCHBAR_PLUGIN

Added: people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/patches/kubuntu_01_kdepot.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh	2005-11-19 09:19:55.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-25 22:08:37.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=`pwd`/debian/patches/common/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

Added: people/jriddell/KDE/3.5/kdeaddons/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,247 @@
+#!/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
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# 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)
+
+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
+
+	# Make absolutely sure these aren't left around from the .orig.tar.gz.
+	-rm -f debian/patches/db++.diff
+	-rm -f debian/atlantikdesigner.override
+	-rm -f debian/konq-plugins.override
+	-rm -f debian/ksig.override
+
+	# 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
+
+	# KDE CVS does not have aclocal.m4 or configure
+	# if test ! -f configure; then \
+	# 	$(MAKE) -f admin/Makefile.common ;\
+	# fi
+
+	# Force a rerun of automake/etc since this is required by the
+	# debian patches.
+	$(MAKE) -f admin/Makefile.common ;\
+
+	# ensure configure is executable
+	chmod +x configure
+
+	# make build directory
+	mkdir $(objdir)
+
+	# run configure with build tree $(objdir)
+	cd $(objdir) && \
+	../configure $(configkde) 
+
+	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
+
+	rm -rf po
+
+	# 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/tmp
+
+	# Fix the knewsticker-scripts installation.
+	chmod 755 debian/tmp/usr/share/apps/knewsticker/scripts/*.pl
+	chmod 755 debian/tmp/usr/share/apps/knewsticker/scripts/*.py
+
+	# Generate HTML docs.
+	for i in `find debian/tmp -name "index.docbook"`; do \
+	  ( cd `dirname $$i`; meinproc `basename $$i` ); \
+	done
+
+	# Install miscellaneous docs.
+	$(INSTALL_DIR) debian/tmp/usr/share/doc/kdeaddons-kfile-plugins
+	$(INSTALL_FILE) renamedlgplugins/README \
+	  debian/tmp/usr/share/doc/kdeaddons-kfile-plugins/README.renamedlgplugins
+
+	# Split into separate binary packages.
+	dh_install --sourcedir=debian/tmp --list-missing \
+	  -Xusr/share/doc/kde/HTML/en/konq-plugins/smbmounter/
+
+	# Install standard documentation links.
+	for pkg in `dh_listpackages`; do \
+	  if test -d debian/$$pkg/usr/share/doc/kde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg usr/share/doc/kde/HTML/en/$$pkg \
+	      usr/share/doc/$$pkg/html; \
+	  fi; \
+	done
+
+	# Install lintian and linda overrides.
+	for pkg in `dh_listpackages`; do \
+	  if test -e debian/$$pkg.override; then \
+	    $(INSTALL_DIR) debian/$$pkg/usr/share/lintian/overrides; \
+	    $(INSTALL_FILE) debian/$$pkg.override \
+	      debian/$$pkg/usr/share/lintian/overrides/$$pkg; \
+	  fi; \
+	  if test -e debian/$$pkg.linda; then \
+	    $(INSTALL_DIR) debian/$$pkg/usr/share/linda/overrides; \
+	    $(INSTALL_FILE) debian/$$pkg.linda \
+	      debian/$$pkg/usr/share/linda/overrides/$$pkg; \
+	  fi; \
+	done
+
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
+
+# 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_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_installmenu
+	dh_installmime
+
+	# Move some incorrectly installed man pages.
+	for pkg in `dh_listpackages`; do \
+	  case "$$pkg" in \
+	    konq-plugins ) \
+	      mv debian/konq-plugins/usr/share/man/py/man1/exif.1 \
+	        debian/konq-plugins/usr/share/man/man1/exif.py.1; \
+	      mv debian/konq-plugins/usr/share/man/py/man1/orient.1 \
+	        debian/konq-plugins/usr/share/man/man1/orient.py.1; \
+	      rm -rf debian/konq-plugins/usr/share/man/py; \
+	    ;; \
+	  esac; \
+	done
+
+	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
+
+	# Run dh_shlibdeps with package-specific library search paths.
+	for pkg in `dh_listpackages`; do \
+	  echo "Checking dependencies for $$pkg..."; \
+	  case "$$pkg" in \
+	    vimpart ) \
+	      DH_OPTIONS='' dh_shlibdeps -p$$pkg \
+	        -ldebian/$$pkg/usr/lib:debian/$$pkg/usr/lib/kde3 ;; \
+	    * ) \
+	      DH_OPTIONS='' dh_shlibdeps -p$$pkg ;; \
+	  esac; \
+	done
+
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# 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


Property changes on: people/jriddell/KDE/3.5/kdeaddons/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: people/jriddell/KDE/3.5/kdeaddons/debian/source.lintian-overrides
===================================================================
--- people/jriddell/KDE/3.5/kdeaddons/debian/source.lintian-overrides	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeaddons/debian/source.lintian-overrides	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+cvsignore-file-in-source
+source-contains-CVS-dir

Added: people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/debian-qt-kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,99 @@
+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:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+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)
+
+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)/usr/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/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/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

Added: people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,93 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney at 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+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_kde
+_cdbs_class_kde := 1
+
+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}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring 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 := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+	rm -rf po
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/simple-patchsys.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+#  Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+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_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+  $$lsdiff -H $(DEB_PATCHES) \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+	  rm -f $$dir/*.log ; \
+	done
+
+# The patch subsystem 
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+	$(MAKE) -f debian/rules reverse-config
+	@echo "patches: $(DEB_PATCHES)"
+	@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+	  if [ "$@" = "reverse-patches" ]; then \
+	    if [ ! -e debian/stamp-patched ]; then \
+	      echo "Not reversing not applied patches."; \
+	      exit 0; \
+	    fi; \
+	    reverse="-R"; \
+	    for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+	    patches="$$reversepatches"; \
+	  fi; \
+	  for patch in $$patches; do \
+          case $$patch in \
+            *.gz) cat=zcat ;; \
+            *.bz2) cat=bzcat ;; \
+            *.uu) cat="uudecode -o -" ;; \
+            *) cat=cat ;; \
+          esac; \
+	  level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+	  reverse=""; \
+	  if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+	  success=""; \
+	  if [ -z "$$level" ]; then \
+	    echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+	    for level in 0 1 2; do \
+	      if test -z "$$success"; then \
+	        echo -n "$$level..."; \
+		if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+		  logfile="/dev/null" ; \
+		else \
+		  logfile="$$patch.level-$$level.log" ; \
+		fi ; \
+	        if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+	          if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+	            success=yes; \
+	            touch debian/stamp-patch-$$(basename $$patch); \
+	            echo "success."; \
+                  fi; \
+	        fi; \
+	      fi; \
+            done; \
+	    if test -z "$$success"; then \
+	      if test -z "$$reverse"; then \
+	        echo "failure."; \
+	        exit 1; \
+	       else \
+	         echo "failure (ignored)."; \
+               fi \
+	    fi; \
+	  else \
+	    echo -n "Trying patch $$patch at level $$level..."; \
+	        echo -n "$$level..."; \
+	    if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+	      logfile="/dev/null" ; \
+	    else \
+	      logfile="$$patch.log" ; \
+	    fi ; \
+	    if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+              touch debian/stamp-patch-$$(basename $$patch); \
+	      echo "success."; \
+	    else \
+	      echo "failure:"; \
+	      cat $$logfile; \
+	      if test -z "$$reverse"; then exit 1; fi; \
+            fi; \
+	  fi; \
+	done
+	if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+	elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+	fi
+	# eliminate update-config when reversing patches - Bug ##299010
+	if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif

Added: people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/cdbs/versions.pl	2006-02-14 17:44:09 UTC (rev 3126)
@@ -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+)$/($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";

Added: people/jriddell/KDE/3.5/kdeadmin/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,740 @@
+kdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes
+    - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway
+    - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768
+    - Ensure changes are applied when clicking OK and don't leave zombie
+    processes around
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Dec 2005 15:19:17 +0000
+
+kdeadmin (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:26:57 +0000
+
+kdeadmin (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 21:44:24 +0000
+
+kdeadmin (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 16:22:21 +0000
+
+kdeadmin (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Nov 2005 16:22:33 -0400
+
+kdeadmin (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 14:26:58 -0400
+
+kdeadmin (4:3.4.2-1) unstable; urgency=low
+
+  [ Debian Qt/KDE Maintainers ]
+  * New upstream release.
+
+  +++ Changes by Luk Claes:
+
+  * Added me to uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 26 Aug 2005 17:18:42 +0200
+
+kdeadmin (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdeadmin (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 02:21:28 +0000
+
+kdeadmin (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 16:24:00 +0000
+
+kdeadmin (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release.
+  * Add all packaged back to meta-package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:02:05 +0000
+
+kdeadmin (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue, 24 May 2005 16:52:30 +0000
+
+kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - no longer FTBFS on amd64/gcc-4.0, upstream applied patch by
+      Andreas Jochens. (Closes: #286998)
+
+  * Converted packaging to CDBS.
+
+  +++ Changes by Pierre Habouzit:
+
+  * Recommends kdebase-bin for lilo-config (kdesu in the menu command).
+  * Remove kcmlinuz from Depends for kdeadmin meta package.
+  * Wrote a man page for kdat.
+
+  * [debian/control] :
+     - reworked package descriptions.
+     - added myself to Uploaders.
+
+  +++ Changes by Adeodato Simó:
+
+  * Created XPM icons for packages having a menu file. Install them in
+    /usr/share/pixmaps and update the menu entries to use them.
+
+  +++ Changes by Christopher Martin:
+
+  * New kdeadmin-doc-html package, containing doc-base registered HTML
+    versions of application handbooks, for users without Konqueror or
+    KHelpCenter.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  7 Apr 2005 20:20:24 -0400
+
+kdeadmin (4:3.3.2-1) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Change debian/copyright file to refer to licenses, instead of copyright,
+    when discussing KDE's licenses.
+
+  +++ Changes by Isaac Clerencia:
+
+  * Added myself to Uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Jan 2005 23:10:27 +0100
+
+kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * Remove build-dependency on automake1.9.
+
+ -- Christopher Martin <chrsmrtn at freeshell.org>  Thu, 16 Dec 2004 13:59:53 -0500
+
+kdeadmin (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu,  4 Nov 2004 23:30:00 -0600
+
+kdeadmin (4:3.3.0-2) unstable; urgency=low
+
+  * KDE_3_3_BRANCH update.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 25 Sep 2004 23:51:24 -0500
+
+kdeadmin (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 13 Aug 2004 23:30:00 -0500
+
+kdeadmin (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  3 Aug 2004 14:00:00 -0500
+
+kdeadmin (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/kpackage.mime: fix the entries to use a proper
+    nametemplate. see also #235216.
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 12 Apr 2004 01:00:00 -0500
+
+kdeadmin (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri,  5 Mar 2004 18:00:00 -0600
+
+kdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 18 Feb 2004 19:00:00 -0600
+
+kdeadmin (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 23 Jan 2004 23:00:00 -0600
+
+kdeadmin (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 12 Jan 2004 14:00:00 -0600
+
+kdeadmin (4:3.1.4-2) unstable; urgency=low
+
+  * Changed Maintainer to Debian Qt/KDE Maintainers
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  6 Jan 2004 19:00:00 -0600
+
+kdeadmin (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added patch to update autotools files.
+  * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
+    causes configure checks to fail due to #line numbers being > 32767.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 16 Oct 2003 01:00:00 -0500
+
+kdeadmin (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri,  1 Aug 2003 14:00:00 -0500
+
+kdeadmin (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 22 May 2003 22:00:00 -0500
+
+kdeadmin (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add 'chmod +x configure' to rules. (Closes: #181357, #181563)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 01:00:00 -0600
+
+kdeadmin (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rebuilt debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 03 Feb 2003 22:00:00 -0600
+
+kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Added special detection routine for big/little endianess on MIPS since
+    the line "byteorder : {big|little} endian" from /proc/cpuinfo was
+    removed as of Linux 2.4.20, resulting in the mipsel buildd being
+    unable to build this package.
+
+ -- Martin Schulze <joey at infodrom.org>  Wed,  8 Jan 2003 20:01:04 +0100
+
+kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patches to fix several potential vulnerabilities.
+    http://www.kde.org/info/security/advisory-20021220-1.txt
+
+ -- Martin Schulze <joey at infodrom.org>  Sun,  5 Jan 2003 21:09:43 +0100
+
+kdeadmin (4:2.2.2-7) unstable; urgency=high
+
+  * Fixed lilo Build-Dep (added [i386])
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon,  4 Mar 2002 08:00:00 -0600
+
+kdeadmin (4:2.2.2-6) unstable; urgency=high
+
+  * Changing Maintainer to Chris.
+  * Fixing PowerPC breakage.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 27 Feb 2002 21:28:09 +1100
+
+kdeadmin (4:2.2.2-5) unstable; urgency=low
+
+  * debian/control, kpackage/Makefile.am:
+    - Update kpackage for rpm 4.0.3, thanks Joey Hess. (Tighten [Build]Deps on
+      rpm, librpm0-dev->librpm-dev). (closes: #128195, #127948)
+  * debian/control:
+    - Tighten Build-Deps so it only builds with libpng2.
+
+ -- Daniel Stone <daniel at sfarc.net>  Tue,  1 Jan 2002 06:50:15 -0500
+
+kdeadmin (4:2.2.2-4) unstable; urgency=low
+
+  * Crap! I lost the Build-Dep on docbook-to-man in the merge between my -2
+    and RevKrusty's; reinstated. (closes: #122044)
+  * Really install the new manpages. 
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun,  2 Dec 2001 11:23:19 +1100
+
+kdeadmin (4:2.2.2-3) unstable; urgency=low
+
+  * New maintainer. (closes: #114101)
+  * debian/{secpolicy,kwuftpd,kuser,ksysv,kpackage,kcron}.sgml:
+    - New manpages.
+  * secpolicy/main.cpp: fix this dodgyness, it now gives an actual description:
+    daniel at tsubasa:~/kde-2.2.2/kdeadmin-2.2.2/kdeadmin-2.2.2% ./secpolicy/secpolicy --help
+    Usage: secpolicy [Qt-options] [KDE-options]
+    What does this do?
+
+ -- Daniel Stone <daniel at sfarc.net>  Sat,  1 Dec 2001 23:59:40 +1100
+
+kdeadmin (4:2.2.2-2) unstable; urgency=low
+
+  * Sync with upstream
+  * Cleanup build process
+  * Update documentation for freeze
+  * Fix build-deps/deps/etc...
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 29 Nov 2001 04:15:00 -0700
+
+kdeadmin (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * use auto* again
+  * lintian cleanup
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Nov 2001 19:26:00 -0700
+
+kdeadmin (4:2.2.1-1.3) unstable; urgency=low
+
+  * take out checks for auto* as it just hoses things
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 08 Oct 2001 19:26:00 -0700
+
+kdeadmin (4:2.2.1-1.2) unstable; urgency=low
+
+  * fix configure
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 09:28:00 -0700
+
+kdeadmin (4:2.2.1-1.1) unstable; urgency=low
+
+  * Workaround for stupid automake 1.5 issues
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 03 Oct 2001 09:28:00 -0700
+
+kdeadmin (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Change maintainer
+  * Lintian error cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Aug 2001 14:31:00 -0700
+
+kdeadmin (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * New upstream version 2.2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
+
+kdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
+ 
+  * Use apt by default and not rpm for kpackage (Closes: #106937)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 28 Jul 2001 18:33:00 -0700
+
+kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * gcc3 build fixes
+  * ksysctrl removed for now by upstream
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 26 Jul 2001 18:05:00 -0700
+
+kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Depend on proper version of rpm so we don't crash (Closes: #103439)
+  * Sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:25:00 -0700
+
+kdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Autobuild for alpha now
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 03 Jul 2001 02:20:00 -0700
+
+kdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * Sync with upstream
+  * fix mips build
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 20:30:00 -0700
+
+kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream version
+  * 2.2 beta1
+  * Adding in Enhances: tags
+  * New package kcmlinuz - linux kernel configuration gui
+  * Fix kpackage deps and crashes due to rpm (Closes: #99747, #97946)
+  * build with nis support
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdeadmin (4:2.1.1-2) unstable; urgency=low
+ 
+  * Update menu tags to include new kde menu removal tag
+  * Update build-depends to recognize real | virtual
+  * Adding in lintian overrides
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 17:28:00 -0700
+
+kdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
+ 
+  * Rebuild with older libc
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 26 Mar 2001 16:33:00 -0700
+
+kdeadmin (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 10:29:00 -0700
+
+kdeadmin (4:2.1.0-3) unstable; urgency=low
+ 
+  * Change Build-Depends and rebuild with new librpm packages (Closes: #89695)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 15 Mar 2001 10:29:00 -0700
+
+kdeadmin (4:2.1.0-2) unstable; urgency=low
+ 
+  * Adding rpm to build-depends (Closes: #87412) 
+  * Upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 11 Mar 2001 04:58:00 -0700
+
+kdeadmin (4:2.1.0-1) unstable; urgency=low
+ 
+  * Fresh CVS sync with future 2.1.1 version
+  * Fixing build process for non-i386 systems (Closes: #87412)
+  * Adding libbz2-dev to build-depends
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 04 Mar 2001 06:46:00 -0700
+
+kdeadmin (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Updating standards version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdeadmin (4:2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
+
+kdeadmin (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixes assertion problems (Closes: #75073)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdeadmin (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing depends as well as updating them
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
+
+kdeadmin (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+    
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 17:05:00 -0700
+     
+kdeadmin (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 13:11:00 -0700
+
+kdeadmin (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in conflicts for kdeadmin which I forgot to to along time ago
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 16 Dec 2000 23:50:00 -0700
+
+kdeadmin (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream beta version
+  * Fix deb package indexing (Closes: #79060)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
+
+kdeadmin (4:2.0-final-8) unstable; urgency=low
+ 
+  * Fixing file conflicts (Closes: #77853)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Nov 2000 06:45:00 -0700
+
+kdeadmin (4:2.0-final-7) unstable; urgency=low
+ 
+  * More upstream fixes
+  * build rules cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 04:45:00 -0700
+
+kdeadmin (4:2.0-final-6) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency cleanup - xlib6g vs xlibs
+  * ftp-server depends fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
+
+kdeadmin (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 00:45:00 -0700
+
+kdeadmin (4:2.0-final-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * adding menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+                                                                                
+kdeadmin (4:2.0-final-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * build against new xlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 04 Nov 2000 18:00:00 -0700
+                                                                                
+kdeadmin (4:2.0-final-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * kdat no longer provided
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+                                                                                
+kdeadmin (4:2.0-final-0) unstable; urgency=low
+
+  * KDE 2.0
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+
+kdeadmin (4:2.0-20001013-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 13 Oct 2000 23:45:00 -0700
+                                                                                
+kdeadmin (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 11 Oct 2000 06:00:00 -0700
+                                                                                
+kdeadmin (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 04:00:00 -0700
+                                                                                
+kdeadmin (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling against non-versioned kdelibs once again
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdeadmin (4:2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
+                                                                                
+kdeadmin (4:2.0-20000927-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Building in RPM support to kpackage again.
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 28 Sep 2000 04:30:00 -0700
+
+kdeadmin (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Updating build-depends
+  * Changing task dependencies (Closes: #72407, #72350, #72333)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdeadmin (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 22:00:00 -0700
+
+kdeadmin (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Breaking down kdeadmin into individual packages
+  * Changing section from utils to admin (Closes: #71870)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 18:00:00 -0700
+
+kdeadmin (4:2.0-20000909-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
+
+kdeadmin (4:2.0-20000907-0) unstable; urgency=low
+
+  * More upstream fixes
+  * Built against new QT 2.2
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 07 Sep 2000 04:00:00 -0700
+
+kdeadmin (4:2.0-20000901-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Merging package changes into upstream CVS
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
+                                                                               
+kdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
+
+kdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 09:30:00 -0700
+
+kdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 18:15:00 -0700
+                                                                              
+kdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:30:00 -0700
+
+kdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:30:00 -0700
+
+kdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+  * Adding in build options for pam
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
+                                                             
+kdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+
+  * New upstream CVS version 
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
+
+  * Cleaning out old workaround in menu.in
+  * Fixing up dependencies
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 14:22:41 -0400
+
+kdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
+
+  * new upstream CVS version
+  * migrating back to /usr from /opt
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 20 Aug 1999 14:22:41 -0400
+
+kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
+
+  * new upstream version
+  * migrating back to / from /opt
+  * migrating in some minor build changes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:00:41 -0400
+
+kdeadmin (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Patricia Jung <trish at freiburg.linux.de>  Wed, 17 Feb 1999 19:09:41 +0100
+
+kdeadmin (4:1.1-19990207-3) unstable; urgency=low
+
+  * fixed ScriptPath and RunlevelPath for ksysv
+
+ -- Patricia Jung <trish at freiburg.linux.de>  Thu, 11 Feb 1999 22:58:00 +0100 
+
+kdeadmin (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the wrong libjpeg version
+
+ -- Stephan Kulow <coolo at kde.org>  Tue,  9 Feb 1999 10:43:42 +0100
+
+kdeadmin (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow <coolo at kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
+
+kdeadmin (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 18:20:53 +0200
+
+kdeadmin (2:980402-1) frozen; urgency=low
+
+  * new upstream version with bugfixes
+
+ -- Stephan Kulow <coolo at kde.org>  Thu,  2 Apr 1998 18:05:34 +0200
+
+kdeadmin (2:980309-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 10 Mar 1998 20:40:02 +0100

Added: people/jriddell/KDE/3.5/kdeadmin/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/compat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/compat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kdeadmin/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,152 @@
+Source: kdeadmin
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at the-barrel.org>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Build-Depends: cdbs (>= 0.4.27), autotools-dev, debhelper (>= 4.2.30), docbook-to-man, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libbz2-dev, libpam0g-dev, lilo [i386], sharutils, texinfo, rpm
+Standards-Version: 3.6.2
+
+Package: kdeadmin
+Section: kde
+Architecture: all
+Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}), secpolicy (>= ${Source-Version})
+Recommends: lilo-config (>= ${Source-Version})
+Suggests: kdeadmin-doc-html (>= ${Source-Version})
+Description: system adminstration tools from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes a collection of system administration tools
+ provided with the official release of KDE.
+
+Package: kdeadmin-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE administration documentation in HTML format
+ By default the modules provided by KDE only provide their documentation
+ in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the KDE administration documentation
+ converted to HTML format so it can be read with any web browser.
+ .
+ The documentation will be installed into the usual directories
+ /usr/share/doc/kde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/kde/HTML/en/kcron/. Documentation is provided for most
+ KDE administration packages.
+ .
+ This package is part of KDE, and a component of the KDE administration
+ module. See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: kcron
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: the KDE crontab editor
+ KCron is an application for scheduling programs to run in the background.
+ It is a graphical user interface to cron, the UNIX system scheduler.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: kdat
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a KDE tape backup tool
+ KDat is a tar-based tape archiver. It is designed to work with multiple
+ archives on a single tape.
+ .
+ Main features are:
+  * Simple graphical interface to local filesystem and tape contents.
+  * Multiple archives on the same physical tape.
+  * Complete index of archives and files is stored on local hard disk.
+  * Selective restore of files from an archive.
+  * Backup profiles for frequently used backups.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: kdeadmin-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE file metainfo plugins for deb and rpm files
+ File metainfo plugins for deb and rpm package files.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: knetworkconf
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE network configuration tool
+ This is a KDE control center module to configure TCP/IP settings.  It
+ can be used to manage network devices and settings for each device.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: kpackage
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: rpm
+Suggests: khelpcenter
+Description: KDE package management tool
+ This is a frontend to both .rpm and .deb package formats. It allows you
+ to view currently installed packages, browse available packages, and
+ install/remove them.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: ksysv
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: KDE SysV-style init configuration editor
+ This program allows you to edit your start and stop scripts using a
+ drag and drop GUI.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: kuser
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: KDE user/group administration tool
+ A user/group administration tool for KDE.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: lilo-config
+Section: kde
+Architecture: i386
+Depends: ${shlibs:Depends}, kcontrol
+Suggests: lilo
+Description: KDE frontend for lilo configuration
+ lilo-config is a KDE based frontend to the lilo boot manager configuration.
+ It runs out of the KDE Control Center.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.
+
+Package: secpolicy
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE PAM security policy configuration tool
+ This tool allows you to manipulate the PAM configuration files for each
+ "service" you have created to use PAM.
+ .
+ This package is part of KDE, as a component of the KDE administration module.
+ See the 'kde' and 'kdeadmin' packages for more information.

Added: people/jriddell/KDE/3.5/kdeadmin/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,424 @@
+This package was debianized by Christopher L Cheney <ccheney at debian.org> on
+Tue, 16 Apr 2002 22:00:00 -0500.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors: Bernhard Rosenkraenzer <bero at redhat.de> and many others.
+
+
+License:
+
+All programs are under the GPL. On Debian systems, the complete text of
+the GPL license can be found in the /usr/share/common-licenses/GPL file.
+
+--------------------
+
+DocBook Documentation:
+
+  Permission is granted to copy, distribute and/or modify this
+  document under the terms of the GNU Free Documentation License,
+  Version 1.1 or any later version published by the Free Software
+  Foundation; with no Invariant Sections, with no Front-Cover Texts,
+  and with no Back-Cover Texts.
+
+  A copy of the GNU Free Documentation License (Version 1.2) is
+  included below.
+
+
+                  GNU Free Documentation License
+                    Version 1.2, November 2002
+
+
+   Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA, 02110-1301, USA.
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+
+  0. PREAMBLE
+
+  The purpose of this License is to make a manual, textbook, or other
+  functional and useful document "free" in the sense of freedom: to
+  assure everyone the effective freedom to copy and redistribute it,
+  with or without modifying it, either commercially or noncommercially.
+  Secondarily, this License preserves for the author and publisher a way
+  to get credit for their work, while not being considered responsible
+  for modifications made by others.
+
+  This License is a kind of "copyleft", which means that derivative
+  works of the document must themselves be free in the same sense.  It
+  complements the GNU General Public License, which is a copyleft
+  license designed for free software.
+
+  We have designed this License in order to use it for manuals for free
+  software, because free software needs free documentation: a free
+  program should come with manuals providing the same freedoms that the
+  software does.  But this License is not limited to software manuals;
+  it can be used for any textual work, regardless of subject matter or
+  whether it is published as a printed book.  We recommend this License
+  principally for works whose purpose is instruction or reference.
+
+
+  1. APPLICABILITY AND DEFINITIONS
+
+  This License applies to any manual or other work, in any medium, that
+  contains a notice placed by the copyright holder saying it can be
+  distributed under the terms of this License.  Such a notice grants a
+  world-wide, royalty-free license, unlimited in duration, to use that
+  work under the conditions stated herein.  The "Document", below,
+  refers to any such manual or work.  Any member of the public is a
+  licensee, and is addressed as "you".  You accept the license if you
+  copy, modify or distribute the work in a way requiring permission
+  under copyright law.
+
+  A "Modified Version" of the Document means any work containing the
+  Document or a portion of it, either copied verbatim, or with
+  modifications and/or translated into another language.
+
+  A "Secondary Section" is a named appendix or a front-matter section of
+  the Document that deals exclusively with the relationship of the
+  publishers or authors of the Document to the Document's overall subject
+  (or to related matters) and contains nothing that could fall directly
+  within that overall subject.  (Thus, if the Document is in part a
+  textbook of mathematics, a Secondary Section may not explain any
+  mathematics.)  The relationship could be a matter of historical
+  connection with the subject or with related matters, or of legal,
+  commercial, philosophical, ethical or political position regarding
+  them.
+
+  The "Invariant Sections" are certain Secondary Sections whose titles
+  are designated, as being those of Invariant Sections, in the notice
+  that says that the Document is released under this License.  If a
+  section does not fit the above definition of Secondary then it is not
+  allowed to be designated as Invariant.  The Document may contain zero
+  Invariant Sections.  If the Document does not identify any Invariant
+  Sections then there are none.
+
+  The "Cover Texts" are certain short passages of text that are listed,
+  as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+  the Document is released under this License.  A Front-Cover Text may
+  be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+  A "Transparent" copy of the Document means a machine-readable copy,
+  represented in a format whose specification is available to the
+  general public, that is suitable for revising the document
+  straightforwardly with generic text editors or (for images composed of
+  pixels) generic paint programs or (for drawings) some widely available
+  drawing editor, and that is suitable for input to text formatters or
+  for automatic translation to a variety of formats suitable for input
+  to text formatters.  A copy made in an otherwise Transparent file
+  format whose markup, or absence of markup, has been arranged to thwart
+  or discourage subsequent modification by readers is not Transparent.
+  An image format is not Transparent if used for any substantial amount
+  of text.  A copy that is not "Transparent" is called "Opaque".
+
+  Examples of suitable formats for Transparent copies include plain
+  ASCII without markup, Texinfo input format, LaTeX input format, SGML
+  or XML using a publicly available DTD, and standard-conforming simple
+  HTML, PostScript or PDF designed for human modification.  Examples of
+  transparent image formats include PNG, XCF and JPG.  Opaque formats
+  include proprietary formats that can be read and edited only by
+  proprietary word processors, SGML or XML for which the DTD and/or
+  processing tools are not generally available, and the
+  machine-generated HTML, PostScript or PDF produced by some word
+  processors for output purposes only.
+
+  The "Title Page" means, for a printed book, the title page itself,
+  plus such following pages as are needed to hold, legibly, the material
+  this License requires to appear in the title page.  For works in
+  formats which do not have any title page as such, "Title Page" means
+  the text near the most prominent appearance of the work's title,
+  preceding the beginning of the body of the text.
+
+  A section "Entitled XYZ" means a named subunit of the Document whose
+  title either is precisely XYZ or contains XYZ in parentheses following
+  text that translates XYZ in another language.  (Here XYZ stands for a
+  specific section name mentioned below, such as "Acknowledgements",
+  "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+  of such a section when you modify the Document means that it remains a
+  section "Entitled XYZ" according to this definition.
+
+  The Document may include Warranty Disclaimers next to the notice which
+  states that this License applies to the Document.  These Warranty
+  Disclaimers are considered to be included by reference in this
+  License, but only as regards disclaiming warranties: any other
+  implication that these Warranty Disclaimers may have is void and has
+  no effect on the meaning of this License.
+
+
+  2. VERBATIM COPYING
+
+  You may copy and distribute the Document in any medium, either
+  commercially or noncommercially, provided that this License, the
+  copyright notices, and the license notice saying this License applies
+  to the Document are reproduced in all copies, and that you add no other
+  conditions whatsoever to those of this License.  You may not use
+  technical measures to obstruct or control the reading or further
+  copying of the copies you make or distribute.  However, you may accept
+  compensation in exchange for copies.  If you distribute a large enough
+  number of copies you must also follow the conditions in section 3.
+
+  You may also lend copies, under the same conditions stated above, and
+  you may publicly display copies.
+
+
+  3. COPYING IN QUANTITY
+
+  If you publish printed copies (or copies in media that commonly have
+  printed covers) of the Document, numbering more than 100, and the
+  Document's license notice requires Cover Texts, you must enclose the
+  copies in covers that carry, clearly and legibly, all these Cover
+  Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+  the back cover.  Both covers must also clearly and legibly identify
+  you as the publisher of these copies.  The front cover must present
+  the full title with all words of the title equally prominent and
+  visible.  You may add other material on the covers in addition.
+  Copying with changes limited to the covers, as long as they preserve
+  the title of the Document and satisfy these conditions, can be treated
+  as verbatim copying in other respects.
+
+  If the required texts for either cover are too voluminous to fit
+  legibly, you should put the first ones listed (as many as fit
+  reasonably) on the actual cover, and continue the rest onto adjacent
+  pages.
+
+  If you publish or distribute Opaque copies of the Document numbering
+  more than 100, you must either include a machine-readable Transparent
+  copy along with each Opaque copy, or state in or with each Opaque copy
+  a computer-network location from which the general network-using
+  public has access to download using public-standard network protocols
+  a complete Transparent copy of the Document, free of added material.
+  If you use the latter option, you must take reasonably prudent steps,
+  when you begin distribution of Opaque copies in quantity, to ensure
+  that this Transparent copy will remain thus accessible at the stated
+  location until at least one year after the last time you distribute an
+  Opaque copy (directly or through your agents or retailers) of that
+  edition to the public.
+
+  It is requested, but not required, that you contact the authors of the
+  Document well before redistributing any large number of copies, to give
+  them a chance to provide you with an updated version of the Document.
+
+
+  4. MODIFICATIONS
+
+  You may copy and distribute a Modified Version of the Document under
+  the conditions of sections 2 and 3 above, provided that you release
+  the Modified Version under precisely this License, with the Modified
+  Version filling the role of the Document, thus licensing distribution
+  and modification of the Modified Version to whoever possesses a copy
+  of it.  In addition, you must do these things in the Modified Version:
+
+  A. Use in the Title Page (and on the covers, if any) a title distinct
+     from that of the Document, and from those of previous versions
+     (which should, if there were any, be listed in the History section
+     of the Document).  You may use the same title as a previous version
+     if the original publisher of that version gives permission.
+  B. List on the Title Page, as authors, one or more persons or entities
+     responsible for authorship of the modifications in the Modified
+     Version, together with at least five of the principal authors of the
+     Document (all of its principal authors, if it has fewer than five),
+     unless they release you from this requirement.
+  C. State on the Title page the name of the publisher of the
+     Modified Version, as the publisher.
+  D. Preserve all the copyright notices of the Document.
+  E. Add an appropriate copyright notice for your modifications
+     adjacent to the other copyright notices.
+  F. Include, immediately after the copyright notices, a license notice
+     giving the public permission to use the Modified Version under the
+     terms of this License, in the form shown in the Addendum below.
+  G. Preserve in that license notice the full lists of Invariant Sections
+     and required Cover Texts given in the Document's license notice.
+  H. Include an unaltered copy of this License.
+  I. Preserve the section Entitled "History", Preserve its Title, and add
+     to it an item stating at least the title, year, new authors, and
+     publisher of the Modified Version as given on the Title Page.  If
+     there is no section Entitled "History" in the Document, create one
+     stating the title, year, authors, and publisher of the Document as
+     given on its Title Page, then add an item describing the Modified
+     Version as stated in the previous sentence.
+  J. Preserve the network location, if any, given in the Document for
+     public access to a Transparent copy of the Document, and likewise
+     the network locations given in the Document for previous versions
+     it was based on.  These may be placed in the "History" section.
+     You may omit a network location for a work that was published at
+     least four years before the Document itself, or if the original
+     publisher of the version it refers to gives permission.
+  K. For any section Entitled "Acknowledgements" or "Dedications",
+     Preserve the Title of the section, and preserve in the section all
+     the substance and tone of each of the contributor acknowledgements
+     and/or dedications given therein.
+  L. Preserve all the Invariant Sections of the Document,
+     unaltered in their text and in their titles.  Section numbers
+     or the equivalent are not considered part of the section titles.
+  M. Delete any section Entitled "Endorsements".  Such a section
+     may not be included in the Modified Version.
+  N. Do not retitle any existing section to be Entitled "Endorsements"
+     or to conflict in title with any Invariant Section.
+  O. Preserve any Warranty Disclaimers.
+
+  If the Modified Version includes new front-matter sections or
+  appendices that qualify as Secondary Sections and contain no material
+  copied from the Document, you may at your option designate some or all
+  of these sections as invariant.  To do this, add their titles to the
+  list of Invariant Sections in the Modified Version's license notice.
+  These titles must be distinct from any other section titles.
+
+  You may add a section Entitled "Endorsements", provided it contains
+  nothing but endorsements of your Modified Version by various
+  parties--for example, statements of peer review or that the text has
+  been approved by an organization as the authoritative definition of a
+  standard.
+
+  You may add a passage of up to five words as a Front-Cover Text, and a
+  passage of up to 25 words as a Back-Cover Text, to the end of the list
+  of Cover Texts in the Modified Version.  Only one passage of
+  Front-Cover Text and one of Back-Cover Text may be added by (or
+  through arrangements made by) any one entity.  If the Document already
+  includes a cover text for the same cover, previously added by you or
+  by arrangement made by the same entity you are acting on behalf of,
+  you may not add another; but you may replace the old one, on explicit
+  permission from the previous publisher that added the old one.
+
+  The author(s) and publisher(s) of the Document do not by this License
+  give permission to use their names for publicity for or to assert or
+  imply endorsement of any Modified Version.
+
+
+  5. COMBINING DOCUMENTS
+
+  You may combine the Document with other documents released under this
+  License, under the terms defined in section 4 above for modified
+  versions, provided that you include in the combination all of the
+  Invariant Sections of all of the original documents, unmodified, and
+  list them all as Invariant Sections of your combined work in its
+  license notice, and that you preserve all their Warranty Disclaimers.
+
+  The combined work need only contain one copy of this License, and
+  multiple identical Invariant Sections may be replaced with a single
+  copy.  If there are multiple Invariant Sections with the same name but
+  different contents, make the title of each such section unique by
+  adding at the end of it, in parentheses, the name of the original
+  author or publisher of that section if known, or else a unique number.
+  Make the same adjustment to the section titles in the list of
+  Invariant Sections in the license notice of the combined work.
+
+  In the combination, you must combine any sections Entitled "History"
+  in the various original documents, forming one section Entitled
+  "History"; likewise combine any sections Entitled "Acknowledgements",
+  and any sections Entitled "Dedications".  You must delete all sections
+  Entitled "Endorsements".
+
+
+  6. COLLECTIONS OF DOCUMENTS
+
+  You may make a collection consisting of the Document and other documents
+  released under this License, and replace the individual copies of this
+  License in the various documents with a single copy that is included in
+  the collection, provided that you follow the rules of this License for
+  verbatim copying of each of the documents in all other respects.
+
+  You may extract a single document from such a collection, and distribute
+  it individually under this License, provided you insert a copy of this
+  License into the extracted document, and follow this License in all
+  other respects regarding verbatim copying of that document.
+
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+  A compilation of the Document or its derivatives with other separate
+  and independent documents or works, in or on a volume of a storage or
+  distribution medium, is called an "aggregate" if the copyright
+  resulting from the compilation is not used to limit the legal rights
+  of the compilation's users beyond what the individual works permit.
+  When the Document is included in an aggregate, this License does not
+  apply to the other works in the aggregate which are not themselves
+  derivative works of the Document.
+
+  If the Cover Text requirement of section 3 is applicable to these
+  copies of the Document, then if the Document is less than one half of
+  the entire aggregate, the Document's Cover Texts may be placed on
+  covers that bracket the Document within the aggregate, or the
+  electronic equivalent of covers if the Document is in electronic form.
+  Otherwise they must appear on printed covers that bracket the whole
+  aggregate.
+
+
+  8. TRANSLATION
+
+  Translation is considered a kind of modification, so you may
+  distribute translations of the Document under the terms of section 4.
+  Replacing Invariant Sections with translations requires special
+  permission from their copyright holders, but you may include
+  translations of some or all Invariant Sections in addition to the
+  original versions of these Invariant Sections.  You may include a
+  translation of this License, and all the license notices in the
+  Document, and any Warranty Disclaimers, provided that you also include
+  the original English version of this License and the original versions
+  of those notices and disclaimers.  In case of a disagreement between
+  the translation and the original version of this License or a notice
+  or disclaimer, the original version will prevail.
+
+  If a section in the Document is Entitled "Acknowledgements",
+  "Dedications", or "History", the requirement (section 4) to Preserve
+  its Title (section 1) will typically require changing the actual
+  title.
+
+
+  9. TERMINATION
+
+  You may not copy, modify, sublicense, or distribute the Document except
+  as expressly provided for under this License.  Any other attempt to
+  copy, modify, sublicense or distribute the Document is void, and will
+  automatically terminate your rights under this License.  However,
+  parties who have received copies, or rights, from you under this
+  License will not have their licenses terminated so long as such
+  parties remain in full compliance.
+
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+  The Free Software Foundation may publish new, revised versions
+  of the GNU Free Documentation License from time to time.  Such new
+  versions will be similar in spirit to the present version, but may
+  differ in detail to address new problems or concerns.  See
+  http://www.gnu.org/copyleft/.
+
+  Each version of the License is given a distinguishing version number.
+  If the Document specifies that a particular numbered version of this
+  License "or any later version" applies to it, you have the option of
+  following the terms and conditions either of that specified version or
+  of any later version that has been published (not as a draft) by the
+  Free Software Foundation.  If the Document does not specify a version
+  number of this License, you may choose any version ever published (not
+  as a draft) by the Free Software Foundation.
+
+
+  ADDENDUM: How to use this License for your documents
+
+  To use this License in a document you have written, include a copy of
+  the License in the document and put the following copyright and
+  license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.2
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts.  A copy of the license is included in the section entitled
+      "GNU Free Documentation License".
+
+  If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+  replace the "with...Texts." line with this:
+
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+  If you have Invariant Sections without Cover Texts, or some other
+  combination of the three, merge those two alternatives to suit the
+  situation.
+
+  If your document contains nontrivial examples of program code, we
+  recommend releasing these examples in parallel under your choice of
+  free software license, such as the GNU General Public License,
+  to permit their use in free software.

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+/* XPM */
+static char *kcron-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 37 1",
+"  c black",
+". c #000F00",
+"X c #001000",
+"o c #001E00",
+"O c #001F00",
+"+ c #002000",
+"@ c #002F00",
+"# c #202020",
+"$ c #004000",
+"% c #3E4F3E",
+"& c #3E5F3E",
+"* c gray25",
+"= c #4F4F40",
+"- c #565665",
+"; c #606060",
+": c #626262",
+"> c #717162",
+", c #808060",
+"< c #80807F",
+"1 c #808080",
+"2 c #8F808F",
+"3 c #A0A0A0",
+"4 c #A2A2A2",
+"5 c #A0A0AF",
+"6 c #B1B1B1",
+"7 c #B6B6B6",
+"8 c #C0C0B0",
+"9 c #C0C0BF",
+"0 c gray76",
+"q c #C0CFC0",
+"w c #D1D1D0",
+"e c #D2D2D2",
+"r c #C0C0FF",
+"t c #E0E0DF",
+"y c #E1E1E1",
+"u c gray100",
+"i c None",
+/* pixels */
+"&$$$$$$@@$$$$$$&",
+"$eyyyyy6eyyyyy6o",
+"$yruuuuiyuuuurio",
+"$yuuuuuiyuuuuuio",
+"$yyyyy8,,8yyyyio",
+"$yuuuuuiyuuuuuio",
+"$yruuuuiyuuuuri+",
+"$yuuuuuiyuuuuui+",
+"$yyyyy8,,8611yi+",
+"$yuuuuui4;;u4>*+",
+"$yruuuui>5uquy=+",
+"$yuuuuui-9u2yy9 ",
+"$yyyyy8,#53uie1.",
+"$yuuuuui:>#0;;*o",
+"$0iiiii40*;1*1;+",
+"&oooooo.o++++++%"
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kcron.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+/* XPM */
+static char *kcron[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 14 1",
+"  c black",
+". c #004000",
+"X c #585858",
+"o c #008000",
+"O c #FFA858",
+"+ c #808080",
+"@ c #A0A0A0",
+"# c #FFDCA8",
+"$ c #C3C3C3",
+"% c gainsboro",
+"& c #C0C0FF",
+"* c #FFFFC0",
+"= c gray100",
+"- c None",
+/* pixels */
+"-                              -",
+" oooooooooooooo..oooooooooooooo ",
+" o$$$$$$$$$$$$$+$$$$$$$$$$$$$+. ",
+" o$============+$============+. ",
+" o$=&&=========+$=========&&=+. ",
+" o$=&&=========+$=========&&=+. ",
+" o$============+$============+. ",
+" o$============+$============+. ",
+" o$==========******==========+. ",
+" o$=$$$$$$$$=      =$$$$$$$$=+. ",
+" o$============+$============+. ",
+" o$=&&=========+$=========&&=+. ",
+" o$=&&=========+$=========&&=+. ",
+" o$============+$============+. ",
+" o$============+$===  =======+. ",
+" o$==========***  * %% =  ===+. ",
+" o$=$$$$$$$$=   %@ @$$@ @% $=+. ",
+" o$============ @%+ at OO@+%@ ==+. ",
+" o$=&&=========+ +OO#O#O+ &&=+. ",
+" o$=&&========  %@O#++O#@%  =+. ",
+" o$========== %$@O#O@@#*O@$% +. ",
+" o$========== +@%+#*##=*+%@+ +. ",
+" o$==========* XX%+#*=#+%XX =+. ",
+" o$=$$$$$$$$=   +$%%++%%$+ $=+. ",
+" o$=========== @=+X+%%+X+=@ =+. ",
+" o$=&&======== %@X  @@  X@% =+. ",
+" o$=&&=========   = %= =   &=+. ",
+" o$============+$== X+ ======+. ",
+" o$============+$===  =======+. ",
+" o$+++++++++++++$+++++++++++++. ",
+" o............................. ",
+"-                              -"
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,116 @@
+/* XPM */
+static char *kdat-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 94 2",
+"   c black",
+".  c #020202",
+"X  c #030303",
+"o  c #040404",
+"O  c #050505",
+"+  c #060606",
+"@  c #070707",
+"#  c #080808",
+"$  c #090909",
+"%  c #0A0A0A",
+"&  c #0E0E0E",
+"*  c #0F0F0F",
+"=  c #131313",
+"-  c #141414",
+";  c #151515",
+":  c #171717",
+">  c #181818",
+",  c #191919",
+"<  c #1B1B1B",
+"1  c #1E1E1E",
+"2  c #1F1F1F",
+"3  c #212121",
+"4  c #222222",
+"5  c #232323",
+"6  c #242424",
+"7  c #262626",
+"8  c #292929",
+"9  c #2B2B2B",
+"0  c #303030",
+"q  c #323232",
+"w  c #343434",
+"e  c #363636",
+"r  c #373737",
+"t  c #383838",
+"y  c #393939",
+"u  c #3B3B3B",
+"i  c #3C3C3C",
+"p  c #3F3F3F",
+"a  c #414141",
+"s  c #434343",
+"d  c #484848",
+"f  c #494949",
+"g  c #4B4B4B",
+"h  c #4C4C4C",
+"j  c #4D4D4D",
+"k  c #4E4E4E",
+"l  c #4F4F4F",
+"z  c #525252",
+"x  c #535353",
+"c  c #5B5B5B",
+"v  c #5C5C5C",
+"b  c #5D5D5D",
+"n  c #5F5F5F",
+"m  c #656565",
+"M  c #686868",
+"N  c #696969",
+"B  c #6A6A6A",
+"V  c #6B6B6B",
+"C  c #6D6D6D",
+"Z  c #6F6F6F",
+"A  c #707070",
+"S  c #737373",
+"D  c #777777",
+"F  c #787878",
+"G  c #797979",
+"H  c #7A7A7A",
+"J  c #7B7B7B",
+"K  c #808080",
+"L  c #818181",
+"P  c #828282",
+"I  c #838383",
+"U  c #8A8A8A",
+"Y  c #8B8B8B",
+"T  c #8C8C8C",
+"R  c #8D8D8D",
+"E  c #8E8E8E",
+"W  c #8F8F8F",
+"Q  c #909090",
+"!  c #929292",
+"~  c #939393",
+"^  c #959595",
+"/  c #979797",
+"(  c #989898",
+")  c #9A9A9A",
+"_  c #9B9B9B",
+"`  c #9D9D9D",
+"'  c #A1A1A1",
+"]  c #A2A2A2",
+"[  c #A7A7A7",
+"{  c #AAAAAA",
+"}  c #ACACAC",
+"|  c #ADADAD",
+" . c #B3B3B3",
+".. c None",
+/* pixels */
+"................................",
+"..............      ............",
+"............  6 A 0 #   ........",
+"..........  6 ) H a ; # #   ....",
+"........  5 ~ ~ C z u m H w #   ",
+"......  2 T ) ' ` ` [ } ~ I j # ",
+"....  > H J ~ ) J }  .) T B u # ",
+"..  > B m j b H ) } ) Q C s 6   ",
+"  ; c j 8 2 w A { ~ T C i 6 O   ",
+"# f s w = f T ' T T B i 6 O   ..",
+"& f a u ; A ) P P m i 5 O   ....",
+"# u z j j H S A b u 6 O   ......",
+"  O > u f f x z u 6 O   ........",
+"....  O > 9 u 0 5 O   ..........",
+"........    = ;     ............",
+"............      .............."
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kdat.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,208 @@
+/* XPM */
+static char *kdat[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 170 2",
+"   c #000000",
+".  c #010101",
+"X  c #020202",
+"o  c #040404",
+"O  c #050505",
+"+  c #060606",
+"@  c #070707",
+"#  c #080808",
+"$  c #090909",
+"%  c #0A0A0A",
+"&  c #0B0B0B",
+"*  c #0C0C0C",
+"=  c #0D0D0D",
+"-  c #0E0E0E",
+";  c #0F0F0F",
+":  c #101010",
+">  c #121212",
+",  c #131313",
+"<  c #141414",
+"1  c #171717",
+"2  c #181818",
+"3  c #191919",
+"4  c #1A1A1A",
+"5  c #1B1B1B",
+"6  c #1C1C1C",
+"7  c #1F1F1F",
+"8  c #202020",
+"9  c #222222",
+"0  c #232323",
+"q  c #262626",
+"w  c #272727",
+"e  c #282828",
+"r  c #2A2A2A",
+"t  c #2B2B2B",
+"y  c #2C2C2C",
+"u  c #2D2D2D",
+"i  c #2E2E2E",
+"p  c #2F2F2F",
+"a  c #303030",
+"s  c #313131",
+"d  c #333333",
+"f  c #343434",
+"g  c #353535",
+"h  c #363636",
+"j  c #373737",
+"k  c #383838",
+"l  c #393939",
+"z  c #3A3A3A",
+"x  c #3B3B3B",
+"c  c #3C3C3C",
+"v  c #3D3D3D",
+"b  c #3E3E3E",
+"n  c #3F3F3F",
+"m  c #404040",
+"M  c #414141",
+"N  c #424242",
+"B  c #434343",
+"V  c #444444",
+"C  c #454545",
+"Z  c #464646",
+"A  c #474747",
+"S  c #484848",
+"D  c #494949",
+"F  c #4A4A4A",
+"G  c #4B4B4B",
+"H  c #4C4C4C",
+"J  c #4D4D4D",
+"K  c #4E4E4E",
+"L  c #4F4F4F",
+"P  c #505050",
+"I  c #515151",
+"U  c #525252",
+"Y  c #535353",
+"T  c #545454",
+"R  c #555555",
+"E  c #565656",
+"W  c #585858",
+"Q  c #595959",
+"!  c #5A5A5A",
+"~  c #5B5B5B",
+"^  c #5C5C5C",
+"/  c #5D5D5D",
+"(  c #5E5E5E",
+")  c #5F5F5F",
+"_  c #626262",
+"`  c #636363",
+"'  c #646464",
+"]  c #656565",
+"[  c #666666",
+"{  c #676767",
+"}  c #686868",
+"|  c #696969",
+" . c #6A6A6A",
+".. c #6B6B6B",
+"X. c #6C6C6C",
+"o. c #6E6E6E",
+"O. c #6F6F6F",
+"+. c #707070",
+"@. c #717171",
+"#. c #727272",
+"$. c #737373",
+"%. c #757575",
+"&. c #767676",
+"*. c #777777",
+"=. c #787878",
+"-. c #797979",
+";. c #7A7A7A",
+":. c #7B7B7B",
+">. c #7E7E7E",
+",. c #7F7F7F",
+"<. c #808080",
+"1. c #818181",
+"2. c #828282",
+"3. c #838383",
+"4. c #848484",
+"5. c #858585",
+"6. c #868686",
+"7. c #888888",
+"8. c #898989",
+"9. c #8A8A8A",
+"0. c #8B8B8B",
+"q. c #8C8C8C",
+"w. c #8D8D8D",
+"e. c #8E8E8E",
+"r. c #8F8F8F",
+"t. c #909090",
+"y. c #919191",
+"u. c #929292",
+"i. c #939393",
+"p. c #949494",
+"a. c #959595",
+"s. c #969696",
+"d. c #979797",
+"f. c #989898",
+"g. c #999999",
+"h. c #9A9A9A",
+"j. c #9B9B9B",
+"k. c #9C9C9C",
+"l. c #9D9D9D",
+"z. c #9E9E9E",
+"x. c #9F9F9F",
+"c. c #A0A0A0",
+"v. c #A1A1A1",
+"b. c #A2A2A2",
+"n. c #A3A3A3",
+"m. c #A4A4A4",
+"M. c #A7A7A7",
+"N. c #A9A9A9",
+"B. c #AAAAAA",
+"V. c #ABABAB",
+"C. c #ACACAC",
+"Z. c #ADADAD",
+"A. c #B2B2B2",
+"S. c #B3B3B3",
+"D. c #B4B4B4",
+"F. c #BDBDBD",
+"G. c #BEBEBE",
+"H. c #C0C0C0",
+"J. c #C8C8C8",
+"K. c #CBCBCB",
+"L. c #CCCCCC",
+"P. c #D0D0D0",
+"I. c #D4D4D4",
+"U. c #D5D5D5",
+"Y. c #D7D7D7",
+"T. c #D8D8D8",
+"R. c #DADADA",
+"E. c #DCDCDC",
+"W. c #E0E0E0",
+"Q. c None",
+/* pixels */
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.        Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.    M c 1     Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.  o U W.C.` p 6     Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.  Q T.b.` ` ( h o $     Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.  ( E.M.` E h 4 - - - > >     Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.  ( U.b. at .` U k t 7 $ $ } ,.C 4     Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.  ` K.z.9.q.5.=.} @.O.G ` H.B.a.` U >     Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.  E J.f.9.M.b.M.a.b.z.q.z.K.C.i.q.9.q.} k o   ",
+"Q.Q.Q.Q.Q.Q.Q.Q.  Q G.a.,.M.C.b.M.f.D.f.z.U.C.a.i.q.5.,.} K $   ",
+"Q.Q.Q.Q.Q.Q.Q.  G A.i. at .q.b.b.a.a.5.i.D.T.C.f.f.i.9.q.` M k $   ",
+"Q.Q.Q.Q.Q.Q.  C B.>.` &.5.a.b.5.=.` ,.W.C.z.f.a.q.9.O.G c h o   ",
+"Q.Q.Q.Q.Q.  M b.=.U ( @.>.9.a.a.} =.T.B.z.f.a.i.q.O.G c k p $   ",
+"Q.Q.Q.Q.  h i.O.C U K c k M ( >.f.E.B.z.f.a.i.q. at .G c h p $     ",
+"Q.Q.    h a.( c G p $ $ > 4 4 U E.b.f.f.a.i.9.O.C c k p $     Q.",
+"Q.    p ,.Q h C p $ o h K M Q U.z.a.a.i.q.q. at .C h h p -   Q.Q.Q.",
+"    w =.Q d M c 1   c } } q.U.f.i.q.q.q.9.O.C h d t -   Q.Q.Q.Q.",
+"  - ` U p k c h > o K Q =.P.i.9.9.9.9.9.O.M h d t -   Q.Q.Q.Q.Q.",
+"  $ K C k k k h >   p 5.K.i.5.5.5.,.,. at .C d d t -   Q.Q.Q.Q.Q.Q.",
+"  - U U K G c h 4 $ E G.9.=.>.>.,.,.} M h h p -   Q.Q.Q.Q.Q.Q.Q.",
+"  $ E E U U K G h K C.9. at .&.&.=.=.` C h h t -   Q.Q.Q.Q.Q.Q.Q.Q.",
+"  o t d U U K U U ` ` } @. at .O.@.( c h d t -   Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.    $ 7 d G G K G C K E ` } Q k d d p -   Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.    $ 7 h M C C M M G G c p p t -   Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.  o > 4 h c M M c h d p p -   Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.    - > 7 p h d p t $   Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.    o 1 7 7 w $     Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.    o $ o     Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.        Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
+"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q."
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,194 @@
+/* XPM */
+static char *kpackage-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 172 2",
+"   c black",
+".  c #0B0C15",
+"X  c #111322",
+"o  c #343D68",
+"O  c #37406C",
+"+  c #394175",
+"@  c #3F4881",
+"#  c #414B81",
+"$  c #485491",
+"%  c #4D5C96",
+"&  c #4E5C98",
+"*  c #575D90",
+"=  c #4F59A3",
+"-  c #535EA8",
+";  c #58619D",
+":  c #5D669C",
+">  c #5260A1",
+",  c #5867AB",
+"<  c #5865B0",
+"1  c #5E6DB9",
+"2  c #6E7BBD",
+"3  c #6677C5",
+"4  c #6879CB",
+"5  c #687CC8",
+"6  c #6C7ED1",
+"7  c #7B83B3",
+"8  c #6E81D2",
+"9  c #7684C6",
+"0  c #7182CE",
+"q  c #7D90DB",
+"w  c #7D95EE",
+"e  c #F8B422",
+"r  c #FAB82A",
+"t  c #FBBC32",
+"y  c #FCBF38",
+"u  c #C3A67B",
+"i  c #DEB664",
+"p  c #DEB26C",
+"a  c #EBBE5B",
+"s  c #FDC234",
+"d  c #FEC340",
+"f  c #FDC742",
+"g  c #FDC64A",
+"h  c #FEC74B",
+"j  c #FFCA4E",
+"k  c #FFCF49",
+"l  c #FCCB56",
+"z  c #FFC954",
+"x  c #FECD50",
+"c  c #FFD056",
+"v  c #E6C77E",
+"b  c #FECB63",
+"n  c #FFDB7A",
+"m  c #FFDC7C",
+"M  c #8F95B3",
+"N  c #A19494",
+"B  c #A29BA7",
+"V  c #AAA0A2",
+"C  c #ACA7A8",
+"Z  c #A1A6BE",
+"A  c #A5A6BD",
+"S  c #B8B3B6",
+"D  c #8294DC",
+"F  c #879EE4",
+"G  c #8499EB",
+"H  c #8199F5",
+"J  c #98A3CC",
+"K  c #89A5FF",
+"L  c #8BA5FC",
+"P  c #8BA5FF",
+"I  c #8DA6FC",
+"U  c #8DA8FF",
+"Y  c #81B0FB",
+"T  c #89B6FE",
+"R  c #8AB6FE",
+"E  c #88BAFF",
+"W  c #8CB9FE",
+"Q  c #95A5E8",
+"!  c #92A8F1",
+"~  c #94ABFB",
+"^  c #98ADF9",
+"/  c #93B2F7",
+"(  c #97B5F4",
+")  c #98B3F4",
+"_  c #9BB1FF",
+"`  c #9FB5FF",
+"'  c #A5B2E0",
+"]  c #A5B1E5",
+"[  c #A5B1E8",
+"{  c #A2B8FF",
+"}  c #A3B8FF",
+"|  c #A6B9FC",
+" . c #ABBBF4",
+".. c #B3BEEE",
+"X. c #9EC8FF",
+"o. c #9ECAFC",
+"O. c #96D2FF",
+"+. c #9CD4FF",
+"@. c #A5C0F6",
+"#. c #A4C7FC",
+"$. c #A1CDFC",
+"%. c #A6CAFF",
+"&. c #A5CEFF",
+"*. c #A8CFFF",
+"=. c #A9CFFF",
+"-. c #A8D1FC",
+";. c #A8D0FF",
+":. c #A9D6FF",
+">. c #B6C2EF",
+",. c #B2C3F3",
+"<. c #B2C0F4",
+"1. c #B4C0F2",
+"2. c #B4C4FE",
+"3. c #B7C8FF",
+"4. c #BAC9F6",
+"5. c #BAC8F9",
+"6. c #B8CBFF",
+"7. c #BCCEFE",
+"8. c #B1D3FF",
+"9. c #B3D6FF",
+"0. c #B4D6FF",
+"q. c #B8D8FF",
+"w. c #BEDDFF",
+"e. c #C4AA81",
+"r. c #D5B781",
+"t. c #D3BA9B",
+"y. c #F0D295",
+"u. c #E3D7AC",
+"i. c #FFE496",
+"p. c #ECE2B7",
+"a. c #FFEFA4",
+"s. c #FFEEA8",
+"d. c #FFF0A6",
+"f. c #C2CADB",
+"g. c #D9DFD9",
+"h. c #C4CDF0",
+"j. c #CAD2F2",
+"k. c #DBE0DD",
+"l. c #CDE8FF",
+"z. c #CEE9FF",
+"x. c #D1E1FF",
+"c. c #D6E4FF",
+"v. c #D8E0FB",
+"b. c #DEEAFF",
+"n. c #DDECFF",
+"m. c #DEEDFF",
+"M. c #DCF0FF",
+"N. c #EAECCF",
+"B. c #FFFECE",
+"V. c #E3E9FC",
+"C. c #E4EFFF",
+"Z. c #E8EDFC",
+"A. c #E9ECFC",
+"S. c #E8F1FF",
+"D. c #E8F2FF",
+"F. c #EDF4FF",
+"G. c #EDF6FF",
+"H. c #EEF6FF",
+"J. c #F0F6FF",
+"K. c #F2F9FF",
+"L. c #F2FBFF",
+"P. c #F3FAFF",
+"I. c #F6FBFF",
+"U. c #F7FAFF",
+"Y. c #F7FCFF",
+"T. c #F7FDFF",
+"R. c #FAFCFF",
+"E. c #FBFDFF",
+"W. c #FEFEFF",
+"Q. c #FEFFFF",
+"!. c gray100",
+"~. c None",
+/* pixels */
+"~.~.~.~.~.~.H w ~.~.6 4 ~.~.~.~.",
+"~.~.~.~.U I f.g.5 q k.J 1 ~.~.~.",
+"~.~.~.~.~ y.i.s.S N.B.B.Z < ~.~.",
+"~.~.~.~.K t.b c s l a.d.d.C - ~.",
+"~.~.~.~.~.Q a k f e g n m n N @ ",
+"~.~.~.~.~.` ) v x r y j l p *   ",
+"~.~.~.~.~.} &./ r.t s x u 7 : = ",
+"~.K _ 2.| ^ W X.( e.i B u.p.M + ",
+"P 2.T.T.c.b. .Y *. .F A B ; X   ",
+"} U.Q.Q.D.T.Q.! E 9.:.:.#.$ ~.~.",
+"6.m.K.V.v.Q.J.1.E =.j.:.X.$ ~.~.",
+"7.C.U.>.] F.b...T :.z.+.$.$ ~.~.",
+"5.Q.Q.G.U.Q.K.[ &.q.M.O.-.$ ~.~.",
+"G A.G.m.T.Q.A.0 4.m.L.z.' # ~.~.",
+"~.D ,.x.F.h.2 . 8 ..j.9 o   ~.~.",
+"~.~.% , > o     ~.3 &     ~.~.~."
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kpackage.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,264 @@
+/* XPM */
+static char *kpackage[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 226 2",
+"   c black",
+".  c #14172A",
+"X  c #181C2F",
+"o  c #191D31",
+"O  c #242949",
+"+  c #2B3254",
+"@  c #3A4178",
+"#  c #404A7C",
+"$  c #414A85",
+"%  c #464F8F",
+"&  c #45508B",
+"*  c #495495",
+"=  c #4D599C",
+"-  c #505E9C",
+";  c #4D57A0",
+":  c #4E5AA0",
+">  c #505CA5",
+",  c #535EA9",
+"<  c #52609D",
+"1  c #5563A7",
+"2  c #5563AB",
+"3  c #596AAD",
+"4  c #5766B0",
+"5  c #5866B2",
+"6  c #5B6AB0",
+"7  c #5D6DBA",
+"8  c #696EA2",
+"9  c #6170BE",
+"0  c #6873B6",
+"q  c #7177AE",
+"w  c #7877A0",
+"e  c #7A78A0",
+"r  c #6374C1",
+"t  c #6578C5",
+"y  c #687BC7",
+"u  c #6A7BCC",
+"i  c #6B7DD0",
+"p  c #7880B7",
+"a  c #6C80CB",
+"s  c #6D80D4",
+"d  c #7382CB",
+"f  c #7C86C1",
+"g  c #7282D3",
+"h  c #7185DA",
+"j  c #7288D3",
+"k  c #7489DD",
+"l  c #7B8BD6",
+"z  c #798CDD",
+"x  c #758CE1",
+"c  c #7B94ED",
+"v  c #7E96F0",
+"b  c #7999F0",
+"n  c #7EB3FF",
+"m  c #F6AE19",
+"M  c #F7B11D",
+"N  c #FAB31E",
+"B  c #F7B221",
+"V  c #F9B524",
+"C  c #F9B628",
+"Z  c #FAB92D",
+"A  c #FBBC33",
+"S  c #FCBE38",
+"D  c #C9AC7B",
+"F  c #D1AD6B",
+"G  c #D1B176",
+"H  c #E3B659",
+"J  c #EDBD58",
+"K  c #F3B853",
+"L  c #F6BD59",
+"P  c #FFBE50",
+"I  c #E1B879",
+"U  c #FFC333",
+"Y  c #FCC03C",
+"T  c #FFC93D",
+"R  c #FEC443",
+"E  c #FFC649",
+"W  c #FFCC43",
+"Q  c #FFC94A",
+"!  c #FEC453",
+"~  c #FECB52",
+"^  c #FFCD5B",
+"/  c #FFD04C",
+"(  c #FFD254",
+")  c #FFD65D",
+"_  c #FFC763",
+"`  c #FFCB66",
+"'  c #FFD360",
+"]  c #FFD26B",
+"[  c #FFDB67",
+"{  c #FFD573",
+"}  c #FFD77D",
+"|  c #FFDE70",
+" . c #FFD87C",
+".. c #838DBB",
+"X. c #8690BE",
+"o. c #8C94B8",
+"O. c #9090AE",
+"+. c #9499BD",
+"@. c #9D9DB2",
+"#. c #B2A08C",
+"$. c #B9A699",
+"%. c #B2A7A5",
+"&. c #B2A9A9",
+"*. c #B0ABBC",
+"=. c #818DC3",
+"-. c #8391C9",
+";. c #8391DC",
+":. c #8B9BD7",
+">. c #8D9CDA",
+",. c #949CC2",
+"<. c #8396E1",
+"1. c #8999E8",
+"2. c #8199F4",
+"3. c #849DF9",
+"4. c #909DE7",
+"5. c #909EEB",
+"6. c #9AA3D5",
+"7. c #86A2E9",
+"8. c #8EA2E9",
+"9. c #86A1FC",
+"0. c #83ABFC",
+"q. c #8CA0F0",
+"w. c #89A4FE",
+"e. c #8CAAFD",
+"r. c #83B4FF",
+"t. c #86B8FF",
+"y. c #8BBCFF",
+"u. c #95A4EB",
+"i. c #9EAEED",
+"p. c #91A7FA",
+"a. c #90AAFF",
+"s. c #9CACF2",
+"d. c #90B0F5",
+"f. c #93B6FE",
+"g. c #94BAFC",
+"h. c #9EB3FF",
+"j. c #9DBDFB",
+"k. c #ADA9C2",
+"l. c #A6B0D8",
+"z. c #ADB7DB",
+"x. c #A1ABE9",
+"c. c #A3B2EA",
+"v. c #A8B3E7",
+"b. c #A1B5FE",
+"n. c #A3BAFB",
+"m. c #AAB5F2",
+"M. c #AAB8F2",
+"N. c #A8BCFF",
+"B. c #B5BEF3",
+"V. c #93C0FF",
+"C. c #9BC6FF",
+"Z. c #9CC8FF",
+"A. c #96D2FF",
+"S. c #9CD5FF",
+"D. c #A2C2F8",
+"F. c #A5CDFF",
+"G. c #ABC7FB",
+"H. c #ACC8FB",
+"J. c #A3D3FF",
+"K. c #ACD3FF",
+"L. c #B7C1EB",
+"P. c #B1C3FF",
+"I. c #B2CCF8",
+"U. c #BBC6F5",
+"Y. c #BBC8F7",
+"T. c #B9CBFF",
+"R. c #B2D5FF",
+"E. c #B6D8FF",
+"W. c #BDD4FB",
+"Q. c #BCDCFF",
+"!. c #C2AB88",
+"~. c #CBAC86",
+"^. c #CDAE89",
+"/. c #C7B193",
+"(. c #C5B7B3",
+"). c #E2C99C",
+"_. c #F1D28D",
+"`. c #FFDD83",
+"'. c #FFE186",
+"]. c #FFE18E",
+"[. c #FFE793",
+"{. c #FEE299",
+"}. c #FFE894",
+"|. c #FFEA9B",
+" X c #FEE5A1",
+".X c #FFEBA4",
+"XX c #FFF4B0",
+"oX c #FFF7B8",
+"OX c #FFFABE",
+"+X c #C7C1C6",
+"@X c #D6D3CD",
+"#X c #C2CBF3",
+"$X c #C6D4FF",
+"%X c #C1DDFF",
+"&X c #CCD4FF",
+"*X c #CBDAFF",
+"=X c #D1DCFF",
+"-X c #C4E2FF",
+";X c #CAE3FF",
+":X c #C9EBFF",
+">X c #D4E4FF",
+",X c #D3EAFF",
+"<X c #DDE6FE",
+"1X c #DCEAFF",
+"2X c #DCF0FF",
+"3X c #E6E6D5",
+"4X c #E3E8DC",
+"5X c #EDF0DC",
+"6X c #F5F0CA",
+"7X c #FFF6C3",
+"8X c #FFFEC5",
+"9X c #FFFFCD",
+"0X c #FFFED7",
+"qX c #FFFFD8",
+"wX c #E0E6FC",
+"eX c #E3ECFF",
+"rX c #E8ECFE",
+"tX c #E5F1FF",
+"yX c #EAF3FF",
+"uX c #EDF9FF",
+"iX c #F1F5E0",
+"pX c LightYellow",
+"aX c #F0F5FF",
+"sX c #F4FBFF",
+"dX c #FEFEFF",
+"fX c None",
+/* pixels */
+"fXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfXfX",
+"fXfXfXfXfXfXfXfXfXfXfXfXfX2.v v fXfXfXfXi i u fXfXfXfXfXfXfXfXfX",
+"fXfXfXfXfXfXfXfXfXfXfX9.3.c.iX1.3 fXfXh :.4Xd 6 fXfXfXfXfXfXfXfX",
+"fXfXfXfXfXfXfXfXfXa.w.w. at XOX8X3Xx   h >.pXpX5X-.7 fXfXfXfXfXfXfX",
+"fXfXfXfXfXfXfXfXa.e.+X{.|..XXXoXl.k z.qXqXqXqXqX=.2 fXfXfXfXfXfX",
+"fXfXfXfXfXfXfXfXa.s.{ } `.].{..X X!.8X8X8X8X8X8X7X+.5 5 fXfXfXfX",
+"fXfXfXfXfXfXfXfXfXw.(.` ] }  .) W N ~ XXXXXXXXXXXXXX at .2 * fXfXfX",
+"fXfXfXfXfXfXfXfXfXw.p.L P ! T T / V m S }.|.|.|.|.|.|.%., > fXfX",
+"fXfXfXfXfXfXfXfXfXfX9.k.U U T / ( C M V Y '.'.'.'.'.'.'./., % fX",
+"fXfXfXfXfXfXfXfXfXfXw.9.*.Q / ( ) Z B C Z S ] { { { { { { 8 $   ",
+"fXfXfXfXfXfXfXfXfXfXw.b.e.6.( ) [ A V Z A S R ^ ) ^ ^ _ w *     ",
+"fXfXfXfXfXfXfXfXfXfXw.N.F.e.6.] | Y C Z Y S R Q E E P w =     fX",
+"fXfXfXfXfXfXfXfXfXfXw.N.F.F.e.<._.S A A Y S Q ~ ~ K e 2 O   fXfX",
+"fXfXfXfXfXfXfXfXfXfXe.N.F.F.F.g.;.H A S R R Q ~ #.0 ,.=..., > ; ",
+"fXfXfXfXfX9.9.3.3.3.3.N.Z.y.F.F.g.l F S R Q G p ,.6X9X9X6Xo.; @ ",
+"fXfXfXw.w.P.*X=X$XP.b.1.e.n t.F.K.j.x D J O.f ).}.}.{.&.2 & .   ",
+"fXfXw.b.yXdXsXuX1X$X>X=Xs.c n y.R.E.H.k s d $.^.G ^.q = O       ",
+"fXw.b.dXdXdXdXsX1X>X1XsXsXs.b r.t.R.Q.R.H.d.7.7.j d 2       fXfX",
+"w.a.uXdXdXdXdXdXtX1XyXdXdXdX1.0.t.y.Q.;X%XF.F.F.K.g.2   fXfXfXfX",
+"w.$XyXsXdXdXdXdXaXuXdXdXdXdX&Xx t.t.y.%X%XJ.K.K.E.j.2   fXfXfXfX",
+"9.1X1XyXsXdXdXsXrXsXdXdXdXdXsXz r.y.y.-X-XR.E.K.J.C.2   fXfXfXfX",
+"h.>X>X2XrXsXaXM.s.rXsXsXrX1X*X5.0.g.y.;X;XE.J.J.S.D.2   fXfXfXfX",
+"b.%X;X>XyXuX=Xy < M.rXrX1X>X*Xu.0.V.y.;X,XQ.J.S.A.G.2   fXfXfXfX",
+"b.tXuXdXdXdXyXu.<.wXsXsXrX<X>X4.0.V.V.,X2X:XS.A.A.G.2   fXfXfXfX",
+"2.dXdXdXdXdXsXeXrXsXdXdXuXrX<Xl f.V.V.1XyX:XA.A.A.I.2   fXfXfXfX",
+"2.=XdXdXdXdXyXuXdXdXdXdXdXsX*Xd 1XZ.V.2XuX,XA.A.S.W.2   fXfXfXfX",
+"c 1.dXdXdXyX1XyXsXdXdXdXdXdX;.z *XtXF.tXsX2XS.:XaXL.1   fXfXfXfX",
+"fXx M.dXsX,X;XrXsXsXdXdXdXm.7 3 x Y.uXdXdXsXsXwX:.7 &   fXfXfXfX",
+"fXfXg i.>X>XW.tXuXsXsXsXx.7 o   3 k U.sXdXaXv.y 2 X     fXfXfXfX",
+"fXfXfXt z M.T.tXrX>XB.g 6 o     fXt h v.#Xl 9 #       fXfXfXfXfX",
+"fXfXfXfX+ 3 t r 9 9 2 +       fXfXfX3 u u <       fXfXfXfXfXfXfX",
+"fXfXfXfXfX                fXfXfXfXfXfX        fXfXfXfXfXfXfXfXfX"
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,127 @@
+/* XPM */
+static char *ksysv-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 105 2",
+"   c black",
+".  c #606060",
+"X  c gray39",
+"o  c DimGray",
+"O  c #6A6A6A",
+"+  c gray42",
+"@  c #6D6D6D",
+"#  c #747474",
+"$  c #767676",
+"%  c #777777",
+"&  c #797B76",
+"*  c #797D75",
+"=  c gray47",
+"-  c #797979",
+";  c gray48",
+":  c #7B7B7B",
+">  c #7E7E7E",
+",  c gray50",
+"<  c #7D8C6F",
+"1  c #7D8675",
+"2  c #7D8278",
+"3  c #7E807D",
+"4  c #BD7E6E",
+"5  c #C67966",
+"6  c #EE7456",
+"7  c #FD6842",
+"8  c #FF714E",
+"9  c #8E9E7F",
+"0  c #948A75",
+"q  c #9B837D",
+"w  c #80B050",
+"e  c #86D635",
+"r  c #9AD45F",
+"t  c #9BDE58",
+"y  c #C7A459",
+"u  c #E1BE73",
+"i  c #FEC959",
+"p  c #F0CC7E",
+"a  c #F8CF76",
+"s  c #FFD476",
+"d  c #FFD67E",
+"f  c #818181",
+"g  c gray51",
+"h  c #838383",
+"j  c gray52",
+"k  c #868686",
+"l  c gray53",
+"z  c #888785",
+"x  c #8F8B81",
+"c  c #888888",
+"v  c #898989",
+"b  c gray54",
+"n  c gray55",
+"m  c #8D8D8D",
+"M  c #8E8E8E",
+"N  c gray56",
+"B  c #9A8984",
+"V  c #91908D",
+"C  c #949089",
+"Z  c #949C8B",
+"A  c #9C908D",
+"S  c gray57",
+"D  c #929292",
+"F  c #939393",
+"G  c gray58",
+"H  c #989897",
+"J  c #9E9897",
+"K  c #989898",
+"L  c gray60",
+"P  c #9A9A9A",
+"I  c gray61",
+"U  c #9D9D9D",
+"Y  c gray62",
+"T  c #A29F99",
+"R  c #AC9791",
+"E  c #AA9B97",
+"W  c #B09C97",
+"Q  c #AAA28E",
+"!  c #ABA69C",
+"~  c #A2B88B",
+"^  c #B8A783",
+"/  c #A0A0A0",
+"(  c gray66",
+")  c gray68",
+"_  c #B0ADAC",
+"`  c #B1B1B1",
+"'  c #B4B4B4",
+"]  c gray73",
+"[  c #BBBBBB",
+"{  c #B5D396",
+"}  c #B6C9A2",
+"|  c #BEE09C",
+" . c #C7A59D",
+".. c #D3A99E",
+"X. c #E7A797",
+"o. c #FBA58F",
+"O. c #FFBFAF",
+"+. c #CFC5B1",
+"@. c #C0C0C0",
+"#. c #C8C8C8",
+"$. c #CECECE",
+"%. c #D6E9C3",
+"&. c #E2D7C1",
+"*. c #E8F7D9",
+"=. c None",
+/* pixels */
+"=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.",
+"=.=.=.=.D ` [ [ ' ' ' ` I =.=.=.",
+"=.=.=.=.K $.+.A W E ) #.) =.=.=.",
+"=.=.=.=.I [ n X.O.o.4 Y F =.=.=.",
+"=.=.=.=.I ( q 6 8 7 5 G j =.=.=.",
+"=.=.=.=.F / H R .. .J N f =.=.=.",
+"=.=.=.=.N I G F j v N v j =.=.=.",
+"=.=.=.=.N G b Q &.+.C j , =.=.=.",
+"=.=.=.=.v Z 9 X.d i y l ; =.=.=.",
+"=.=.=.=.v Z 0 u s a ^ h $ =.=.=.",
+"=.=.=.=.f m b N ! T j ; ; =.=.=.",
+"=.=.=.=.v v j - 1 2 : % + =.=.=.",
+"=.=.=.=.f h - } *.%.9 $ + =.=.=.",
+"=.=.=.=.$ 0 < r t e < ; + =.=.=.",
+"=.=.=.=.> > 2 ~ | { Z + X =.=.=.",
+"=.=.=.=.j % # # 1 < + . + =.=.=."
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/ksysv.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,182 @@
+/* XPM */
+static char *ksysv[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 144 2",
+"   c black",
+".  c #5C5C5C",
+"X  c #636363",
+"o  c #6B6B6B",
+"O  c #6E716B",
+"+  c #747F69",
+"@  c #79746A",
+"#  c #7F7A6E",
+"$  c #737373",
+"%  c #747870",
+"&  c #7B7A75",
+"*  c #7B7B7B",
+"=  c #7B8372",
+"-  c #7F916D",
+";  c #7AA251",
+":  c #6FCE10",
+">  c #7BD323",
+",  c #8C7069",
+"<  c #867773",
+"1  c #817875",
+"2  c #867F7D",
+"3  c #8B7772",
+"4  c #897A76",
+"5  c #AE6B5A",
+"6  c #BE6F5C",
+"7  c #A77B6F",
+"8  c #B67260",
+"9  c #B37768",
+"0  c #FD5126",
+"q  c #FF582F",
+"w  c #F95931",
+"e  c #EE7B5F",
+"r  c #FF6944",
+"t  c #FD6D49",
+"y  c #F57B5C",
+"u  c #FF7B5A",
+"i  c #87817F",
+"p  c #868E7F",
+"a  c #8A867F",
+"s  c #849573",
+"d  c #879B74",
+"f  c #899B76",
+"g  c #9B847E",
+"h  c #85A861",
+"j  c #89A56C",
+"k  c #89AD65",
+"l  c #B79959",
+"z  c #AA9566",
+"x  c #AE996E",
+"c  c #89D43E",
+"v  c #8AD83C",
+"b  c #8DD941",
+"n  c #94DA4D",
+"m  c #A7E26C",
+"M  c #A8E06F",
+"N  c #AAE371",
+"B  c #FDB723",
+"V  c #FFBC2E",
+"C  c #C0A364",
+"Z  c #FFC447",
+"A  c #F7C65A",
+"S  c #F8C455",
+"D  c #FFCB5C",
+"F  c #F2C360",
+"G  c #FDCD64",
+"H  c #FFCF68",
+"J  c #FFD67E",
+"K  c #838383",
+"L  c #858882",
+"P  c #8D8684",
+"I  c #8B8985",
+"U  c #8B8B8A",
+"Y  c #928380",
+"T  c #908F8D",
+"R  c #90908F",
+"E  c #939393",
+"W  c #989E92",
+"Q  c #9B9A9A",
+"!  c #98A08F",
+"~  c #9CAA8E",
+"^  c #9EB08B",
+"/  c #AC8B83",
+"(  c #AE9F80",
+")  c #A39C96",
+"_  c #B9968D",
+"`  c #B69C95",
+"'  c #AEA38C",
+"]  c #A0A69A",
+"[  c #ACA390",
+"{  c #B0AA9D",
+"}  c #BEB399",
+"|  c #A2A2A2",
+" . c #ACA2A0",
+".. c #AAAAAA",
+"X. c #B1ADA1",
+"o. c #B8A6A2",
+"O. c #BAA8A3",
+"+. c #B2B2B2",
+"@. c #B9B9B9",
+"#. c #A6C686",
+"$. c #A8CD84",
+"%. c #AAD580",
+"&. c #B4C5A2",
+"*. c #B6C8A3",
+"=. c #B6E588",
+"-. c #B9E88A",
+";. c #CDB88A",
+":. c #C9BA99",
+">. c #DEA191",
+",. c #D7BE87",
+"<. c #C4A9A3",
+"1. c #FF9B82",
+"2. c #E4A798",
+"3. c #E8A898",
+"4. c #FAA18B",
+"5. c #FFA791",
+"6. c #FFA892",
+"7. c #F5B09E",
+"8. c #EAB3A5",
+"9. c #CEC1A4",
+"0. c #CBC1AC",
+"q. c #C7DEB0",
+"w. c #C8DFB1",
+"e. c #C8E4AC",
+"r. c #D6F1BB",
+"t. c #FDDA8E",
+"y. c #FCDC99",
+"u. c #FFE1A1",
+"i. c #C2C2C2",
+"p. c #CBCBCB",
+"a. c #D3D3D3",
+"s. c #D8D8D8",
+"d. c #DEF4C7",
+"f. c #E1C8C2",
+"g. c #FED4C9",
+"h. c #FFDAD1",
+"j. c #E1EDD5",
+"k. c #E4F1D6",
+"l. c #F4EAD5",
+"z. c #F8EED8",
+"x. c #FFF7E7",
+"c. c #F7FCF2",
+"v. c #F8FDF2",
+"b. c None",
+/* pixels */
+"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.Q Q Q Q | | Q | Q Q Q E E E R E b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.s.U @.p.a.a.p.p.i.i.i.p.p.i.i...E b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.E Q a.a.a.i.Q & < 4 P ..p.p.a. at .| b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K Q p.p.i.R 4 <.f.f.<.a | i.i.+.E b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.U Q i.i.E , 8.h.h.h.g.>.Y  ...E U b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.Q | @. at .K 9 1.6.5.1.u w 5 Q E T E b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.E Q ....2 6 t t r q 0 0 8 Q E U K b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.E Q ..| U 7 y u u u u e / Q E U * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.U E | | Q U _ 3.7.7.3.` Q E U U * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.E E | Q Q E E ) o.O. .Q E U R K $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K E | Q Q Q E E E E E R R U U K K b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K E Q Q Q E I * * * K U U U K K U b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K U Q Q E * # ' :.0.[ P I U K K K b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K E Q Q I @ :.z.x.x.l.} I U K K $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.* U E E * x y.u.u.y.J S z U K * * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K U E E * C G H G Z V B l R K * * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.U U E R K x A D D D D A ( E * * $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K K E R K I ,.t.t.t.t.;.Q K * * $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.* K R U U I U X.0.0.X.Q U * * $ * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.* K U U U U K R R E R K K * * O * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K K U U I I K $ $ * * * * * * O o b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.R U U I L * o + d f = * * $ $ o X b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.K K K K * O ^ k.c.c.j.~ K * $ o X b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.* K K K $ - e.d.d.d.r.%.s K $ o o b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.O * K K $ k M N m n > : ; U o o $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.$ * K K & h n n n b v c j K o X $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.* * * * * p $.=.-.-.=.#.W * o . . b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.U K * * * = W *.w.q.&.] U o o X $ b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.K * * * & * U E E U * o X X . * b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.U * $ $ o $ o o o X X X . . X K b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b."
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,212 @@
+/* XPM */
+static char *kuser-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 190 2",
+"   c black",
+".  c #000009",
+"X  c #000C1F",
+"o  c #0F1B03",
+"O  c #001026",
+"+  c #091627",
+"@  c #002500",
+"#  c #062700",
+"$  c #052900",
+"%  c #0D2700",
+"&  c #083302",
+"*  c #1C3E06",
+"=  c #19212F",
+"-  c #00007F",
+";  c #0A284C",
+":  c #002A6A",
+">  c #084100",
+",  c #0F4605",
+"<  c #145A0D",
+"1  c #177A10",
+"2  c #265909",
+"3  c #335514",
+"4  c #305A2E",
+"5  c #256A05",
+"6  c #367433",
+"7  c #1B4A7E",
+"8  c #1E4B7E",
+"9  c #204772",
+"0  c #254B73",
+"q  c #354A60",
+"w  c #32577E",
+"e  c #507D20",
+"r  c #46586D",
+"t  c #004499",
+"y  c #2F629A",
+"u  c #3266A0",
+"i  c #425F80",
+"p  c #5C7286",
+"a  c #657B8F",
+"s  c #128A22",
+"d  c #1AAE07",
+"f  c #208402",
+"g  c #2CAB16",
+"h  c #2DB202",
+"j  c #2BB409",
+"k  c #30B302",
+"l  c #38B716",
+"z  c #3EB13C",
+"x  c #39C000",
+"c  c #3EC001",
+"v  c #3DC118",
+"b  c #42BD17",
+"n  c #46BF16",
+"m  c #43B823",
+"M  c #46B232",
+"N  c #67981E",
+"B  c #639427",
+"V  c #50AA7A",
+"C  c #67AD61",
+"Z  c #41C600",
+"A  c #46CD0D",
+"S  c #49C800",
+"D  c #4ACA00",
+"F  c #4DCD00",
+"G  c #48C116",
+"H  c #51CF00",
+"J  c #53CE00",
+"K  c #51C61B",
+"L  c #51C71A",
+"P  c #52C61B",
+"I  c #53D000",
+"U  c #55D000",
+"Y  c #59D400",
+"T  c #5ED700",
+"R  c #4EC320",
+"E  c #62D60E",
+"W  c #68DF00",
+"Q  c #65C528",
+"!  c #6EE100",
+"~  c #72E400",
+"^  c #78E40A",
+"/  c #7AE32C",
+"(  c #6EC54E",
+")  c #6DC664",
+"_  c #6EC764",
+"`  c #6EC667",
+"'  c #6BCB69",
+"]  c #72C96F",
+"[  c #479F80",
+"{  c #4E9F9A",
+"}  c #5F80A7",
+"|  c #5787B2",
+" . c #5C89BE",
+".. c #569FB5",
+"X. c #728397",
+"o. c #72869A",
+"O. c #68A088",
+"+. c #67AFA9",
+"@. c #6CB6B6",
+"#. c #528CC5",
+"$. c #5E8FC9",
+"%. c #5EA0DF",
+"&. c #709CCE",
+"*. c #71ABC6",
+"=. c #67A9E1",
+"-. c #6CACF3",
+";. c #73B7F6",
+":. c #7FB0FA",
+">. c #7CBBFA",
+",. c #7EB8F8",
+"<. c #81B67D",
+"1. c #84EB11",
+"2. c #8DF210",
+"3. c #98FC19",
+"4. c #80E033",
+"5. c #87F121",
+"6. c #A0FF12",
+"7. c #89D354",
+"8. c #82CE6E",
+"9. c #84CF74",
+"0. c #85D171",
+"q. c #88D57E",
+"w. c #9AE44A",
+"e. c #96E052",
+"r. c #82BDEF",
+"t. c #86BFFA",
+"y. c #88BFF5",
+"u. c #8DBBFA",
+"i. c #9BBAE1",
+"p. c #9BBCE2",
+"a. c #87CA86",
+"s. c #92C58E",
+"d. c #B4EAB4",
+"f. c #82C3FB",
+"g. c #85C6FD",
+"h. c #8AC2F1",
+"j. c #8AC3F1",
+"k. c #8BC6F3",
+"l. c #8BC4F5",
+"z. c #8FC5F1",
+"x. c #8EC5F9",
+"c. c #8DC8F4",
+"v. c #9BCAEE",
+"b. c #90C6F2",
+"n. c #92C8F2",
+"m. c #96CEF5",
+"M. c #97CFF5",
+"N. c #9AC6F1",
+"B. c #9AC7F1",
+"V. c #9BC6F1",
+"C. c #9BC7F1",
+"Z. c #98CFF5",
+"A. c #98CFF6",
+"S. c #9ED3F6",
+"D. c #9ED4F6",
+"F. c #9ED4F7",
+"G. c #99D4FF",
+"H. c #9FD7FF",
+"J. c #A6CDF2",
+"K. c #A5CEF7",
+"L. c #ADCFFC",
+"P. c #A1D0F8",
+"I. c #A1D6F8",
+"U. c #A1D7F8",
+"Y. c #B0D3F5",
+"T. c #B2D5F6",
+"R. c #AEE0FA",
+"E. c #AFE1FB",
+"W. c #B6E0FF",
+"Q. c #B6E5FF",
+"!. c #B8E6FD",
+"~. c #B9E7FD",
+"^. c #BFEBFF",
+"/. c #C2DFF7",
+"(. c #C2DFF8",
+"). c #C7EAC8",
+"_. c #C6ECC8",
+"`. c #C7ECC9",
+"'. c #C0EDFF",
+"]. c #CEF3FF",
+"[. c #CFF4FF",
+"{. c #D3E7FF",
+"}. c #D4E7FB",
+"|. c #D3E9FF",
+" X c #D4E8FC",
+".X c #D1FAFF",
+"XX c #D1FBFF",
+"oX c #DEFFFF",
+"OX c #DFFFFF",
+"+X c None",
+/* pixels */
+"+X+X+X+X+X+X+X+X< C s.<.4   +X+X",
+"+X+X+X+X+X+X+X& a._.)._.d.6   +X",
+"+X+X+X- t :   1 ' ` ` ) ] z @ +X",
+"+X+X; $.p.i.} s j b G n l d > +X",
+"+XX &.|.}. X{.*.g F Y I Z h # +X",
+"+X7 t.V.B.V.V.:.[ ^ 2.1.E 5   +X",
+"+Xy ;.r.j.j.r.-...7.w.e.( , +X+X",
+"+X9 g.A.U.U.m.,.+.0.8.9.q.M $ +X",
+"+X. | !. X].W. at .m P P P R G f   ",
+"+X  u K.'.'.L.{ c I J J D k k % ",
+"+X8 z.Y.J.J.Y.u.V W ~ ! W F A 2 ",
+"O %.z.z.z.z.z.f.=./ 6.3.5.4.Q , ",
+"0 f.c.A.D.D.A.c.,.O.N B e 3 o   ",
+"#.H.I.E.!.!.T.F.G. .      +X+X+X",
+"w v.^.XXOXOXXX'.F.i   +X+X+X+X+X",
+"  + q p X.o.a r =   +X+X+X+X+X+X"
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/icons/kuser.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kuser[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #000009",
+"X  c #020A00",
+"o  c #000818",
+"O  c #081001",
+"+  c #000C22",
+"@  c #051225",
+"#  c #001939",
+"$  c #151F2D",
+"%  c #002B00",
+"&  c #0B2603",
+"*  c #003B00",
+"=  c #0B3200",
+"-  c #132903",
+";  c #1D3805",
+":  c #17263C",
+">  c #15253A",
+",  c #001F46",
+"<  c #00007F",
+"1  c #062850",
+"2  c #0A2D57",
+"3  c #052D5A",
+"4  c #1B2B41",
+"5  c #002A6A",
+"6  c #002E73",
+"7  c #0B3669",
+"8  c #003574",
+"9  c #22385B",
+"0  c #034C01",
+"q  c #004000",
+"w  c #075400",
+"e  c #144503",
+"r  c #036900",
+"t  c #0B7C00",
+"y  c #126400",
+"u  c #187103",
+"i  c #187D10",
+"p  c #284806",
+"a  c #275608",
+"s  c #2E5229",
+"d  c #217A19",
+"f  c #2D7E26",
+"g  c #174374",
+"h  c #1A766F",
+"j  c #1F7E75",
+"k  c #27456A",
+"l  c #425C7E",
+"z  c #094185",
+"x  c #1C569C",
+"c  c #0044AA",
+"v  c #385A85",
+"b  c #205FA8",
+"n  c #2267B3",
+"m  c #2F71BA",
+"M  c #316CAC",
+"N  c #306CB1",
+"B  c #377BBB",
+"V  c #2C73C3",
+"C  c #2C79C1",
+"Z  c #337CCE",
+"A  c #387CC3",
+"S  c #405E87",
+"D  c #5179A7",
+"F  c #178201",
+"G  c #1E8418",
+"H  c #0BA302",
+"J  c #16A701",
+"K  c #1DA81B",
+"L  c #309007",
+"P  c #2D890F",
+"I  c #368F2F",
+"U  c #3A9834",
+"Y  c #23AD01",
+"T  c #24A309",
+"R  c #2CAA1D",
+"E  c #25B400",
+"W  c #2BB401",
+"Q  c #33AE05",
+"!  c #34BB02",
+"~  c #39BD01",
+"^  c #35B808",
+"/  c #31AF22",
+"(  c #33AD30",
+")  c #3FB729",
+"_  c #38B136",
+"`  c #1F845E",
+"'  c #338D5C",
+"]  c #38A54B",
+"[  c #3EC100",
+"{  c #4AAD13",
+"}  c #44B517",
+"|  c #55AB14",
+" . c #46A60D",
+".. c #42BA29",
+"X. c #49BD28",
+"o. c #40BA25",
+"O. c #75BF28",
+"+. c #519014",
+"@. c #4B9744",
+"#. c #41A35A",
+"$. c #5EB25C",
+"%. c #59BD51",
+"&. c #55BB53",
+"*. c #51AD66",
+"=. c #44C302",
+"-. c #44C10A",
+";. c #48C700",
+":. c #4CCA00",
+">. c #45C800",
+",. c #51CD00",
+"<. c #54CD0C",
+"1. c #56D000",
+"2. c #5BD300",
+"3. c #5ED20E",
+"4. c #4DC81C",
+"5. c #4DC028",
+"6. c #5CC82E",
+"7. c #55C428",
+"8. c #5AC633",
+"9. c #5DC832",
+"0. c #56C236",
+"q. c #60D601",
+"w. c #63D900",
+"e. c #6BDE00",
+"r. c #66D514",
+"t. c #74D11A",
+"y. c #6BD634",
+"u. c #7ECD3F",
+"i. c #7BDC26",
+"p. c #7FDF36",
+"a. c #6DE100",
+"s. c #75E500",
+"d. c #7BEA00",
+"f. c #5EC151",
+"g. c #62C451",
+"h. c #6CC45F",
+"j. c #7BC848",
+"k. c #75CD5E",
+"l. c #78CF5E",
+"z. c #7CC657",
+"x. c #77CD63",
+"c. c #7CCA79",
+"v. c #76C873",
+"b. c #7AD060",
+"n. c #3A88AC",
+"m. c #3E87DF",
+"M. c #5EA49F",
+"N. c #698AB3",
+"B. c #77B99A",
+"V. c #4B83C3",
+"C. c #5498C7",
+"Z. c #5591D0",
+"A. c #4892E7",
+"S. c #5B9DE5",
+"D. c #529CE7",
+"F. c #5798F0",
+"G. c #5AA4ED",
+"H. c #6293CC",
+"J. c #6196E5",
+"K. c #6EACC2",
+"L. c #66A3DF",
+"P. c #77ACDE",
+"I. c #69ABEB",
+"U. c #66A8E8",
+"Y. c #69A6F1",
+"T. c #6EB0ED",
+"R. c #75B4ED",
+"E. c #7AB6EE",
+"W. c #7EBBEF",
+"Q. c #74B4F2",
+"!. c #7CBAF3",
+"~. c #7BB4F2",
+"^. c #8CD539",
+"/. c #84F000",
+"(. c #99F41F",
+"). c #91ED2C",
+"_. c #9AED39",
+"`. c #9BF527",
+"'. c #92ED33",
+"]. c #A6FC29",
+"[. c #A2FB25",
+"{. c #8ECC7E",
+"}. c #96E849",
+"|. c #B0F84A",
+" X c #B3FA45",
+".X c #A7EE48",
+"XX c #81AAD4",
+"oX c #84ACE3",
+"OX c #84BCEE",
+"+X c #8ABDED",
+"@X c #84BAE7",
+"#X c #80BEF0",
+"$X c #8ABCF3",
+"%X c #82BCF8",
+"&X c #90B8E1",
+"*X c #9DBDF5",
+"=X c #80CD80",
+"-X c #8DD08D",
+";X c #93D58C",
+":X c #99D887",
+">X c #99D993",
+",X c #97CC94",
+"<X c #A1DAA1",
+"1X c #A9DDA9",
+"2X c #B1DFAF",
+"3X c #BEE5BD",
+"4X c #8FC3EF",
+"5X c #85C1F1",
+"6X c #8BC4F2",
+"7X c #8EC8F3",
+"8X c #8ECAFC",
+"9X c #9BC3EE",
+"0X c #90C1EF",
+"qX c #93C4F1",
+"wX c #94CBF3",
+"eX c #9DC5F0",
+"rX c #98CEF5",
+"tX c #91CCFF",
+"yX c #9BD1F6",
+"uX c #A2C4E8",
+"iX c #A3CBF1",
+"pX c #A4CBF2",
+"aX c #A4D1F4",
+"sX c #A3D6F9",
+"dX c #A6D9F8",
+"fX c #ACDDF9",
+"gX c #B6D4F4",
+"hX c #B2DCF9",
+"jX c #B9D5F3",
+"kX c #B8D8F5",
+"lX c #B8DFFB",
+"zX c #AFE1FB",
+"xX c #B3E2FB",
+"cX c #BAE5FD",
+"vX c #BCEAFE",
+"bX c #C0DBF8",
+"nX c #CDEBCD",
+"mX c #D4F1D4",
+"MX c #DAF1DA",
+"NX c #C5E0F9",
+"BX c #C2EEFF",
+"VX c #C8E7FC",
+"CX c #CBF1FF",
+"ZX c #C6F1FF",
+"AX c #D4E5F8",
+"SX c #D9EAFC",
+"DX c #D4F4FE",
+"FX c #DBF4FE",
+"GX c #DBFAFF",
+"HX c #D7F8FF",
+"JX c #E0EEFE",
+"KX c #EAF9EA",
+"LX c #E5F3FD",
+"PX c #E3FCFF",
+"IX c #E8FEFF",
+"UX c #F3FAFF",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXw r i I U i 0   YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX0 f ,XMXKXKXKX2X at .% YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX* U 3XMXnXnXnXnXMXmX$.% YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXX G >X1X<X<X<X<X<X<X1X<XG O YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYX* ( =Xc.c.c.c.c.c.c.c.=X_ * YXYXYXYX",
+"YXYXYXYXYXYXYXYX< c 8 5 YX  r K &.&.f.f.g.g.f.f.%.&.K r   YXYXYX",
+"YXYXYXYXYXYX6 z m Z.H.V.x # t H R ) ..5.5.7.5.X.) / H F   YXYXYX",
+"YXYXYXYXYX# m uXLXUXUXUXSXoXh K J ! ~ [ -.-.-.~ ^ J J F   YXYXYX",
+"YXYXYXYX+ N bXSXSXAXAXAXAXSX*X` E [ >.,.,.,.:.>.[ W E u   YXYXYX",
+"YXYXYXYXz $XbXgXgXgXgXgXgXjXbXJ.` >.1.2.w.a.2.1.;.[ ! e   YXYXYX",
+"YXYXYX+ V qX9XeXiXiXpXpXpX9XpXE.C 5.2.a.s.s.a.2.3.<.L X YXYXYXYX",
+"YXYXYX1 A.E.0X0XqXqX9XqXqX+X+XI.m.$.).).`.(.).).i. .&   YXYXYXYX",
+"YXYXYX2 D.I.W.OX+X6X6X5X5X at XR.G.A.' t._. X X_.^.{ y   YXYXYXYXYX",
+"YXYXYX2 G.T.E.W.5X6X6X6X5XW.R.I.S.M.:Xz.j.u.j.{.-XR w   YXYXYXYX",
+"YXYXYX# D.!.5X7XrXyXyXrXwX6XW.R.S.B.:X>X;X;X>X>X>Xc.T = YXYXYXYX",
+"YXYXYX. B 8XwXyXdXfXzXfXsXrX7X%XC.h.l.l.l.l.l.k.k.b...F X YXYXYX",
+"YXYXYXYX1 R.xXhXxXvXvXcXhXfXaXU.#.7.8.9.6.6.6.9.8.0.) Y e YXYXYX",
+"YXYXYXYX  g 0XCXDXHXFXDXCXNX at X] ~ -.-.-.=.=.;.-.-.^ ^ W L   YXYX",
+"YXYXYXYXYX3 Z +XcXFXLXDXlX$XB R [ =.:.,.,.,.:.:.=.~ ~ W Q = YXYX",
+"YXYXYXYX, Z $XjX9X9XeXuXpXgXOXn.) 1.1.2.2.w.2.1.,.;.~ ! ~ a YXYX",
+"YXYXYX. n !.kXkXkXjXgXkXkXkXjXY.n.1.w.e.a.e.e.w.2.,.>.~ ~ L . YX",
+"YXYXYX7 G.qXiXiXaXaXaXaXpXyXyX+XF.*.a.s.d.d.s.a.w.2.>.[ 4.{ O YX",
+"YXYXo A Q.6X4XwXqXwX9XwXwX4X4X5XI.C.r.d././.d.s.a.3.3.y.y.| O YX",
+"YXYX7 I.W.OX5X7X4X7X7X7X6X6X5XW.E.Y.v.[.].].`._._.}.}.^.| ;   YX",
+"YX  N %X#X6X7X7XwXyXrXyXrXwX6X5XW.Q.K..X|.|..X.X^.6.+.a O   YXYX",
+"YX@ Z.6X6X7XyXyXdXdXdXdXaXyXrX7X5X5XJ.s p p p ; - O       YXYXYX",
+"YX2 Q.6XwXyXdXzXxXxXxXxXfXdXyXrX7X5X!.9 YX      YXYXYXYXYXYXYXYX",
+"YXb rXrXyXyXfXzXvXvXvXvXcXzXdXyXwXrXtXv YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXg 6XcXfXzXxXvXBXZXZXZXvXcXhXhXfXfXtXk   YXYXYXYXYXYXYXYXYXYXYX",
+"YX  g P.cXZXGXGXPXIXIXIXGXHXDXCXcX$XS X YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYX  + k D XXuXjXbXAXNXhXaX&XN.S $   YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX    . @ > : : 4 : @ .       YXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kcron.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kcron.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kcron.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/kcron
+debian/tmp/usr/share/applications/kde/kcron.desktop
+debian/tmp/usr/share/apps/kcron/kcronui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/kcron.png
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/kcronstart.png
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/newtask.png
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/newvariable.png
+debian/tmp/usr/share/doc/kde/HTML/en/kcron/print.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kcron.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kcron.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kcron.png
+
+debian/icons/kcron.xpm		/usr/share/pixmaps
+debian/icons/kcron-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kcron.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kcron.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kcron.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/kcron.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kcron.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kcron.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kcron.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(kcron):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDE Task Scheduler"\
+	icon32x32="/usr/share/pixmaps/kcron.xpm"\
+	icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+	command="/usr/bin/kcron"
+
+# Icon 32x32 kcron/cr32-app-kcron.png kcron.xpm
+# Icon 16x16 kcron/cr16-app-kcron.png kcron-16.xpm

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdat.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdat.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdat.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+debian/tmp/usr/bin/kdat
+debian/tmp/usr/share/applications/kde/kdat.desktop
+debian/tmp/usr/share/apps/kdat/icons/hicolor/16x16/apps/kdat.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_archive.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_backup.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_eject.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_mounted.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_restore.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_all.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_none.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_some.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_unmounted.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_verify.png
+debian/tmp/usr/share/apps/kdat/icons/hicolor/22x22/apps/kdat.png
+debian/tmp/usr/share/apps/kdat/icons/hicolor/32x32/apps/kdat.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_backup.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_restore.png
+debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_verify.png
+debian/tmp/usr/share/apps/kdat/icons/hicolor/48x48/apps/kdat.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_archive.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_backup.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_eject.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_mounted.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_restore.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_all.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_none.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_some.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_unmounted.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_verify.png
+debian/tmp/usr/share/apps/kdat/icons/locolor/32x32/apps/kdat.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdat/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdat/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdat/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kdat.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kdat.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kdat.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kdat.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kdat.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kdat.png
+
+debian/icons/kdat.xpm		/usr/share/pixmaps
+debian/icons/kdat-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdat.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdat.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdat.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/kdat.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdat.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdat.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdat.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(kdat):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDat"\
+	icon32x32="/usr/share/pixmaps/kdat.xpm"\
+	icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+	command="/usr/bin/kdat"
+
+# Icon 32x32 kdat/pics/cr32-app-kdat.png kdat.xpm
+# Icon 16x16 kdat/pics/cr32-app-kdat.png kdat-16.xpm

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeadmin-doc-html-kcron
+Title: Kcron Handbook
+Author: Morgan Sandquist, Gary Meyer, Lauri Watts
+Abstract: Kcron is an application that schedules programs to be run.
+Section: System
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcron/index.html
+Files: /usr/share/doc/kde/HTML/en/kcron/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeadmin-doc-html-kdat
+Title: Kdat Handbook
+Author: Sean Vyain
+Abstract: KDE tape management.
+Section: Admin 
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdat/index.html
+Files: /usr/share/doc/kde/HTML/en/kdat/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeadmin-doc-html-knetworkconf
+Title: KNetworkConf Handbook
+Author: Sean Wheller, Christoph Eckert
+Abstract: KNetworkConf is a graphical manager for network devices and settings.
+Section: Admin
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knetworkconf/index.html
+Files: /usr/share/doc/kde/HTML/en/knetworkconf/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdeadmin-doc-html-kpackage
+Title: KPackage Handbook
+Author: Toivo Pedaste, Lauri Watts 
+Abstract: KPackage is a graphical interface to the RPM, Debian,
+ Slackware and BSD package managers.
+Section: Admin
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpackage/index.html
+Files: /usr/share/doc/kde/HTML/en/kpackage/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeadmin-doc-html-ksysv
+Title: KSysV Handbook
+Author: Peter Putzer 
+Abstract: KSysV is a graphical editor for the SysV style init configuration.
+Section: Admin
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksysv/index.html
+Files: /usr/share/doc/kde/HTML/en/ksysv/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeadmin-doc-html-kuser
+Title: KUser Handbook
+Author: Matt Johnston, Lauri Watts, Jonathan Singer
+Abstract: KUser allows you to manage users and groups on your system. 
+Section: Admin
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kuser/index.html
+Files: /usr/share/doc/kde/HTML/en/kuser/*.html
+

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-kfile-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-kfile-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kdeadmin-kfile-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/kde3/kfile_deb.la
+debian/tmp/usr/lib/kde3/kfile_deb.so
+debian/tmp/usr/lib/kde3/kfile_rpm.la
+debian/tmp/usr/lib/kde3/kfile_rpm.so
+debian/tmp/usr/share/services/kfile_deb.desktop
+debian/tmp/usr/share/services/kfile_rpm.desktop

Added: people/jriddell/KDE/3.5/kdeadmin/debian/knetworkconf.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/knetworkconf.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/knetworkconf.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,57 @@
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/01.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/02.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/11.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/03.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/04.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/05.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/06.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/07.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/about1.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/08.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/09.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/knetworkconf/common
+debian/tmp/usr/share/icons/hicolor/32x32/apps/knetworkconf.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/knetworkconf.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/knetworkconf.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png
+debian/tmp/usr/share/apps/knetworkconf/backends/network-conf
+debian/tmp/usr/share/apps/knetworkconf/backends/debug.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/file.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/general.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/network.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/parse.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/platform.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/process.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/replace.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/report.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/service.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/service-list.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/util.pl
+debian/tmp/usr/share/apps/knetworkconf/backends/xml.pl
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/ark.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/debian.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/mandrake.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/blackpanther.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/pld.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/redhat.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/rpath.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/suse.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/turbolinux.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/conectiva.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/fedora.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/openna.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/slackware.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/freebsd.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/gentoo.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/vine.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/kubuntu.png
+debian/tmp/usr/share/apps/knetworkconf/pixmaps/yoper.png
+debian/tmp/usr/share/applications/kde/kcm_knetworkconfmodule.desktop
+debian/tmp/usr/lib/kde3/kcm_knetworkconfmodule.so
+debian/tmp/usr/lib/kde3/kcm_knetworkconfmodule.la
+debian/tmp/usr/lib/pkgconfig/system-tools-backends.pc

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+debian/tmp/usr/bin/kpackage
+debian/tmp/usr/share/applications/kde/kpackage.desktop
+debian/tmp/usr/share/apps/kpackage/kpackageui.rc
+debian/tmp/usr/share/apps/kpackage/pics/bnew.png
+debian/tmp/usr/share/apps/kpackage/pics/bsd.png
+debian/tmp/usr/share/apps/kpackage/pics/bupdated.png
+debian/tmp/usr/share/apps/kpackage/pics/cross.png
+debian/tmp/usr/share/apps/kpackage/pics/dbad.png
+debian/tmp/usr/share/apps/kpackage/pics/deb.png
+debian/tmp/usr/share/apps/kpackage/pics/dnew.png
+debian/tmp/usr/share/apps/kpackage/pics/dupdated.png
+debian/tmp/usr/share/apps/kpackage/pics/ftin.xpm
+debian/tmp/usr/share/apps/kpackage/pics/ftout.xpm
+debian/tmp/usr/share/apps/kpackage/pics/kiss.png
+debian/tmp/usr/share/apps/kpackage/pics/knew.png
+debian/tmp/usr/share/apps/kpackage/pics/kupdated.png
+debian/tmp/usr/share/apps/kpackage/pics/noball.png
+debian/tmp/usr/share/apps/kpackage/pics/ptick.png
+debian/tmp/usr/share/apps/kpackage/pics/question.png
+debian/tmp/usr/share/apps/kpackage/pics/rnew.png
+debian/tmp/usr/share/apps/kpackage/pics/rpm.png
+debian/tmp/usr/share/apps/kpackage/pics/rupdated.png
+debian/tmp/usr/share/apps/kpackage/pics/slack.png
+debian/tmp/usr/share/apps/kpackage/pics/snew.png
+debian/tmp/usr/share/apps/kpackage/pics/supdated.png
+debian/tmp/usr/share/apps/kpackage/pics/tick.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/bsdloc.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/common
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/debaptloc.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/debloc.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/handle.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/install.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/left.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-change.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-files.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-prop.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/root-prompt.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/rpmloc.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/slackloc.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/uninstall.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kpackage.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kpackage.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kpackage.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kpackage.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kpackage.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kpackage.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/search.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/searchf.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpackage/searchl.png
+
+debian/icons/kpackage.xpm		/usr/share/pixmaps
+debian/icons/kpackage-16.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/kpackage.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(kpackage):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDE Package Manager"\
+	icon32x32="/usr/share/pixmaps/kpackage.xpm"\
+	icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+	command="/usr/bin/kpackage"
+
+# Icon 32x32 kpackage/icon/cr32-app-kpackage.png kpackage.xpm
+# Icon 16x16 kpackage/icon/cr16-app-kpackage.png kpackage-16.xpm

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.mime
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kpackage.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+application/x-deb;	kpackage -caption "Package Manager" %s;	nametemplate=%s.deb;	test=test "$DISPLAY" != "";	priority=7
+application/x-rpm;	kpackage -caption "Package Manager" %s;	nametemplate=%s.rpm;	test=test "$DISPLAY" != "";	priority=7

Added: people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+debian/tmp/usr/bin/ksysv
+debian/tmp/usr/share/applications/kde/ksysv.desktop
+debian/tmp/usr/share/apps/ksysv/ksysvui.rc
+debian/tmp/usr/share/apps/ksysv/pics/ksysv_locked.png
+debian/tmp/usr/share/apps/ksysv/pics/ksysv_restart.png
+debian/tmp/usr/share/apps/ksysv/pics/ksysv_start.png
+debian/tmp/usr/share/apps/ksysv/pics/ksysv_stop.png
+debian/tmp/usr/share/apps/ksysv/pics/ksysv_unlocked.png
+debian/tmp/usr/share/doc/kde/HTML/en/ksysv/common
+debian/tmp/usr/share/doc/kde/HTML/en/ksysv/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ksysv/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/toggle_log.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ksysv.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/ksysv.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksysv.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/ksysv.png
+debian/tmp/usr/share/mimelnk/application/x-ksysv.desktop
+debian/tmp/usr/share/mimelnk/text/x-ksysv-log.desktop
+
+debian/icons/ksysv.xpm		/usr/share/pixmaps
+debian/icons/ksysv-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/ksysv.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/ksysv.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(ksysv):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDE SysV-Init Editor"\
+	icon32x32="/usr/share/pixmaps/ksysv.xpm"\
+	icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+	command="/usr/bin/ksysv"
+
+# Icon 32x32 ksysv/cr32-app-ksysv.png ksysv.xpm
+# Icon 16x16 ksysv/cr16-app-ksysv.png ksysv-16.xpm

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kuser.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kuser.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kuser.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+debian/tmp/usr/bin/kuser
+debian/tmp/usr/share/applications/kde/kuser.desktop
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png
+debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
+debian/tmp/usr/share/apps/kuser/kuserui.rc
+debian/tmp/usr/share/apps/kuser/pics/group.png
+debian/tmp/usr/share/apps/kuser/pics/user.png
+debian/tmp/usr/share/config.kcfg/kuser.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kuser/common
+debian/tmp/usr/share/doc/kde/HTML/en/kuser/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kuser/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kuser/kuser.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kuser.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kuser.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kuser.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kuser.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kuser.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kuser.png
+
+debian/icons/kuser.xpm		/usr/share/pixmaps
+debian/icons/kuser-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kuser.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kuser.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kuser.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/kuser.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/kuser.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/kuser.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/kuser.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(kuser):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDE User Manager"\
+	icon32x32="/usr/share/pixmaps/kuser.xpm"\
+	icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+	command="/usr/bin/kuser"
+
+# Icon 32x32 kuser/icon/cr32-app-kuser.png kuser.xpm
+# Icon 16x16 kuser/icon/cr16-app-kuser.png kuser-16.xpm

Added: people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/kde3/kcm_lilo.la
+debian/tmp/usr/lib/kde3/kcm_lilo.so
+debian/tmp/usr/share/applications/kde/lilo.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/lilo-config/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/lilo-config/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/lilo-config/common

Added: people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+lilo-config: menu-command-not-in-package /usr/lib/menu/lilo-config:6 /usr/bin/kdesu

Added: people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/lilo-config.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+?package(lilo-config):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="lilo-config"\
+	command="/usr/bin/kdesu kcmshell lilo"

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/kcron.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/kcron.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/kcron.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,333 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
+  <!ENTITY dhsurname   "<surname>Stone</surname>">
+  <!ENTITY dhdate      "<date>October 21, 2001</date>">
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>daniel at sfarc.net</email>">
+  <!ENTITY dhusername  "Daniel Stone">
+  <!ENTITY dhucpackage "<refentrytitle>KCRON</refentrytitle>">
+  <!ENTITY dhpackage   "kcron">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Views and sets cron daemon configuration.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is an application to configure cron 
+    services.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/kdat.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/kdat.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/kdat.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,333 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Pierre</firstname>">
+  <!ENTITY dhsurname   "<surname>Habouzit</surname>">
+  <!ENTITY dhdate      "<date>February 28, 2005</date>">
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>madcoder at debian.org</email>">
+  <!ENTITY dhusername  "Pierre Habouzit">
+  <!ENTITY dhucpackage "<refentrytitle>KDAT</refentrytitle>">
+  <!ENTITY dhpackage   "kdat">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2005</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>tar-based DAT archiver for KDE.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is a tar based tape archiver,
+      that is designed to work with multiple archives on a single tape.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/kpackage.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/kpackage.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/kpackage.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,349 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
+  <!ENTITY dhsurname   "<surname>Stone</surname>">
+  <!ENTITY dhdate      "<date>October 21, 2001</date>">
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>daniel at sfarc.net</email>">
+  <!ENTITY dhusername  "Daniel Stone">
+  <!ENTITY dhucpackage "<refentrytitle>KPACKAGE</refentrytitle>">
+  <!ENTITY dhpackage   "kpackage">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Installs, removes, and queries packages.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+      <arg><option>--remote<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>file<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is an application to install, remove 
+    and query packages in many formats, including RPM and DEB.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--remote &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Perform the actions on remote server <var>server</var> via SSH.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>&lt;file&gt;</option>
+	</term>
+	<listitem>
+	  <para>Name of the file (package) to install.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/ksysv.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/ksysv.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/ksysv.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,333 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
+  <!ENTITY dhsurname   "<surname>Stone</surname>">
+  <!ENTITY dhdate      "<date>October 21, 2001</date>">
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>daniel at sfarc.net</email>">
+  <!ENTITY dhusername  "Daniel Stone">
+  <!ENTITY dhucpackage "<refentrytitle>KSYSV</refentrytitle>">
+  <!ENTITY dhpackage   "ksysv">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Views and sets SysV init configuration.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is an application to configure SysV-like 
+    init services.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/kuser.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/kuser.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/kuser.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,333 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
+  <!ENTITY dhsurname   "<surname>Stone</surname>">
+  <!ENTITY dhdate      "<date>October 21, 2001</date>">
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>daniel at sfarc.net</email>">
+  <!ENTITY dhusername  "Daniel Stone">
+  <!ENTITY dhucpackage "<refentrytitle>KUSER</refentrytitle>">
+  <!ENTITY dhpackage   "kuser">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Configures users on the system.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is an application to configure users on 
+    the system.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/man/secpolicy.sgml
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/man/secpolicy.sgml	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/man/secpolicy.sgml	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,333 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
+  <!ENTITY dhsurname   "<surname>Stone</surname>">
+  <!ENTITY dhdate      "<date>October 21, 2001</date>">
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>daniel at sfarc.net</email>">
+  <!ENTITY dhusername  "Daniel Stone">
+  <!ENTITY dhucpackage "<refentrytitle>SECPOLICY</refentrytitle>">
+  <!ENTITY dhpackage   "secpolicy">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Views and sets PAM security policies.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help<replaceable></replaceable></option></arg>
+      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-qt<replaceable></replaceable></option></arg>
+      <arg><option>--version<replaceable> -v</replaceable></option></arg>
+      <arg><option>--license<replaceable></replaceable></option></arg>
+      <arg><option>--author<replaceable></replaceable></option></arg>
+      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
+      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
+      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--cmap<replaceable></replaceable></option></arg>
+      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
+      <arg><option>--nograb<replaceable></replaceable></option></arg>
+      <arg><option>--dograb<replaceable></replaceable></option></arg>
+      <arg><option>--sync<replaceable></replaceable></option></arg>
+      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
+      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
+      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
+      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
+      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
+      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
+      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
+      <arg><option>--noxim<replaceable></replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para><command>&dhpackage;</command> is an application to view and set PAM security 
+    policies.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below. However, the ordering is very strict -
+      --help/-h must come before hostname.</para>
+    <variablelist>
+      <varlistentry>
+        <term><option>-v</option>
+	  <option>--version</option>
+	</term>
+	<listitem>
+	  <para>Show version information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--author</option>
+	</term>
+	<listitem>
+	  <para>Show information about the author.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--license</option>
+	</term>
+	<listitem>
+	  <para>Show license information.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--caption &lt;caption&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the caption of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--icon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--miniicon &lt;icon&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the mini-icon of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dcopserver &lt;server&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specify the DCOP server to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nocrashhandler</option>
+	</term>
+	<listitem>
+	  <para>Disable KDE crash handler (enables core dumps).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--waitforwm</option>
+	</term>
+	<listitem>
+	  <para>Waits for a compatible window manager to start.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--style &lt;style&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the application's GUI style (overrides KDE).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--geometry &lt;geometry&gt;</option>
+	</term>
+	<listitem>
+	  <para>Sets the geometry of the window.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--display &lt;display&gt;</option>
+	</term>
+	<listitem>
+	  <para>Specifies the X display to use.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--session &lt;sessionid&gt;</option>
+	</term>
+	<listitem>
+	  <para>Restores the application for the given session ID.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--cmap</option>
+	</term>
+	<listitem>
+	  <para>Forces use of an internal colour map on an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--ncols &lt;count&gt;</option>
+	</term>
+	<listitem>
+	  <para>Limits the number of colours allowed in an 8-bit display.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--nograb</option>
+	</term>
+	<listitem>
+	  <para>Forces Qt to never grab the mouse or keyboard.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dograb</option>
+	</term>
+	<listitem>
+	  <para>Overrides --nograb, which may be implicitly set.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--sync</option>
+	</term>
+	<listitem>
+	  <para>Forces synchronous mode (for debugging).</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--font &lt;font&gt;</option>
+	  <option>--fn &lt;font&gt;</option></term>
+	<listitem>
+	  <para>Sets the default application font.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--background &lt;colour&gt;</option>
+	  <option>--bg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default background colour and application
+	  pallette.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--foreground &lt;colour&gt;</option>
+	  <option>--fg &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default foreground colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--button &lt;colour&gt;</option>
+	  <option>--btn &lt;colour&gt;</option></term>
+	<listitem>
+	  <para>Sets the default button colour.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--name &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application name.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--title &lt;name&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets the application title.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--visual TrueColor</option>
+	  </term>
+	<listitem>
+	  <para>Forces the application to use a True Colour visual on 8-bit
+	  displays.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--inputstyle &lt;style&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) input style. Possible values are: 
+	  onthespot, overthespot, offthespot, and root.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--im &lt;server&gt;</option>
+	  </term>
+	<listitem>
+	  <para>Sets X Input Method (XIM) server.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--noxim</option>
+	  </term>
+	<listitem>
+	  <para>Disables X Input Method (XIM) support.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public License
+      version 2 or any later version published by the Free Software Foundation.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/02_autotools_update.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp	2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp	2005-10-28 15:11:00.000000000 -0400
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2005-05-14.22
++scriptversion=2005-07-09.11
+ 
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+@@ -467,7 +467,8 @@
+   done
+ 
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+     sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/03_libtool_update.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6192 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in	2005-11-10 12:07:37.000000000 -0500
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file 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.
+ 
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +523,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,7 +541,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -578,7 +605,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -615,11 +644,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -643,7 +677,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -672,20 +706,53 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -924,20 +991,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1150,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1160,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1238,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -1169,7 +1247,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1275,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1329,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,7 +1352,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1285,8 +1364,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -1331,9 +1419,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1436,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1447,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1421,22 +1509,19 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  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
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -1446,6 +1531,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -1455,7 +1564,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -1484,7 +1593,11 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1617,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -1650,7 +1763,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -1712,7 +1827,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1886,7 +2001,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2111,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -2028,7 +2143,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2170,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -2088,44 +2212,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+-  
++
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -2141,7 +2257,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2158,42 +2274,21 @@
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -2212,19 +2307,14 @@
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -2234,7 +2324,6 @@
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -2342,13 +2431,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -2367,13 +2456,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2500,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2487,6 +2587,10 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -2500,7 +2604,7 @@
+ fi
+ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
+   else
+     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+@@ -2541,7 +2645,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2550,48 +2654,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2616,7 +2683,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2645,7 +2712,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2660,6 +2727,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2681,7 +2752,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2770,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2797,7 @@
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2827,22 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -2774,7 +2859,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -2795,6 +2880,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -2803,15 +2891,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +2909,12 @@
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+@@ -2840,8 +2928,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
+@@ -2854,16 +2942,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +2961,81 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       else
+-	case ${MACOSX_DEPLOYMENT_TARGET} in
+-	  10.[012])
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    ;;
+-	  10.*)
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	    ;;
+-	esac
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
+       fi
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    else
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-    fi
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    fi
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3046,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3070,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+@@ -2984,11 +3084,11 @@
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,7 +3098,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -3014,7 +3114,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3035,17 +3135,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3161,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -3079,9 +3179,9 @@
+     ;;
+   irix5* | irix6*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -3092,9 +3192,9 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3105,14 +3205,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -3130,20 +3230,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
+ 	# Intel C++
+ 	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
+ 	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3295,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3305,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -3192,15 +3316,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3350,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3375,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3394,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3409,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3438,7 @@
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3322,7 +3462,7 @@
+   sco*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3334,12 +3474,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3492,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -3389,9 +3526,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+-      gcx)
++      gcx*)
+ 	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3538,9 @@
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3549,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3432,7 +3569,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3542,7 +3679,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -3582,7 +3719,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -3618,6 +3755,21 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -3668,12 +3820,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3839,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -3691,8 +3847,10 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3743,20 +3901,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3803,11 +3968,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4003,12 @@
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+-  fi  
++  fi
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+     deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3887,7 +4058,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3953,11 +4124,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4159,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -4018,7 +4195,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4226,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4241,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4470,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -4335,9 +4515,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -4359,6 +4536,13 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+@@ -4366,7 +4550,7 @@
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris* | sysv5*)
+-  symcode='[[BDT]]'
++  symcode='[[BDRT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -4384,14 +4568,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
++  symcode='[[ABCDGIRSTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -4555,7 +4742,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -4580,18 +4767,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4599,22 +4796,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -4629,7 +4826,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -4640,18 +4837,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
+-	  cxx)
++	    ;;
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4871,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -4702,7 +4905,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -4711,13 +4914,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -4727,12 +4930,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4742,7 +4945,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4813,7 +5016,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4839,6 +5042,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5063,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4874,12 +5087,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -4900,9 +5120,14 @@
+       ;;
+ 
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -4924,6 +5149,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5181,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4984,7 +5214,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux*)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -5010,7 +5243,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5260,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5047,6 +5281,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -5084,7 +5339,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5094,13 +5349,13 @@
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,19 +5364,51 @@
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+-	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -5139,8 +5426,8 @@
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5155,24 +5442,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5206,9 +5488,20 @@
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -5225,7 +5518,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -5246,6 +5539,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5254,29 +5550,29 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       if test "$aix_use_runtimelinking" = yes; then
+ 	# Warning - without using the other runtime loading flags (-brtl),
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+@@ -5290,8 +5586,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -5304,7 +5600,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5610,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.[012])
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
+       esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
+       ;;
+ 
+     dgux*)
+@@ -5409,8 +5705,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +5714,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       fi
+@@ -5434,16 +5730,16 @@
+ 
+     hpux10* | hpux11*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -5453,7 +5749,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -5486,7 +5782,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +5792,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -5519,7 +5815,8 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -5529,7 +5826,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -5540,14 +5837,14 @@
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +5856,13 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5584,10 +5881,12 @@
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+       else
++	wlarc=''
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +5895,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +5915,7 @@
+       if test "x$host_vendor" = xsequent; then
+ 	# Use $CC to link under sequent, because it throws in some extra .o
+ 	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -5666,9 +5975,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5726,7 +6035,7 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+@@ -5860,7 +6169,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/ltmain.sh	2005-11-10 12:07:37.000000000 -0500
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+   cat <<EOF
+ $*
+ EOF
+-  exit 0
++  exit $EXIT_SUCCESS
+ fi
+ 
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+-  SP2NL="tr '\100' '\n'"
+-  NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
+   ;;
+- *) # Assume ASCII based system
+-  SP2NL="tr '\040' '\012'"
+-  NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
+   ;;
+ esac
+ 
+@@ -94,12 +113,14 @@
+ fi
+ 
+ # Make sure IFS has a sensible default
+-: ${IFS=" 	"}
++lt_nl='
++'
++IFS=" 	$lt_nl"
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -118,10 +139,14 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+@@ -130,7 +155,7 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+ 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+       if test "X$win32_nmres" = "Ximport" ; then
+@@ -140,7 +165,7 @@
+       fi
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +179,179 @@
+   $echo $win32_libid_type
+ }
+ 
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      status=$?
++      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+ 
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +371,13 @@
+       ;;
+     tag)
+       tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+ 	;;
+       esac
+ 
+@@ -191,10 +387,10 @@
+ 	# not specially marked.
+ 	;;
+       *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+@@ -220,24 +416,25 @@
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
++    exit $?
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-    exit 0
++    exit $?
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --dry-run | -n)
+@@ -256,7 +453,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,6 +465,7 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --tag) prevopt="--tag" prev=tag ;;
+@@ -275,6 +473,7 @@
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -285,7 +484,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,7 +497,7 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+@@ -311,7 +510,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+@@ -354,7 +553,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -369,13 +568,15 @@
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
+     suppress_output=
+     arg_mode=normal
+     libobj=
++    later=
+ 
+     for arg
+     do
+-      case "$arg_mode" in
++      case $arg_mode in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+@@ -394,24 +595,19 @@
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+-	-static)
+-	  build_old_libs=yes
++	-static | -prefer-pic | -prefer-non-pic)
++	  later="$later $arg"
+ 	  continue
+ 	  ;;
+ 
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
+-
+-	-prefer-non-pic)
+-	  pic_mode=no
++	-no-suppress)
++	  suppress_opt=no
+ 	  continue
+ 	  ;;
+ 
+@@ -424,7 +620,7 @@
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+@@ -462,7 +658,10 @@
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+@@ -474,11 +673,11 @@
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+@@ -511,51 +710,39 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base compile
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
++    func_infer_tag $base_compile
++
++    for arg in $later; do
++      case $arg in
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
+ 	;;
+       esac
+-    fi
++    done
+ 
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+@@ -568,7 +755,7 @@
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+@@ -579,7 +766,7 @@
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -598,7 +785,7 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -608,7 +795,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -626,14 +813,19 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+-      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+@@ -655,10 +847,10 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+@@ -681,7 +873,7 @@
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -701,7 +893,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +914,9 @@
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
++      if test "$suppress_opt" = yes; then
++        suppress_output=' >/dev/null 2>&1'
++      fi
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+@@ -736,9 +930,9 @@
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -751,7 +945,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +965,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1003,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1029,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1041,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1061,7 @@
+     no_install=no
+     objs=
+     non_pic_objects=
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -881,6 +1075,8 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+@@ -912,7 +1108,6 @@
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+-      base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+@@ -976,7 +1171,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -991,6 +1186,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1223,7 @@
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+@@ -1076,7 +1276,7 @@
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		else
+ 		  # Dry-run case.
+ 
+@@ -1097,7 +1297,7 @@
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+@@ -1109,7 +1309,7 @@
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -1149,16 +1349,15 @@
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-	        *" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-              esac
+-              ;;
+-   	  esac
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++        darwin_framework)
++	  compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1409,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -1220,6 +1419,14 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch)
++        prev=darwin_framework
++        compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++        continue
++        ;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1453,7 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1280,18 +1487,18 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    continue
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1301,18 +1508,36 @@
+ 	continue
+ 	;;
+ 
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1365,6 +1590,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1617,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1473,11 +1703,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1713,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1740,7 @@
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+@@ -1569,7 +1793,7 @@
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  else
+ 	    # Dry-run case.
+ 
+@@ -1623,7 +1847,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1860,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
+-    fi
+-
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $compile_command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1722,7 +1904,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +1914,7 @@
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
++      # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+@@ -1785,7 +1967,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +1993,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -1823,18 +2008,23 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    compiler_flags="$compiler_flags $deplib"
++	  fi
++	  continue
++	  ;;
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+-	  if test "$pass" = conv && test "$allow_undefined" = yes; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    for search_ext in .la $shrext .so .a; do
++	    for search_ext in .la $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+@@ -1895,18 +2085,6 @@
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -1922,11 +2100,11 @@
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2132,22 @@
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2005,14 +2198,14 @@
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2221,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2230,6 @@
+ 	*) . ./$lib ;;
+ 	esac
+ 
+-	case $host in
+-	*-*-darwin*)
+-	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+-	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  ;;
+-	esac
+-
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2240,32 @@
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    #echo "Adding $deplib to \$deplibs"
+-	    deplibs="$deplib $deplibs"
+-            if test "X$duplicate_deps" = "Xyes" ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-            fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+-    
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -2086,16 +2273,18 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2321,19 @@
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+@@ -2144,7 +2341,7 @@
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -2171,7 +2368,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2209,12 +2406,12 @@
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
+ 	      esac
+ 	    fi
+ 
+@@ -2258,17 +2455,18 @@
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+-	    $echo "*** $linklib is not portable!"    
+-      fi	  
++	    $echo "*** $linklib is not portable!"
++	  fi
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+@@ -2326,9 +2524,10 @@
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
++	      cmds=$extract_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2339,9 +2538,10 @@
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      cmds=$old_archive_from_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -2364,9 +2564,9 @@
+ 		case $host in
+ 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+@@ -2374,7 +2574,7 @@
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+-		      fi 
++		      fi
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2597,9 @@
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+-		  case "$libdir" in
++		  case $libdir in
+ 		    [\\/]*)
+-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2416,7 +2616,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -2459,7 +2659,8 @@
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+@@ -2469,9 +2670,9 @@
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+-		case "$libdir" in
++		case $libdir in
+ 		  [\\/]*)
+-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2530,17 +2731,16 @@
+ 	      fi
+ 	    fi
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+-	  #if test -n "$dependency_libs" &&
+-	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+-	  #     test "$link_static" = yes; }; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2554,7 +2754,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2796,18 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+-		    # Sure, some shells/systems don't implement the -ef.
+-		    # Those will have to live with the warning.
+-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
++		  # we do not want to link against static libs,
++		  # but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+@@ -2617,55 +2815,45 @@
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+-		   fi
++		    fi
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+ 		    *) newlib_search_path="$newlib_search_path $path";;
+ 		    esac
+-		    path=""
+ 		  fi
++		  path=""
+ 		  ;;
+ 		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
++		  path="-L$path"
++		  ;;
++		esac
+ 		;;
+-		  -l*)
++	      -l*)
+ 		case $host in
+ 		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
+ 		  ;;
+ 		*) continue ;;
+-		esac  		  
+-		;;
+-
+-	      *.ltframework)
+-		case $host in
+-		  *-*-darwin*)
+-		    depdepl="$deplib"
+-		    ;;
+ 		esac
+ 		;;
+-
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+-	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
+-	      case " $deplibs " in
+ 	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+@@ -2752,7 +2940,8 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2812,19 +3001,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3024,7 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3072,13 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+-	
++
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+@@ -2918,6 +3107,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -2929,36 +3123,36 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ 	*)
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -2975,7 +3169,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3047,7 +3241,7 @@
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -3098,9 +3292,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+@@ -3137,7 +3337,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -3170,12 +3370,12 @@
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+@@ -3225,7 +3425,7 @@
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,7 +3462,7 @@
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+@@ -3314,7 +3514,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3583,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3663,7 @@
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+@@ -3509,13 +3709,6 @@
+ 	    fi
+ 	  fi
+ 	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	case $host in
+-	  *-*-darwin*)
+-	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    ;;
+-	esac
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+@@ -3532,7 +3725,7 @@
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+@@ -3587,7 +3780,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -3617,10 +3810,11 @@
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
++	    cmds=$export_symbols_cmds
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+@@ -3630,6 +3824,9 @@
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+@@ -3650,12 +3847,12 @@
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+-		*) 
++		*)
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+-	deplibs="$tmp_deplibs" 
++	deplibs="$tmp_deplibs"
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +3860,13 @@
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -3734,31 +3877,27 @@
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+-	# Add all flags from the command line.  We here create a library,
+-	# but those flags were only added to compile_command and
+-	# finalize_command, which are only used when creating executables.
+-	# So do it by hand here.
+-	compiler_flags="$compiler_flags $add_flags"
+-	# Only add it to commands which use CC, instead of LD, i.e.
+-	# only to $compiler_flags
+-	#linker_flags="$linker_flags $add_flags"
+-
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval cmds=\"$module_expsym_cmds\"
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
+ 	  else
+-	    eval cmds=\"$module_cmds\"
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
+ 	else
+-	  eval cmds=\"$archive_cmds\"
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
+ 	  fi
+ 	fi
+ 
+-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+@@ -3777,6 +3916,7 @@
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+@@ -3786,13 +3926,13 @@
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+@@ -3806,9 +3946,9 @@
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
+ 	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+@@ -3828,13 +3968,13 @@
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+-	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +3999,54 @@
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
++	    else
++	      cmds=$module_cmds
++	    fi
++	  else
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval cmds=\"$archive_expsym_cmds\"
++	    cmds=$archive_expsym_cmds
+ 	  else
+-	    eval cmds=\"$archive_cmds\"
++	    cmds=$archive_cmds
++	    fi
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+-	  eval cmds=\"\$cmds~$rm $delfiles\"
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+-	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -3928,7 +4094,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3957,64 +4123,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
+-	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
+-	    fi
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -4022,10 +4134,11 @@
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+-      eval cmds=\"$reload_cmds\"
++      cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -4038,7 +4151,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4164,18 @@
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+-	eval cmds=\"$reload_cmds\"
++	cmds=$reload_cmds
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -4073,7 +4187,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,21 +4212,18 @@
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+-      *-*-darwin*)
++      *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+       esac
+ 
+@@ -4277,12 +4388,12 @@
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+ 	  fi
+@@ -4334,7 +4445,26 @@
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
+   const char *name;
+   lt_ptr address;
+ }
+@@ -4394,7 +4524,7 @@
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4407,17 +4537,6 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+-      # This does not apply on AIX for ia64, which uses a SysV linker.
+-      case "$host" in
+-        ia64-*-aix5*) ;;
+-        *-*-aix4* | *-*-aix5*)
+-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+-      esac
+-
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+@@ -4493,7 +4612,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -4548,10 +4667,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -4573,11 +4692,11 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
++	  *cygwin* | *mingw* )
++	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
+ 	    cwrapper=`$echo ${output}.exe`
+ 	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+@@ -4586,7 +4705,7 @@
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+-   
++
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+@@ -4618,7 +4737,7 @@
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
++#ifndef DIR_SEPARATOR_2
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+@@ -4649,7 +4768,7 @@
+ {
+   char **newargz;
+   int i;
+-  
++
+   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+@@ -4662,7 +4781,7 @@
+   newargz[1] = fnqualify(argv[0]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
++  strendzap(newargz[1],".exe");
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
+@@ -4673,6 +4792,7 @@
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,7 +4805,7 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+@@ -4699,7 +4819,7 @@
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha (name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+@@ -4709,7 +4829,7 @@
+   return (char *) base;
+ }
+ 
+-char * 
++char *
+ fnqualify(const char *path)
+ {
+   size_t size;
+@@ -4737,7 +4857,7 @@
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4757,7 +4877,7 @@
+ }
+ 
+ static void
+-lt_error_core (int exit_status, const char * mode, 
++lt_error_core (int exit_status, const char * mode,
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4786,7 +4906,7 @@
+ 	  ;;
+ 	esac
+ 	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4807,7 +4927,7 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -4886,7 +5006,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5056,32 @@
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+-	  # Need to set LD_LIBRARY_PATH, to the value already
+-	  # computed within libtool.
+ 	  $echo >> $output "\
+-      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -4986,78 +5104,78 @@
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
+-	  fi
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
+       fi
+ 
+-      compiler_flags="$compiler_flags $add_flags"
+-
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
++       cmds=$old_archive_from_new_cmds
+       else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    status=$?
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
++	  cmds=$old_archive_cmds
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+@@ -5066,31 +5184,18 @@
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
+-	  fi
++
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+-	  done  
++	  done
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+@@ -5098,7 +5203,7 @@
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+-	      fi  
++	      fi
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+@@ -5109,12 +5214,13 @@
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+@@ -5146,11 +5252,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       if test "$hardcode_automatic" = yes ; then
+-        relink_command=
+-      fi  
++	relink_command=
++      fi
++
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+@@ -5168,7 +5276,7 @@
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -5182,7 +5290,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -5193,11 +5301,30 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+@@ -5241,7 +5368,7 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -5254,7 +5381,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5392,11 @@
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5278,14 +5405,14 @@
+       shift
+     else
+       install_prog=
+-      arg="$nonopt"
++      arg=$nonopt
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+       arg="\"$arg\""
+       ;;
+     esac
+@@ -5303,28 +5430,31 @@
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+-	dest="$arg"
++	dest=$arg
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+-      -*) ;;
+-
++      -*)
++	;;
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+-	  dest="$arg"
++	  dest=$arg
+ 	  continue
+ 	fi
+ 	;;
+@@ -5333,7 +5463,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5473,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -5359,7 +5489,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -5380,7 +5510,7 @@
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -5392,7 +5522,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -5421,7 +5551,7 @@
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -5463,7 +5593,7 @@
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+@@ -5478,7 +5608,7 @@
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -5502,23 +5632,36 @@
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
++	  cmds=$postinstall_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+-	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+@@ -5556,7 +5699,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +5717,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +5755,21 @@
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -5650,17 +5791,15 @@
+ 	  done
+ 
+ 	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  outputname=
+@@ -5669,8 +5808,12 @@
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      save_umask=`umask`
++	      umask 0077
++	      if $mkdir "$tmpdir"; then
++	        umask $save_umask
+ 	      else
++	        umask $save_umask
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+@@ -5697,7 +5840,7 @@
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
++	# one anyway 
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+@@ -5729,16 +5872,17 @@
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
++      if test -n "$stripme" && test -n "$old_striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
++      cmds=$old_postinstall_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -5752,9 +5896,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5773,10 +5917,11 @@
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
++	  cmds=$finish_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+@@ -5793,7 +5938,7 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+     $echo "----------------------------------------------------------------------"
+     $echo "Libraries have been installed in:"
+@@ -5829,7 +5974,7 @@
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+     $echo "----------------------------------------------------------------------"
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5841,7 +5986,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -5849,7 +5994,7 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+@@ -5860,7 +6005,7 @@
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -5887,7 +6032,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -5967,7 +6112,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6140,7 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+@@ -6050,10 +6195,11 @@
+ 	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
++	      cmds=$postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6211,11 @@
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      eval cmds=\"$old_postuninstall_cmds\"
++	      cmds=$old_postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6107,7 +6254,7 @@
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
++	  *.exe)
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6299,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -6201,7 +6348,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool at gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6313,6 +6460,8 @@
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+@@ -6354,14 +6503,14 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $?
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/05_pedantic-errors.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/07_disable-visibility.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,143 @@
+--- kde/admin/acinclude.m4.in	2005-11-21 16:59:50.000000000 +0000
++++ kde/admin/acinclude.m4.in	2005-11-21 17:01:34.000000000 +0000
+@@ -3339,73 +3339,73 @@
+ 
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
+-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+-    [
+-      kde_have_gcc_visibility=yes
+-      dnl the whole toolchain is just a mess, gcc is just too buggy
+-      dnl to handle STL with visibility enabled. Lets reconsider 
+-      dnl when gcc 4.2 is out or when things get fixed in the compiler.
+-      dnl Contact mueller at kde.org for details.
+-      AC_ARG_ENABLE(gcc-hidden-visibility,
+-        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
+-          [kde_have_gcc_visibility=$enableval],
+-          [kde_have_gcc_visibility=no])
+-
+-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+-        [
+-          AC_LANG_SAVE
+-          AC_LANG_CPLUSPLUS
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          AC_TRY_COMPILE(
+-          [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-          ], [/* elvis is alive */],
+-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          AC_LANG_RESTORE
+-        ]
+-      )
+-
+-      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-        KDE_CHECK_VISIBILITY_GCC_BUG
+-        HAVE_GCC_VISIBILITY=1
+-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+-      fi
+-    ])
+-  fi
++dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl  if test "x$GXX" = "xyes"; then
++dnl    AC_LANG_SAVE
++dnl    AC_LANG_CPLUSPLUS
++dnl    AC_EGREP_CPP(
++dnl       [GCC visibility push],
++dnl       [ #include <exception> 
++dnl       ], 
++dnl    [
++dnl      AC_MSG_RESULT(yes)
++dnl      kde_stdc_visibility_patched=yes ],
++dnl    [ 
++dnl      AC_MSG_RESULT(no)
++dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++dnl                   visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl      kde_stdc_visibility_patched=no ])
++dnl
++dnl    AC_LANG_RESTORE
++dnl
++dnl    kde_have_gcc_visibility=no
++dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
++dnl    [
++dnl      kde_have_gcc_visibility=yes
++dnl      dnl the whole toolchain is just a mess, gcc is just too buggy
++dnl      dnl to handle STL with visibility enabled. Lets reconsider 
++dnl      dnl when gcc 4.2 is out or when things get fixed in the compiler.
++dnl      dnl Contact mueller at kde.org for details.
++dnl      AC_ARG_ENABLE(gcc-hidden-visibility,
++dnl        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
++dnl          [kde_have_gcc_visibility=$enableval],
++dnl          [kde_have_gcc_visibility=no])
++dnl
++dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl        [
++dnl          AC_LANG_SAVE
++dnl          AC_LANG_CPLUSPLUS
++dnl
++dnl          safe_CXXFLAGS=$CXXFLAGS
++dnl          CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl          AC_TRY_COMPILE(
++dnl          [
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
++dnl          ], [/* elvis is alive */],
++dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl          CXXFLAGS=$safe_CXXFLAGS
++dnl          AC_LANG_RESTORE
++dnl        ]
++dnl      )
++dnl
++dnl      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl        KDE_CHECK_VISIBILITY_GCC_BUG
++dnl        HAVE_GCC_VISIBILITY=1
++dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl      fi
++dnl    ])
++dnl  fi
+ ])
+ 
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/README	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+Common patches across KDE Debian packages
+=========================================
+
+  These directory should contain patches to the admin/ subdir of KDE
+  modules that are meant to be applied to all packaged modules. As the
+  admin/ subdir is shared across modules (and so, it's identical for all
+  modules at a certain version), I think it makes sense to have these
+  patches in a central location, and update them here.
+
+  The script update.sh takes care of automatically updating the patches
+  that update autotools and libtool. You need to pass the location of an
+  admin/ directory as the first argument.
+
+  -- Adeodato Simó, 2005-02-26

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh	2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

Added: people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/patches/common/update.sh	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+ADMIN="$1"
+
+test -d "$ADMIN" || {
+    echo >&2 "Error, admin dir '$ADMIN' does not exist."
+    exit 1
+}
+
+rm -rf a b
+mkdir  a b
+
+cp -a "$ADMIN" a/admin
+
+############################################################
+PATCH=03_libtool_update.diff
+rm -rf b/admin; cp -a a/admin b
+
+cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
+cp -f /usr/share/libtool/ltmain.sh  b/admin/ltmain.sh
+
+diff -Nrua a b >$PATCH
+############################################################
+
+
+############################################################
+PATCH=02_autotools_update.diff
+AUTOMAKE_DIR=/usr/share/automake-1.9
+rm -rf b/admin; cp -a a/admin b
+
+( cd b/admin
+  for file in *; do
+      case "$file" in
+	  config.guess|config.sub)
+	      continue
+	      ;;
+      esac
+      if test -r "$AUTOMAKE_DIR/$file"; then
+	  cp -f "$AUTOMAKE_DIR/$file" "$file"
+      fi
+  done
+)
+
+diff -Nrua a b >$PATCH
+############################################################
+
+rm -rf a b

Added: people/jriddell/KDE/3.5/kdeadmin/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--without-rpm --with-pam=kde --with-shadow --with-nis \
+	--with-private-groups


Property changes on: people/jriddell/KDE/3.5/kdeadmin/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.install
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/secpolicy

Added: people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/man/out/secpolicy.1

Added: people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeadmin/debian/secpolicy.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+?package(secpolicy):\
+	needs="X11"\
+	section="Apps/System"\
+	hints="KDE"\
+	title="KDE PAM Security Policy Editor"\
+	command="/usr/bin/secpolicy"

Added: people/jriddell/KDE/3.5/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+kscreensaver-xsavers depends on xscreensaver-data not xscreensaver

Added: people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/debian-qt-kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,90 @@
+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:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+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)
+
+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-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ALL_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)/usr/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/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/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

Added: people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,93 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney at 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+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_kde
+_cdbs_class_kde := 1
+
+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}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring 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 := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-post-build-arch::
+	mkdir -p po
+	XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages	
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+	rm -rf po
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/simple-patchsys.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+#  Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# 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., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+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_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+  $$lsdiff -H $(DEB_PATCHES) \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+	  rm -f $$dir/*.log ; \
+	done
+
+# The patch subsystem 
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+	$(MAKE) -f debian/rules reverse-config
+	@echo "patches: $(DEB_PATCHES)"
+	@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+	  if [ "$@" = "reverse-patches" ]; then \
+	    if [ ! -e debian/stamp-patched ]; then \
+	      echo "Not reversing not applied patches."; \
+	      exit 0; \
+	    fi; \
+	    reverse="-R"; \
+	    for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+	    patches="$$reversepatches"; \
+	  fi; \
+	  for patch in $$patches; do \
+          case $$patch in \
+            *.gz) cat=zcat ;; \
+            *.bz2) cat=bzcat ;; \
+            *.uu) cat="uudecode -o -" ;; \
+            *) cat=cat ;; \
+          esac; \
+	  level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+	  reverse=""; \
+	  if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+	  success=""; \
+	  if [ -z "$$level" ]; then \
+	    echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+	    for level in 0 1 2; do \
+	      if test -z "$$success"; then \
+	        echo -n "$$level..."; \
+		if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+		  logfile="/dev/null" ; \
+		else \
+		  logfile="$$patch.level-$$level.log" ; \
+		fi ; \
+	        if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+	          if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+	            success=yes; \
+	            touch debian/stamp-patch-$$(basename $$patch); \
+	            echo "success."; \
+                  fi; \
+	        fi; \
+	      fi; \
+            done; \
+	    if test -z "$$success"; then \
+	      if test -z "$$reverse"; then \
+	        echo "failure."; \
+	        exit 1; \
+	       else \
+	         echo "failure (ignored)."; \
+               fi \
+	    fi; \
+	  else \
+	    echo -n "Trying patch $$patch at level $$level..."; \
+	        echo -n "$$level..."; \
+	    if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+	      logfile="/dev/null" ; \
+	    else \
+	      logfile="$$patch.log" ; \
+	    fi ; \
+	    if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+              touch debian/stamp-patch-$$(basename $$patch); \
+	      echo "success."; \
+	    else \
+	      echo "failure:"; \
+	      cat $$logfile; \
+	      if test -z "$$reverse"; then exit 1; fi; \
+            fi; \
+	  fi; \
+	done
+	if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+	elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+	fi
+	# eliminate update-config when reversing patches - Bug ##299010
+	if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif

Added: people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/cdbs/versions.pl	2006-02-14 17:44:09 UTC (rev 3126)
@@ -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+)$/($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";

Added: people/jriddell/KDE/3.5/kdeartwork/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,342 @@
+kdeartwork (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdeartwork (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Do not install ant.desktop, xscreensaver no longer 
+    includes it
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  7 Dec 2005 18:46:44 +0000
+
+kdeartwork (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:27:12 +0000
+
+kdeartwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 22:06:39 +0000
+
+kdeartwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+  * Remove 02_dfsg_images_ignore.diff, merged upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 20:02:30 +0000
+
+kdeartwork (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 13:56:19 -0400
+
+kdeartwork (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * Rebuild (Closes: #317202)
+
+  +++ Changes by Christopher Martin:
+
+  * Replace the build-dep on xlibmesa-glu-dev with libglu1-xorg-dev for the
+    X.Org transition.
+
+  * Remove the dummy transitional package kdeartwork-theme-desktop, as Sarge
+    was released and Woody --> Sarge upgrades are no longer a concern.
+    (Closes: #322008)
+
+  * Don't install webcollage.desktop. This effectively disables that
+    screensaver, removing it from the random screensaver's pool, preventing
+    the inadvertent display of completely random pictures from the Internet.
+    (Closes: #311683, #316900)
+
+  * The necessary files for the pinion screensaver are now installed.
+    (Closes: #310866)
+
+  +++ Changes by Luk Claes:
+
+  * Added me to uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Sep 2005 18:52:58 +0200
+
+kdeartwork (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdeartwork (4:3.4.0-0pre2) alioth; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Converted packaging to CDBS.
+  * Added a new package, kdeartwork-emoticons (containing the former
+    Kopete emoticons, now usable by everyone).
+  * Forward port a patch from KDE 3.3 that fixes the building of the
+    KFireSaver screensaver.
+  * Lower kscreensaver-xsavers's dependency on xscreensaver-gl to a Recommends.
+    (Closes: #278263)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Mar 2005 08:48:21 -0500
+
+kdeartwork (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Jan 2005 06:53:59 +1100
+
+kdeartwork (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Added kdeclassic/locolor icon license to debian/copyright, which has been
+    clarified upstream.
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * Force a rerun of admin/Makefile.common when building (not just after a
+    clean), since the debian patches affect Makefile.ams.
+  * Fixed typo in kaleidescope configuration command (closes: #277119).
+  * Distinguished KSlideshow and GL Slideshow translations in German
+    (closes: #267974).
+
+ -- Ben Burton <bab at debian.org>  Sun, 31 Oct 2004 15:17:56 +1100
+
+kdeartwork (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #267571).
+  * The previous versioned libqt3-mt-dev build-depends is no longer
+    necessary, since kdelibs4-dev already forces Qt 3.3.
+  * Split xscreensaver hooks into a separate package kscreensaver-xsavers,
+    along with kxsconfig and kxsrun (closes: #208769, #244538).  Two years
+    of confusion is enough.
+  * Build-depends on both xscreensaver and xscreensaver-gl, which are
+    required for the corresponding .desktop files to be installed.
+  * Removed depths_xxx.jpg from the kworldclock themes since the license is
+    too restrictive (all rights reserved).
+  * Removed Virtual Machine screensaver since GPL cannot be mixed with BSD
+    with advertising clause.
+
+ -- Ben Burton <bab at debian.org>  Thu, 14 Oct 2004 08:30:34 +1000
+
+kdeartwork (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Rebuilt against STL-enabled Qt and corresponding kdelibs (closes: #254021).
+  * Patched the autoconf tests for kxsconfig so that xscreensaver
+    configuration works again (closes: #238180, #243150).
+  * Suggests (kwin | x-window-manager) for kdewallpapers instead of just
+    x-window-manager.
+  * Removed recommends: kwin from kdeartwork-theme-window since this is
+    already coming in as a depends from the kwin shlibs file.
+
+ -- Ben Burton <bab at debian.org>  Tue, 15 Jun 2004 08:38:18 +1000
+
+kdeartwork (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Don't use Conflicts/Replaces where we should just use Replaces.
+
+ -- Ben Burton <bab at debian.org>  Mon, 26 Apr 2004 09:25:01 +1000
+
+kdeartwork (4:3.2.1-1) unstable; urgency=low
+
+  * First KDE 3.2 upload to sid.
+
+ -- Ben Burton <bab at debian.org>  Sun,  7 Mar 2004 17:42:59 +1100
+
+kdeartwork (4:3.2.0.1-1) experimental; urgency=low
+
+  * First KDE 3.2 upload to experimental.
+  * Sync from KDE_3_2_BRANCH for recent bugfixes (this requires an upstream
+    version change since some binary files have been updated).
+  * Using versioned dependencies for the kdeartwork metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdeartwork (4:3.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
+
+ -- Ben Burton <bab at debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdeartwork (4:3.1.5-2) unstable; urgency=low
+
+  * Made kscreensaver depend on kdebase-bin (closes: #203185).
+
+ -- Ben Burton <bab at debian.org>  Mon, 19 Jan 2004 11:08:45 +1100
+
+kdeartwork (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
+
+kdeartwork (4:3.1.4-2) unstable; urgency=low
+
+  * Fixed paths to xscreensaver XML files in kxsconfig (closes: #221974).
+
+ -- Ben Burton <bab at debian.org>  Sat, 13 Dec 2003 09:34:11 +1100
+
+kdeartwork (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Sun, 12 Oct 2003 19:52:13 +1000
+
+kdeartwork (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added dummy kdeartwork-theme-desktop upgrade package.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab at debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
+
+kdeartwork (4:3.1.2-2) unstable; urgency=low
+
+  * Split kdeartwork-theme-desktop into kdeartwork-theme-icon and
+    kdewallpapers (closes: #189804)
+  * Bumped standards-version to 3.5.10.0.
+
+ -- Ben Burton <bab at debian.org>  Mon,  9 Jun 2003 13:13:35 +1000
+
+kdeartwork (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Man page overhaul.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdeartwork (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Package kscreensaver recommends xscreensaver-gl.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab at debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
+
+kdeartwork (4:3.1.0-3) unstable; urgency=low
+
+  * Made kdeartwork-theme-desktop conflict with kdewallpapers
+    (closes: #180209).
+
+ -- Ben Burton <bab at debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
+
+kdeartwork (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian!
+  * Build-depends on xlibmesa-gl-dev and xlibmesa-glu-dev.
+
+ -- Ben Burton <bab at debian.org>  Mon,  3 Feb 2003 08:53:03 +1100
+
+kdeartwork (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Renamed kdeartwork-screensaver to kscreensaver.
+  * Shifted epoch to 4: since kdebase used to provide kscreensaver 4:3.0.x.
+
+ -- Ben Burton <bab at debian.org>  Sat,  4 Jan 2003 20:06:44 +1100
+
+kdeartwork (3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built with g++-3.2.
+  * Build-depends on automake1.7.
+
+ -- Ben Burton <benb at acm.org>  Tue, 22 Oct 2002 11:57:39 +1000
+
+kdeartwork (3.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to Chris Cheney's style of debian/rules.
+  * Build-depends on automake1.6.
+
+ -- Ben Burton <benb at acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
+
+kdeartwork (3.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on automake1.5.
+
+ -- Ben Burton <benb at acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
+
+kdeartwork (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdeartwork (3.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Mon, 13 May 2002 15:29:23 +1000
+
+kdeartwork (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
+
+kdeartwork (2.2.1-5) unstable; urgency=low
+
+  * Uses automake again to solve new alpha problems.
+
+ -- Ben Burton <benb at acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
+
+kdeartwork (2.2.1-4) unstable; urgency=low
+
+  * Cleaned up automake-related material.
+
+ -- Ben Burton <benb at acm.org>  Sun, 28 Oct 2001 13:48:04 -0600
+
+kdeartwork (2.2.1-3) unstable; urgency=low
+
+  * Builds with automake 1.5.
+
+ -- Ben Burton <benb at acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
+
+kdeartwork (2.2.1-2) unstable; urgency=low
+
+  * Updated parameters for alpha build (closes: Bug#113125).
+
+ -- Ben Burton <benb at acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
+
+kdeartwork (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
+
+kdeartwork (2.2.0-final-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.5.6.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Jul 2001 17:48:59 +1000
+
+kdeartwork (2.2-beta1-2) unstable; urgency=low
+
+  * Builds on alpha.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
+
+kdeartwork (2.2-beta1-1) unstable; urgency=low
+
+  * Initial Release (closes: Bug#101244).
+
+ -- Ben Burton <benb at acm.org>  Sat, 26 May 2001 21:31:05 -0500
+
+Local variables:
+mode: debian-changelog
+End:

Added: people/jriddell/KDE/3.5/kdeartwork/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/compat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/compat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kdeartwork/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,141 @@
+Source: kdeartwork
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.5.1), gawk, gettext, sharutils, kdebase-dev (>= 4:3.5.1), kwin, libgl1-mesa-dev, x11proto-gl-dev, xscreensaver, xscreensaver-gl
+Build-Conflicts: autoconf2.13, nvidia-glx
+Standards-Version: 3.6.2
+
+Package: kdeartwork
+Architecture: all
+Section: kde
+Depends: kdeartwork-misc (>= ${Source-Version}), kdeartwork-emoticons (>= ${Source-Version}), kdeartwork-style (>= ${Source-Version}), kdeartwork-theme-icon (>= ${Source-Version}), kdeartwork-theme-window (>= ${Source-Version}), kdewallpapers (>= ${Source-Version}), kscreensaver (>= ${Source-Version}), kscreensaver-xsavers (>= ${Source-Version})
+Description: themes, styles and more from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes a collection of artistic extras (themes, widget
+ styles, screen savers, wallpaper, icons, emoticons and so on) provided
+ with the official release of KDE.
+ .
+ Homepage: http://artist.kde.org 
+
+Package: kdeartwork-emoticons
+Architecture: all
+Section: kde
+Enhances: kopete
+Description: emoticon collections for KDE chat clients
+ This package contains several collections of emoticons used by official
+ and unofficial KDE chat clients, such as Kopete and Konversation.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kdeartwork-misc
+Architecture: all
+Section: kde
+Suggests: kworldclock
+Description: various multimedia goodies released with KDE
+ This package contains miscellaneous multimedia goodies for KDE.
+ Included are additional KDE sounds and kworldclock themes.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kdeartwork-style
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Description: widget styles released with KDE
+ This package contains additional widget styles for KDE. Widget styles
+ can be used to customise the look and feel of interface components such
+ as buttons, scrollbars and so on.  They can be applied using the style
+ manager in the KDE Control Centre.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kdeartwork-theme-icon
+Architecture: all
+Section: kde
+Recommends: kdesktop, kicker
+Conflicts: kdeartwork-theme-desktop (<= 4:3.1.2-1)
+Replaces: kdeartwork-theme-desktop (<= 4:3.1.2-1)
+Description: icon themes released with KDE
+ This package contains additional icon themes for KDE. Icon themes can be
+ used to customise the appearance of standard icons throughout KDE. They
+ can be applied using the icon manager in the KDE Control Centre.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kdeartwork-theme-window
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Replaces: kwin (<< 4:3.1.93)
+Description: window decoration themes released with KDE
+ This package contains additional window decoration themes for KDE. Window
+ decoration themes can be used to customise the look of window borders and
+ buttons, and can be applied using the window decoration manager in the KDE
+ Control Center.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kdewallpapers
+Architecture: all
+Section: kde
+Suggests: kwin | x-window-manager
+Conflicts: kdeartwork-theme-desktop (<= 4:3.1.2-1)
+Replaces: kdeartwork-theme-desktop (<= 4:3.1.2-1)
+Description: wallpapers released with KDE
+ This package contains additional wallpapers for KDE. Wallpapers can be
+ applied using the background manager in the KDE Control Centre.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kscreensaver
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdebase-bin
+Recommends: kwin, kscreensaver-xsavers (= ${Source-Version})
+Conflicts: kdeartwork-screensaver (<= 3.1.0-1)
+Replaces: kdeartwork-screensaver (<= 3.1.0-1)
+Description: additional screen savers released with KDE
+ This package contains the screen savers for KDE. They can be tested and
+ selected within the Appearance and Themes section of the KDE Control
+ Center.
+ .
+ The hooks for the standard xscreensavers are no longer part of this
+ package. To select and/or configure the standard xscreensavers through
+ the KDE Control Center, install the separate package kscreensaver-xsavers.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.
+
+Package: kscreensaver-xsavers
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kdebase-bin, xscreensaver-data
+Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl
+Conflicts: kdeartwork-screensaver (<= 3.1.0-1)
+Replaces: kdeartwork-screensaver (<= 3.1.0-1), kscreensaver (<< 4:3.3.0)
+Description: KDE hooks for standard xscreensavers
+ This package allows a smooth integration of the standard xscreensavers
+ into KDE. With this package installed you can select and/or configure
+ the standard xscreensavers through the Appearances and Themes section of
+ the KDE Control Centre.
+ .
+ Note that this package does not actually contain any screensavers itself.
+ For the additional screensavers shipped with KDE, see the separate package
+ kscreensaver. This package does depend on the xscreensaver package, and
+ recommend the xscreensaver-gl package, as well as contain the necessary
+ files to integrate these packages into KDE.
+ .
+ This package is part of KDE, and a component of the KDE artwork module.
+ See the 'kde' and 'kdeartwork' packages for more information.

Added: people/jriddell/KDE/3.5/kdeartwork/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,233 @@
+This package was debianized by Ben Burton <bab at debian.org> on
+Tue, 22 May 2001 01:53:05 -0500.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors:
+
+  Note that kdeartwork has many contributers beyond those listed below.
+
+  Icon Themes:
+    iKons: Kristof Borrey <kborrey at skynet.be>
+    Kids: Everaldo Coelho <everaldo at everaldo.com>
+    Slick: Robert Cosgrove <rob at digital-confusion.net> and others
+    Technical: Antialias <antialias at b2mail.dk>
+
+  KWorldClock Themes:
+    (see below)
+
+  Screen Savers:
+    Banner: Martin R. Jones <mjones at kde.org> and others
+    Blob: Tiaan Wessels <tiaan at netsys.co.za>
+    Clock: Melchior Franz <mfranz at kde.org>
+    Euphoria: Terence Welsh and Karl Robillard
+    Fireworks 3D: Enrico Ros <asy at libero.it> and David Sansome
+    Flux: Terence Welsh and Karl Robillard
+    Gravity: Ian Reinhart Geiser <geiseri at msoe.edu>,
+        Jeff Molofee <nehe at connect.ab.ca> and
+        Nick Betcher <nbetcher at usinternet.com>
+    Lines: Dirk Staneker <dirk.stanerker at student.uni-tuebingen.de>,
+        Martin R. Jones <mjones at kde.org> and Mario Weilguni <mweilguni at kde.org>
+    Lorenz Attractor: Nicolas Brodu <brodu at kde.org> and others
+    Media: Stefan Schimanski <1Stein at gmx.de>
+    Particle Fountain: Ian Reinhart Geiser <geiseri at msoe.edu>,
+        Jeff Molofee <nehe at connect.ab.ca> and
+        Nick Betcher <nbetcher at usinternet.com>
+    Pendulum: Georg Drenkhahn <georg-d at users.sourceforge.net>
+    Polygons: Martin R. Jones <mjones at kde.org> and
+        Mario Weilguni <mweilguni at kde.org>
+    Rotation: Georg Drenkhahn <georg-d at users.sourceforge.net>
+    Science: Rene Beutler <rbeutler at g26.ethz.ch>
+    Slide Show: Stefan Taferner <taferner at kde.org>,
+        Martin R. Jones <mjones at kde.org>, Chris Howells <howells at kde.org>
+        and Sven Leiber <s.leiber at web.de>
+    Solar Winds: Terence Welsh and Karl Robillard
+    Space: Bernd Johannes Wuebben <wuebben at math.cornell.edu> and
+        Silicon Graphics, Inc.
+    Swarm: Patrick J. Naughton, Emanuel Pirker <epirker at edu.uni-klu.ac.at>,
+        Jeff Butterworth <butterwo at ncsc.org> and
+        Mario Weilguni <mweilguni at kde.org>
+    Virtual Machine: Artur Rataj <art at zeus.polsl.gliwice.pl>,
+        Eric Plante and Jamie Zawinski <jwz at jwz.org>
+    Wave: Ian Reinhart Geiser <geiseri at msoe.edu> and
+        Jeff Molofee <nehe at connect.ab.ca>
+
+    KDE xscreensaver tools: Martin R. Jones <mjones at kde.org>
+    Original xscreensaver code: Jamie Zawinski <jwz at jwz.org>
+
+  Wallpapers:
+    (see below)
+
+  Widget Styles:
+    .NET: Chris Lee <lee at azsites.com>, Carsten Pfeiffer <pfeiffer at kde.org>,
+        Karol Szwed <gallium at kde.org> and others
+    Plastik: Sandro Giessl <ceebx at users.sourceforge.net> and many others
+
+  Window Decoration Themes:
+    CDE: Chris Lee <lee at azsites.com>, Lennart Kudling <kudling at kde.org>,
+        Fredrik Höglund <fredrik at kde.org> and
+        Luciano Montanaro <mikelima at cirulla.net>
+    Glow: Henning Burchardt <h_burchardt at gmx.net>
+    IceWM support: Karol Szwed <gallium at kde.org>
+    KDE1: Matthias Ettrich <ettrich at kde.org>
+    MenschMaschine: <kraftw at gmx.de>
+    Model: <kraftw at gmx.de>
+    OpenLook: Luciano Montanaro <mikelima at cirulla.net> and others
+    Plastik: Sandro Giessl <ceebx at users.sourceforge.net>,
+        Rik Hemsley (rikkus) <rik at kde.org> and Laur Ivan <laurivan at eircom.net>
+    Risc OS: Rik Hemsley <rik at kde.org>
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions:
+
+    CDE window decoration theme: BSD License
+    KDE-Classic and KDE-LoColor icon themes: (see below)
+    KWorldClock Themes: (see below)
+    OpenLook window decoration theme: (see below)
+    Media screen saver: GNU Lesser General Public License (LGPL)
+    .NET widget style: GNU Lesser General Public License (LGPL)
+    Plastik widget style: GNU Lesser General Public License (LGPL)
+    Plastik window decoration theme: Mixture of GPL and LGPL
+    Space screen saver: GNU Lesser General Public License (LGPL)
+    Virtual Machine screen saver: (see below)
+    Wallpapers: (see below)
+    xscreensaver code, used in various screen savers: (see below)
+
+  On Debian GNU/Linux systems, the complete texts of these licenses
+  can be found in `/usr/share/common-licenses/GPL',
+  `/usr/share/common-licenses/LGPL' and `/usr/share/common-licenses/BSD'.
+
+  --------------------
+
+  KDE-Classic and KDE-LoColor icon themes:
+
+  The images inside this directory are COMPLETELY FREE for commercial
+  and non-commercial use.
+  Clarification: this means you can copy, modify and redistribute them.
+
+  --------------------
+
+  KWorldClock themes:
+
+  Map Copyright Information
+
+  These maps have been taken from:
+
+  http://www.radcyberzine.com/xglobe/
+
+  Most maps are images available primarily from US Government agencies and
+  web sites.  None of the maps on this distrubution are copyrighted to my
+  knowledge. This web page gives no permission to sell any maps and make
+  no copyright claim on any map images found therein.
+
+  alt_xxx.jpg:
+    Taken from USGS National Mapping Division, EROS Data Center, GTOPO30
+    (Global 30 Arc Second Elebation Data).
+  bio_xxx.jpg:
+    Taken from http://seawifs.gsfc.nasa.gov/SEAWIFS/IMAGES/SEAWIFS_GALLERY.html
+    with black ocean replaced by auqa-blue.
+  caida_xxx.jpg & caida_bw_xxx.jpg:
+    Cooperative Association for Internet Data Analysis (CAIDA) at
+    http://www.caida.org. (Taken from
+    http://hum.amu.edu.pl/~zbzw/glob/glob7d.htm).
+  mggd_xxx.jpg:
+    Taken from http://www.ngdc.noaa.gov/mgg/.
+
+  --------------------
+
+  OpenLook window decoration theme:
+
+  'OpenLook' kwin client
+
+  Porting to kde3.2 API
+    Copyright 2003 Luciano Montanaro <mikelima at cirulla.net>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  --------------------
+
+  Virtual Machine screen saver:
+
+  Mixture of GNU General Public License and the following:
+
+    Copyright (c) 1983 Regents of the University of California.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms are permitted
+    provided that the above copyright notice and this paragraph are
+    duplicated in all such forms and that any documentation,
+    advertising materials, and other materials related to such
+    distribution and use acknowledge that the software was developed
+    by the University of California, Berkeley.  The name of the
+    University may not be used to endorse or promote products derived
+    from this software without specific prior written permission.
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+    WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+  Since these two licenses are incompatible, the Virtual Machine screen
+  saver is not built and shipped with kdeartwork.  However, the individual
+  source files (each under only a single one of these licenses) are
+  still available in the kdeartwork source package.
+
+  --------------------
+
+  Wallpapers:
+
+  Credits and licensing:
+
+  Dasding.jpg - Qwertz <kraftw at gmx.de>
+  alien-night.jpg - Rob Cosgrove <abug at ozemail.com.au>
+  kde_passion.jpg - Benjamin Keating <ben at digitalsimplicity.com>
+  kdemagic.jpg - "El Tonno Loco" <tunnash at libero.it>
+  kiagara.jpg - Thomas Cherouny <th.cherouny at web.de>
+  kraftwurm.jpg - Qwertz <kraftw at gmx.de>
+  linux_addict.jpg - Ayo <73lab at free.fr>
+  mystical_rightturn.jpg - Christian Müller <cmue81 at gmx.de>
+  only_k.jpg - Sven Müller <lightmaker at web.de>
+  triplegears.jpg - Jörg Gastner <gastner at t-online.de>
+  winter_theme_1.jpg - Ayo <73lab at free.fr>
+  kde3blue.jpg - Matthias Grünler <matthias.gruenler at web.de>
+
+  License: free for commercial and noncommercial usage, distribution and
+  modification
+
+  The following tiles are courteously provided by  Bowie J. Poag /
+  PROPAGANDA:
+
+  Superfluous-Organ-1.jpg, The-Good-Times-1.jpg, Whirling_Spirit.jpg,
+  Appropriately-Left-Handed-2.jpg
+
+  License: Copyleft
+
+  --------------------
+
+  xscreensaver code:
+
+  xscreensaver, Copyright (c) 1993-2002 Jamie Zawinski <jwz at jwz.org>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.  No representations are made about the suitability of this
+  software for any purpose.  It is provided "as is" without express or
+  implied warranty.
+

Added: people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/README.Packaging
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/README.Packaging	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/README.Packaging	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+
+Packaging kdeartwork for Debian
+-------------------------------
+
+Note that kdeartwork ships with some images that are not DFSG-free.
+These images need to be removed from the original upstream tarball
+before debian packaging takes place.  To do this, unpack the original
+upstream tarball into kdeartwork-<version>.orig as usual, and then run
+
+  debian/clean-sources
+
+from the top-level kdeartwork-<version>.orig directory.  The same must also
+be done from the working kdeartwork-<version> directory where the usual
+debian-specific changes are to be made.
+
+ -- Ben Burton <bab at debian.org>, Thu, 14 Oct 2004 22:03:03 +1000

Added: people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/clean-sources
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/clean-sources	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/dfsg/clean-sources	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+if [ ! -d kworldclock ]; then
+  echo "You must be in the top-level kdeartwork directory."
+  exit 1
+fi
+
+
+echo "Processing non-DFSG-free kdeartwork data..."
+imgdirs=kworldclock/depths
+
+if [ ! -e "$imgdirs" ]; then
+  echo "Non-free images not found, perhaps you have already cleaned them out?"
+else
+  rm -rf $imgdirs
+  echo "Removed."
+fi

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-emoticons.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-emoticons.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-emoticons.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/share/emoticons

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-misc.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-misc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-misc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/apps/kworldclock
+debian/tmp/usr/share/sounds/KDE_Logout_new.wav
+debian/tmp/usr/share/sounds/KDE_Startup_new.wav

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-style.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-style.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-style.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/kde3/plugins/styles
+debian/tmp/usr/lib/kde3/kstyle_phase_config.la
+debian/tmp/usr/lib/kde3/kstyle_phase_config.so
+debian/tmp/usr/share/apps/kstyle

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-icon.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-icon.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-icon.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/share/icons

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-window.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-window.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork-theme-window.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/kde3/kwin*
+debian/tmp/usr/share/apps/kwin

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdeartwork.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KDE Artwork for Debian
+----------------------
+
+Package kdeartwork is a metapackage that depends on the full set of
+themes, widget styles, screen savers and other artistic goodies provided
+with the official release of KDE.
+
+ -- Ben Burton <bab at debian.org>, Thu,  4 Jul 2002 19:36:49 +1000

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kdewallpapers.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kdewallpapers.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kdewallpapers.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/share/wallpapers

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Screensavers for Debian
+---------------------------
+
+This package (kscreensaver-xsavers) only contains hooks for the standard
+xscreensavers, so that they can be selected and/or configured through
+the KDE Control Centre.
+
+For the additional screensavers that are specifically shipped with KDE,
+see the separate package kscreensaver.
+
+ -- Ben Burton <bab at debian.org>, Thu, 14 Oct 2004 08:30:34 +1000

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,190 @@
+debian/tmp/usr/bin/kxsconfig
+debian/tmp/usr/bin/kxsrun
+debian/tmp/usr/share/applnk/System/ScreenSavers/anemone.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/anemotaxis.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/antinspect.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/antspotlight.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/apollonian.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/apple2.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/atlantis.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/attraction.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/atunnel.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/barcode.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/blaster.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/blinkbox.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/blitspin.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/blocktube.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bouboule.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bouncingcow.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/boxed.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/braid.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bsod.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bubble3d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bubbles.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/bumps.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/cage.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/ccurve.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/circuit.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/cloudlife.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/compass.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/coral.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/critical.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/crystal.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/cubenetic.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/cubestorm.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/cynosure.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/dangerball.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/decayscreen.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/deco.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/deluxe.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/demon.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/discrete.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/distort.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/drift.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/endgame.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/engine.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/epicycle.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/eruption.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/euler2d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/extrusion.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/fadeplot.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/fireworkx.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flag.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flame.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flipflop.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flipscreen3d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flow.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/fluidballs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flurry.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/flyingtoasters.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/fontglide.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/forest.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/fuzzyflakes.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/galaxy.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/gears.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/gflux.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glblur.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/gleidescope.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glforestfire.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glknots.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glmatrix.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glplanet.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glslideshow.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/glsnake.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/gltext.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/goop.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/grav.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/greynetic.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/halftone.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/halo.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/helix.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/hopalong.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/hyperball.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/hypercube.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/hypertorus.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/ifs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/imsmap.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/interference.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/intermomentary.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/jigglypuff.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/jigsaw.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/juggle.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/julia.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/kaleidescope.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/klein.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/kumppa.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lament.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/laser.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lavalite.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lightning.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lisa.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lissie.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/lmorph.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/loop.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/maze.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/memscroller.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/menger.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/metaballs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/mirrorblob.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/mismunch.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/moebius.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/moire.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/moire2.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/molecule.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/morph3d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/mountain.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/munch.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/nerverot.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/noof.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/noseguy.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pacman.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pedal.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/penetrate.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/penrose.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/petri.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/phosphor.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/piecewise.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pinion.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pipes.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/polyhedra.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/polyominoes.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/polytopes.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pong.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/popsquares.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/providence.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pulsar.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/pyro.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/qix.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/queens.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rd-bomb.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/ripples.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rocks.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rorschach.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rotor.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rotzoomer.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/rubik.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sballs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/shadebobs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sierpinski.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sierpinski3d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/slidescreen.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/slip.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sonar.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/speedmine.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sphere.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/spheremonics.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/spiral.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/spotlight.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/sproingies.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/squiral.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/stairs.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/starfish.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/starwars.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/stonerview.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/strange.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/substrate.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/superquadrics.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/swirl.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/t3d.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/thornbird.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/triangle.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/truchet.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/twang.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/vermiculate.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/vidwhacker.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/vines.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/wander.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/whirlwindwarp.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/whirlygig.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/worm.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/wormhole.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xanalogtv.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xflame.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xjack.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xlyap.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xmatrix.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xrayswarm.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xspirograph.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xsublim.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/xteevee.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/zoom.desktop

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver-xsavers.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/man/kxsconfig.1
+debian/man/kxsrun.1

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Screensavers for Debian
+---------------------------
+
+This package (kscreensaver) no longer contains the hooks for the standard
+xscreensavers.  It only contains the additional screensavers that are
+specifically shipped with KDE.
+
+To select and/or configure the standard xscreensavers through the KDE Control
+Centre, install the separate package kscreensaver-xsavers.
+
+ -- Ben Burton <bab at debian.org>, Thu, 14 Oct 2004 08:30:34 +1000

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.install
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,44 @@
+debian/tmp/usr/bin/kslideshow.kss
+debian/tmp/usr/bin/kpolygon.kss
+debian/tmp/usr/bin/krotation.kss
+debian/tmp/usr/bin/ksolarwinds.kss
+debian/tmp/usr/bin/klorenz.kss
+debian/tmp/usr/bin/kspace.kss
+debian/tmp/usr/bin/kvm.kss
+debian/tmp/usr/bin/kflux.kss
+debian/tmp/usr/bin/kscience.kss
+debian/tmp/usr/bin/kbanner.kss
+debian/tmp/usr/bin/kfiresaver.kss
+debian/tmp/usr/bin/keuphoria.kss
+debian/tmp/usr/bin/kclock.kss
+debian/tmp/usr/bin/kswarm.kss
+debian/tmp/usr/bin/kfountain.kss
+debian/tmp/usr/bin/kgravity.kss
+debian/tmp/usr/bin/kpartsaver.kss
+debian/tmp/usr/bin/kpendulum.kss
+debian/tmp/usr/bin/kblob.kss
+debian/tmp/usr/bin/klines.kss
+debian/tmp/usr/bin/kwave.kss
+debian/tmp/usr/share/applnk/System/ScreenSavers/KBanner.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KBlob.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KClock.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KEuphoria.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KFiresaver.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KFlux.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KFountain.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KGravity.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KLines-saver.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KLorenz.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KPendulum.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KPolygon.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KRotation.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KScience.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KSlideshow.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KSolarWinds.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KSpace.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KSwarm.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KVm.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KWave.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/kpartsaver.desktop
+debian/tmp/usr/share/apps/kfiresaver
+debian/tmp/usr/share/apps/kscreensaver

Added: people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/kscreensaver.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+debian/man/kbanner.kss.1
+debian/man/kblob.kss.1
+debian/man/kclock.kss.1
+debian/man/keuphoria.kss.1
+debian/man/kfiresaver.kss.1
+debian/man/kflux.kss.1
+debian/man/kfountain.kss.1
+debian/man/kgravity.kss.1
+debian/man/klines.kss.1
+debian/man/klorenz.kss.1
+debian/man/kpartsaver.kss.1
+debian/man/kpendulum.kss.1
+debian/man/kpolygon.kss.1
+debian/man/krotation.kss.1
+debian/man/kscience.kss.1
+debian/man/kslideshow.kss.1
+debian/man/ksolarwinds.kss.1
+debian/man/kspace.kss.1
+debian/man/kswarm.kss.1
+debian/man/kvm.kss.1
+debian/man/kwave.kss.1

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kbanner.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kbanner.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kbanner.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KBANNER.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kbanner.kss \- Banner screen saver for KDE
+.SH SYNOPSIS
+.B kbanner.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBBanner\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkbanner.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Martin R. Jones <mjones at kde.org> and others.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kblob.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kblob.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kblob.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KBLOB.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kblob.kss \- Blob screen saver for KDE
+.SH SYNOPSIS
+.B kblob.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBBlob\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkblob.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Tiaan Wessels <tiaan at netsys.co.za>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kclock.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kclock.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kclock.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KCLOCK.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kclock.kss \- Clock screen saver for KDE
+.SH SYNOPSIS
+.B kclock.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBClock\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkclock.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Melchior Franz <mfranz at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/keuphoria.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/keuphoria.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/keuphoria.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KEUPHORIA.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+keuphoria.kss \- Euphoria screen saver for KDE
+.SH SYNOPSIS
+.B keuphoria.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBEuphoria\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkeuphoria.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Terence Welsh and Karl Robillard.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kfiresaver.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kfiresaver.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kfiresaver.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KFIRESAVER.KSS 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kfiresaver.kss \- Fireworks 3D screen saver for KDE
+.SH SYNOPSIS
+.B kfiresaver.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBFireworks 3D\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkfiresaver.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Enrico Ros <asy at libero.it> and
+David Sansome.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kflux.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kflux.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kflux.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KFLUX.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kflux.kss \- Flux screen saver for KDE
+.SH SYNOPSIS
+.B kflux.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBFlux\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkflux.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Terence Welsh and Karl Robillard.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kfountain.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kfountain.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kfountain.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KFOUNTAIN.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kfountain.kss \- Particle Fountain screen saver for KDE
+.SH SYNOPSIS
+.B kfountain.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBParticle Fountain\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkfountain.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Ian Reinhart Geiser <geiseri at msoe.edu>,
+Jeff Molofee <nehe at connect.ab.ca> and Nick Betcher <nbetcher at usinternet.com>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kgravity.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kgravity.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kgravity.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KGRAVITY.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kgravity.kss \- Particle Gravity screen saver for KDE
+.SH SYNOPSIS
+.B kgravity.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBParticle Gravity\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkgravity.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Ian Reinhart Geiser <geiseri at msoe.edu>,
+Jeff Molofee <nehe at connect.ab.ca> and Nick Betcher <nbetcher at usinternet.com>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/klines.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/klines.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/klines.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KLINES.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+klines.kss \- Lines screen saver for KDE
+.SH SYNOPSIS
+.B klines.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBLines\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIklines.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by
+Dirk Staneker <dirk.stanerker at student.uni-tuebingen.de>,
+Martin R. Jones <mjones at kde.org> and Mario Weilguni <mweilguni at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/klorenz.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/klorenz.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/klorenz.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KLORENZ.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+klorenz.kss \- Lorenz Attractor screen saver for KDE
+.SH SYNOPSIS
+.B klorenz.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBLorenz Attractor\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIklorenz.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Nicolas Brodu <brodu at kde.org> and others.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kpartsaver.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kpartsaver.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kpartsaver.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KPARTSAVER.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kpartsaver.kss \- Media screen saver for KDE
+.SH SYNOPSIS
+.B kpartsaver.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBMedia\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkpartsaver.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Stefan Schimanski <1Stein at gmx.de>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kpendulum.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kpendulum.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kpendulum.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KPENDULUM.KSS 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kpendulum.kss \- Pendulum screen saver for KDE
+.SH SYNOPSIS
+.B kpendulum.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBPendulum\fP is a screen saver for the K Desktop Environment (KDE).
+It simulates a two-part pendulum.
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkpendulum.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Georg Drenkhahn
+<georg-d at users.sourceforge.net>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kpolygon.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kpolygon.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kpolygon.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KPOLYGON.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kpolygon.kss \- Polygons screen saver for KDE
+.SH SYNOPSIS
+.B kpolygon.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBPolygons\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkpolygon.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Martin R. Jones <mjones at kde.org> and
+Mario Weilguni <mweilguni at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/krotation.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/krotation.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/krotation.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KROTATION.KSS 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+krotation.kss \- Rotation screen saver for KDE
+.SH SYNOPSIS
+.B krotation.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBRotation\fP is a screen saver for the K Desktop Environment (KDE).
+It simulates a force free rotating asymmetric body.
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkrotation.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Georg Drenkhahn
+<georg-d at users.sourceforge.net>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kscience.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kscience.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kscience.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSCIENCE.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kscience.kss \- Science screen saver for KDE
+.SH SYNOPSIS
+.B kscience.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBScience\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkscience.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Rene Beutler <rbeutler at g26.ethz.ch>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kslideshow.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kslideshow.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kslideshow.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSLIDESHOW.KSS 1 "January 30, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kslideshow.kss \- Slide Show screen saver for KDE
+.SH SYNOPSIS
+.B kslideshow.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBSlide Show\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkslideshow.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Stefan Taferner <taferner at kde.org>,
+Martin R. Jones <mjones at kde.org>, Chris Howells <howells at kde.org>
+and Sven Leiber <s.leiber at web.de>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/ksolarwinds.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/ksolarwinds.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/ksolarwinds.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSOLARWINDS.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ksolarwinds.kss \- Solar Winds screen saver for KDE
+.SH SYNOPSIS
+.B ksolarwinds.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBSolar Winds\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIksolarwinds.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Terence Welsh and Karl Robillard.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kspace.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kspace.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kspace.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSPACE.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kspace.kss \- Space screen saver for KDE
+.SH SYNOPSIS
+.B kspace.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBSpace\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkspace.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Bernd Johannes Wuebben
+<wuebben at math.cornell.edu> and Silicon Graphics, Inc.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kswarm.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kswarm.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kswarm.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KSWARM.KSS 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kswarm.kss \- Swarm screen saver for KDE
+.SH SYNOPSIS
+.B kswarm.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBSwarm\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkswarm.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Patrick J. Naughton,
+Emanuel Pirker <epirker at edu.uni-klu.ac.at>,
+Jeff Butterworth <butterwo at ncsc.org> and Mario Weilguni <mweilguni at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kvm.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kvm.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kvm.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KVM.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kvm.kss \- Virtual Machine screen saver for KDE
+.SH SYNOPSIS
+.B kvm.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBVirtual Machine\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkvm.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Artur Rataj <art at zeus.polsl.gliwice.pl>,
+Eric Plante and Jamie Zawinski <jwz at jwz.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kwave.kss.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kwave.kss.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kwave.kss.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,52 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KWAVE.KSS 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kwave.kss \- Bitmap Wave screen saver for KDE
+.SH SYNOPSIS
+.B kwave.kss
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBBitmap Wave\fP is a screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the screen saver-specific options.
+For a full summary of options, run \fIkwave.kss \-\-help\fP.
+.TP
+\fB\-\-setup\fP
+Set up the screen saver.
+.TP
+\fB\-\-window-id\fP \fIwid\fP
+Run in the specified XWindow.
+.TP
+\fB\-\-root\fP
+Run in the root XWindow.
+.TP
+\fB\-\-demo\fP
+Start the screen saver in demo mode (default).
+.SH SEE ALSO
+.BR kxsconfig (1),
+.BR kxsrun (1).
+.SH AUTHOR
+This screen saver was written by Ian Reinhart Geiser <geiseri at msoe.edu>
+and Jeff Molofee <nehe at connect.ab.ca>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsconfig.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsconfig.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsconfig.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,50 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KXSCONFIG 1 "October 13, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kxsconfig \- KDE X screen saver configuration tool
+.SH SYNOPSIS
+.B kxsconfig
+.RI "[ " generic-options " ]"
+\fIscreensaver\fP
+[ \fIsavername\fP ]
+.SH DESCRIPTION
+\fBkxsconfig\fP is a screen saver configuration tool
+for the K Desktop Environment (KDE).  It is used to configure generic
+X screen savers, i.e., screen savers that have not been written explicitly
+for KDE.
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the kxsconfig-specific options.
+For a full summary of options, run \fIkxsconfig \-\-help\fP.
+.TP
+\fIscreensaver\fP
+The filename of the screen saver to configure.
+.TP
+\fIsavername\fP
+An optional human-readable screen saver name to use in messages.
+.SH EXAMPLES
+\fIexample$\fP kxsconfig /usr/lib/xscreensaver/bouboule Bouboule
+.SH SEE ALSO
+.BR kxsrun (1).
+.SH AUTHOR
+This tool was written by Martin R. Jones <mjones at kde.org>.  It also
+makes use of xscreensaver code written by Jamie Zawinski <jwz at jwz.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsrun.1
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsrun.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/man/kxsrun.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,49 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KXSRUN 1 "May 12, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kxsrun \- KDE X screen saver launcher
+.SH SYNOPSIS
+.B kxsrun
+.RI "[ " generic-options " ]"
+\fIscreensaver\fP
+[ \fB\-\-\fP \fIoptions\fP ]
+.SH DESCRIPTION
+\fBkxsrun\fP is a screen saver launcher
+for the K Desktop Environment (KDE).  It is used to launch generic
+X screen savers, i.e., screen savers that have not been written explicitly
+for KDE.
+.PP
+This program is part of the official KDE artwork module.
+.SH OPTIONS
+Below are the kxsrun-specific options.
+For a full summary of options, run \fIkxsrun \-\-help\fP.
+.TP
+\fIscreensaver\fP
+The filename of the screen saver to launch.
+.TP
+\fB\-\-\fP \fIoptions\fP
+Additional options to pass to the screen saver.
+.SH EXAMPLES
+\fIexample$\fP kxsrun /usr/lib/xscreensaver/bouboule
+.SH SEE ALSO
+.BR kxsconfig (1).
+.SH AUTHOR
+This tool was written by Martin R. Jones <mjones at kde.org>.
+.br
+This manual page was prepared by Ben Burton <bab at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/02_autotools_update.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp	2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp	2005-10-28 15:11:00.000000000 -0400
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2005-05-14.22
++scriptversion=2005-07-09.11
+ 
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+@@ -467,7 +467,8 @@
+   done
+ 
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+     sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"

Added: people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/03_libtool_update.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6192 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in	2005-11-10 12:07:37.000000000 -0500
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file 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.
+ 
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +523,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -513,7 +541,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -578,7 +605,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -615,11 +644,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -643,7 +677,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -672,20 +706,53 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -924,20 +991,13 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+-   chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1150,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1160,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1160,7 +1238,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -1169,7 +1247,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1275,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1329,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -1273,7 +1352,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -1285,8 +1364,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -1331,9 +1419,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1436,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1447,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1421,22 +1509,19 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  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
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -1446,6 +1531,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec